* [PATCH] also force TLS when requiring user authentication in WebUI
@ 2017-10-10 13:39 Peter Müller
2017-10-11 10:16 ` Michael Tremer
0 siblings, 1 reply; 3+ messages in thread
From: Peter Müller @ 2017-10-10 13:39 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]
Force TLS _and_ a valid login when accessing protected directories.
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..50e257f16 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
- <Files chpasswd.cgi>
+ <RequireAll>
+ Require user admin
+ Require ssl
+ </RequireAll>
+ <Files chpasswd.cgi>
Require all granted
</Files>
<Files webaccess.cgi>
Require all granted
</Files>
</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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] also force TLS when requiring user authentication in WebUI
2017-10-10 13:39 [PATCH] also force TLS when requiring user authentication in WebUI Peter Müller
@ 2017-10-11 10:16 ` Michael Tremer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2017-10-11 10:16 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2387 bytes --]
Same here:
[root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 1451
Applying patch #1451 using 'git am -s'
Description: also force TLS when requiring user authentication in WebUI
Applying: also force TLS when requiring user authentication in WebUI
error: corrupt patch at line 36
Patch failed at 0001 also force TLS when requiring user authentication in WebUI
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128
On Tue, 2017-10-10 at 15:39 +0200, Peter Müller wrote:
> Force TLS _and_ a valid login when accessing protected directories.
>
> 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..50e257f16 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
> - <Files chpasswd.cgi>
> + <RequireAll>
> + Require user admin
> + Require ssl
> + </RequireAll>
> + <Files chpasswd.cgi>
> Require all granted
> </Files>
> <Files webaccess.cgi>
> Require all granted
> </Files>
> </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>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] also force TLS when requiring user authentication in WebUI
@ 2017-10-11 16:30 Peter Müller
0 siblings, 0 replies; 3+ messages in thread
From: Peter Müller @ 2017-10-11 16:30 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
Force TLS _and_ a valid login when accessing protected directories.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
---
config/httpd/vhosts.d/ipfire-interface-ssl.conf | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index e9ad26a96..816b9e637 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,7 +35,10 @@
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>
@@ -74,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>
--
2.13.6
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-11 16:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-10 13:39 [PATCH] also force TLS when requiring user authentication in WebUI Peter Müller
2017-10-11 10:16 ` Michael Tremer
2017-10-11 16:30 Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox