sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add "irc" in ALPN list for WebSocket servers

Browse Source 
This is incorrect because HTTP listeners don't handle plain IRC
connections. This also prevents net/http from setting up an HTTP/2
server.
This commit is contained in:
Simon Ser 2021-03-18 11:33:30 +01:00
parent e35a116188
commit 0c0397407c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/soju/main.go
View File

@ -55,10 +55,7 @@ func main() {
if err != nil { if err != nil {
log.Fatalf("failed to load TLS certificate and key: %v", err) log.Fatalf("failed to load TLS certificate and key: %v", err)
} }
tlsCfg = &tls.Config{ tlsCfg = &tls.Config{Certificates: []tls.Certificate{cert}}
NextProtos: []string{"irc"},
Certificates: []tls.Certificate{cert},
}
} }
srv := soju.NewServer(db) srv := soju.NewServer(db)
@ -89,7 +86,9 @@ func main() {
if _, _, err := net.SplitHostPort(host); err != nil { if _, _, err := net.SplitHostPort(host); err != nil {
host = host + ":6697" host = host + ":6697"
} }
ln, err := tls.Listen("tcp", host, tlsCfg) ircsTLSCfg := tlsCfg.Clone()
ircsTLSCfg.NextProtos = []string{"irc"}
ln, err := tls.Listen("tcp", host, ircsTLSCfg)
if err != nil { if err != nil {
log.Fatalf("failed to start TLS listener on %q: %v", listen, err) log.Fatalf("failed to start TLS listener on %q: %v", listen, err)
} }