From fe2e8f649c29cea8368bbe8efa09450bfb58fc28 Mon Sep 17 00:00:00 2001 From: Jochen Wiedmann Date: Mon, 2 Feb 2015 20:04:45 +0000 Subject: [PATCH] Bug 1121477: Support for Apache HTTPD 2.4 r=dkl,a=glob --- .htaccess | 12 +++- Bugzilla/Install/Filesystem.pm | 104 +++++++++++++++++++++++++++++---- 2 files changed, 104 insertions(+), 12 deletions(-) diff --git a/.htaccess b/.htaccess index 7ef20d8b69..14325d1523 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,16 @@ # Don't allow people to retrieve non-cgi executable files or our private data - deny from all + + + Deny from all + + 2.2> + Require all denied + + + + Deny from all + Options -Indexes diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 15fca30ee1..6d7f14ced9 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -47,7 +47,17 @@ our @EXPORT = qw( use constant HT_DEFAULT_DENY => < + + Deny from all + + 2.2> + Require all denied + + + + Deny from all + EOT ############### @@ -339,11 +349,31 @@ EOT "$graphsdir/.htaccess" => { perms => WS_SERVE, contents => < - Allow from all + + + Allow from all + + 2.2> + Require all granted + + + + Allow from all + # And no directory listings, either. -Deny from all + + + Deny from all + + 2.2> + Require all denied + + + + Deny from all + EOT }, @@ -352,28 +382,80 @@ EOT # if research.att.com ever changes their IP, or if you use a different # webdot server, you'll need to edit this - Allow from 192.20.225.0/24 - Deny from all + + + Allow from 192.20.225.0/24 + Deny from all + + 2.2> + Require ip 192.20.225.0/24 + Require all denied + + + + Allow from 192.20.225.0/24 + Deny from all + -# Allow access to .png files created by a local copy of 'dot' - - Allow from all + # Allow access to .png files created by a local copy of 'dot' + + + + Allow from all + + 2.2> + Require all granted + + + + Allow from all + # And no directory listings, either. -Deny from all + + + Deny from all + + 2.2> + Require all denied + + + + Deny from all + EOT }, "$assetsdir/.htaccess" => { perms => WS_SERVE, contents => < - Allow from all + + + Allow from all + + 2.2> + Require all granted + + + + Allow from all + # And no directory listings, either. -Deny from all + + + Deny from all + + 2.2> + Require all denied + + + + Deny from all + EOT }, -- 2.47.2