Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 9d74c0a..e0cfd60 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -16,11 +16,11 @@
     RewriteLog /var/log/apache2/mkws-rewrite.log 
 
     # Credential-hiding rewrite rules for standard MKWS account, testing account and various application accounts
-    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?       /service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws [P]
-    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest [P]
-    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?          /service-proxy/$2?command=auth&action=check,login&username=credo&password=emu [P]
-    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo [P]
-    RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc [P]
+    RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?       /service-proxy/$2?command=auth&action=check,login&username=mkws&password=mkws&identity=mkws [P]
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=mkwstest&password=mkwstest&identity=mkws_test [P]
+    RewriteRule /service-proxy-credoauth(/)?(;jsessionid=.+)?          /service-proxy/$2?command=auth&action=check,login&username=credo&password=emu&identity=testing_credo_emulator [P]
+    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=kohademo&password=kohademo&identity=demo_koha_mkws [P]
+    RewriteRule /service-proxy-orexauth(/)?(;jsessionid=.+)?   /service-proxy/$2?command=auth&action=check,login&username=orex&password=orexmkc&identity=orex_digital2 [P]
 
     # The following rule allows the server to accept service-proxy
     # requests that begin with an escaped "%3F" rather than a literal

diff --git a/tools/service-proxy/service-proxy.properties b/tools/service-proxy/service-proxy.properties
index 668915b..4f851bf 100644 (file)
--- a/tools/service-proxy/service-proxy.properties
+++ b/tools/service-proxy/service-proxy.properties
@@ -24,6 +24,8 @@ relay.CF_ENGINE_ADDRESS = localhost:9003
 # authn plugin, for torus based authentication 
 authn.TORUS_URL        = http://mkc-admin.indexdata.com/torus2/identity.USERS/records/
 authn.MASTER_TORUS_URL = http://mkc-admin.indexdata.com/torus2/admin.admin/records/
+authn.ACTION_SEQUENCE = check,login,ipauth,referrer
+#authn.SPECIFIC_CONSTRAINT = vhost=${thisHost} 
 
 # categories plugin, for Torus-based target categories
 categories.TORUS_BASEURL            = http://mkc-admin.indexdata.com/torus2/
@@ -38,4 +40,10 @@ ils.CFWS_URL = http://localhost:9003/connector
 chains.auth = authn
 chains.categories = categories
 chains.ils = ils
-chains.*      = relay # Map all other commands to the Pazpar2 relayer
\ No newline at end of file
+# Map all other commands to the Pazpar2 relayer
+chains.* = relay
+
+
+# Just so I can check that this particular SP config is in use
+chains.mike = info
+plugins.info = com.indexdata.serviceproxy.plugins.InfoPlugin