Enable specific status codes to be passed from the request parser.

This allows us to start providing better HTTP/1.1 compliant errors for
the various request parsing problems.

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 7525b070aaf8d849dace94eaf0161033c4027b56..fe1656bcbcb213583d62533db7bab546b12e6f8a 100644 (file)
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -402,6 +402,7 @@ void
 HttpParserInit(HttpParser *hdr, const char *buf, int bufsiz)
 {
     hdr->state = 1;
+    hdr->request_parse_status = HTTP_NONE;
     hdr->buf = buf;
     hdr->bufsiz = bufsiz;
     hdr->req_start = hdr->req_end = -1;

diff --git a/src/HttpMsg.h b/src/HttpMsg.h
index c38abc0175befd011079d221fa3555d85a983fd2..2c5268768944a04204113faa42a0ea1c943de33a 100644 (file)
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
@@ -34,6 +33,7 @@
 #ifndef SQUID_HTTPMSG_H
 #define SQUID_HTTPMSG_H
 
+#include "enums.h"
 #include "typedefs.h"
 #include "HttpHeader.h"
 #include "HttpVersion.h"
@@ -131,6 +131,11 @@ public:
     int u_start, u_end;
     int v_start, v_end;
     int v_maj, v_min;
+
+    /** HTTP status code to be used on the invalid-request error page
+     * HTTP_STATUS_NONE indicates incomplete parse, HTTP_OK indicates no error.
+     */
+    http_status request_parse_status;
 };
 
 extern void HttpParserInit(HttpParser *, const char *buf, int len);

diff --git a/src/client_side.cc b/src/client_side.cc
index 60a28be44140fe23176b7e20a090e705d80dae50..bd7480429c07cbbfff85b7a335394b855ea427dd 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -139,8 +139,7 @@ static IOCB clientWriteComplete;
 static IOCB clientWriteBodyComplete;
 static bool clientParseRequest(ConnStateData * conn, bool &do_next_read);
 static PF clientLifetimeTimeout;
-static ClientSocketContext *parseHttpRequestAbort(ConnStateData * conn,
-        const char *uri);
+static ClientSocketContext *parseHttpRequestAbort(ConnStateData * conn, const char *uri);
 static ClientSocketContext *parseHttpRequest(ConnStateData *, HttpParser *, HttpRequestMethod *, HttpVersion *);
 #if USE_IDENT
 static IDCB clientIdentDone;
@@ -1834,9 +1833,10 @@ prepareAcceleratedURL(ConnStateData * conn, ClientHttpRequest *http, char *url,
 
 #if SHOULD_REJECT_UNKNOWN_URLS
 
-        if (!url)
+        if (!url) {
+            hp->request_parse_status = HTTP_BAD_REQUEST;
             return parseHttpRequestAbort(conn, "error:invalid-request");
-
+        }
 #endif
 
         if (url)
@@ -1963,6 +1963,7 @@ parseHttpRequest(ConnStateData *conn, HttpParser *hp, HttpRequestMethod * method
         return NULL;
     } else if ( (size_t)hp->bufsiz >= Config.maxRequestHeaderSize && headersEnd(hp->buf, Config.maxRequestHeaderSize) == 0) {
         debugs(33, 5, "parseHttpRequest: Too large request");
+        hp->request_parse_status = HTTP_HEADER_TOO_LARGE;
         return parseHttpRequestAbort(conn, "error:request-too-large");
     }
 
@@ -2007,6 +2008,7 @@ parseHttpRequest(ConnStateData *conn, HttpParser *hp, HttpRequestMethod * method
     /* Enforce max_request_size */
     if (req_sz >= Config.maxRequestHeaderSize) {
         debugs(33, 5, "parseHttpRequest: Too large request");
+        hp->request_parse_status = HTTP_HEADER_TOO_LARGE;
         return parseHttpRequestAbort(conn, "error:request-too-large");
     }
 
@@ -2018,15 +2020,14 @@ parseHttpRequest(ConnStateData *conn, HttpParser *hp, HttpRequestMethod * method
         debugs(33, DBG_IMPORTANT, "WARNING: CONNECT method received on " << conn->port->protocol << " Accelerator port " << conn->port->s.GetPort() );
         /* XXX need a way to say "this many character length string" */
         debugs(33, DBG_IMPORTANT, "WARNING: for request: " << hp->buf);
-        /* XXX need some way to set 405 status on the error reply */
+        hp->request_parse_status = HTTP_METHOD_NOT_ALLOWED;
         return parseHttpRequestAbort(conn, "error:method-not-allowed");
     }
 
     if (*method_p == METHOD_NONE) {
         /* XXX need a way to say "this many character length string" */
         debugs(33, 1, "clientParseRequestMethod: Unsupported method in request '" << hp->buf << "'");
-
-        /* XXX where's the method set for this error? */
+        hp->request_parse_status = HTTP_METHOD_NOT_ALLOWED;
         return parseHttpRequestAbort(conn, "error:unsupported-request-method");
     }
 
@@ -2049,6 +2050,7 @@ parseHttpRequest(ConnStateData *conn, HttpParser *hp, HttpRequestMethod * method
      */
     if ( squid_strnstr(req_hdr, "\r\r\n", req_sz) ) {
         debugs(33, 1, "WARNING: suspicious HTTP request contains double CR");
+        hp->request_parse_status = HTTP_BAD_REQUEST;
         return parseHttpRequestAbort(conn, "error:double-CR");
     }
 
@@ -2343,7 +2345,17 @@ clientProcessRequest(ConnStateData *conn, HttpParser *hp, ClientSocketContext *c
         debugs(33, 1, "clientProcessRequest: Invalid Request");
         clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
         assert (repContext);
-        repContext->setReplyToError(ERR_INVALID_REQ, HTTP_BAD_REQUEST, method, NULL, conn->peer, NULL, conn->in.buf, NULL);
+        switch(hp->request_parse_status)
+        {
+        case HTTP_HEADER_TOO_LARGE:
+            repContext->setReplyToError(ERR_TOO_BIG, HTTP_HEADER_TOO_LARGE, method, http->uri, conn->peer, NULL, conn->in.buf, NULL);
+            break;
+        case HTTP_METHOD_NOT_ALLOWED:
+            repContext->setReplyToError(ERR_UNSUP_REQ, HTTP_METHOD_NOT_ALLOWED, method, http->uri, conn->peer, NULL, conn->in.buf, NULL);
+            break;
+        default:
+            repContext->setReplyToError(ERR_INVALID_REQ, HTTP_BAD_REQUEST, method, http->uri, conn->peer, NULL, conn->in.buf, NULL);
+        }
         assert(context->http->out.offset == 0);
         context->pullData();
         conn->flags.readMoreRequests = false;
@@ -2907,8 +2919,7 @@ ConnStateData::requestTimeout(const CommTimeoutCbParams &io)
          */
         ClientHttpRequest **H;
         clientStreamNode *node;
-        ClientHttpRequest *http =
-            parseHttpRequestAbort(this, "error:Connection%20lifetime%20expired");
+        ClientHttpRequest *http = parseHttpRequestAbort(this, "error:Connection%20lifetime%20expired");
         node = http->client_stream.tail->prev->data;
         clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
         assert (repContext);