Use test- and productive TrustStore configurations in one IDP instance

  - every service configuration could select its preferred  TrustStore

12 files changed, 278 insertions, 75 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 63bdab919..e2b0f78a5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -353,7 +353,7 @@ public class AuthenticationServer extends MOAIDAuthConstants {
 		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
 		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
 		.build(identityLink, authConf
-				.getMoaSpIdentityLinkTrustProfileID());
+				.getMoaSpIdentityLinkTrustProfileID(pendingReq.getOnlineApplicationConfiguration().isUseIDLTestTrustStore()));
 
 		// invokes the call
 		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
@@ -586,63 +586,63 @@ public class AuthenticationServer extends MOAIDAuthConstants {
 		return createXMLSignatureRequest;
 	}
 
-	/**
-	 * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Parses response enclosed in
-	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Verifies signature by calling the MOA SP component</li>
-	 * <li>Returns the signer certificate</li>
-	 * </ul>
-	 *
-	 * @param sessionID                            ID of associated authentication session data
-	 * @param createXMLSignatureResponseParameters The parameters from the response returned from the BKU
-	 *                                             including the <code>&lt;CreateXMLSignatureResponse&gt;</code>
-	 * @throws BKUException
-	 */
-	public X509Certificate verifyXMLSignature(String sessionID,
-			Map<String, String> createXMLSignatureResponseParameters)
-					throws AuthenticationException, BuildException, ParseException,
-					ConfigurationException, ValidateException, ServiceException, BKUException {
-
-		if (isEmpty(sessionID))
-			throw new AuthenticationException("auth.10", new Object[]{
-					REQ_GET_FOREIGN_ID, PARAM_SESSIONID});
-
-		String xmlCreateXMLSignatureResponse = (String) createXMLSignatureResponseParameters
-				.get(PARAM_XMLRESPONSE);
-
-		if (isEmpty(xmlCreateXMLSignatureResponse))
-			throw new AuthenticationException("auth.10", new Object[]{
-					REQ_GET_FOREIGN_ID, PARAM_XMLRESPONSE});
-
-		AuthConfiguration authConf = AuthConfigurationProviderFactory
-				.getInstance();
-
-		// parses the <CreateXMLSignatureResponse>
-		CreateXMLSignatureResponseParser p = new CreateXMLSignatureResponseParser(
-				xmlCreateXMLSignatureResponse);
-		CreateXMLSignatureResponse createXMLSignatureResponse = p
-				.parseResponseDsig();
-
-		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
-		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
-		.buildDsig(createXMLSignatureResponse, authConf
-				.getMoaSpAuthBlockTrustProfileID());
-
-		// invokes the call
-		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
-		.verifyXMLSignature(domVerifyXMLSignatureRequest);
-
-		// parses the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
-				domVerifyXMLSignatureResponse).parseData();
-
-		return verifyXMLSignatureResponse.getX509certificate();
-
-	}
+//	/**
+//	 * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
+//	 * security layer implementation.<br>
+//	 * <ul>
+//	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+//	 * <li>Parses response enclosed in
+//	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+//	 * <li>Verifies signature by calling the MOA SP component</li>
+//	 * <li>Returns the signer certificate</li>
+//	 * </ul>
+//	 *
+//	 * @param sessionID                            ID of associated authentication session data
+//	 * @param createXMLSignatureResponseParameters The parameters from the response returned from the BKU
+//	 *                                             including the <code>&lt;CreateXMLSignatureResponse&gt;</code>
+//	 * @throws BKUException
+//	 */
+//	public X509Certificate verifyXMLSignature(String sessionID,
+//			Map<String, String> createXMLSignatureResponseParameters)
+//					throws AuthenticationException, BuildException, ParseException,
+//					ConfigurationException, ValidateException, ServiceException, BKUException {
+//
+//		if (isEmpty(sessionID))
+//			throw new AuthenticationException("auth.10", new Object[]{
+//					REQ_GET_FOREIGN_ID, PARAM_SESSIONID});
+//
+//		String xmlCreateXMLSignatureResponse = (String) createXMLSignatureResponseParameters
+//				.get(PARAM_XMLRESPONSE);
+//
+//		if (isEmpty(xmlCreateXMLSignatureResponse))
+//			throw new AuthenticationException("auth.10", new Object[]{
+//					REQ_GET_FOREIGN_ID, PARAM_XMLRESPONSE});
+//
+//		AuthConfiguration authConf = AuthConfigurationProviderFactory
+//				.getInstance();
+//
+//		// parses the <CreateXMLSignatureResponse>
+//		CreateXMLSignatureResponseParser p = new CreateXMLSignatureResponseParser(
+//				xmlCreateXMLSignatureResponse);
+//		CreateXMLSignatureResponse createXMLSignatureResponse = p
+//				.parseResponseDsig();
+//
+//		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
+//		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
+//		.buildDsig(createXMLSignatureResponse, authConf
+//				.getMoaSpAuthBlockTrustProfileID());
+//
+//		// invokes the call
+//		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
+//		.verifyXMLSignature(domVerifyXMLSignatureRequest);
+//
+//		// parses the <VerifyXMLSignatureResponse>
+//		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
+//				domVerifyXMLSignatureResponse).parseData();
+//
+//		return verifyXMLSignatureResponse.getX509certificate();
+//
+//	}
 
 	/**
 	 * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
@@ -1122,7 +1122,7 @@ public class AuthenticationServer extends MOAIDAuthConstants {
 
 		// builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
 		List<String> vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
-		String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
+		String tpid = authConf.getMoaSpAuthBlockTrustProfileID(pendingReq.getOnlineApplicationConfiguration().isUseAuthBlockTestTestStore());
 		Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp,
 				vtids, tpid);
 		// debug output
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
index d8f1a28c5..c98a7d537 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
@@ -35,7 +35,7 @@ public interface AuthConfiguration extends ConfigurationProvider{
 
 	public OAAuthParameter getOnlineApplicationParameter(String oaURL);
 
-	public String getMoaSpAuthBlockTrustProfileID() throws ConfigurationException;
+	public String getMoaSpAuthBlockTrustProfileID(boolean useTestTrustStore) throws ConfigurationException;
 
 	public List<String> getMoaSpAuthBlockVerifyTransformsInfoIDs() throws ConfigurationException;
 
@@ -44,8 +44,8 @@ public interface AuthConfiguration extends ConfigurationProvider{
 	public ConnectionParameter getForeignIDConnectionParameter() throws ConfigurationException;
 
 	public ConnectionParameter getOnlineMandatesConnectionParameter() throws ConfigurationException;
-
-	public String getMoaSpIdentityLinkTrustProfileID() throws ConfigurationException;
+	
+	public String getMoaSpIdentityLinkTrustProfileID(boolean useTestTrustStore) throws ConfigurationException;
 
 	public List<String> getTransformsInfos() throws ConfigurationException;
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/IOAAuthParameters.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/IOAAuthParameters.java
index 92d0856ba..b68f42086 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/IOAAuthParameters.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/IOAAuthParameters.java
@@ -188,6 +188,9 @@ public interface IOAAuthParameters {
 
 	List<String> getTestCredentialOIDs();
 	
+	boolean isUseIDLTestTrustStore();
+	boolean isUseAuthBlockTestTestStore();
+	
 	PrivateKey getBPKDecBpkDecryptionKey();
 
 	/**
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 8f3091e42..fdd125156 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -888,4 +888,30 @@ public List<Integer> getReversionsLoggingEventCodes() {
 	return null;
 }
 
+
+/* (non-Javadoc)
+ * @see at.gv.egovernment.moa.id.config.auth.IOAAuthParameters#isUseIDLTestTrustStore()
+ */
+@Override
+public boolean isUseIDLTestTrustStore() {
+	String value = oaConfiguration.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTIDLTRUSTSTORE);
+	if (MiscUtil.isNotEmpty(value))
+		return Boolean.parseBoolean(value);	
+	else
+		return false;	
+}
+
+
+/* (non-Javadoc)
+ * @see at.gv.egovernment.moa.id.config.auth.IOAAuthParameters#isUseAuthBlockTestTestStore()
+ */
+@Override
+public boolean isUseAuthBlockTestTestStore() {
+	String value = oaConfiguration.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTAUTHBLOCKTRUSTSTORE);
+	if (MiscUtil.isNotEmpty(value))
+		return Boolean.parseBoolean(value);	
+	else
+		return false;	
+}
+
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
index cb9ac890d..702cd3ce3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
@@ -334,7 +334,14 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 	 * @return a string with a url-reference to the VerifyAuthBlock trust profile ID.
 	 * @throws ConfigurationException is thrown in case of missing {@link AuthComponentGeneral} or in case of missing {@link MOASP}.
 	 */
