From a60b99e926ccd5c18baa36144922a94835819777 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 16 Aug 2016 07:08:26 +0200
Subject: change STORK QAA to eIDAS LoA

---
 .../id/configuration/data/GeneralStorkConfig.java    | 15 ++++++++++-----
 .../moa/id/configuration/data/oa/OASTORKConfig.java  | 20 +++++++++++++-------
 .../struts/action/EditGeneralConfigAction.java       |  2 +-
 .../validation/moaconfig/StorkConfigValidator.java   |  7 ++++---
 .../validation/oa/OASTORKConfigValidation.java       |  7 ++++---
 .../resources/applicationResources_de.properties     |  2 +-
 .../resources/applicationResources_en.properties     |  2 +-
 .../src/main/webapp/jsp/editMOAConfig.jsp            |  7 ++++---
 .../src/main/webapp/jsp/snippets/OA/stork.jsp        | 10 +++++++---
 9 files changed, 45 insertions(+), 27 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
index e71bad299..b5c996c72 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentGeneral;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.ForeignIdentities;
@@ -40,7 +41,7 @@ public class GeneralStorkConfig {
 
 	private List<CPEPS> cpepslist;
 	private List<StorkAttribute> attributes;
-	private int qaa;
+	private String qaa;
     private static final Logger log = Logger.getLogger(GeneralStorkConfig.class);
 
     private MOAIDConfiguration dbconfig = null;
@@ -91,10 +92,10 @@ public class GeneralStorkConfig {
 						}
 
 						try {
-							qaa = stork.getQualityAuthenticationAssuranceLevel();
+							qaa = stork.getGeneral_eIDAS_LOA();
 							
 						} catch(NullPointerException e) {
-							qaa = 4;
+							qaa = MOAIDConstants.eIDAS_LOA_HIGH;
 						}
 					}
 					
@@ -114,6 +115,10 @@ public class GeneralStorkConfig {
 			attributes.add(new StorkAttribute());
 	}
 
+	public List<String> getAllowedLoALevels() {
+		return MOAIDConstants.ALLOWED_eIDAS_LOA;
+	}
+    
     public List<CPEPS> getRawCPEPSList() {
     	return cpepslist;
     }
@@ -161,11 +166,11 @@ public class GeneralStorkConfig {
 		this.attributes = attributes;
 	}
 
