auth

2 files changed, 21 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index fc43d25e5..226d05520 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
@@ -134,7 +134,7 @@ public class BPKBuilder {
     }
 
     /**
-     * Builds the wbPK from the given parameters.
+     * Builds the storkeid from the given parameters.
      *
      * @param identificationValue Base64 encoded "Stammzahl"
      * @param destinationCountry  destination country code (2 chars)
@@ -148,7 +148,7 @@ public class BPKBuilder {
 
 
     /**
-     * Builds the wbPK from the given parameters.
+     * Builds the storkeid from the given parameters.
      *
      * @param identificationValue Base64 encoded "Stammzahl"
      * @param sourceCountry       source country code (2 chars)
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 6a2fe3bfc..e10c4d9d9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -31,6 +31,7 @@ import java.io.*;
 import java.util.HashMap;
 import eu.stork.peps.auth.engine.SAMLEngine;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 
 
 /**
@@ -54,17 +55,18 @@ public class AuthenticationRequest implements IAction {
 
         this.moaSession = moasession;
         this.moaStorkAuthnRequest = (MOASTORKAuthnRequest)req;
-        try{
-        MISMandate mandate = moasession.getMISMandate();
-        String owbpk = mandate.getOWbPK();
-        byte[] mand = mandate.getMandate();
-        String profprep = mandate.getProfRep();
-        //String textdesc = mandate.getTextualDescriptionOfOID();
-        Element mndt = moasession.getMandate();
 
+        try {
+            MISMandate mandate = moasession.getMISMandate();
+            String owbpk = mandate.getOWbPK();
+            byte[] mand = mandate.getMandate();
+            String profprep = mandate.getProfRep();
+            //String textdesc = mandate.getTextualDescriptionOfOID();
+            Element mndt = moasession.getMandate();
 
-        Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
-} catch (Exception x) {}
+            iterate(mndt.getAttributes());
+            Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
+        } catch (Exception x) {}
 
         Logger.debug("Starting AuthenticationRequest");
         //AuthenticationServer.getInstance().startSTORKAuthentication(httpReq, httpResp, moasession);
@@ -134,6 +136,14 @@ public class AuthenticationRequest implements IAction {
     }
 
 
+    private void iterate(NamedNodeMap attributesList) {
+        for (int j = 0; j < attributesList.getLength(); j++) {
+            Logger.debug("--Attribute: "
+                    + attributesList.item(j).getNodeName() + " = "
+                    + attributesList.item(j).getNodeValue());
+        }                    }
+
+
     public PersonalAttributeList populateAttributes() {
 
         IPersonalAttributeList attrLst = moaStorkAuthnRequest.getStorkAuthnRequest().getPersonalAttributeList();