| 1 |
diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias |
| 2 |
--- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2023-10-25 15:34:29.676000000 -0400 |
| 3 |
+++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2023-10-25 15:40:33.273000000 -0400 |
| 4 |
@@ -29,14 +29,20 @@ |
| 5 |
$OUT .= "# phpMyAdmin Multiuser access disabled\n"; |
| 6 |
} |
| 7 |
|
| 8 |
- |
| 9 |
+ # Location overrides Directory for access control and default is RequireAny |
| 10 |
+ # we need to repeat the Require ip section for both context to filter both admin and multiuser access. |
| 11 |
$OUT .= qq( |
| 12 |
<Location /phpmyadmin> |
| 13 |
AuthName "phpmyadmin" |
| 14 |
AuthType Basic |
| 15 |
AuthBasicProvider external |
| 16 |
AuthExternal pwauth |
| 17 |
- require user admin |
| 18 |
+ <RequireAll> |
| 19 |
+ require user admin |
| 20 |
+ ); |
| 21 |
+ $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " Require all granted": " Require ip $localAccess $externalSSLAccess"; |
| 22 |
+ $OUT .= qq( |
| 23 |
+ </RequireAll> |
| 24 |
</Location>) if "$adminaccess" eq "enabled"; |
| 25 |
|
| 26 |
$OUT .= qq( |
Parent Directory
| 
Revision Log
| 
Revision Graph