-	public String getMoaSpAuthBlockTrustProfileID() throws ConfigurationException {
+	public String getMoaSpAuthBlockTrustProfileID(boolean useTestTrustStore) throws ConfigurationException {
+		if (useTestTrustStore)
+			return getMoaSpAuthBlockTestTrustProfileID();
+		else
+			return getMoaSpAuthBlockTrustProfileID();
+	}
+
+	private String getMoaSpAuthBlockTrustProfileID() throws ConfigurationException {
 		try {
 			return configuration.getStringValue(
 					MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_PROD);
@@ -344,7 +351,39 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 			return null;
 		}
 	}
+	
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.AuthConfiguration#getMoaSpAuthBlockTestTrustProfileID()
+	 */
+	private String getMoaSpAuthBlockTestTrustProfileID()
+			throws ConfigurationException {
+		try {
+			return configuration.getStringValue(
+					MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_TEST);
+			
+		} catch (at.gv.egiz.components.configuration.api.ConfigurationException e) {
+			Logger.warn("Test-AuthBlock validation trustprofile can not be read from configuration.", e);
+			return null;
+		}
+	}
 
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.AuthConfiguration#getMoaSpIdentityLinkTestTrustProfileID()
+	 */
+	private String getMoaSpIdentityLinkTestTrustProfileID()
+			throws ConfigurationException {
+		try {
+			return configuration.getStringValue(
+					MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_TEST);
+			
+		} catch (at.gv.egiz.components.configuration.api.ConfigurationException e) {
+			Logger.warn("Test-IdentityLink validation trustprofile can not be read from configuration.", e);
+			return null;
+		}
+	}
+	
+	
 	/**
 	 * Returns a list of strings with references to all verify transform info IDs within the moa-sp part of the authentication component.
 	 * 
@@ -446,7 +485,7 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 	 * @return String with a url-reference to the VerifyIdentityLink trust profile ID
 	 * @throws ConfigurationException is thrown in case of missing {@link AuthComponentGeneral} or in case of missing {@link VerifyIdentityLink}.
 	 */
-	public String getMoaSpIdentityLinkTrustProfileID() throws ConfigurationException {
+	private String getMoaSpIdentityLinkTrustProfileID() throws ConfigurationException {
 		try {
 			return configuration.getStringValue(
 					MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_PROD);
@@ -1060,4 +1099,15 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 		return null;
 	}
 
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.AuthConfiguration#getMoaSpIdentityLinkTrustProfileID(boolean)
+	 */
+	@Override
+	public String getMoaSpIdentityLinkTrustProfileID(boolean useTestTrustStore)
+			throws ConfigurationException {
+		if (useTestTrustStore)
+			return getMoaSpIdentityLinkTestTrustProfileID();
+		else
+			return getMoaSpIdentityLinkTrustProfileID();
+	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
index e59ac827b..386e04f45 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
@@ -468,4 +468,22 @@ public class DynamicOAAuthParameters implements IOAAuthParameters, Serializable{
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.IOAAuthParameters#isUseIDLTestTrustStore()
+	 */
+	@Override
+	public boolean isUseIDLTestTrustStore() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.IOAAuthParameters#isUseAuthBlockTestTestStore()
+	 */
+	@Override
+	public boolean isUseAuthBlockTestTestStore() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 05de581d2..38a111707 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -270,7 +270,11 @@ public class ConfigurationMigrationUtils {
 						
 						}
 						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_OIDs, oids);
-					}							
+					}
+					
+					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTIDLTRUSTSTORE, String.valueOf(oaauth.getTestCredentials().isUseTestIDLTrustStore()));
+					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTAUTHBLOCKTRUSTSTORE, String.valueOf(oaauth.getTestCredentials().isUseTestAuthBlockTrustStore()));
+					
 				}
 				
 				//convert foreign bPK
