Changeset 3973 for cats/ISOcat

Timestamp:

11/08/13 09:02:21 (11 years ago)

Author:

mwindhouwer

Message:

M credentials.js

• extended the Shibboleth fallback chain

File:

• cats/ISOcat/trunk/mod-ISOcat-control-access/control/credentials.js (modified) (4 diffs)

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

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