add default monitoring IDL

2 files changed, 26 insertions, 12 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index 038e92f1c..b69fdd9ab 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
@@ -127,11 +127,11 @@ public class VerifyXMLSignatureResponseValidator {
 			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 5) 
 				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.25", null);
 
-    // TEST CARDS
-    //  if (whatToCheck.equals(CHECK_IDENTITY_LINK))
-    //    throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
-    //  else
-    //    throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
+//     TEST CARDS
+      if (whatToCheck.equals(CHECK_IDENTITY_LINK))
+        throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
+      else
+        throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
     }
     
     //check QC 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
index c88769197..b95c08044 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
@@ -32,6 +32,7 @@ import org.w3c.dom.Element;
 import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
+import at.gv.egovernment.moa.id.auth.exception.ValidateException;
 import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
@@ -70,14 +71,27 @@ public class IdentityLinkTestModule implements TestModuleInterface {
 		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
 				.verifyXMLSignature(domVerifyXMLSignatureRequest);
 		// parses the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
-				domVerifyXMLSignatureResponse).parseData();
+		try {
+			VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
+					domVerifyXMLSignatureResponse).parseData();
 		
-		VerifyXMLSignatureResponseValidator.getInstance().validate(
-				verifyXMLSignatureResponse,
-				config.getIdentityLinkX509SubjectNames(),
-				VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
-				true);
+		
+			VerifyXMLSignatureResponseValidator.getInstance().validate(
+					verifyXMLSignatureResponse,
+					config.getIdentityLinkX509SubjectNames(),
+					VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
+					true);
+			
+		} catch (ValidateException e) {
+			//check if default Monitoring IDL is used then error is ignored
+			if ("validator.07".equals(e.getMessageId()) 
+					&& e.getMessage().contains("Das Zertifikat der Personenbindung ist"))
+				return null;
+			
+			else
+				throw e;
+			
+		}
 		
 		Logger.trace("Finished MOA-ID IdentityLink Test without errors");