Code CleanUP

4 files changed, 99 insertions, 41 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java
index 84aea44a3..e21666bfb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java
@@ -106,4 +106,15 @@ public class DatabaseTestModule implements TestModuleInterface{
 			return "AdvancedLoggingDataBase: " + e.getMessage();
 		}
 	}
+
+
+	public String getName() {
+		return "DatabaseTest";
+	}
+
+
+	public void initializeTest(long delayParam, String url) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
 }
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 9b81d197f..44ecdfde7 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
@@ -12,7 +12,6 @@ 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.invoke.SignatureVerificationInvoker;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
 import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
 import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator;
 import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator;
@@ -22,46 +21,49 @@ import at.gv.egovernment.moa.util.MiscUtil;
 
 public class IdentityLinkTestModule implements TestModuleInterface {
 
+	private static IdentityLink identityLink = null;
+	
+	public void initializeTest(long delayParam, String url) throws Exception{
+		
+		if (MiscUtil.isNotEmpty(url)) {
+			File idlfile = new File(url);
+			InputStream idlstream = new FileInputStream(idlfile);
+			identityLink = new IdentityLinkAssertionParser(idlstream).parseIdentityLink();
+		}
+		
+	}
+	
 	public List<String> performTests()  throws Exception{
 		Logger.trace("Start MOA-ID IdentityLink Test");
 		
 		AuthConfigurationProvider config = AuthConfigurationProvider.getInstance();
+		
+		IdentityLinkValidator.getInstance().validate(identityLink);
+		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
+		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
+				.build(identityLink, config
+						.getMoaSpIdentityLinkTrustProfileID());
 
-		String idlurl = config.getTestIdentityLinkURL();
+		// invokes the call
+		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
+				.verifyXMLSignature(domVerifyXMLSignatureRequest);
+		// parses the <VerifyXMLSignatureResponse>
+		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
+				domVerifyXMLSignatureResponse).parseData();
 		
-		if (MiscUtil.isNotEmpty(idlurl)) {
-			File idlfile = new File(idlurl);
-			InputStream idlstream = new FileInputStream(idlfile);
+		VerifyXMLSignatureResponseValidator.getInstance().validate(
+				verifyXMLSignatureResponse,
+				config.getIdentityLinkX509SubjectNames(),
+				VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
+				true);
 		
-			IdentityLink identityLink = new IdentityLinkAssertionParser(idlstream).parseIdentityLink();
-			
-			IdentityLinkValidator.getInstance().validate(identityLink);
-			// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
-			Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
-					.build(identityLink, config
-							.getMoaSpIdentityLinkTrustProfileID());
-	
-			// invokes the call
-			Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
-					.verifyXMLSignature(domVerifyXMLSignatureRequest);
-			// parses the <VerifyXMLSignatureResponse>
-			VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
-					domVerifyXMLSignatureResponse).parseData();
-			
-			VerifyXMLSignatureResponseValidator.getInstance().validate(
-					verifyXMLSignatureResponse,
-					config.getIdentityLinkX509SubjectNames(),
-					VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
-					true);
-			
-			Logger.trace("Finished MOA-ID IdentityLink Test without errors");
-			
-			return null;
-			
-		} else {
-			Logger.warn("MOA-ID IdentityLink Test can not performed without IdentityLink. Insert IdentityLink file to MOA-ID configuration");
-			return null;
-		}
+		Logger.trace("Finished MOA-ID IdentityLink Test without errors");
+		
+		return null;
+	}
+
+	public String getName() {
+		return "IdentityLinkTest";
 	}
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java
index bbebbed57..dadbc494b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java
@@ -1,27 +1,45 @@
 package at.gv.egovernment.moa.id.monitoring;
 
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class TestManager {
 
 	private static TestManager instance;
 	
-	private List<TestModuleInterface> tests = new ArrayList<TestModuleInterface>();
+	private Map<String, TestModuleInterface> tests = new HashMap<String, TestModuleInterface>();
 	
-	public static TestManager getInstance() {
+	public static TestManager getInstance() throws ConfigurationException {
 		if (instance == null)
 			instance = new TestManager();
 		
 		return instance;
 	}
 	
-	private TestManager() {
-		tests.add(new DatabaseTestModule());
-		tests.add(new IdentityLinkTestModule());
+	private TestManager() throws ConfigurationException {
+		
+		AuthConfigurationProvider config = AuthConfigurationProvider.getInstance();
+		
+		//add Database test
+		DatabaseTestModule test1 = new DatabaseTestModule();
+		tests.put(test1.getName(), test1);
+		
+		//add IdentityLink verification test
+		IdentityLinkTestModule test2 = new IdentityLinkTestModule();
+		String idlurl = config.getMonitoringTestIdentityLinkURL();
+		try {
+			test2.initializeTest(0, idlurl);
+			tests.put(test2.getName(), test2);;
+			
+		} catch (Exception e) {
+			Logger.warn("MOA-ID IdentityLink Test can not performed without IdentityLink. Insert IdentityLink file to MOA-ID configuration", e);
+		}
 	}
 	
 	public List<String> executeTests() {
@@ -30,7 +48,7 @@ public class TestManager {
 		
 		List<String> errors;
 		
-		for (TestModuleInterface test : tests) {
+		for (TestModuleInterface test : tests.values()) {
 			try {
 				errors = test.performTests();
 				if (errors != null && errors.size() > 0)
@@ -44,4 +62,27 @@ public class TestManager {
 		
 		return null;	
 	}
+	
+	public List<String> executeTest(String testname) {
+		
+		TestModuleInterface test = tests.get(testname);
+		
+		if (test != null) {
+			try {
+				return test.performTests();
+				
+			} catch (Exception e) {
+				Logger.warn("General Testing Eception during Test " + test.getName() + ": ", e);
+				return Arrays.asList(e.getMessage());
+			}
+			
+		} else {
+			Logger.info("TestModule with Name " + testname + " is not implemented");
+			return null;
+		}
+	}
+	
+	public boolean existsModule(String modulename) {
+		return tests.containsKey(modulename);
+	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java
index f4e94fee0..a2b49f34a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java
@@ -5,4 +5,8 @@ import java.util.List;
 public interface TestModuleInterface {
 
 	public List<String> performTests() throws Exception;
+	
+	public void initializeTest(long delayParam, String url) throws Exception; 
+	
+	public String getName();
 }