Changeset 2904

Timestamp:

05/18/13 08:08:03 (11 years ago)

Author:

mwindhouwer

Message:

M mod-ISOcat-interface-rest/etc/HTTPBridgeConfig.xml
M mod-ISOcat-control-access/control/credentials.js

• adapted to the new Shibboleth configuration of catalog.clarin.eu

Location:

cats/ISOcat/trunk

Files:

• mod-ISOcat-control-access/control/credentials.js (modified) (1 diff)
• mod-ISOcat-interface-rest/etc/HTTPBridgeConfig.xml (modified) (1 diff)

cats/ISOcat/trunk/mod-ISOcat-control-access/control/credentials.js

@@ -39 +39 @@
 
 // try Shibboleth EPPN authentication
+if ((req.argumentExists("oid-eduPersonPrincipalName"))) {
+    var auth = req.getArgument("oid-eduPersonPrincipalName");
+    auth = auth.replace("data:text/plain,","");
+    //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]");
+    if (auth != "") {
+        shib = auth;
+    }
+}
+if ((req.argumentExists("mace-eduPersonPrincipalName"))) {
+    var auth = req.getArgument("mace-eduPersonPrincipalName");
+    auth = auth.replace("data:text/plain,","");
+    //java.lang.System.out.println("DBG:credentials.js:principal["+auth+"]");
+    if (auth != "") {
+        shib = auth;
+    }
+}
 if ((req.argumentExists("eduPersonPrincipalName"))) {
     var auth = req.getArgument("eduPersonPrincipalName");

cats/ISOcat/trunk/mod-ISOcat-interface-rest/etc/HTTPBridgeConfig.xml

@@ -5 +5 @@
                 <passMethod/>
                 <passCookies/>
-                <passHeaders>User-Agent X-Forwarded-For Referer Authorization Accept eduPersonPrincipalName eduPersonTargetedID</passHeaders>
+                <passHeaders>User-Agent X-Forwarded-For Referer Authorization Accept oid-eduPersonPrincipalName mace-eduPersonPrincipalName eduPersonPrincipalName eduPersonTargetedID</passHeaders>
                 <passRemoteHost/>
                 <passByURI/>