1 files changed, 16 insertions, 4 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 4806edde6..5e9d50221 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -73,16 +73,17 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         Logger.debug("Request content length: " + request.getContentLength());
         Logger.debug("Initiating action: " + action);
 
+        MOASTORKRequest STORK2Request = new MOASTORKRequest();
+
+		if (AttributeCollector.class.getSimpleName().equals(action))
+			return STORK2Request;
+
         HTTPInTransport profileReq = new HttpServletRequestAdapter(request);
         HTTPOutTransport profileResp = new HttpServletResponseAdapter(response, request.isSecure());
 
-
         BasicSAMLMessageContext samlMessageContext = new BasicSAMLMessageContext();
         samlMessageContext.setInboundMessageTransport(profileReq);
 
-        MOASTORKRequest STORK2Request = new MOASTORKRequest();
-
-
         //extract STORK Response from HTTP Request
         byte[] decSamlToken;
         try {
@@ -104,6 +105,7 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
             authnRequest = authnEngine.validateSTORKAuthnRequest(decSamlToken);
         } catch (STORKSAMLEngineException ex) {
             Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+<<<<<<< HEAD
         }  catch (ClassCastException e) {
             Logger.error("Could not extract authenticaiton request");
         }
@@ -116,6 +118,16 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
             Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
         } catch (ClassCastException e) {
             Logger.error("Could not extract attribute request");
+=======
+        } catch(ClassCastException e) {
+        	// we do not have a authnRequest
+        	// check if a valid attr request is container
+        	try {
+        		attrRequest = attrEngine.validateSTORKAttrQueryRequest(decSamlToken);
+        	} catch (STORKSAMLEngineException ex) {
+        		Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+        	}
+>>>>>>> origin/bs_3_fr
         }
         // if there is no authn or attr request, raise error
         if ((authnRequest == null) && (attrRequest == null)) {