1 files changed, 41 insertions, 54 deletions
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 e10c4d9d9..91326a51d 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
@@ -3,91 +3,77 @@ package at.gv.egovernment.moa.id.protocols.stork2;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
-import at.gv.egovernment.moa.id.auth.stork.VelocityProvider;
-import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
-import at.gv.egovernment.moa.id.storage.AssertionStorage;
 import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;
 import at.gv.egovernment.moa.logging.Logger;
-import edu.emory.mathcs.backport.java.util.Collections;
-import eu.stork.peps.auth.commons.*;
-import eu.stork.peps.auth.engine.STORKSAMLEngine;
-import eu.stork.peps.exceptions.STORKSAMLEngineException;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import eu.stork.peps.auth.commons.PersonalAttributeList;
+import eu.stork.peps.auth.commons.STORKAuthnResponse;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.opensaml.xml.util.Base64;
-import org.opensaml.xml.util.XMLHelper;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.*;
-import java.util.HashMap;
-import eu.stork.peps.auth.engine.SAMLEngine;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
+ * Second request step - after authentication of the user is done and moasession obtained,
+ * process request and forward the user further to PEPS and/or other entities
+ *
  * @author bsuzic
- *         Date: 12/3/13, Time: 2:08 PM
  */
 
 public class AuthenticationRequest implements IAction {
-    /*
-    Second request step - after authentication of the user is done and moasession obtained,
-    process request and forward the user further to PEPS and/or other entities
-     */
 
 
     private VelocityEngine velocityEngine;
     private AuthenticationSession moaSession;
-    private MOASTORKAuthnRequest moaStorkAuthnRequest;
+    private MOASTORKRequest moaStorkRequest;
 
 
     public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
 
         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();
+        this.moaStorkRequest = (MOASTORKRequest) req;
+
+        if (moasession.getUseMandate()) {
+            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();
+
+                iterate(mndt.getAttributes());
+                Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
+            } catch (Exception x) {
+                Logger.debug("There is no mandate used in transaction");
+            }
+        }
 
-            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);
-        Logger.debug("Http Response: " + httpResp.toString() + ", ");
-        Logger.debug("Remote user: " + httpReq.getRemoteAddr());
-        Logger.debug("Moa session: " + moasession.toString() + " " + moasession.getOAURLRequested() + " " + moasession.getPublicOAURLPrefix() + " " + moasession.getAction() + " " + moasession.getIdentityLink().getName() + " " + moasession.getTarget());
         httpResp.reset();
 
         STORKAuthnResponse authnResponse = new STORKAuthnResponse();
-        authnResponse.setCountry(((MOASTORKAuthnRequest)req).getStorkAuthnRequest().getSpCountry());
-
+        authnResponse.setCountry(((MOASTORKRequest) req).getStorkAuthnRequest().getSpCountry());
 
 
         OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
         if (oaParam == null)
-            throw new AuthenticationException("stork.12", new Object[] { moasession.getPublicOAURLPrefix() });
+            throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
 
 
         // Prepare basic AT attributes
         try {
-            IPersonalAttributeList moaAttrList =  moasession.getStorkAttributes();
+            IPersonalAttributeList moaAttrList = moasession.getStorkAttributes();
             Logger.info("Found number of moa personal attributes: " + moasession.getStorkAttributes().size());
 
 
@@ -114,13 +100,13 @@ public class AuthenticationRequest implements IAction {
         DataContainer container = new DataContainer();
 
         // - fill in the request we extracted above
-        container.setRequest(((MOASTORKAuthnRequest) req).getStorkAuthnRequest());
-        
+        container.setRequest(((MOASTORKRequest) req).getStorkAuthnRequest());
+
         // - fill in the partial response created above
         container.setResponse(authnResponse);
-        
+
         // - memorize the target url were we have to return the result
-        container.setTarget(((MOASTORKAuthnRequest) req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
+        container.setTarget(((MOASTORKRequest) req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
 
         container.setRemoteAddress(httpReq.getRemoteAddr());
 
@@ -141,24 +127,25 @@ public class AuthenticationRequest implements IAction {
             Logger.debug("--Attribute: "
                     + attributesList.item(j).getNodeName() + " = "
                     + attributesList.item(j).getNodeValue());
-        }                    }
+        }
+    }
 
 
     public PersonalAttributeList populateAttributes() {
 
-        IPersonalAttributeList attrLst = moaStorkAuthnRequest.getStorkAuthnRequest().getPersonalAttributeList();
-        Logger.info("Found " + attrLst.size() + " personal attributes in the request." );
+        IPersonalAttributeList attrLst = moaStorkRequest.getStorkAuthnRequest().getPersonalAttributeList();
+        Logger.info("Found " + attrLst.size() + " personal attributes in the request.");
 
         // Define attribute list to be populated
         PersonalAttributeList attributeList = new PersonalAttributeList();
-        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink(), moaStorkAuthnRequest);
+        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink(), moaStorkRequest);
 
         try {
             for (PersonalAttribute personalAttribute : attrLst) {
                 Logger.debug("Personal attribute found in request: " + personalAttribute.getName() + " isRequired: " + personalAttribute.isRequired());
                 moaAttributeProvider.populateAttribute(attributeList, personalAttribute);
             }
-        }  catch (Exception e) {
+        } catch (Exception e) {
             Logger.error("Exception, attributes: " + e.getMessage());
         }