From ee431f1e85a8ee7d3c6e069c8858c671da1c2acd Mon Sep 17 00:00:00 2001
From: clsr <clsr@clsr.net>
Date: Wed, 30 Aug 2017 14:56:11 +0200
Subject: Unify error handling and clean request paths in server

---
 server.go | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/server.go b/server.go
index 6d23ddd..26301ab 100644
--- a/server.go
+++ b/server.go
@@ -91,7 +91,9 @@ func (srv *Server) sendError(conn net.Conn, req *Request, err Error) {
 	if e2 != nil {
 		srv.logError(e2)
 	}
-	srv.logAccess(&responseWriter{addr: conn.RemoteAddr()}, req, er.Intent(), l)
+	if req != nil {
+		srv.logAccess(&responseWriter{addr: conn.RemoteAddr()}, req, er.Intent(), l)
+	}
 }
 
 // HandleConn reads a CNP request from conn and runs a handler to respond.
@@ -99,13 +101,19 @@ func (srv *Server) HandleConn(conn net.Conn) {
 	var rw *responseWriter
 	var req *Request
 
-	defer func() {
-		/*_, err := io.Copy(ioutil.Discard, req.Body)
-		if err != nil {
-			srv.ErrorLog.Print(err)
-		}*/
+	resp, _ := NewResponse(IntentOK, nil)
+	rw = &responseWriter{
+		w:    conn,
+		resp: resp,
+		addr: conn.RemoteAddr(),
+	}
+
+	if srv.Handler == nil {
+		panic(errors.New("cnp.Server.Handler is nil"))
+	}
 
-		if rw != nil && rw.headerWritten {
+	defer func() {
+		if req != nil && rw.headerWritten {
 			srv.logAccess(rw, req, rw.resp.Header.Intent, rw.n)
 		}
 
@@ -119,40 +127,26 @@ func (srv *Server) HandleConn(conn net.Conn) {
 		if req != nil {
 			req.Close()
 		}
+		conn.Close()
 	}()
 
 	req, err := ParseRequest(conn)
 	if err != nil {
-		if e, ok := err.(Error); ok {
-			resp, _ := NewResponse(IntentError, nil)
-			resp.SetParam("reason", e.CNPError())
-			resp.Write(conn)
-			return
-		}
 		panic(err)
 	}
 
+	req.SetPath(Clean(req.Path()))
 	req.Body = io.LimitReader(req.Body, req.Length())
 
 	if srv.Validate {
-		err = req.Validate()
 		if err != nil {
-			srv.sendError(conn, req, err.(Error))
-			return
+			panic(err)
 		}
 	}
 
-	if srv.Handler != nil {
-		resp, _ := NewResponse(IntentOK, nil)
-		rw = &responseWriter{
-			w:    conn,
-			resp: resp,
-			addr: conn.RemoteAddr(),
-		}
-		srv.Handler.ServeCNP(rw, req)
-		if !rw.headerWritten {
-			rw.WriteHeader()
-		}
+	srv.Handler.ServeCNP(rw, req)
+	if !rw.headerWritten {
+		rw.WriteHeader()
 	}
 }
 
-- 
cgit