From bb1b12ac5b240629e16ea1c7a50891e99f4adc14 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 27 Aug 2015 11:32:05 +0200
Subject: Use test- and productive TrustStore configurations in one IDP
 instance   - every service configuration could select its preferred 
 TrustStore

---
 .../data/oa/OAAuthenticationData.java              | 50 +++++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
index 0c633f312..9b0172a24 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
@@ -70,7 +70,9 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	private Map<String, byte[]> transformations;
 	
 	private boolean enableTestCredentials = false;
-	private List<String> testCredentialOIDs = null;
+	private List<String> testCredentialOIDs = null;	
+	private boolean useTestIDLValidationTrustStore = false;
+	private boolean useTestAuthblockValidationTrustStore = false;
 	
 	/**
 	 * 
@@ -210,7 +212,9 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 			enableTestCredentials = oaauth.getTestCredentials().isEnableTestCredentials();
 			testCredentialOIDs = new ArrayList<String>();
 			testCredentialOIDs.addAll(oaauth.getTestCredentials().getCredentialOID());
-					
+			
+			useTestAuthblockValidationTrustStore = oaauth.getTestCredentials().isUseTestAuthBlockTrustStore();
+			useTestIDLValidationTrustStore = oaauth.getTestCredentials().isUseTestIDLTrustStore();		
 		}
 		
 		return null;
@@ -332,6 +336,17 @@ public class OAAuthenticationData implements IOnlineApplicationData {
         	
         }
         
+        TestCredentials testing = authoa.getTestCredentials(); 
+        if (testing == null) {
+        	testing = new TestCredentials();
+        	authoa.setTestCredentials(testing);
+        	
+        }
+        testing.setUseTestAuthBlockTrustStore(useTestAuthblockValidationTrustStore);
+        testing.setUseTestIDLTrustStore(useTestIDLValidationTrustStore);
+        
+        
+        
         return null;
 	}
 
@@ -614,5 +629,36 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 				this.testCredentialOIDs.add(oidList[i].trim());  
 		}
 	}
+
+	/**
+	 * @return the useTestIDLValidationTrustStore
+	 */
+	public boolean isUseTestIDLValidationTrustStore() {
+		return useTestIDLValidationTrustStore;
+	}
+
+	/**
+	 * @param useTestIDLValidationTrustStore the useTestIDLValidationTrustStore to set
+	 */
+	public void setUseTestIDLValidationTrustStore(
+			boolean useTestIDLValidationTrustStore) {
+		this.useTestIDLValidationTrustStore = useTestIDLValidationTrustStore;
+	}
+
+	/**
+	 * @return the useTestAuthblockValidationTrustStore
+	 */
+	public boolean isUseTestAuthblockValidationTrustStore() {
+		return useTestAuthblockValidationTrustStore;
+	}
+
+	/**
+	 * @param useTestAuthblockValidationTrustStore the useTestAuthblockValidationTrustStore to set
+	 */
+	public void setUseTestAuthblockValidationTrustStore(
+			boolean useTestAuthblockValidationTrustStore) {
+		this.useTestAuthblockValidationTrustStore = useTestAuthblockValidationTrustStore;
+	}
 		
+	
 }
-- 
cgit v1.2.3