Changeset 895

Timestamp:

08/21/07 20:24:56 (1 year ago)

Author:

adefacc

Message:

improved header parsing and added support for HTTP 501 and HTTP 505 error responses, now HTTP/0.9 requests should be properly understood and of course refused (because they are unsecure and deprecated)

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (3 diffs)
• cherokee/trunk/cherokee/downloader.c (modified) (2 diffs)
• cherokee/trunk/cherokee/header.c (modified) (12 diffs)
• cherokee/trunk/cherokee/header.h (modified) (1 diff)
• cherokee/trunk/cherokee/macros.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-08-21  A.D.F  <adefacc@tin.it>
+
+        * cherokee/macros.h
+          - added LBS macro (HTTP linear blank space);
+
+        * cherokee/header.h
+          - parse_request_first_line() + parse_response_first_line() +
+            cherokee_header_parse():
+            - added formal parameter "error_code" (HTTP error code);
+
+        * cherokee/header.c
+          - parse_request_first_line() + parse_response_first_line() +
+            cherokee_header_parse():
+            - added formal parameter "error_code" (HTTP error code);
+          - parse_request_first_line():
+            - added support for:
+              - HTTP 505 version not supported;
+              - HTTP 501 (method) not implemented;
+            - partially rewritten the HTTP request parser in order
+              to be more standard conformant;
+          - cherokee_header_has_header(), lowered minimum HTTP request length
+            in order to handle properly HTTP/0.9 requests too
+            (which are refused with error: HTTP 505 Version Not Implemented);
+
+        * cherokee/connection.c,
+          cherokee/downloader.c
+          - added formal parameter (HTTP) error_code.
+
-2007-08-13  A.D.F  <adefacc@tin.it>
-

cherokee/trunk/cherokee/connection.c

@@ -1368 +1368 @@
-{
-        ret_t    ret;
+        cherokee_http_t error_code = http_bad_request;
-        char    *host, *upgrade, *cnt;
-        cuint_t  host_len, upgrade_len, cnt_len;
@@ -1373 +1374 @@
-        /* Header parsing
-         */
-
-ret < ret_ok) {
+, &error_code
+unlikely (ret < ret_ok))
-                goto error;
-        }
-
-        /* Maybe read the POST data
@@ -1487 +1487 @@
-
-error:
-http_bad_request
+error_code
-        return ret_error;
-}

cherokee/trunk/cherokee/downloader.c

@@ -270 +270 @@
-        size_t              readed = 0;
-        cherokee_socket_t  *sock   = &downloader->socket;
+        cherokee_http_t     error_code = http_bad_request;
-
-        ret = cherokee_socket_bufread (sock, &downloader->reply_header, DEFAULT_RECV_SIZE, &readed);
@@ -303 +304 @@
-                 */
-                ret = cherokee_header_parse (downloader->header,
-
-
+
+
+
+
-                if (unlikely(ret != ret_ok)) return ret_error;
-

cherokee/trunk/cherokee/header.c

@@ -194 +194 @@
-
-static ret_t
-
+, cherokee_http_t *error_code
-{
-        char *line  = buf->buf;
@@ -200 +200 @@
-        char  tmp[4];
-        char *end;
-
-
-
+
+
+
+
+
+
+
+
+
+
-                return ret_error;
-        }
-
-        /* Some security checks
-         */
-        if (buf->len < 14) {
-                return ret_error;
-        }
-
-        /* Return next line
-         */
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Example:
-         * HTTP/1.0 403 Forbidden
-         */
-
+
+
+
+
+
-                return ret_error;
-        }
-
+        if (unlikely(! isdigit(begin[7]))) {
+                return ret_error;
+        }
+
-        /* Get the HTTP version
-         */
-        switch (begin[7]) {
-        case '1':
-                hdr->version = http_version_11; 
-                break;
-        case '0':
-                hdr->version = http_version_10; 
-                break;
-
-
-
+
-        default:
-
+
+
-        }
-
-        /* Read the response code
+         * TODO: skip spaces properly (usually there is only one blank).
-         */
-        memcpy (tmp, begin+9, 3);
@@ -324 +341 @@
-
-static ret_t
-
+, cherokee_http_t *error_code
-{
-        ret_t  ret;
-        char  *line  = buf->buf;
-        char  *begin = buf->buf;
+        char  *begin_ver = buf->buf;
-        char  *end;
-        char  *ptr;
-        char  *restore;
-        char  chr_end;
+        size_t len = 0;
+        size_t len_ver = 0;
-
-        /* Basic security check. The shortest possible request
-
-
-
+
+
+
+
+
-                return ret_error;
-        }
@@ -352 +374 @@
-                /* Return begin of next line 
-                 */
+                len = (size_t) (end - line);
-                *next_pos = end + 1;
-        } else {
-                /* Return begin of next line 
-                 */
+                len = (size_t) (end - line);
-                *next_pos = end + 2;
-        }
@@ -362 +386 @@
-        restore = end;
-
+        /* Check shortest string length "GET /"
+         */
+        if (len < 5)
+                goto error;
+
-        /* Get the method
-         */
-        ret = parse_method (hdr, line, &begin);
-
+
+
-                goto error;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                goto error;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Skip the HTTP version string: " HTTP/x.y"
-         */
--= 9
+= &begin[len]
-
-        /* Look for the QueryString
-         */
-end - begi
+le
-        ptr = strchr (begin, '?');
-
-        if (ptr) {
-                end = ptr;
-++ptr - buf->buf
-unsigned long) strchr(ptr, ' ') - (unsigned long) ptr
+(off_t) (++ptr - buf->buf)
+cint_t) (&begin[len] - ptr)
-        } else {
-                hdr->query_string_len = 0;
@@ -409 +459 @@
-        /* Get the request
-         */
-begin - buf->buf
-end - begin
+(off_t)  (begin - buf->buf)
+(cint_t) (end - begin)
-
-        /* Check if the request is a full URL
@@ -418 +468 @@
-                char   *dir;
-                char   *host = begin + 7;
-
+
+
+
+
+
+
-                dir = strchr (host, '/');
+                *end = end_chr;
-                if (dir == NULL)
-                        goto error;
@@ -474 +530 @@
-
-ret_t 
-
+, cherokee_http_t *error_code
-{
-        ret_t  ret;
@@ -483 +539 @@
-        char  *header_end;
-        char  chr_header_end;
+
+        /* Set default error code.
+         */
+        *error_code = http_bad_request;
-
-        /* Check the buffer content
@@ -529 +589 @@
-                 * GET /icons/compressed.png HTTP/1.1CRLF
-                 */
-
+, error_code
-                if (unlikely(ret < ret_ok)) {
-                        PRINT_DEBUG ("ERROR: Failed to parse header_type_request:\n===\n%s===\n", buffer->buf);
@@ -538 +598 @@
-
-        case header_type_response:
-
+, error_code
-                if (unlikely(ret < ret_ok)) {
-                        PRINT_DEBUG ("ERROR: Failed to parse header_type_response:\n===\n%s===\n", buffer->buf);
@@ -923 +983 @@
-
-        /* Do we have enough information ?
+         * len("GET /" LF_LF) = 7                   (HTTP/0.9)
-         * len("GET /" CRLF_CRLF) = 9               (HTTP/0.9)
-         * len("GET / HTTP/1.0" CRLF_CRLF) = 18     (HTTP/1.x)
-         */
-18
+7
-                return ret_not_found;
-        }

cherokee/trunk/cherokee/header.h

@@ -82 +82 @@
-
-ret_t cherokee_header_clean               (cherokee_header_t *hdr);
-
+, cherokee_http_t *error_code
-ret_t cherokee_header_has_header          (cherokee_header_t *hdr, cherokee_buffer_t *buffer, int tail_len);
-

cherokee/trunk/cherokee/macros.h

@@ -140 +140 @@
-#define CRLF      "\r\n"        /* EOH (End Of Header Line) */
-#define LWS       " \t\r\n"     /* HTTP linear white space */
+#define LBS       " \t"         /* HTTP linear blank space */
-#define CHR_CR    '\r'          /* Carriage return */
-#define CHR_LF    '\n'          /* Line feed (new line) */