]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 272e29b)
MINOR: http: Add 404 to http-request deny
authorFlorian Tham <tham@fidion.de>
Wed, 8 Jan 2020 12:35:30 +0000 (13:35 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Wed, 8 Jan 2020 15:15:23 +0000 (16:15 +0100)
This patch adds http status code 404 Not Found to http-request deny. See
issue #80.

doc/configuration.txt patch | blob | blame | history
include/common/http.h patch | blob | blame | history
src/http.c patch | blob | blame | history

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 69daaa8b76a3ea424c5c680ec53713d07c96f27c..d0bb97415270d23cc98844a819f352f1a1d10713 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -373,6 +373,7 @@ HAProxy may emit the following status codes by itself :
    401  when an authentication is required to perform the action (when
         accessing the stats page)
    403  when a request is forbidden by a "http-request deny" rule
+   404  when the requested resource could not be found
    408  when the request timeout strikes before the request is complete
    410  when the requested resource is no longer available and will not
         be available again
@@ -3607,8 +3608,8 @@ errorfile <code> <file>
                                  yes   |    yes   |   yes  |   yes
   Arguments :
     <code>    is the HTTP status code. Currently, HAProxy is capable of
-              generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
-              503, and 504.
+              generating codes 200, 400, 403, 404, 405, 408, 410, 425, 429, 500,
+              502, 503, and 504.
 
     <file>    designates a file containing the full HTTP response. It is
               recommended to follow the common practice of appending ".http" to
@@ -3656,8 +3657,8 @@ errorloc302 <code> <url>
                                  yes   |    yes   |   yes  |   yes
   Arguments :
     <code>    is the HTTP status code. Currently, HAProxy is capable of
-              generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
-              503, and 504.
+              generating codes 200, 400, 403, 404, 405, 408, 410, 425, 429, 500,
+              502, 503, and 504.
 
     <url>     it is the exact contents of the "Location" header. It may contain
               either a relative URI to an error page hosted on the same site,
@@ -3688,8 +3689,8 @@ errorloc303 <code> <url>
                                  yes   |    yes   |   yes  |   yes
   Arguments :
     <code>    is the HTTP status code. Currently, HAProxy is capable of
-              generating codes 200, 400, 403, 405, 408, 410, 425, 429, 500, 502,
-              503, and 504.
+              generating codes 200, 400, 403, 404, 405, 408, 410, 425, 429, 500,
+              502, 503, and 504.
 
     <url>     it is the exact contents of the "Location" header. It may contain
               either a relative URI to an error page hosted on the same site,
diff --git a/include/common/http.h b/include/common/http.h
index 2d9bad7eebc5984f7e751cce653012a145a4bb64..d3519bc11e5a2a268f8107c993cdb02b090f1339 100644 (file)
--- a/include/common/http.h
+++ b/include/common/http.h
@@ -83,6 +83,7 @@ enum {
        HTTP_ERR_200 = 0,
        HTTP_ERR_400,
        HTTP_ERR_403,
+       HTTP_ERR_404,
        HTTP_ERR_405,
        HTTP_ERR_408,
        HTTP_ERR_410,
diff --git a/src/http.c b/src/http.c
index 4f57a43bc4dabc83aed2b646d83947dcdf3fa21f..8e17bed0cf408e24823072ad6afb37bfc79ca02e 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -216,6 +216,7 @@ const int http_err_codes[HTTP_ERR_SIZE] = {
        [HTTP_ERR_200] = 200,  /* used by "monitor-uri" */
        [HTTP_ERR_400] = 400,
        [HTTP_ERR_403] = 403,
+       [HTTP_ERR_404] = 404,
        [HTTP_ERR_405] = 405,
        [HTTP_ERR_408] = 408,
        [HTTP_ERR_410] = 410,
@@ -256,6 +257,15 @@ const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "\r\n"
        "<html><body><h1>403 Forbidden</h1>\nRequest forbidden by administrative rules.\n</body></html>\n",
 
+       [HTTP_ERR_404] =
+       "HTTP/1.1 404 Not Found\r\n"
+       "Content-length: 83\r\n"
+       "Cache-Control: no-cache\r\n"
+       "Connection: close\r\n"
+       "Content-Type: text/html\r\n"
+       "\r\n"
+       "<html><body><h1>404 Not Found</h1>\nThe resource could not be found.\n</body></html>\n",
+
        [HTTP_ERR_405] =
        "HTTP/1.1 405 Method Not Allowed\r\n"
        "Content-length: 146\r\n"
@@ -387,6 +397,7 @@ int http_get_status_idx(unsigned int status)
        case 200: return HTTP_ERR_200;
        case 400: return HTTP_ERR_400;
        case 403: return HTTP_ERR_403;
+       case 404: return HTTP_ERR_404;
        case 405: return HTTP_ERR_405;
        case 408: return HTTP_ERR_408;
        case 410: return HTTP_ERR_410;
Mirror of https://github.com/haproxy/haproxy.git