Catch all purge requests, even if cache isn't configured.

When enabled, cache purge will now catch all requests with
PURGE (or specified) method, even if cache isn't configured.
Previously, it would pass such requests to the upstream.

Change-Id: Ic8ebf3eb22ce5862e98f7844670a096f56065746
Signed-off-by: Piotr Sikora <[email protected]>

Author: PiotrSikora

ngx_cache_purge_module.c

@@ -716,6 +716,10 @@ ngx_http_cache_purge_access_handler(ngx_http_request_t *r)
         return NGX_HTTP_FORBIDDEN;
     }
 
+    if (cplcf->handler == NULL) {
+        return NGX_HTTP_NOT_FOUND;
+    }
+
     return cplcf->handler(r);
 }
 
@@ -1184,11 +1188,10 @@ ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     if (conf->fastcgi.enable && clcf->handler != NULL) {
         flcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_fastcgi_module);
 
-        if (flcf->upstream.cache
-            && (flcf->upstream.upstream || flcf->fastcgi_lengths))
-        {
+        if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
             conf->conf = &conf->fastcgi;
-            conf->handler = ngx_http_fastcgi_cache_purge_handler;
+            conf->handler = flcf->upstream.cache
+                          ? ngx_http_fastcgi_cache_purge_handler : NULL;
             conf->original_handler = clcf->handler;
 
             clcf->handler = ngx_http_cache_purge_access_handler;
@@ -1204,11 +1207,10 @@ ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     if (conf->proxy.enable && clcf->handler != NULL) {
         plcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_proxy_module);
 
-        if (plcf->upstream.cache
-            && (plcf->upstream.upstream || plcf->proxy_lengths))
-        {
+        if (plcf->upstream.upstream || plcf->proxy_lengths) {
             conf->conf = &conf->proxy;
-            conf->handler = ngx_http_proxy_cache_purge_handler;
+            conf->handler = plcf->upstream.cache
+                          ? ngx_http_proxy_cache_purge_handler : NULL;
             conf->original_handler = clcf->handler;
 
             clcf->handler = ngx_http_cache_purge_access_handler;
@@ -1224,13 +1226,11 @@ ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     if (conf->scgi.enable && clcf->handler != NULL) {
         slcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_scgi_module);
 
-        if (slcf->upstream.cache
-            && (slcf->upstream.upstream || slcf->scgi_lengths))
-        {
+        if (slcf->upstream.upstream || slcf->scgi_lengths) {
             conf->conf = &conf->scgi;
-            conf->handler = ngx_http_scgi_cache_purge_handler;
+            conf->handler = slcf->upstream.cache
+                          ? ngx_http_scgi_cache_purge_handler : NULL;
             conf->original_handler = clcf->handler;
-
             clcf->handler = ngx_http_cache_purge_access_handler;
 
             return NGX_CONF_OK;
@@ -1244,11 +1244,10 @@ ngx_http_cache_purge_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     if (conf->uwsgi.enable && clcf->handler != NULL) {
         ulcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_uwsgi_module);
 
-        if (ulcf->upstream.cache
-            && (ulcf->upstream.upstream || ulcf->uwsgi_lengths))
-        {
+        if (ulcf->upstream.upstream || ulcf->uwsgi_lengths) {
             conf->conf = &conf->uwsgi;
-            conf->handler = ngx_http_uwsgi_cache_purge_handler;
+            conf->handler = ulcf->upstream.cache
+                          ? ngx_http_uwsgi_cache_purge_handler : NULL;
             conf->original_handler = clcf->handler;
 
             clcf->handler = ngx_http_cache_purge_access_handler;

t/proxy2.t

@@ -241,3 +241,79 @@ X-Cache-Status: HIT
 --- response_body_like: root
 --- timeout: 10
 --- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 13: no cache (PURGE allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8 127.0.0.0/8 3.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 404
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- timeout: 10
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 14: no cache (PURGE not allowed)
+--- http_config eval: $::http_config
+--- config
+    proxy_cache_purge  PURGE from 1.0.0.0/8;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 403
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 403 Forbidden
+--- timeout: 10
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62
+
+
+
+=== TEST 15: multiple cache purge directives
+--- http_config eval: $::http_config
+--- config
+    fastcgi_cache_purge  on;
+    proxy_cache_purge    on;
+
+    location /proxy {
+        proxy_pass         $scheme://127.0.0.1:$server_port/etc/passwd;
+        proxy_cache        test_cache;
+        proxy_cache_key    $uri$is_args$args;
+        proxy_cache_valid  3m;
+        add_header         X-Cache-Status $upstream_cache_status;
+
+        if ($uri)          { }
+    }
+
+    location = /etc/passwd {
+        root               /;
+    }
+--- request
+PURGE /proxy/passwd
+--- error_code: 200
+--- response_headers
+Content-Type: text/html
+--- response_body_like: Successful purge
+--- timeout: 10
+--- skip_nginx2: 4: < 0.8.3 or < 0.7.62