Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot

Conflicts:
	id/server/idserverlib/pom.xml

3 files changed, 179 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/OAListElement.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/OAListElement.java
index c4a825589..28eba9f34 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/OAListElement.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/OAListElement.java
@@ -24,7 +24,7 @@ package at.gv.egovernment.moa.id.configuration.data;
 
 public class OAListElement {
 	
-	public enum ServiceType {OA, VIDP, IDP} 
+	public enum ServiceType {OA, VIDP, IDP, GWAY} 
 	
 	private long dataBaseID;
 	private String oaIdentifier;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
index 9431cc1fd..2f9df18aa 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAMOAIDPInterfederationConfig.java
@@ -45,9 +45,11 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 	private static final Logger log = Logger.getLogger(OAMOAIDPInterfederationConfig.class);
 	
 	private String queryURL;
-	private boolean inboundSSO = true;
-	private boolean outboundSSO = true;
-	private boolean storeSSOSession = true;
+	private Boolean inboundSSO = true;
+	private Boolean outboundSSO = true;
+	private Boolean storeSSOSession = true;
+	private Boolean passiveRequest = true;
+	private Boolean localAuthOnError = true;
 	
 	/* (non-Javadoc)
 	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
@@ -70,6 +72,8 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 			this.inboundSSO = moaIDP.isInboundSSO();
 			this.outboundSSO = moaIDP.isOutboundSSO();
 			this.storeSSOSession = moaIDP.isStoreSSOSession();
+			this.localAuthOnError = moaIDP.isPerformLocalAuthenticationOnError();
+			this.passiveRequest = moaIDP.isPerformPassivRequest();
 		}
 		
 		return null;
@@ -95,8 +99,10 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 			moaIDP.setInboundSSO(inboundSSO);
 			moaIDP.setOutboundSSO(outboundSSO);
 			moaIDP.setStoreSSOSession(storeSSOSession);
-		}
-		
+			moaIDP.setPerformLocalAuthenticationOnError(localAuthOnError);
+			moaIDP.setPerformPassivRequest(passiveRequest);
+			
+		}		
 		return null;
 	}
 
@@ -143,7 +149,7 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 	 * @return the inboundSSO
 	 */
 	public boolean isInboundSSO() {
-		return inboundSSO;
+		return inboundSSO.booleanValue();
 	}
 
 	/**
@@ -157,7 +163,7 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 	 * @return the outboundSSO
 	 */
 	public boolean isOutboundSSO() {
-		return outboundSSO;
+		return outboundSSO.booleanValue();
 	}
 
 	/**
@@ -171,7 +177,7 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 	 * @return the storeSSOSession
 	 */
 	public boolean isStoreSSOSession() {
-		return storeSSOSession;
+		return storeSSOSession.booleanValue();
 	}
 
 	/**
@@ -180,6 +186,34 @@ public class OAMOAIDPInterfederationConfig implements IOnlineApplicationData {
 	public void setStoreSSOSession(boolean storeSSOSession) {
 		this.storeSSOSession = storeSSOSession;
 	}
+
+	/**
+	 * @return the passiveRequest
+	 */
+	public boolean isPassiveRequest() {
+		return passiveRequest.booleanValue();
+	}
+
+	/**
+	 * @param passiveRequest the passiveRequest to set
+	 */
+	public void setPassiveRequest(boolean passiveRequest) {
+		this.passiveRequest = passiveRequest;
+	}
+
+	/**
+	 * @return the localAuthOnError
+	 */
+	public boolean isLocalAuthOnError() {
+		return localAuthOnError.booleanValue();
+	}
+
+	/**
+	 * @param localAuthOnError the localAuthOnError to set
+	 */
+	public void setLocalAuthOnError(boolean localAuthOnError) {
+		this.localAuthOnError = localAuthOnError;
+	}
 	
 	
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/PVPGatewayInterfederationConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/PVPGatewayInterfederationConfig.java
new file mode 100644
index 000000000..23af59d8e
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/PVPGatewayInterfederationConfig.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.InterfederationGatewayType;
+import at.gv.egovernment.moa.id.commons.db.dao.config.InterfederationIDPType;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.configuration.Constants;
+import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class PVPGatewayInterfederationConfig implements IOnlineApplicationData {
+
+	private static final Logger log = Logger.getLogger(PVPGatewayInterfederationConfig.class);
+	
+	private String entityID = null;
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
+	 */
+	@Override
+	public String getName() {
+		return "PVPGatewayInterfederation";
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public List<String> parse(OnlineApplication dbOA,
+			AuthenticatedUser authUser, HttpServletRequest request) {
+		
+		InterfederationGatewayType gateway = dbOA.getInterfederationGateway();
+		if (gateway != null) {
+			this.entityID = gateway.getForwardIDPIdentifier();
+
+		}
+		
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
+			HttpServletRequest request) {
+
+		if (authUser.isAdmin()) {			
+			dbOA.setIsInterfederationGateway(true);
+			
+			InterfederationGatewayType gateway = dbOA.getInterfederationGateway();
+			if (gateway == null) {
+				gateway = new InterfederationGatewayType();
+				dbOA.setInterfederationGateway(gateway);
+			}
+			
+			gateway.setForwardIDPIdentifier(entityID);
+		}
+		
+		dbOA.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);		
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public List<String> validate(OAGeneralConfig general,
+			AuthenticatedUser authUser, HttpServletRequest request) {
+		
+		List<String> errors  = new ArrayList<String>();
+		
+		if (MiscUtil.isNotEmpty(entityID)) {
+			if (!ValidationHelper.validateURL(entityID)) {
+				log.info("PVP gateway EntityID is not valid");
+				errors.add(LanguageHelper.getErrorString("validation.interfederation.gateway.entityID.valid", request));
+				
+			}
+			
+		} else
+			errors.add(LanguageHelper.getErrorString("validation.interfederation.gateway.entityID.empty", request));
+				
+		return errors;
+	}
+
+	/**
+	 * @return the entityID
+	 */
+	public String getEntityID() {
+		return entityID;
+	}
+
+	/**
+	 * @param entityID the entityID to set
+	 */
+	public void setEntityID(String entityID) {
+		this.entityID = entityID;
+	}
+
+
+	
+}