From 16645606a6e2e6c1b00b2b20ef0373e2c81f7f4a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 8 Feb 2017 14:44:26 +0100
Subject: update eIDAS node configuration to allow more then on configuration
 for the same country code. Country codes can be extended by a suffix like NL
 and NL-Test. Both generates a Authn. request for NL but there are two entries
 in citizen country selector and maybe two different service URLs

---
 .../id/configuration/validation/moaconfig/StorkConfigValidator.java  | 2 +-
 id/ConfigWebTool/src/main/webapp/css/index.css                       | 5 +++++
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp               | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'id/ConfigWebTool/src/main')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index ed2c2f903..8e8020d75 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -43,7 +43,7 @@ public class StorkConfigValidator {
 						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 					}
-					if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
+					if(!check.toLowerCase().matches("(^[a-z][a-z]$)|(^[a-z][a-z]-[a-z]*)")) {
 							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
 							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 									new Object[] {check}, request ));
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 80ccf93be..aa83e0c2b 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -375,6 +375,11 @@ div .wwgrp br {
 	
 }
 
+.textfield_PEPS_CC {
+	width: 70px;
+	
+}
+
 .textfield_middle {
 	width: 100px;
 	
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 6694a4273..6892535a1 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -296,7 +296,7 @@
 								  <tr>
 								  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
 								  	<s:if test="%{countryCode == 'CC'}">
-									  	<td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+									  	<td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_PEPS_CC"/></td>
 								  	</s:if>
 								  	<s:else>
 								  		<td><s:property value="%{countryCode}" /></td>
@@ -307,7 +307,7 @@
 								  </tr>
 								</s:iterator>
                      						<s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}">
-                                    <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_short"/></td>
+                                    <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_PEPS_CC"/></td>
                                         <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" cssClass="textfield_long"/></td>
                                         <td><s:checkbox name="storkconfig.cpepslist[0].supportsXMLSignature" value="true" /></td>
                                         <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-- 
cgit v1.2.3