Merge pull request #15 from mysteriumnetwork/fix/panic-on-malformed-t…

…ls-request Do not panic for malformed TLS request
mysteriumnetwork · Feb 21, 2020 · ea4dc4b · ea4dc4b
2 parents ea22ec3 + ae83cd3
commit ea4dc4b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/proxy/server.go b/proxy/server.go
@@ -137,6 +137,14 @@ func (s *proxyServer) authorityAddr(scheme, authority string) string {
 }
 
 func (s *proxyServer) serveTLS(c net.Conn) {
+	defer func() {
+		// For some malformed TLS connection vhost.TLS could panic.
+		// We don't care about a single failed request, service should keep working.
+		if r := recover(); r != nil {
+			log.Println("Recovered panic in serveTLS", r)
+		}
+	}()
+
 	tlsConn, err := vhost.TLS(c)
 	if err != nil {
 		log.Printf("Error accepting new connection - %v", err)