1 files changed, 40 insertions, 9 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
index c8a9a24ad..1fbcb9a46 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
@@ -27,6 +27,7 @@ package at.gv.egovernment.moa.id.protocols.saml1;
 import java.util.Calendar;
 
 import org.apache.axis.AxisFault;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
@@ -78,12 +79,12 @@ public class GetAuthenticationDataService implements Constants {
   	throws AxisFault {
   		
 		Element request = requests[0];
-    Element[] responses = new Element[1];
+		Element[] responses = new Element[1];
 		String requestID = "";
 		String statusCode = "";
 		String subStatusCode = null;
 		String statusMessageCode = null;
-    String statusMessage = null;
+		String statusMessage = null;
 		String samlAssertion = "";
 		boolean useUTC = false;
 		if (requests.length > 1) {
@@ -107,14 +108,15 @@ public class GetAuthenticationDataService implements Constants {
 					subStatusCode = "samlp:TooManyResponses";
 					statusMessageCode = "1203";
 				}
+				
 				else {
 					Element samlArtifactElem = (Element)samlArtifactList.item(0);
                     requestID = request.getAttribute("RequestID");
 					String samlArtifact = DOMUtils.getText(samlArtifactElem);
+					SAML1AuthenticationServer saml1server = SAML1AuthenticationServer.getInstace();
+					
 					try {
-						
-						SAML1AuthenticationServer saml1server = SAML1AuthenticationServer.getInstace();
-						
+							
 						AuthenticationData authData = saml1server.getSaml1AuthenticationData(samlArtifact);
                         
 						useUTC = authData.getUseUTC();
@@ -123,9 +125,36 @@ public class GetAuthenticationDataService implements Constants {
 						samlAssertion = authData.getSamlAssertion();
 						statusCode = "samlp:Success";
 						statusMessageCode = "1200";
-          }
-          catch (AuthenticationException ex) {
-						// no authentication data for given SAML artifact
+					}
+					
+					catch (ClassCastException ex) {
+					
+						try {
+							Throwable error = saml1server.getErrorResponse(samlArtifact);
+							statusCode = "samlp:Responder";
+							subStatusCode = "samlp:RequestDenied";
+							
+							if (error instanceof MOAIDException) {
+								statusMessageCode = ((MOAIDException)error).getMessageId();	
+								statusMessage = StringEscapeUtils.escapeXml(((MOAIDException)error).getMessage());
+								
+							} else {
+								statusMessage = StringEscapeUtils.escapeXml(error.getMessage());	
+							}
+							
+							
+									
+						} catch (Exception e) {
+							//no authentication data for given SAML artifact
+							statusCode = "samlp:Requester";
+							subStatusCode = "samlp:ResourceNotRecognized";
+							statusMessage = ex.toString();
+						}
+						
+					}
+					
+					catch (AuthenticationException ex) {
+						//no authentication data for given SAML artifact
 						statusCode = "samlp:Requester";
 						subStatusCode = "samlp:ResourceNotRecognized";
 						statusMessage = ex.toString();
@@ -137,10 +166,12 @@ public class GetAuthenticationDataService implements Constants {
 				statusCode = "samlp:Requester";
 				statusMessageCode = "1204";
 	    }
-		}
+	}
+		
     try {
 			String responseID = Random.nextRandom();			
 			String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance(), useUTC);
+			
       if (statusMessage == null)
 			  statusMessage = MOAIDMessageProvider.getInstance().getMessage(statusMessageCode, null);
 	    responses[0] = new SAMLResponseBuilder().build(