Go back to 503 rejections instead of TLS aborts

socketserver/cmd/ffzsocketserver/socketserver.go

@@ -81,8 +81,7 @@ func main() {
 			Addr:    conf.SSLListenAddr,
 			Handler: http.DefaultServeMux,
 			TLSConfig: &tls.Config{
-				GetCertificate:     reloader.GetCertificateFunc(),
-				GetConfigForClient: server.TLSEarlyReject,
+				GetCertificate: reloader.GetCertificateFunc(),
 			},
 		}
 		go func() {

socketserver/cmd/statsweb/html.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"bitbucket.org/stendec/frankerfacez/socketserver/server"
+	"github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server"
 )
 
 type CalendarData struct {

socketserver/cmd/statsweb/servers.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"bitbucket.org/stendec/frankerfacez/socketserver/server"
+	"github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server"
 	"github.com/clarkduvall/hyperloglog"
 	lru "github.com/hashicorp/golang-lru"
 )

socketserver/cmd/statsweb/statsweb.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"bitbucket.org/stendec/frankerfacez/socketserver/server"
+	"github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server"
 	"github.com/clarkduvall/hyperloglog"
 )
 

socketserver/server/handlecore.go

@@ -2,7 +2,6 @@ package server // import "github.com/FrankerFaceZ/FrankerFaceZ/socketserver/serv
 
 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -254,15 +253,6 @@ func shouldRejectConnection() bool {
 	return false
 }
 
-var errEarlyTLSReject = errors.New("over capacity")
-
-func TLSEarlyReject(*tls.ClientHelloInfo) (*tls.Config, error) {
-	if shouldRejectConnection() {
-		return nil, errEarlyTLSReject
-	}
-	return nil, nil
-}
-
 // HTTPHandleRootURL is the http.HandleFunc for requests on `/`.
 // It either uses the SocketUpgrader or writes out the BannerHTML.
 func HTTPHandleRootURL(w http.ResponseWriter, r *http.Request) {
@@ -283,6 +273,7 @@ func HTTPHandleRootURL(w http.ResponseWriter, r *http.Request) {
 
 		conn, err := SocketUpgrader.Upgrade(w, r, nil)
 		if err != nil {
+			w.WriteHeader(400)
 			fmt.Fprintf(w, "error: %v", err)
 			return
 		}