@@ -856,10 +860,12 @@ public class ConfigurationMigrationUtils {
 	        }
 	        authoa.setMandates(mandates);
 	       
-	        if (Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_ENABLED))) {
-	        	TestCredentials testing = authoa.getTestCredentials();        	
-	        	testing = new TestCredentials();
-	    		authoa.setTestCredentials(testing);
+        	TestCredentials testing = authoa.getTestCredentials();
+        	if (Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_ENABLED))) {
+        		if (testing == null) {
+                	testing = new TestCredentials();
+                	authoa.setTestCredentials(testing);        		        		
+            	}
 	        	testing.setEnableTestCredentials(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_ENABLED)));
 	        	
 	        	if (oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_OIDs) != null) {
@@ -868,15 +874,29 @@ public class ConfigurationMigrationUtils {
 					testing.setCredentialOID(testCredentialOIDs);
 	        	}
 	        	                      	
-	        } else {
-	        	TestCredentials testing = authoa.getTestCredentials();        	
+	        } else {        	
 	        	if (testing != null) {
 	        		testing.setEnableTestCredentials(false);
 	        	}
 	        	
 	        }
-			
+        	
+        	if (testing == null) {
+            	testing = new TestCredentials();
+            	authoa.setTestCredentials(testing);        		        		
+        	}
+        	
+	        if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTIDLTRUSTSTORE)))
+	        	testing.setUseTestIDLTrustStore(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTIDLTRUSTSTORE)));
+	        else
+	        	testing.setUseTestIDLTrustStore(false);
 	        
