* add new error message if MOA-ID-Proxy configuration is not found

* change SAML1 legacy-request parameter validation
* change OA-SL Template labels

4 files changed, 8 insertions, 7 deletions

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index 0b59e6a24..d96b48cbd 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -165,9 +165,9 @@ webpages.oaconfig.general.bku.handy=Handy BKU
 webpages.oaconfig.general.bku.slversion=SecurityLayer Version
 webpages.oaconfig.general.bku.keyboxidentifier=KeyBoxIdentifier
 webpages.oaconfig.general.bku.legacy=SecurityLayerTemplates (Legacy Request)
-webpages.oaconfig.general.bku.sltemplate.first=1. SecurityLayer Template
-webpages.oaconfig.general.bku.sltemplate.second=2. SecurityLayer Template
-webpages.oaconfig.general.bku.sltemplate.third=3. SecurityLayer Template
+webpages.oaconfig.general.bku.sltemplate.first=SecurityLayer Template
+webpages.oaconfig.general.bku.sltemplate.second=SecurityLayer Template (WhiteList)
+webpages.oaconfig.general.bku.sltemplate.third=SecurityLayer Template (WhiteList)
 
 webpages.oaconfig.general.bku.delete=L\u00F6schen
 webpages.oaconfig.general.bku.bkuselection.header=BKU-Selection Template
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
index 93de902ef..66d330d20 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
@@ -118,7 +118,7 @@ public class ProxyConfigurationProvider extends ConfigurationProvider {
     throws ConfigurationException {
     String fileName = System.getProperty(PROXY_CONFIG_PROPERTY_NAME);
     if (fileName == null) {
-      throw new ConfigurationException("config.01", null);
+      throw new ConfigurationException("config.20", null);
     }
     Logger.info("Loading MOA-ID-PROXY configuration " + fileName);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 327170054..bd6514c5c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -513,8 +513,8 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 				throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");

 		    if (MiscUtil.isEmpty(bkuURL))

 		       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");

-		    if (MiscUtil.isEmpty(templateURL))

-		       throw new WrongParametersException("StartAuthentication", PARAM_TEMPLATE, "auth.12");

+//		    if (MiscUtil.isEmpty(templateURL))

+//		       throw new WrongParametersException("StartAuthentication", PARAM_TEMPLATE, "auth.12");

 		    if (!ParamValidatorUtils.isValidUseMandate(useMandate))

 	           throw new WrongParametersException("StartAuthentication", PARAM_USEMANDATE, "auth.12");		    

 		    if (!ParamValidatorUtils.isValidCCC(ccc))

diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index 2f956bd39..93e8cdb99 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -69,7 +69,8 @@ config.15=Das Personenbindungs-Trust-Profil (TrustProfileID \= {0}) darf nicht f
 config.16=MOA ID Proxy konnte nicht gestartet werden. Das Element ConnnectionParameter im allgemeinen Konfigurationsteil der MOA-ID-PROXY Konfigurationsdatei fehlt. 

 config.17=Fehler beim initialisieren von Hibernate

 config.18=Keine MOA-ID 2.x Konfiguration gefunden.

-config.19=Kein Schl?ssel f\u00FCr die Resignierung der Personenbindung gefunden. 

+config.19=Kein Schl?ssel f\u00FCr die Resignierung der Personenbindung gefunden.

+config.20=Umgebungsvariable "moa.id.proxy.configuration" nicht gesetzt 

 

 parser.00=Leichter Fehler beim Parsen: {0}

 parser.01=Fehler beim Parsen: {0}