From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] also force TLS when requiring user authentication in WebUI Date: Wed, 11 Oct 2017 11:16:22 +0100 Message-ID: <1507716982.4045.58.camel@ipfire.org> In-Reply-To: <20171010153915.1ea70bda.peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1044548705913763759==" List-Id: --===============1044548705913763759== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Web= UI 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=C3=BCller wrote: > Force TLS _and_ a valid login when accessing protected directories. >=20 > Signed-off-by: Peter M=C3=BCller > --- > 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 > + > + Require user admin > + Require ssl > + > > ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/ > > @@ -32,24 +35,16 @@ > AuthName "IPFire - Restricted" > AuthType Basic > AuthUserFile /var/ipfire/auth/users > - Require user admin > - > + > + Require user admin > + Require ssl > + > + > Require all granted > > > Require all granted > > > > SSLOptions +StdEnvVars > @@ -85,6 +80,9 @@ > AuthName "IPFire - Restricted" > AuthType Basic > AuthUserFile /var/ipfire/auth/users > - Require user admin > + > + Require user admin > + Require ssl > + > > --===============1044548705913763759== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxuZDczWUFDZ2tRZ0hudy8yK1EKQ1FlQzlCQUFrRXNwRitiMjNF MWxDS0ZhWWdkMVNWMG9hdW1wcElPMTFINmVEM2hwb2ZLWXNEZHFTRDJ5MXZ1cApwYzh4b2Fqd3hu UW1Nei9uWUJzVVJSZGc3MmxuY01TTHBubFhqZHZqTmJwZkhDdS8vM1J1Nzlqd2NpTGN3czVUCkJP UEZHSUswQWIxemZMRHhRNS9mY1dlOUJuWGpwSHo1ZkkwWWhjT2l0ZWVrYm9BUTNnWk8yQVdUc0gx NS8xSkkKMlFUOVFMMGQyZ2JMU1ozVzhXUHpCRERJNjE1Vk1WZU4wMEx2NEM1MEZhZkJrUVVlQy9D czk3SUl5aFhSSUNobwpNUGhWQUVzWjZXOGFyUDhWbit5MTZueklvNVFEWHd6UjU0cEZQZ2hEWU5C UFYxMDBGVVUySzNFSHZLSXhJUHl1Cnp1VGl6emZGTk5qS1R1WC9GOU5xbUpXelN6QUQ3eU05Slk1 ZmVtS1ZCSXBLMWVEbHRrRWRXN2Ezcy9nQWpjbkUKektQNktOaHU5ZlUxZ2ZpeWtETjZaektzOEJa cVp0NmlMUmdTS3VYZWh6MGJucGtBVWQvRGU4UkhMRUlHS1lWQwpWNjQ5ZlVITHNTWXdBekZ1a0hY QXk4aGhOSXN0cTJqYnp4NDc3VVNRdGVJRU9CdFF5Z3plRUxBU3FmM3Q4dUVCCmcwYVdCUHcwWWtX ckpHSnpMeFZJUlJ5VUd1SzM4SzRWd0xaT3hxVUNOZWJ0dkYxVUtUUm5FU3RXNzkwQmZ5Uy8KdnRB emRUaTFoVTB2K0hJRFF6UlBoVGFxR1ZoaEUzeEhGbC9PYkhMNmwySzR6V3BnN0hBKzZIeDJlMDln Z3hpRApQbUxZUFNNSzNhWWlJNGFSMlduRFhLMVU0RnVueFc3RFk0SGlZbzRJUnl5amFGTkRtMW89 Cj01TG1DCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============1044548705913763759==--