Skip to content

Commit

Permalink
Use mod_authz_host syntax instead of deprecated directives
Browse files Browse the repository at this point in the history
  • Loading branch information
@ancorgs
ancorgs committed Oct 3, 2014
1 parent d2a7e71 commit d39c55d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 27 deletions.
6 changes: 2 additions & 4 deletions src/modules/HttpServerWidgets.rb
View file
Expand Up @@ -1675,8 +1675,7 @@ def validateVhostId(key, event)
"SECTIONPARAM" => documentroot,
"VALUE" => [
{ "KEY" => "AllowOverride", "VALUE" => "None" },
{ "KEY" => "Order", "VALUE" => "allow,deny" },
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
],
"OVERHEAD" => ""
}
Expand Down Expand Up @@ -2093,8 +2092,7 @@ def storeVhostDetails(key, events)
"VALUE" => [
{ "KEY" => "AllowOverride", "VALUE" => "None" },
{ "KEY" => "Options", "VALUE" => "+ExecCGI -Includes" },
{ "KEY" => "Order", "VALUE" => "allow,deny" },
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
],
"OVERHEAD" => ""
}
Expand Down
4 changes: 1 addition & 3 deletions src/modules/YaPI/HTTPDModules.pm
View file
Expand Up @@ -14,9 +14,7 @@ textdomain "http-server";
packages => [],
default => 1,
position => 10,
directives=> [ { option => "Allow", "context" => [ "Directory" ] },
{ option => "Deny", "context" => [ "Directory" ] },
{ option => "Order", "context" => [ "Directory" ], "values" => [ "Deny,Allow", "Allow,Deny", "Mutual-failure" ] }
directives=> [ { option => "Require", "context" => [ "Directory", "Files", "Location" ] }
]
},
'actions' => {
Expand Down
8 changes: 2 additions & 6 deletions src/modules/YaST/HTTPDData.pm
View file
Expand Up @@ -88,12 +88,8 @@ sub addDir {
'VALUE' => 'None'
},
{
'KEY' => 'Order',
'VALUE' => 'allow,deny'
},
{
'KEY' => 'Allow',
'VALUE' => 'from all'
'KEY' => 'Require',
'VALUE' => 'all granted'
}
]
};
Expand Down
4 changes: 2 additions & 2 deletions testsuite/tests/readHosts.out
View file
@@ -1,5 +1,5 @@
Read .http_server.vhosts $["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default", "VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja@ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]], "HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"], $["OVERHEAD":""]]]
Read .http_server.vhosts $["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default", "VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja@ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]], "HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"], $["OVERHEAD":""]]]
Return true
Return ["default", "10.20.1.28/TestNew"]
Return [$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"ja@ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]]
Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]]
Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]]
16 changes: 4 additions & 12 deletions testsuite/tests/readHosts.rb
View file
Expand Up @@ -36,12 +36,7 @@ def main
"OVERHEAD" => "",
"VALUE" => "None"
},
{
"KEY" => "Order",
"OVERHEAD" => "",
"VALUE" => "allow,deny"
},
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
]
},
{
Expand All @@ -57,8 +52,7 @@ def main
"VALUE" => [
{ "KEY" => "Options", "VALUE" => "Indexes MultiViews" },
{ "KEY" => "AllowOverride", "VALUE" => "None" },
{ "KEY" => "Order", "VALUE" => "allow,deny" },
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
]
},
{
Expand All @@ -74,8 +68,7 @@ def main
"VALUE" => [
{ "KEY" => "AllowOverride", "VALUE" => "None" },
{ "KEY" => "Options", "VALUE" => "+ExecCGI -Includes" },
{ "KEY" => "Order", "VALUE" => "allow,deny" },
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
]
},
{
Expand Down Expand Up @@ -116,8 +109,7 @@ def main
"VALUE" => [
{ "KEY" => "Options", "VALUE" => "None" },
{ "KEY" => "AllowOverride", "VALUE" => "None" },
{ "KEY" => "Order", "VALUE" => "allow,deny" },
{ "KEY" => "Allow", "VALUE" => "from all" }
{ "KEY" => "Require", "VALUE" => "all granted" }
]
},
{ "KEY" => "NameVirtualHost", "VALUE" => "10.20.1.28" },
Expand Down

0 comments on commit d39c55d

Please sign in to comment.