From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] remove unused directories in Apache vhosts and force TLS for logins
Date: Tue, 10 Oct 2017 12:24:35 +0100 [thread overview]
Message-ID: <1507634675.4045.37.camel@ipfire.org> (raw)
In-Reply-To: <20171009222103.5b23665a.peter.mueller@link38.eu>
[-- Attachment #1: Type: text/plain, Size: 3954 bytes --]
Hi,
it would indeed be better to split this patch into two to three.
Could you please do this and resubmit?
-Michael
On Mon, 2017-10-09 at 22:21 +0200, Peter Müller wrote:
> - remove unused dial.cgi stuff
> - redirect to TLS version for directories requiring an authentication
> - force TLS for directories requiring an authentication
>
> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> ---
> diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
> b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
> index 6f353962e..433103fdc 100644
> --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
> +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
> @@ -23,7 +23,10 @@
> AuthName "IPFire - Restricted"
> AuthType Basic
> AuthUserFile /var/ipfire/auth/users
> - Require user admin
> + <RequireAll>
> + Require user admin
> + Require ssl
> + </RequireAll>
> </DirectoryMatch>
> ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
> <Directory /srv/web/ipfire/cgi-bin>
> @@ -32,24 +35,16 @@
> AuthName "IPFire - Restricted"
> AuthType Basic
> AuthUserFile /var/ipfire/auth/users
> - Require user admin
> + <RequireAll>
> + Require user admin
> + Require ssl
> + </RequireAll>
> <Files chpasswd.cgi>
> Require all granted
> </Files>
> <Files webaccess.cgi>
> Require all granted
> </Files>
> - <Files dial.cgi>
> - Require user admin
> - </Files>
> - </Directory>
> - <Directory /srv/web/ipfire/cgi-bin/dial>
> - AllowOverride None
> - Options None
> - AuthName "IPFire - Restricted"
> - AuthType Basic
> - AuthUserFile /var/ipfire/auth/users
> - Require user dial admin
> </Directory>
> <Files ~ "\.(cgi|shtml?)$">
> SSLOptions +StdEnvVars
> @@ -85,6 +80,9 @@
> AuthName "IPFire - Restricted"
> AuthType Basic
> AuthUserFile /var/ipfire/auth/users
> - Require user admin
> + <RequireAll>
> + Require user admin
> + Require ssl
> + </RequireAll>
> </Directory>
> </VirtualHost>
> diff --git a/config/httpd/vhosts.d/ipfire-interface.conf
> b/config/httpd/vhosts.d/ipfire-interface.conf
> index 619f90fcc..41d10c874 100644
> --- a/config/httpd/vhosts.d/ipfire-interface.conf
> +++ b/config/httpd/vhosts.d/ipfire-interface.conf
> @@ -12,36 +12,17 @@
> Require all granted
> </Directory>
> <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
> - AuthName "IPFire - Restricted"
> - AuthType Basic
> - AuthUserFile /var/ipfire/auth/users
> - Require user admin
> + Options SymLinksIfOwnerMatch
> + RewriteEngine on
> + RewriteCond %{HTTPS} off
> + RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
> </DirectoryMatch>
> ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
> <Directory /srv/web/ipfire/cgi-bin>
> - AllowOverride None
> - Options None
> - AuthName "IPFire - Restricted"
> - AuthType Basic
> - AuthUserFile /var/ipfire/auth/users
> - Require user admin
> - <Files chpasswd.cgi>
> - Require all granted
> - </Files>
> - <Files webaccess.cgi>
> - Require all granted
> - </Files>
> - <Files dial.cgi>
> - Require user admin
> - </Files>
> - </Directory>
> - <Directory /srv/web/ipfire/cgi-bin/dial>
> - AllowOverride None
> - Options None
> - AuthName "IPFire - Restricted"
> - AuthType Basic
> - AuthUserFile /var/ipfire/auth/users
> - Require user dial admin
> + Options SymLinksIfOwnerMatch
> + RewriteEngine on
> + RewriteCond %{HTTPS} off
> + RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
> </Directory>
> Alias /updatecache/ /var/updatecache/
> <Directory /var/updatecache>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-10-10 11:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 20:21 Peter Müller
2017-10-10 11:24 ` Michael Tremer [this message]
2017-10-10 13:40 ` Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507634675.4045.37.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox