From mboxrd@z Thu Jan  1 00:00:00 1970
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
Message-ID: <1507634675.4045.37.camel@ipfire.org>
In-Reply-To: <20171009222103.5b23665a.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1364154713534645918=="
List-Id: <development.lists.ipfire.org>

--===============1364154713534645918==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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>

--===============1364154713534645918==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXlCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxuY3JmTUFDZ2tRZ0hudy8yK1EKQ1FjWDNRLzR5MXR4OHFubEFn
ZzFteGk1MXlkZWZjcFVya1N3ZE9uWWgxTEZYZ01abzJmbmdSSFdOaXdVZzVadApmRFFPMDdhQ2xp
RUhxUVlEeXR5QUd3aGwxektSZm5EOU1BTnBaN21sc3BOaUFHTU5mby9LNko2SjZQSE5SS0lPCnlN
NFhlZFRzWnR2aTNJclkvdk9lK0R2QzJEOC8rZzRDVUxSSUNnQzRDUTNWQ3VqSVNpbFJJVktYbVE5
MDFzazgKYVl5Y2VZMGpaM01hdmFpYzdtN2haRWJLQWNLLzdtVUVkdnNyK2RRNXl4am5ETDZaV0FD
algxVmlsWDBzaHZvWAoxTlQ0dW1uY0U2VUlpakwxYnh5UHUweTRWYmVzR2grTnIyR1owUllSeG1m
cTZyYkRJdk02d0kxanVHblN6bnQvCm9JbFczVWU3eWpva3AybzdMS25TclBKODZ6M2N6cDJ6OUxX
UHc0bVAyWDZpakdZTjcremI1THZ5aVBoUzN5ajMKZ0kzYnlFb1dwdjMxTVpDRUdSUlFvZFYxL1Rz
TDhuV01IUExxNWVENGdxWWM0K0tmZXdBOVV6d29ESE1pTDFSRgpoRk9qNHJBMldlTW9iV0hicjJq
RkFrWFAvT1BFOEVKVnBEaHFJYkdzRlU5YTZ0SUN2VExRS1RqaEdKUjA5eFlTCmlTZXBoMkVmN0kv
Y0xQdENqVDEwQ2hlUVdIMXZYVkxYZWhxeUwxcStvQUtlZVB0bXhGbHkrS1k2SFUrMW5hT0sKVTZS
V2RTeWc0WVhFalVSQ0NWbjlWcnJqVkFOOXdvZjA2YkhwTkUvLzBZUXpBWmxkYmpzT1JOeU1FdnNX
OFFtRApFaE5FZFNrTGxGMWtyTjc5U1ZEbjl0NlFLcnVmZDRzQkljekFMdEI2YnNPVFN2SUtzdz09
Cj1pRm5wCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============1364154713534645918==--