Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bisonw-desktop: don't force tls for mac os desktop app #2923

Merged
merged 1 commit into from
Aug 20, 2024
Merged

bisonw-desktop: don't force tls for mac os desktop app #2923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions client/cmd/bisonw-desktop/app_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,6 @@ func mainCore() error {
}()
}

// Default to serving the web interface over TLS.
cfg.WebTLS = true
Comment on lines -309 to -310
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why this setting would be forced. I do see there was a tangentially related comment in the PR, and I'm wondering if it was misinterpreted. Hopefully @ukane-philemon can shed some light, but I don't see a reason to default to TLS on the desktop app, which will always be running localhost.

webSrv, err := webserver.New(cfg.Web(clientCore, marketMaker, logMaker.Logger("WEB"), utc))
if err != nil {
return fmt.Errorf("failed creating web server: %w", err)
Expand Down
6 changes: 5 additions & 1 deletion client/webserver/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,11 @@ func (s *WebServer) Connect(ctx context.Context) (*sync.WaitGroup, error) {
// Safari. When this is removed, the allowInCSP variable can be removed
// but prepareAddr should still return 127.0.0.1 for unspecified
// addresses.
s.csp = fmt.Sprintf("%s ws://%s", baseCSP, addr)
scheme := "ws"
if s.srv.TLSConfig != nil {
scheme = "wss"
}
s.csp = fmt.Sprintf("%s %s://%s", baseCSP, scheme, addr)
Comment on lines -670 to +674
Copy link
Member Author

@buck54321 buck54321 Aug 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is where I encountered a problem on an older version of MacOS (v12 Monterey). We were forcing TLS, so the websocket scheme was wss, but were hard coding here assuming ws. Didn't seem to affect newer versions, likely related to the code comment above.

}
s.addr = addr

Expand Down
Loading