| 1 |
diff -Nur --no-dereference smeserver-subversion-1.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent smeserver-subversion-1.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent |
| 2 |
--- smeserver-subversion-1.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent 2015-08-11 09:30:17.000000000 -0400 |
| 3 |
+++ smeserver-subversion-1.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent 2022-08-01 15:04:48.457000000 -0400 |
| 4 |
@@ -57,30 +57,30 @@ |
| 5 |
|
| 6 |
if ($properties{'AccessType'} eq 'global') { |
| 7 |
|
| 8 |
- $allow = 'all'; |
| 9 |
+ $allow = 'all granted'; |
| 10 |
$pass = 0; |
| 11 |
- $satisfy = 'all'; |
| 12 |
+ $satisfy = 'RequireAll'; |
| 13 |
|
| 14 |
} elsif ($properties{'AccessType'} eq 'private') { |
| 15 |
|
| 16 |
- $allow = join (' ', ($localAccess, $externalSSLAccess)) ; |
| 17 |
+ $allow = "ip $localAccess $externalSSLAccess"; |
| 18 |
$pass = 0; |
| 19 |
- $satisfy = 'all'; |
| 20 |
+ $satisfy = 'RequireAll'; |
| 21 |
|
| 22 |
} elsif ($properties{'AccessType'} eq 'local') { |
| 23 |
|
| 24 |
|
| 25 |
- $allow = $localAccess; |
| 26 |
+ $allow = "ip $localAccess"; |
| 27 |
$pass = 0; |
| 28 |
- $satisfy = 'all'; |
| 29 |
+ $satisfy = 'RequireAll'; |
| 30 |
|
| 31 |
} else { |
| 32 |
|
| 33 |
# Catch all incorrect values, including empty ones |
| 34 |
|
| 35 |
- $allow = '127.0.0.1'; |
| 36 |
+ $allow = 'ip 127.0.0.1'; |
| 37 |
$pass = 0; |
| 38 |
- $satisfy = 'all'; |
| 39 |
+ $satisfy = 'RequireAll'; |
| 40 |
|
| 41 |
} |
| 42 |
|
| 43 |
@@ -271,23 +271,22 @@ |
| 44 |
# $OUT .= " <LimitExcept GET PROPFIND OPTIONS REPORT>\n"; |
| 45 |
$OUT .= " <Limit GET PROPFIND OPTIONS REPORT>\n"; |
| 46 |
|
| 47 |
- $OUT .= " order deny,allow\n"; |
| 48 |
- $OUT .= " deny from all\n"; |
| 49 |
- |
| 50 |
if ( ( ($groupsRead eq "") && ($usersRead eq "") ) || ( ( ($groupsRead ne "") || ($usersRead ne "") ) && ($port eq 443) ) ) { |
| 51 |
|
| 52 |
- $OUT .= " allow from $allow\n"; |
| 53 |
+ $OUT .= " <$satisfy>\n"; |
| 54 |
+ $OUT .= " Require $allow\n"; |
| 55 |
$OUT .= " Require group $groupsRead\n" unless ($groupsRead eq ""); |
| 56 |
$OUT .= " Require user $usersRead\n" unless ($usersRead eq ""); |
| 57 |
+ $OUT .= " </$satisfy>\n"; |
| 58 |
|
| 59 |
} else { |
| 60 |
|
| 61 |
$OUT .= " # Denying access:\n"; |
| 62 |
+ $OUT .= " Require all denied\n"; |
| 63 |
$OUT .= " # User authentication required this requires SSL\n"; |
| 64 |
|
| 65 |
} |
| 66 |
|
| 67 |
- $OUT .= " Satisfy $satisfy\n"; |
| 68 |
# $OUT .= " </LimitExcept>\n\n"; |
| 69 |
$OUT .= " </Limit>\n\n"; |
| 70 |
|
| 71 |
@@ -299,8 +298,6 @@ |
| 72 |
# $OUT .= " <Limit GET PROPFIND OPTIONS REPORT>\n"; |
| 73 |
$OUT .= " <LimitExcept GET PROPFIND OPTIONS REPORT>\n"; |
| 74 |
|
| 75 |
- $OUT .= " order deny,allow\n"; |
| 76 |
- $OUT .= " deny from all\n"; |
| 77 |
|
| 78 |
if ( |
| 79 |
( ($port eq 443) && |
| 80 |
@@ -316,14 +313,18 @@ |
| 81 |
) |
| 82 |
) { |
| 83 |
|
| 84 |
- $OUT .= " allow from $allow\n"; |
| 85 |
- $OUT .= " Require group $groupsWrite\n" unless ($groupsWrite eq ""); |
| 86 |
- $OUT .= " Require user $usersWrite\n" unless ($usersWrite eq ""); |
| 87 |
+ $OUT .= " <$satisfy>\n"; |
| 88 |
+ $OUT .= " Require $allow\n"; |
| 89 |
+ $OUT .= " <RequireAny>\n" unless ($groupsWrite eq "" || $usersWrite eq ""); |
| 90 |
+ $OUT .= " Require group $groupsWrite\n" unless ($groupsWrite eq ""); |
| 91 |
+ $OUT .= " Require user $usersWrite\n" unless ($usersWrite eq ""); |
| 92 |
+ $OUT .= " </RequireAny>\n" unless ($groupsWrite eq "" || $usersWrite eq ""); |
| 93 |
+ $OUT .= " </$satisfy>\n"; |
| 94 |
|
| 95 |
} else { |
| 96 |
|
| 97 |
$OUT .= " # Denying access:\n"; |
| 98 |
- |
| 99 |
+ $OUT .= " Require all denied\n"; |
| 100 |
if ( ($groupsRead ne "") || ($usersRead ne "") || ( ($groupsRead ne "") && ($usersRead ne "") ) ) { |
| 101 |
|
| 102 |
$OUT .= " # Read authentication required, no anonymous write access allowed\n"; |
| 103 |
@@ -335,12 +336,9 @@ |
| 104 |
|
| 105 |
} |
| 106 |
|
| 107 |
- $OUT .= " Satisfy $satisfy\n"; |
| 108 |
# $OUT .= " </Limit>\n\n"; |
| 109 |
$OUT .= " </LimitExcept>\n\n"; |
| 110 |
|
| 111 |
-# $OUT .= " Satisfy $satisfy\n\n"; |
| 112 |
-# $OUT .= " Satisfy any\n\n"; |
| 113 |
|
| 114 |
$OUT .= " </Location>\n\n"; |
| 115 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
