quick fix for #1302: allowing in file-system paths

A proper but more intrusive fix will be merged in devel.
inverse-inc · Aug 15, 2012 · 3547973 · 3547973
1 parent 53c5f85
commit 3547973
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -19,6 +19,7 @@ Bug Fixes
  * FreeRADIUS watchdog updated for 3.5.0 changes (#1514)
  * debian packages improvements regarding FreeRADIUS configuration
  * cosmetic fix in `pfcmd service ... status` regarding pfdhcplistener (#1515)
+ * Guests are not able to confirm registration in some cases - take 2 (#1302)
 
 --------------------------------------------------------------------------------
 Version 3.5.0 released on 2012-08-01

diff --git a/lib/pf/services/apache.pm b/lib/pf/services/apache.pm
@@ -124,15 +124,15 @@ sub generate_httpd_conf {
     if ($guest_regist_allowed && isenabled($Config{'guests_self_registration'}{'preregistration'})) {
         # TODO hardcoded URL mentionned here is probably suboptimal for maintenance
         # | is for a regexp "or" as this is pulled from a 'Location ~' statement 
-        $tags{'allowed_from_all_urls'} .= '|/signup|/preregister';
+        $tags{'allowed_from_all_urls'} .= '|/signup|/guest-selfregistration.cgi|/preregister';
     }
     # /activate/email allowed if sponsor or email mode enabled
     my $email_enabled = $guest_self_registration{$SELFREG_MODE_EMAIL};
     my $sponsor_enabled = $guest_self_registration{$SELFREG_MODE_SPONSOR};
     if ($guest_regist_allowed && ($email_enabled || $sponsor_enabled)) {
         # TODO hardcoded URL mentionned here is probably suboptimal for maintenance
         # | is for a regexp "or" as this is pulled from a 'Location ~' statement 
-        $tags{'allowed_from_all_urls'} .= '|/activate/email';
+        $tags{'allowed_from_all_urls'} .= '|/activate/email|/email_activation.cgi';
     }
 
     my ($pt_http, $pt_https, $remediation);