1 files changed, 60 insertions, 52 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 91326a51d..d33b33c77 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
@@ -33,88 +33,96 @@ public class AuthenticationRequest implements IAction {
 
 
     private VelocityEngine velocityEngine;
-    private AuthenticationSession moaSession;
-    private MOASTORKRequest moaStorkRequest;
+    private AuthenticationSession moaSession = null;
+    private MOASTORKRequest moaStorkRequest = null;
 
 
     public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
 
         this.moaSession = moasession;
-        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");
+        if (req instanceof MOASTORKRequest) {
+
+            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");
+                }
             }
-        }
 
 
-        Logger.debug("Starting AuthenticationRequest");
-        httpResp.reset();
+            Logger.debug("Starting AuthenticationRequest");
+            httpResp.reset();
 
-        STORKAuthnResponse authnResponse = new STORKAuthnResponse();
-        authnResponse.setCountry(((MOASTORKRequest) req).getStorkAuthnRequest().getSpCountry());
+            STORKAuthnResponse authnResponse = new STORKAuthnResponse();
+            authnResponse.setCountry(moaStorkRequest.getStorkAuthnRequest().getSpCountry());
 
 
-        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
-        if (oaParam == null)
-            throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
+            OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+            if (oaParam == null)
+                throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
 
 
-        // Prepare basic AT attributes
-        try {
-            IPersonalAttributeList moaAttrList = moasession.getStorkAttributes();
-            Logger.info("Found number of moa personal attributes: " + moasession.getStorkAttributes().size());
+            // Prepare basic AT attributes
+            try {
+                IPersonalAttributeList moaAttrList = moasession.getStorkAttributes();
+                Logger.info("Found number of moa personal attributes: " + moasession.getStorkAttributes().size());
 
 
-            for (PersonalAttribute personalAttribute : moaAttrList) {
-                Logger.info("Personal attribute found: " + personalAttribute.getName() + personalAttribute.getStatus());
-                if (personalAttribute.getValue().size() > 0) {
-                    for (String value : personalAttribute.getValue()) {
-                        Logger.info("     Value found: " + value);
+                for (PersonalAttribute personalAttribute : moaAttrList) {
+                    Logger.info("Personal attribute found: " + personalAttribute.getName() + personalAttribute.getStatus());
+                    if (personalAttribute.getValue().size() > 0) {
+                        for (String value : personalAttribute.getValue()) {
+                            Logger.info("     Value found: " + value);
+                        }
                     }
                 }
-            }
 
-        } catch (Exception e) {
-            Logger.error("Exception, attributes: " + e.getMessage());
-        }
+            } catch (Exception e) {
+                Logger.error("Exception, attributes: " + e.getMessage());
+            }
 
-        // Get personal attributtes from MOA/IdentityLink
-        authnResponse.setPersonalAttributeList(populateAttributes());
+            // Get personal attributtes from MOA/IdentityLink
+            authnResponse.setPersonalAttributeList(populateAttributes());
 
-        // Prepare extended attributes
-        Logger.debug("Preparing data container");
+            // Prepare extended attributes
+            Logger.debug("Preparing data container");
 
-        // create fresh container
-        DataContainer container = new DataContainer();
+            // create fresh container
+            DataContainer container = new DataContainer();
 
-        // - fill in the request we extracted above
-        container.setRequest(((MOASTORKRequest) req).getStorkAuthnRequest());
+            // - fill in the request we extracted above
+            container.setRequest(moaStorkRequest.getStorkAuthnRequest());
 
-        // - fill in the partial response created above
-        container.setResponse(authnResponse);
+            // - fill in the partial response created above
+            container.setResponse(authnResponse);
 
-        // - memorize the target url were we have to return the result
-        container.setTarget(((MOASTORKRequest) req).getStorkAuthnRequest().getAssertionConsumerServiceURL());
+            // - memorize the target url were we have to return the result
+            container.setTarget(moaStorkRequest.getStorkAuthnRequest().getAssertionConsumerServiceURL());
 
-        container.setRemoteAddress(httpReq.getRemoteAddr());
+            container.setRemoteAddress(httpReq.getRemoteAddr());
 
 
-        Logger.debug("Data container prepared");
+            Logger.debug("Data container prepared");
 
-        return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
+            return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
 
+        } else {
+            Logger.error("Could not recognize request.");
+            throw new MOAIDException("stork.15", null);
+        }
     }
 
     public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {