WebInterface MOAID-General finished

1 files changed, 87 insertions, 16 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index f03b1c057..d14e12df5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -38,22 +38,28 @@ import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 
 public class GeneralMOAIDConfig {
 
-	public static final String LINE_DELIMITER = ";\n"; 
+	public static final long DEFAULTTIMEOUTASSERTION = 120; //sec
+	public static final long DEFAULTTIMEOUTMOASESSIONCREATED = 1200; //sec
+	public static final long DEFAULTTIMEOUTMOASESSIONUPDATED = 2700; //sec
+	
+	public static final String LINE_DELIMITER = ";"; 
 	
 	private String szrgwURL = null;
 	private String alternativeSourceID = null;
 	private String certStoreDirectory = null; 
 	private boolean trustmanagerrevocationcheck = false;
 	
-	private long timeoutAssertion = 120;  //sec
-	private long timeoutMOASessionCreated = 1200;  //sec
-	private long timeoutMOASessionUpdated = 2700;  //sec
+	private String timeoutAssertion = String.valueOf(DEFAULTTIMEOUTASSERTION);
+	private String timeoutMOASessionCreated = String.valueOf(DEFAULTTIMEOUTMOASESSIONCREATED);
+	private String timeoutMOASessionUpdated = String.valueOf(DEFAULTTIMEOUTMOASESSIONUPDATED);
 	
 	private String identityLinkSigners = "";
+	private List<String> idlSignersList = null;
 	
 	private String moaspssURL = null;
 	private String moaspssAuthTrustProfile = null;
 	private String moaspssAuthTransformations = "";
+	private List<String> authTransformList = null;
 	private String moaspssIdlTrustProfile = null;
 	
 	private String mandateURL = null;
@@ -71,6 +77,7 @@ public class GeneralMOAIDConfig {
 	private List<File> fileUpload = null;
 	private List<String> fileUploadContentType;
 	private List<String> fileUploadFileName;
+	private Map<String, byte[]> secLayerTransformation = null;
 	
 	private String ssoTarget = null;
 	private String ssoFriendlyName = null;
@@ -130,11 +137,11 @@ public class GeneralMOAIDConfig {
 					if (timeouts != null) {
 						
 						if(timeouts.getAssertion() != null)
-							timeoutAssertion = timeouts.getAssertion().longValue();
+							timeoutAssertion = String.valueOf(timeouts.getAssertion().longValue());
 						if(timeouts.getMOASessionCreated() != null)
-							timeoutMOASessionCreated = timeouts.getMOASessionCreated().longValue();
+							timeoutMOASessionCreated = String.valueOf(timeouts.getMOASessionCreated().longValue());
 						if(timeouts.getMOASessionUpdated() != null)
-							timeoutMOASessionUpdated = timeouts.getMOASessionUpdated().longValue();
+							timeoutMOASessionUpdated = String.valueOf(timeouts.getMOASessionUpdated().longValue());
 						
 					}
 				}
@@ -144,7 +151,7 @@ public class GeneralMOAIDConfig {
 					List<IdentityLinkSignersX509SubjectNameItem> idem = idlsign.getX509SubjectNameItems();
 					
 					for (IdentityLinkSignersX509SubjectNameItem el : idem) {
-						identityLinkSigners += el.getItem() + LINE_DELIMITER;
+						identityLinkSigners += el.getItem() + LINE_DELIMITER + "\n";
 					}
 					
 				}
@@ -161,7 +168,7 @@ public class GeneralMOAIDConfig {
 						
 						List<String> list = authblock.getVerifyTransformsInfoProfileID();
 						for (String el : list)
-							moaspssAuthTransformations += el + LINE_DELIMITER;
+							moaspssAuthTransformations += el + LINE_DELIMITER + "\n";
 					}
 					
 					VerifyIdentityLink idl = moaspss.getVerifyIdentityLink();
@@ -219,8 +226,9 @@ public class GeneralMOAIDConfig {
 				
 					fileUploadFileName = new ArrayList<String>();
 					
-					for (TransformsInfoType el : list)
+					for (TransformsInfoType el : list) {
 						fileUploadFileName.add(el.getFilename());
+					}
 				}
 				
 				SSO sso = auth.getSSO();
@@ -314,42 +322,42 @@ public class GeneralMOAIDConfig {
 	/**
 	 * @return the timeoutAssertion
 	 */
-	public long getTimeoutAssertion() {
+	public String getTimeoutAssertion() {
 		return timeoutAssertion;
 	}
 
 	/**
 	 * @param timeoutAssertion the timeoutAssertion to set
 	 */
-	public void setTimeoutAssertion(long timeoutAssertion) {
+	public void setTimeoutAssertion(String timeoutAssertion) {
 		this.timeoutAssertion = timeoutAssertion;
 	}
 
 	/**
 	 * @return the timeoutMOASessionCreated
 	 */
-	public long getTimeoutMOASessionCreated() {
+	public String getTimeoutMOASessionCreated() {
 		return timeoutMOASessionCreated;
 	}
 
 	/**
 	 * @param timeoutMOASessionCreated the timeoutMOASessionCreated to set
 	 */
-	public void setTimeoutMOASessionCreated(long timeoutMOASessionCreated) {
+	public void setTimeoutMOASessionCreated(String timeoutMOASessionCreated) {
 		this.timeoutMOASessionCreated = timeoutMOASessionCreated;
 	}
 
 	/**
 	 * @return the timeoutMOASessionUpdated
 	 */
-	public long getTimeoutMOASessionUpdated() {
+	public String getTimeoutMOASessionUpdated() {
 		return timeoutMOASessionUpdated;
 	}
 
 	/**
 	 * @param timeoutMOASessionUpdated the timeoutMOASessionUpdated to set
 	 */
-	public void setTimeoutMOASessionUpdated(long timeoutMOASessionUpdated) {
+	public void setTimeoutMOASessionUpdated(String timeoutMOASessionUpdated) {
 		this.timeoutMOASessionUpdated = timeoutMOASessionUpdated;
 	}
 
@@ -800,6 +808,69 @@ public class GeneralMOAIDConfig {
 	public void setChainigmodelist(Map<String, String> chainigmodelist) {
 		GeneralMOAIDConfig.chainigmodelist = chainigmodelist;
 	}
+
+	/**
+	 * @return the secLayerTransformation
+	 */
+	public Map<String, byte[]> getSecLayerTransformation() {
+		return secLayerTransformation;
+	}
+
+	/**
+	 * @param secLayerTransformation the secLayerTransformation to set
+	 */
+	public void setSecLayerTransformation(Map<String, byte[]> secLayerTransformation) {
+		this.secLayerTransformation = secLayerTransformation;
+	}
+
+	/**
+	 * @return the idlSignersList
+	 */
+	public List<String> getIdlSignersList() {
+		return idlSignersList;
+	}
+
+	/**
+	 * @param idlSignersList the idlSignersList to set
+	 */
+	public void setIdlSignersList(List<String> idlSignersList) {
+		this.idlSignersList = idlSignersList;
+	}
+
+	/**
+	 * @return the authTransformList
+	 */
+	public List<String> getAuthTransformList() {
+		return authTransformList;
+	}
+
+	/**
+	 * @param authTransformList the authTransformList to set
+	 */
+	public void setAuthTransformList(List<String> authTransformList) {
+		this.authTransformList = authTransformList;
+	}
+	
+	
+	
+	
+	public void setFileUpload(File fileUpload) {
+		if (this.fileUpload == null)
+			this.fileUpload = new ArrayList<File>();
+		this.fileUpload.add(fileUpload);
+	}
+
+	public void setFileUploadContentType(String fileUploadContentType) {
+		if (this.fileUploadContentType == null)
+			this.fileUploadContentType = new ArrayList<String>();
+		this.fileUploadContentType.add(fileUploadContentType);
+	}
+
+	public void setFileUploadFileName(String fileUploadFileName) {
+		if (this.fileUploadFileName == null)
+			this.fileUploadFileName = new ArrayList<String>();
+		this.fileUploadFileName.add(fileUploadFileName);
+	}
 	
 	
 }