-
Notifications
You must be signed in to change notification settings - Fork 299
Fixed auditlog in case of internal redirect #90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+265
−6
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
241 changes: 241 additions & 0 deletions
tests/modsecurity-config-custom-error-page.t
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,241 @@ | ||
| #!/usr/bin/perl | ||
|
|
||
| # | ||
| # ModSecurity, http://www.modsecurity.org/ | ||
| # Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/) | ||
| # | ||
| # You may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # If any of the files related to licensing are missing or if you have any | ||
| # other questions related to licensing please contact Trustwave Holdings, Inc. | ||
| # directly using the email address security@modsecurity.org. | ||
| # | ||
|
|
||
|
|
||
| # Tests for ModSecurity module. | ||
|
|
||
| ############################################################################### | ||
|
|
||
| use warnings; | ||
| use strict; | ||
|
|
||
| use Test::More; | ||
|
|
||
| BEGIN { use FindBin; chdir($FindBin::Bin); } | ||
|
|
||
| use lib 'lib'; | ||
| use Test::Nginx; | ||
|
|
||
| ############################################################################### | ||
|
|
||
| select STDERR; $| = 1; | ||
| select STDOUT; $| = 1; | ||
|
|
||
| my $t = Test::Nginx->new()->has(qw/http/); | ||
|
|
||
| $t->write_file_expand('nginx.conf', <<'EOF'); | ||
|
|
||
| %%TEST_GLOBALS%% | ||
|
|
||
| daemon off; | ||
|
|
||
| events { | ||
| } | ||
|
|
||
| http { | ||
| %%TEST_GLOBALS_HTTP%% | ||
|
|
||
| server { | ||
| listen 127.0.0.1:8080; | ||
| server_name localhost; | ||
|
|
||
| error_page 403 /403.html; | ||
|
|
||
| location /403.html { | ||
| root %%TESTDIR%%/http; | ||
| internal; | ||
| } | ||
|
|
||
| location / { | ||
| modsecurity on; | ||
| modsecurity_rules ' | ||
| SecRuleEngine On | ||
| SecRule ARGS "@streq root" "id:10,phase:1,auditlog,status:403,deny" | ||
| SecDebugLog %%TESTDIR%%/auditlog-debug-local.txt | ||
| SecDebugLogLevel 9 | ||
| SecAuditEngine RelevantOnly | ||
| SecAuditLogParts AB | ||
| SecAuditLog %%TESTDIR%%/auditlog-local.txt | ||
| SecAuditLogType Serial | ||
| SecAuditLogStorageDir %%TESTDIR%%/ | ||
| '; | ||
| } | ||
| } | ||
|
|
||
| server { | ||
| listen 127.0.0.1:8081; | ||
| server_name localhost; | ||
|
|
||
| modsecurity on; | ||
| modsecurity_rules ' | ||
| SecRuleEngine On | ||
| SecRule ARGS "@streq root" "id:10,phase:1,auditlog,status:403,deny" | ||
| SecDebugLog %%TESTDIR%%/auditlog-debug-global.txt | ||
| SecDebugLogLevel 9 | ||
| SecAuditEngine RelevantOnly | ||
| SecAuditLogParts AB | ||
| SecAuditLog %%TESTDIR%%/auditlog-global.txt | ||
| SecAuditLogType Serial | ||
| SecAuditLogStorageDir %%TESTDIR%%/ | ||
| '; | ||
|
|
||
| error_page 403 /403.html; | ||
|
|
||
| location /403.html { | ||
| modsecurity off; | ||
| root %%TESTDIR%%/http; | ||
| internal; | ||
| } | ||
|
|
||
| location / { | ||
| } | ||
| } | ||
| } | ||
| EOF | ||
|
|
||
| my $index_txt = "This is the index page."; | ||
| my $custom_txt = "This is a custom error page."; | ||
|
|
||
| $t->write_file("/index.html", $index_txt); | ||
| mkdir($t->testdir() . '/http'); | ||
| $t->write_file("/http/403.html", $custom_txt); | ||
|
|
||
| $t->run(); | ||
| $t->plan(8); | ||
|
|
||
| ############################################################################### | ||
|
|
||
| my $d = $t->testdir(); | ||
|
|
||
| my $t1; | ||
| my $t2; | ||
| my $t3; | ||
| my $t4; | ||
|
|
||
| # Performing requests to a server with ModSecurity enabled at location context | ||
| $t1 = http_get('/index.html?what=root'); | ||
| $t2 = http_get('/index.html?what=other'); | ||
|
|
||
| # Performing requests to a server with ModSecurity enabled at server context | ||
| $t3 = http_get2('/index.html?what=root'); | ||
| $t4 = http_get2('/index.html?what=other'); | ||
|
|
||
| my $local = do { | ||
| local $/ = undef; | ||
| open my $fh, "<", "$d/auditlog-local.txt" | ||
| or die "could not open: $!"; | ||
| <$fh>; | ||
| }; | ||
|
|
||
| my $global = do { | ||
| local $/ = undef; | ||
| open my $fh, "<", "$d/auditlog-global.txt" | ||
| or die "could not open: $!"; | ||
| <$fh>; | ||
| }; | ||
|
|
||
| like($t1, qr/$custom_txt/, 'ModSecurity at location / root'); | ||
| like($t2, qr/$index_txt/, 'ModSecurity at location / other'); | ||
| like($local, qr/what=root/, 'ModSecurity at location / root present in auditlog'); | ||
| unlike($local, qr/what=other/, 'ModSecurity at location / other not present in auditlog'); | ||
|
|
||
| like($t3, qr/$custom_txt/, 'ModSecurity at server / root'); | ||
| like($t4, qr/$index_txt/, 'ModSecurity at server / other'); | ||
| like($global, qr/what=root/, 'ModSecurity at server / root present in auditlog'); | ||
| unlike($global, qr/what=other/, 'ModSecurity at server / other not present in auditlog'); | ||
|
|
||
| ############################################################################### | ||
|
|
||
| sub http_get2($;%) { | ||
| my ($url, %extra) = @_; | ||
| return http2(<<EOF, %extra); | ||
| GET $url HTTP/1.0 | ||
| Host: localhost | ||
|
|
||
| EOF | ||
| } | ||
|
|
||
| sub http2($;%) { | ||
| my ($request, %extra) = @_; | ||
|
|
||
| my $s = http_start2($request, %extra); | ||
|
|
||
| return $s if $extra{start} or !defined $s; | ||
| return http_end2($s); | ||
| } | ||
|
|
||
| sub http_start2($;%) { | ||
| my ($request, %extra) = @_; | ||
| my $s; | ||
|
|
||
| eval { | ||
| local $SIG{ALRM} = sub { die "timeout\n" }; | ||
| local $SIG{PIPE} = sub { die "sigpipe\n" }; | ||
| alarm(8); | ||
|
|
||
| $s = $extra{socket} || IO::Socket::INET->new( | ||
| Proto => 'tcp', | ||
| PeerAddr => '127.0.0.1:' . port(8081) | ||
| ) | ||
| or die "Can't connect to nginx: $!\n"; | ||
|
|
||
| log_out($request); | ||
| $s->print($request); | ||
|
|
||
| select undef, undef, undef, $extra{sleep} if $extra{sleep}; | ||
| return '' if $extra{aborted}; | ||
|
|
||
| if ($extra{body}) { | ||
| log_out($extra{body}); | ||
| $s->print($extra{body}); | ||
| } | ||
|
|
||
| alarm(0); | ||
| }; | ||
| alarm(0); | ||
| if ($@) { | ||
| log_in("died: $@"); | ||
| return undef; | ||
| } | ||
|
|
||
| return $s; | ||
| } | ||
|
|
||
| sub http_end2($;%) { | ||
| my ($s) = @_; | ||
| my $reply; | ||
|
|
||
| eval { | ||
| local $SIG{ALRM} = sub { die "timeout\n" }; | ||
| local $SIG{PIPE} = sub { die "sigpipe\n" }; | ||
| alarm(8); | ||
|
|
||
| local $/; | ||
| $reply = $s->getline(); | ||
|
|
||
| alarm(0); | ||
| }; | ||
| alarm(0); | ||
| if ($@) { | ||
| log_in("died: $@"); | ||
| return undef; | ||
| } | ||
|
|
||
| log_in($reply); | ||
| return $reply; | ||
| } | ||
|
|
||
| ############################################################################### |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.