changeset 4:35f0ee7a3c28

Auth request: fix SIGSEGV on POST.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 05 Mar 2010 21:04:17 +0300
parents 666c7bf3e009
children cc231fa95159
files ngx_http_auth_request_module.c t/auth-request.t
diffstat 2 files changed, 24 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ngx_http_auth_request_module.c	Sat Feb 27 21:25:18 2010 +0300
+++ b/ngx_http_auth_request_module.c	Fri Mar 05 21:04:17 2010 +0300
@@ -159,6 +159,7 @@
         return NGX_ERROR;
     }
 
+    sr->discard_body = 1;
     sr->header_only = 1;
 
     ctx->subrequest = sr;
--- a/t/auth-request.t	Sat Feb 27 21:25:18 2010 +0300
+++ b/t/auth-request.t	Fri Mar 05 21:04:17 2010 +0300
@@ -9,6 +9,8 @@
 use warnings;
 use strict;
 
+use Socket qw/ CRLF /;
+
 use Test::More;
 use Test::Nginx;
 
@@ -18,7 +20,7 @@
 select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/http rewrite proxy fastcgi auth_basic/)
-	->plan(14);
+	->plan(17);
 
 $t->write_file_expand('nginx.conf', <<'EOF');
 
@@ -83,6 +85,8 @@
         }
         location = /auth-proxy {
             proxy_pass http://127.0.0.1:8080/auth-basic;
+            proxy_pass_request_body off;
+            proxy_set_header Content-Length "";
         }
         location = /auth-basic {
             auth_basic "restricted";
@@ -94,6 +98,7 @@
         }
         location = /auth-fastcgi {
             fastcgi_pass 127.0.0.1:8081;
+            fastcgi_pass_request_body off;
         }
     }
 }
@@ -115,6 +120,9 @@
 like(http_get('/error'), qr/ 500 /, 'auth error');
 like(http_get('/off'), qr/ 404 /, 'auth off');
 
+like(http_post('/open'), qr/ 404 /, 'auth post open');
+like(http_post('/unauthorized'), qr/ 401 /, 'auth post unauthorized');
+
 like(http_get('/open-static'), qr/ 404 /, 'auth open static');
 unlike(http_get('/open-static'), qr/INVISIBLE/, 'auth static no content');
 
@@ -124,6 +132,8 @@
 like(http_get_auth('/proxy'), qr/ 404 /, 'proxy auth pass');
 unlike(http_get_auth('/proxy'), qr/INVISIBLE/, 'proxy auth no content');
 
+like(http_post('/proxy'), qr/ 401 /, 'proxy auth post');
+
 SKIP: {
 	eval { require FCGI; };
 	skip 'FCGI not installed', 2 if $@;
@@ -147,6 +157,18 @@
 EOF
 }
 
+sub http_post {
+	my ($url, %extra) = @_;
+
+	my $p = "POST $url HTTP/1.0" . CRLF .
+		"Host: localhost" . CRLF .
+		"Content-Length: 10" . CRLF .
+		CRLF .
+		"1234567890"; 
+
+	return http($p, %extra);
+}
+
 ###############################################################################
 
 sub fastcgi_daemon {