Tests: Minor refactoring in custom error page test

Author: mlevogiannis

tests/modsecurity-config-custom-error-page.t

@@ -52,10 +52,10 @@ http {
         listen       127.0.0.1:8080;
         server_name  s1;
 
-        error_page 403 /403.html;
+        error_page 403 /error;
 
-        location /403.html {
-            root %%TESTDIR%%/http;
+        location /error {
+            alias %%TESTDIR%%/error.html;
             internal;
         }
 
@@ -64,11 +64,11 @@ http {
             modsecurity_rules '
                 SecRuleEngine On
                 SecRule ARGS "@streq root" "id:10,phase:1,auditlog,status:403,deny"
-                SecDebugLog %%TESTDIR%%/auditlog-debug-local.txt
+                SecDebugLog %%TESTDIR%%/auditlog-debug-location.txt
                 SecDebugLogLevel 9
                 SecAuditEngine RelevantOnly
                 SecAuditLogParts ABIJDEFHZ
-                SecAuditLog %%TESTDIR%%/auditlog-local.txt
+                SecAuditLog %%TESTDIR%%/auditlog-location.txt
                 SecAuditLogType Serial
                 SecAuditLogStorageDir %%TESTDIR%%/
             ';
@@ -83,20 +83,20 @@ http {
         modsecurity_rules '
             SecRuleEngine On
             SecRule ARGS "@streq root" "id:10,phase:1,auditlog,status:403,deny"
-            SecDebugLog %%TESTDIR%%/auditlog-debug-global.txt
+            SecDebugLog %%TESTDIR%%/auditlog-debug-server.txt
             SecDebugLogLevel 9
             SecAuditEngine RelevantOnly
             SecAuditLogParts ABIJDEFHZ
-            SecAuditLog %%TESTDIR%%/auditlog-global.txt
+            SecAuditLog %%TESTDIR%%/auditlog-server.txt
             SecAuditLogType Serial
             SecAuditLogStorageDir %%TESTDIR%%/
         ';
 
-        error_page 403 /403.html;
+        error_page 403 /error;
 
-        location /403.html {
+        location /error {
             modsecurity off;
-            root %%TESTDIR%%/http;
+            alias %%TESTDIR%%/error.html;
             internal;
         }
 
@@ -107,11 +107,10 @@ http {
 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);
+
+my $error_txt = "This is a custom error page.";
+$t->write_file("/error.html", $error_txt);
 
 $t->run();
 $t->plan(10);
@@ -126,39 +125,39 @@ my $t3;
 my $t4;
 
 # Performing requests to a server with ModSecurity enabled at location context
-$t1 = http_get_host('s1', '/index.html?what=root');
-$t2 = http_get_host('s1', '/index.html?what=other');
+$t1 = http_get_host('s1', '/?what=root');
+$t2 = http_get_host('s1', '/?what=other');
 
 # Performing requests to a server with ModSecurity enabled at server context
-$t3 = http_get_host('s2', '/index.html?what=root');
-$t4 = http_get_host('s2', '/index.html?what=other');
+$t3 = http_get_host('s2', '/?what=root');
+$t4 = http_get_host('s2', '/?what=other');
 
-my $local = do {
+my $auditlog_location = do {
     local $/ = undef;
-    open my $fh, "<", "$d/auditlog-local.txt"
+    open my $fh, "<", "$d/auditlog-location.txt"
         or die "could not open: $!";
     <$fh>;
 };
 
-my $global = do {
+my $auditlog_server = do {
     local $/ = undef;
-    open my $fh, "<", "$d/auditlog-global.txt"
+    open my $fh, "<", "$d/auditlog-server.txt"
         or die "could not open: $!";
     <$fh>;
 };
 
-like($t1, qr/$custom_txt/, 'ModSecurity at location / root');
+like($t1, qr/$error_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($auditlog_location, qr/what=root/, 'ModSecurity at location / root present in auditlog');
+unlike($auditlog_location, qr/what=other/, 'ModSecurity at location / other not present in auditlog');
 
-like($t3, qr/$custom_txt/, 'ModSecurity at server / root');
+like($t3, qr/$error_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');
+like($auditlog_server, qr/what=root/, 'ModSecurity at server / root present in auditlog');
+unlike($auditlog_server, qr/what=other/, 'ModSecurity at server / other not present in auditlog');
 
-like($local, qr/Access denied with code 403/, 'ModSecurity at location / 403 in auditlog');
-like($global, qr/Access denied with code 403/, 'ModSecurity at server / 403 in auditlog');
+like($auditlog_location, qr/Access denied with code 403/, 'ModSecurity at location / 403 in auditlog');
+like($auditlog_server, qr/Access denied with code 403/, 'ModSecurity at server / 403 in auditlog');
 
 ###############################################################################