-	public int getDefaultQaa() {
+	public String getDefaultQaa() {
 		return qaa;
 	}
 
-	public void setDefaultQaa(int qaa) {
+	public void setDefaultQaa(String qaa) {
 		this.qaa = qaa;
 	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index c0e1eaaf7..fb096a2a0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.CPEPS;
@@ -49,7 +50,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	private static final Logger log = Logger.getLogger(OASTORKConfig.class);
 	
 	private boolean isStorkLogonEnabled = false;
-	private int qaa;
+	private String qaa;
 
 	private List<AttributeHelper> attributes = null;
 
@@ -107,14 +108,14 @@ public class OASTORKConfig implements IOnlineApplicationData{
 				setStorkLogonEnabled(config.isStorkLogonEnabled());
 
 				try {
-					setQaa(config.getQaa());
+					setQaa(config.geteIDAS_LOA());
 				} catch(NullPointerException e) {
 					// if there is no configuration available for the OA, get the default qaa level
 					try {
-						setQaa(dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getQualityAuthenticationAssuranceLevel());
+						setQaa(dbconfig.getAuthComponentGeneral().getForeignIdentities().getSTORK().getGeneral_eIDAS_LOA());
 						
 					} catch (NullPointerException e1) {
-						setQaa(4);
+						setQaa(MOAIDConstants.eIDAS_LOA_HIGH);
 						
 					}
 				}
@@ -208,7 +209,7 @@ public class OASTORKConfig implements IOnlineApplicationData{
         }
         // transfer the incoming data to the database model
         stork.setStorkLogonEnabled(isStorkLogonEnabled());
-        stork.setQaa(getQaa());
+        stork.seteIDAS_LOA(getQaa());
         stork.setOAAttributes(getAttributes());
         stork.setVidpEnabled(isVidpEnabled());
         stork.setRequireConsent(isRequireConsent());
@@ -227,11 +228,11 @@ public class OASTORKConfig implements IOnlineApplicationData{
 		this.isStorkLogonEnabled = enabled;
 	}
 
-	public int getQaa() {
+	public String getQaa() {
 		return qaa;
 	}
 
-	public void setQaa(int qaa) {
+	public void setQaa(String qaa) {
 		this.qaa = qaa;
 	}
 
@@ -282,6 +283,11 @@ public class OASTORKConfig implements IOnlineApplicationData{
 		return citizenCountries;
 	}
 	
+
+	public List<String> getAllowedLoALevels() {
+		return MOAIDConstants.ALLOWED_eIDAS_LOA;
+	}
+	
 	public List<String> getEnabledCitizenCountries() {
 		return enabledCitizenCountries;
 	}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 40e9b1a90..5e348f91b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -553,7 +553,7 @@ public class EditGeneralConfigAction extends BasicAction {
 
             try {
             	log.error("QAAAA " + storkconfig.getDefaultQaa());
-            	stork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa());
+            	stork.setGeneral_eIDAS_LOA(storkconfig.getDefaultQaa());
 			
 				if (storkconfig.getAttributes() != null) {
 					List<StorkAttribute> dbStorkAttr = new ArrayList<StorkAttribute>();
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 6b5c51e3f..ed2c2f903 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
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.StorkAttribute;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -82,9 +83,9 @@ public class StorkConfigValidator {
 		}
 
 		// check qaa
-		int qaa = form.getDefaultQaa();
-		if(1 > qaa && 4 < qaa) {
-			log.warn("QAA is out of range : " + qaa);
+		String qaa = form.getDefaultQaa();
+		if (!MOAIDConstants.ALLOWED_eIDAS_LOA.contains(qaa)) {
+			log.warn("eIDAS LoA is not allowed : " + qaa);
 			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
 					new Object[] {qaa}, request ));
 		}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index 5c451c06a..6a03bf194 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
@@ -45,9 +46,9 @@ public class OASTORKConfigValidation {
 		List<String> errors = new ArrayList<String>();
 
 		// check qaa
-		int qaa = oageneral.getQaa();
-		if(1 > qaa && 4 < qaa) {
-			log.warn("QAA is out of range : " + qaa);
+		String qaa = oageneral.getQaa();
+		if (!MOAIDConstants.ALLOWED_eIDAS_LOA.contains(qaa)) {
+			log.warn("eIDAS LoA is not allowed : " + qaa);
 			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
 					new Object[] {qaa}, request ));
 		}
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index b77097e70..ae2678c8a 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -501,7 +501,7 @@ validation.stork.cpeps.empty=CPEPS Konfiguration ist unvollst\u00E4ndig
 validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
 validation.stork.cpeps.duplicate=L\u00E4ndercodes sind nicht eindeutig
 validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
-validation.stork.qaa.outofrange=G\u00FCltige QAA Werte sind 1, 2, 3, und 4
+validation.stork.qaa.outofrange=Ung\u00FCltiger LoA Werte {0}
 validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
 validation.stork.ap.url.valid=Ung\u00FCltige AttributProvider Url
 validation.stork.ap.name.empty=Ung\u00FCltiger AttributProvider Name
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index d62ce3807..d09301dab 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -499,7 +499,7 @@ validation.stork.cpeps.empty=CPEPS configuration is incomplete
 validation.stork.cpeps.url=CPEPS URL is invalid
 validation.stork.cpeps.duplicate=Country codes are not unique
 validation.stork.requestedattributes=STORK attributes are incorrect. Example: attr1, attr2
-validation.stork.qaa.outofrange=Valid QAA values are 1, 2, 3, and 4
+validation.stork.qaa.outofrange=Not valid LoA value {0}
 validation.stork.attributes.empty=Only one attribute can be provided
 validation.stork.ap.url.valid=Invalid URL of AttributeProvider
 validation.stork.ap.name.empty=Invalid name of AttributeProvider
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 254418415..c54e386a2 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -277,11 +277,12 @@
 						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
-							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
-								value="#{storkconfig.defaultQaa}"
+							<s:select list="storkconfig.allowedLoALevels"
+								value="%{storkconfig.defaultQaa}"
 								name="storkconfig.defaultQaa"
 								key="webpages.moaconfig.stork.qaa.default"
-								labelposition="left" />
+								labelposition="left" 
+								cssClass="textfield_long" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
               <table id="stork_pepslist">
 								<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLEncryption</td></tr>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
index 78fdf8921..76c8d069b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
@@ -14,11 +14,15 @@
 							onclick="oaStork();"
 							id="OAuseSTORKLogon" />
 						<div id="stork_block">
-							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
-								value="#{storkOA.qaa}"
+							
+							<s:select list="storkOA.allowedLoALevels"
+								value="%{storkOA.qaa}"
 								name="storkOA.qaa"
 								key="webpages.moaconfig.stork.qaa"
-								labelposition="left" />
+								labelposition="left" 
+								cssClass="textfield_long"/>
+								
+								
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.enabledcpeps", request) %></h4>
 							<s:checkboxlist name="storkOA.enabledCitizenCountries" list="storkOA.availableCitizenCountries" value="storkOA.enabledCitizenCountries" />
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
-- 
cgit v1.2.3