diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-06-05 11:21:58 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-06-05 11:21:58 +0200 | 
| commit | eeb353539af8e185eca23795ae592df01b049914 (patch) | |
| tree | 7ad5296f785702915b9f4646d8f0f4fa3108e1c8 /id/server/modules/module-monitoring | |
| parent | cd5cef47db73c85cbb2defdec3b283655fdc859b (diff) | |
| download | moa-id-spss-eeb353539af8e185eca23795ae592df01b049914.tar.gz moa-id-spss-eeb353539af8e185eca23795ae592df01b049914.tar.bz2 moa-id-spss-eeb353539af8e185eca23795ae592df01b049914.zip | |
fix refactoring problem in monitoring module
Diffstat (limited to 'id/server/modules/module-monitoring')
2 files changed, 12 insertions, 3 deletions
| 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 fa4a50992..867855c49 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 @@ -46,14 +46,22 @@ import at.gv.egovernment.moa.util.MiscUtil;  public class IdentityLinkTestModule implements TestModuleInterface {  	private static IIdentityLink identityLink = null; +	private AuthConfiguration authConfig; -	public void initializeTest(long delayParam, String url) throws Exception{ +	@Override +	public void initializeTest(long delayParam, String url) throws Exception { +		Logger.error("NOT implemented yet!!!"); +		 +	} +	 +	public void initializeTest(long delayParam, String url, AuthConfiguration authConfig) throws Exception{  		if (MiscUtil.isNotEmpty(url)) {  		  	URL keystoreURL = new URL(url);					  			InputStream idlstream = keystoreURL.openStream();  			identityLink = new IdentityLinkAssertionParser(idlstream).parseIdentityLink(); +			this.authConfig = authConfig;  		}  	}  @@ -85,7 +93,8 @@ public class IdentityLinkTestModule implements TestModuleInterface {  					verifyXMLSignatureResponse,  					config.getIdentityLinkX509SubjectNames(),  					VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK, -					oaParam); +					oaParam, +					authConfig);  		} catch (ValidateException e) {  			//check if default Monitoring IDL is used then error is ignored diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java index 9f0083fb8..1fa878d60 100644 --- a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java @@ -101,7 +101,7 @@ public class TestManager{  		IdentityLinkTestModule test2 = new IdentityLinkTestModule();  		String idlurl = FileUtils.makeAbsoluteURL(authConfig.getMonitoringTestIdentityLinkURL(), authConfig.getRootConfigFileDir());  		try { -			test2.initializeTest(0, idlurl); +			test2.initializeTest(0, idlurl, authConfig);  			tests.put(test2.getName(), test2);;  		} catch (Exception e) { | 
