aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2015-12-20 21:19:57 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2015-12-20 21:19:57 +0100
commit5df604a0ae5f1433c37759d4f7ebaa7d4f8af8d6 (patch)
tree84ee7bb195bb2abb9d1a0f5c7446ee3da05cb014 /id/server
parent1da87c34732751c0262bc62adbad6ae139b3bfeb (diff)
downloadmoa-id-spss-5df604a0ae5f1433c37759d4f7ebaa7d4f8af8d6.tar.gz
moa-id-spss-5df604a0ae5f1433c37759d4f7ebaa7d4f8af8d6.tar.bz2
moa-id-spss-5df604a0ae5f1433c37759d4f7ebaa7d4f8af8d6.zip
Fix problems with MOA-ID eIDAS SAML-engine configuration
Diffstat (limited to 'id/server')
-rw-r--r--id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java3
-rw-r--r--id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLEngineConfigurationImpl.java11
2 files changed, 9 insertions, 5 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
index 14fde95a0..3f94ca5e5 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
@@ -28,7 +28,8 @@ package at.gv.egovernment.moa.id.auth.modules.eidas;
*/
public class Constants {
- public static final String eIDAS_SAML_ENGINE_NAME = "MOA_eIDASEninge";
+ //public static final String eIDAS_SAML_ENGINE_NAME = "MOA_eIDASEninge";
+ public static final String eIDAS_SAML_ENGINE_NAME = "default";
//default keys for eIDAS SAML-engine configuration
public static final String eIDAS_SAML_ENGINE_NAME_ID_BASICCONFIG = "SamlEngineConf";
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLEngineConfigurationImpl.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLEngineConfigurationImpl.java
index 28bd2fc04..584910ea5 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLEngineConfigurationImpl.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/config/MOAeIDASSAMLEngineConfigurationImpl.java
@@ -88,7 +88,7 @@ public class MOAeIDASSAMLEngineConfigurationImpl extends
EngineInstance engineInst = new EngineInstance();
engineInst.setName(Constants.eIDAS_SAML_ENGINE_NAME);
List<InstanceConfiguration> engineConfigs = new ArrayList<InstanceConfiguration>();
- engineInst.setConfigurations(engineConfigs);
+
//add configurations
@@ -105,17 +105,20 @@ public class MOAeIDASSAMLEngineConfigurationImpl extends
Constants.SAML_SIGNING_IMPLENTATION);
//TODO: load signing keys directly from MOA-ID configuration in finale version
- samlBaseConfig.addParameter(loadConfigurationFromExternalFile(Constants.CONIG_PROPS_EIDAS_SAMLENGINE_SIGN_CONFIGFILE));
+ samlSignConfig.addParameter(loadConfigurationFromExternalFile(Constants.CONIG_PROPS_EIDAS_SAMLENGINE_SIGN_CONFIGFILE));
engineConfigs.add(samlSignConfig);
//add encryption eIDAS SAML-engine configuration
MOAeIDASSAMLInstanceConfigurationImpl samlEncConfig = new MOAeIDASSAMLInstanceConfigurationImpl();
- samlEncConfig.setName(Constants.eIDAS_SAML_ENGINE_NAME_ID_ENCRYPTIONCONFIG);
+ samlEncConfig.setName(Constants.eIDAS_SAML_ENGINE_NAME_ID_ENCRYPTIONCONFIG);
+ samlEncConfig.addParameter(Constants.eIDAS_SAML_ENGINE_NAME_ID_CLASS,
+ Constants.SAML_ENCRYPTION_IMPLENTATION);
//TODO: load encryption keys directly from MOA-ID configuration in finale version
- samlBaseConfig.addParameter(loadConfigurationFromExternalFile(Constants.CONIG_PROPS_EIDAS_SAMLENGINE_ENC_CONFIGFILE));
+ samlEncConfig.addParameter(loadConfigurationFromExternalFile(Constants.CONIG_PROPS_EIDAS_SAMLENGINE_ENC_CONFIGFILE));
engineConfigs.add(samlEncConfig);
+ engineInst.setConfigurations(engineConfigs);
super.addInstance(engineInst);
}