+	        if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTAUTHBLOCKTRUSTSTORE)))
+	        	testing.setUseTestAuthBlockTrustStore(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TESTCREDENTIALS_USETESTAUTHBLOCKTRUSTSTORE)));
+	        else
+	        	testing.setUseTestAuthBlockTrustStore(false);
+    		
+	        	        
 	        EncBPKInformation bPKEncDec = authoa.getEncBPKInformation();
 			if (bPKEncDec == null) {
 				bPKEncDec = new EncBPKInformation();
@@ -1188,6 +1208,9 @@ public class ConfigurationMigrationUtils {
 					if (authblock != null) {
 						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_PROD, 
 								authblock.getTrustProfileID());
+						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_TEST, 
+								authblock.getTestTrustProfileID());
+						
 						
 						List<String> list = authblock.getVerifyTransformsInfoProfileID();
 						if (list.size() == 1)
@@ -1203,6 +1226,8 @@ public class ConfigurationMigrationUtils {
 					if (idl != null) {
 						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_PROD, 
 								idl.getTrustProfileID());
+						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_TEST, 
+								idl.getTestTrustProfileID());
 					}
 				}
 				
@@ -1721,12 +1746,14 @@ public class ConfigurationMigrationUtils {
 			dbmoasp.setVerifyIdentityLink(moaidl);
 		}
 		moaidl.setTrustProfileID(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_PROD));
+		moaidl.setTestTrustProfileID(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_IDL_TEST));
 		VerifyAuthBlock moaauth = dbmoasp.getVerifyAuthBlock();
 		if (moaauth == null) {
 			moaauth = new VerifyAuthBlock();
 			dbmoasp.setVerifyAuthBlock(moaauth);
 		}
 		moaauth.setTrustProfileID(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_PROD));
