[open-ils-commits] [GIT] Evergreen ILS branch master updated. aa3da6f5ab5d995f1d640fbb2c389762ff36807a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  aa3da6f5ab5d995f1d640fbb2c389762ff36807a (commit)
      from  96764f57fb2c9ab052d8c9ab2999607220acc10d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aa3da6f5ab5d995f1d640fbb2c389762ff36807a
Author: Jason Boyer <jboyer at library.in.gov>
Date:   Fri Dec 4 01:17:21 2015 -0500

    LP1522686: Force SSL for Web Staff, Add Basic Redirect for Staff URL
    
    1 minor change, 1 less minor change.
    
    First, add a simple redirect for staff that forget to enter the
    final '/' at the end of <server>/eg/staff/.
    
    Second, and most importantly, force all connections to the web
    staff client to be redirected through an HTTPS connection. By
    default the system would accept whichever connection type you
    enter by hand, and fewer and fewer people actually enter the
    protocol specifier these days.
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index bf63947..e64c2d7 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -9,6 +9,11 @@
 RedirectMatch 301 ^/$ /eg/opac/home
 
 # ----------------------------------------------------------------------------------
+# Redirect staff to the correct URL if they forget to include the final /
+# ----------------------------------------------------------------------------------
+RedirectMatch 301 ^/eg/staff$ /eg/staff/
+
+# ----------------------------------------------------------------------------------
 # Point / to the IP address redirector
 # ----------------------------------------------------------------------------------
 #<LocationMatch ^/$>
@@ -812,6 +817,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
+    RewriteCond %{HTTPS} off
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
+
     # sample staff-specific translation files
     #PerlAddVar OILSWebLocale "en_ca"                                           
     #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 78fab7e..94d5c34 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -9,6 +9,11 @@
 RedirectMatch 301 ^/$ /eg/opac/home
 
 # ----------------------------------------------------------------------------------
+# Redirect staff to the correct URL if they forget to include the final /
+# ----------------------------------------------------------------------------------
+RedirectMatch 301 ^/eg/staff$ /eg/staff/
+
+# ----------------------------------------------------------------------------------
 # Point / to the IP address redirector
 # ----------------------------------------------------------------------------------
 #<LocationMatch ^/$>
@@ -818,6 +823,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
+    RewriteCond %{HTTPS} off
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
+
     # sample staff-specific translation files
     #PerlAddVar OILSWebLocale "en_ca"                                           
     #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/en-CA.po"         

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/apache/eg_vhost.conf.in    |    8 ++++++++
 Open-ILS/examples/apache_24/eg_vhost.conf.in |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS