sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: abort request handling on bad requests

Browse Source 
A request to a hostname that hasn't been registered with the server
currently results in a nil pointer deref panic in server.go:215 as
request handling continues even if ReadRequest() returns an error.

This change changes all if-else error handling in Server.respond() to
a WriteStatus-call and early return. This makes it clear when request
handling is aborted (and actually aborts when ReadRequest() fails).
This commit is contained in:
Hugo Wetterberg 2021-01-05 20:16:33 +01:00 committed by Adnan Maolood
parent c8626bae17
commit efef44c2f9
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server.go
View File

@ -188,7 +188,9 @@ func (s *Server) respond(conn net.Conn) {
req, err := ReadRequest(conn)
if err != nil {
w.WriteStatus(StatusBadRequest)
} else {
return
}
// Store information about the TLS connection
if tlsConn, ok := conn.(*tls.Conn); ok {
req.TLS = tlsConn.ConnectionState()
@ -201,14 +203,14 @@ func (s *Server) respond(conn net.Conn) {
}
}
}
}
resp := s.responder(req)
if resp != nil {
resp.Respond(w, req)
} else {
if resp == nil {
w.WriteStatus(StatusNotFound)
return
}
resp.Respond(w, req)
}
func (s *Server) responder(r *Request) Responder {