do not expect "Origin" header for websocket connections (#80)

* websocket: do not check the presence of the "Origin" header

* avoid using http.DefaultServeMux
This commit is contained in:
gerdstolpmann authored and GitHub committed 2020-04-04 10:40:12 +08:00
1 parent 17dac26996
commit 839041e912
1 file changed
+5 -3
+5 -3
View File
@@ -155,12 +155,14 @@ func (b *Broker) StartWebsocketListening() {
path := b.config.WsPath path := b.config.WsPath
hp := ":" + b.config.WsPort hp := ":" + b.config.WsPort
log.Info("Start Websocket Listener on:", zap.String("hp", hp), zap.String("path", path)) log.Info("Start Websocket Listener on:", zap.String("hp", hp), zap.String("path", path))
http.Handle(path, websocket.Handler(b.wsHandler)) ws := &websocket.Server{Handler: websocket.Handler(b.wsHandler)}
mux := http.NewServeMux()
mux.Handle(path, ws)
var err error var err error
if b.config.WsTLS { if b.config.WsTLS {
err = http.ListenAndServeTLS(hp, b.config.TlsInfo.CertFile, b.config.TlsInfo.KeyFile, nil) err = http.ListenAndServeTLS(hp, b.config.TlsInfo.CertFile, b.config.TlsInfo.KeyFile, mux)
} else { } else {
err = http.ListenAndServe(hp, nil) err = http.ListenAndServe(hp, mux)
} }
if err != nil { if err != nil {
log.Error("ListenAndServe:" + err.Error()) log.Error("ListenAndServe:" + err.Error())