diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 12:55:52 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 12:55:52 -0700 |
| commit | 63973c641c4be00765fa27e55c57cc5b9aa4da19 (patch) | |
| tree | 68ea71023d7116229e97fd27b38b87b5ac65228a /htetc | |
| parent | 7b5a266236857fbb4bbf8d4ac3031c3fec75cac2 (diff) | |
| parent | 0832972047a36d19ffcf7d1462abc48de7045d3d (diff) | |
merge NG auth, RT#21563
Diffstat (limited to 'htetc')
| -rw-r--r-- | htetc/freeside-base2.conf | 54 | ||||
| -rw-r--r-- | htetc/htpasswd.logout | 1 |
2 files changed, 37 insertions, 18 deletions
diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf index 49b4a24..1bbe90a 100644 --- a/htetc/freeside-base2.conf +++ b/htetc/freeside-base2.conf @@ -14,28 +14,48 @@ PerlRequire "%%%MASON_HANDLER%%%" # AddDefaultCharset UTF-8 +PerlModule FS::AuthCookieHandler + +#XXX need to also work properly for installs w/o /freeside/ in path +PerlSetVar FreesideLoginScript /freeside/loginout/login.html + +#PerlSetVar FreesideEverSecure 1 +PerlSetVar FreesideHttpOnly 1 + <Directory %%%FREESIDE_DOCUMENT_ROOT%%%> -AuthName Freeside -AuthType Basic -AuthUserFile %%%FREESIDE_CONF%%%/htpasswd -require valid-user -<Files ~ "(\.cgi|\.html)$"> -SetHandler perl-script -PerlHandler HTML::Mason + + AuthName Freeside + AuthType FS::AuthCookieHandler + PerlAuthenHandler FS::AuthCookieHandler->authenticate + PerlAuthzHandler FS::AuthCookieHandler->authorize + require valid-user + + <Files ~ "(\.cgi|\.html)$"> + SetHandler perl-script + PerlHandler HTML::Mason + </Files> + +</Directory> + +<Files login> + AuthName Freeside + AuthType FS::AuthCookieHandler + SetHandler perl-script + PerlHandler FS::AuthCookieHandler->login </Files> + +<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/elements/> + <Files "freeside.css"> + Satisfy any + </Files> </Directory> + <Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/> -SetHandler perl-script -PerlHandler HTML::Mason + SetHandler perl-script + PerlHandler HTML::Mason </Directory> -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/loginout> -AuthName Freeside -AuthType Basic -AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout -require valid-user -<Files ~ "(\.cgi|\.html)$"> -SetHandler default-handler -</Files> +<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/REST/1.0/NoAuth/> + Satisfy any </Directory> diff --git a/htetc/htpasswd.logout b/htetc/htpasswd.logout deleted file mode 100644 index 3523f23..0000000 --- a/htetc/htpasswd.logout +++ /dev/null @@ -1 +0,0 @@ -magic:Jgvaxb502SIqQ |