+		moaauth.setTestTrustProfileID(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_MOASP_TRUSTPROFILE_AUTHBLOCK_TEST));
 		
 		if (moaauth.getVerifyTransformsInfoProfileID() == null) {
 			moaauth.setVerifyTransformsInfoProfileID(new ArrayList<String>());
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
index 07c3151a2..c338c65ba 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
@@ -107,7 +107,9 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	private static final String SERVICE_AUTH_TESTCREDENTIALS = AUTH + "." + TESTCREDENTIALS;
 	public static final String SERVICE_AUTH_TESTCREDENTIALS_ENABLED = SERVICE_AUTH_TESTCREDENTIALS + ".enabled"; 
 	public static final String SERVICE_AUTH_TESTCREDENTIALS_OIDs = SERVICE_AUTH_TESTCREDENTIALS + ".oids";
-	
+	public static final String SERVICE_AUTH_TESTCREDENTIALS_USETESTIDLTRUSTSTORE = SERVICE_AUTH_TESTCREDENTIALS + "useTestIDLTrustStore";
+	public static final String SERVICE_AUTH_TESTCREDENTIALS_USETESTAUTHBLOCKTRUSTSTORE = SERVICE_AUTH_TESTCREDENTIALS + "useTestAuthBlockTrustStore";
+		
 	private static final String SERVICE_AUTH_MANDATES = AUTH + "." + MANDATES;
 	public static final String SERVICE_AUTH_MANDATES_OVS = SERVICE_AUTH_MANDATES + ".ovs";
 	public static final String SERVICE_AUTH_MANDATES_OVS_USE = SERVICE_AUTH_MANDATES_OVS + ".use";
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java
index e3bd00912..2e80cb0d5 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
@@ -82,6 +83,13 @@ public class TestCredentials
     protected Long hjid;
     protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems;
 
+    @XmlTransient
+    protected boolean useTestIDLTrustStore;
+    
+    @XmlTransient
+    protected boolean useTestAuthBlockTrustStore;
+    
+    
     /**
      * Gets the value of the credentialOID property.
      * 
@@ -203,7 +211,37 @@ public class TestCredentials
         }
     }
 
-    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+    
+    
+    /**
+	 * @return the useTestIDLTrustStore
+	 */
+	public boolean isUseTestIDLTrustStore() {
+		return useTestIDLTrustStore;
+	}
+
+	/**
+	 * @param useTestIDLTrustStore the useTestIDLTrustStore to set
+	 */
+	public void setUseTestIDLTrustStore(boolean useTestIDLTrustStore) {
+		this.useTestIDLTrustStore = useTestIDLTrustStore;
+	}
+
+	/**
+	 * @return the useTestAuthBlockTrustStore
+	 */
+	public boolean isUseTestAuthBlockTrustStore() {
+		return useTestAuthBlockTrustStore;
+	}
+
+	/**
+	 * @param useTestAuthBlockTrustStore the useTestAuthBlockTrustStore to set
+	 */
+	public void setUseTestAuthBlockTrustStore(boolean useTestAuthBlockTrustStore) {
+		this.useTestAuthBlockTrustStore = useTestAuthBlockTrustStore;
+	}
+
+	public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
         if (!(object instanceof TestCredentials)) {
             return false;
         }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
index ecfb6b701..155863b03 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.jvnet.hyperjaxb3.item.ItemUtils;
 import org.jvnet.jaxb2_commons.lang.Equals;
@@ -80,6 +81,10 @@ public class VerifyAuthBlock
     protected Long hjid;
     protected transient List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems;
 
+    @XmlTransient
+    protected String TestTrustProfileID;
+    
+    
     /**
      * Gets the value of the trustProfileID property.
      * 
@@ -106,7 +111,23 @@ public class VerifyAuthBlock
         this.trustProfileID = value;
     }
 
+    
+    
     /**
+	 * @return the testTrustProfileID
+	 */
+	public String getTestTrustProfileID() {
+		return TestTrustProfileID;
+	}
+
+	/**
+	 * @param testTrustProfileID the testTrustProfileID to set
+	 */
+	public void setTestTrustProfileID(String testTrustProfileID) {
+		TestTrustProfileID = testTrustProfileID;
+	}
+
+	/**
      * Gets the value of the verifyTransformsInfoProfileID property.
      * 
      * <p>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java
index 5b54bf5f2..ac7ad96cc 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
@@ -68,6 +69,9 @@ public class VerifyIdentityLink
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
 
+    @XmlTransient
+    protected String TestTrustProfileID;
+    
     /**
      * Gets the value of the trustProfileID property.
      * 
@@ -110,6 +114,20 @@ public class VerifyIdentityLink
     }
 
     /**
+	 * @return the testTrustProfileID
+	 */
+	public String getTestTrustProfileID() {
+		return TestTrustProfileID;
+	}
+
+	/**
+	 * @param testTrustProfileID the testTrustProfileID to set
+	 */
+	public void setTestTrustProfileID(String testTrustProfileID) {
+		TestTrustProfileID = testTrustProfileID;
+	}
+
+	/**
      * Sets the value of the hjid property.
      * 
      * @param value
diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
index de6c0fed0..824791797 100644
--- a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
+++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java
@@ -68,7 +68,7 @@ public class IdentityLinkTestModule implements TestModuleInterface {
 		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
 		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
 				.build(identityLink, config
-						.getMoaSpIdentityLinkTrustProfileID());
+						.getMoaSpIdentityLinkTrustProfileID(false));
 
 		// invokes the call
 		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()