From 3ce97392ddb2c858e3c153b7c91db2c121bf6588 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 15 Oct 2014 13:04:31 +0200
Subject: update MOA-ID configuration xsd

---
 .../src/main/resources/config/moaid_config_2.0.xsd             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index f2f1949cc..8f2ba1a41 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -481,6 +481,12 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="InterfederationGatewayType">
+		<xsd:sequence>
+			<xsd:element name="forwardIDPIdentifier" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="forwardProtocolIdentifer" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
 	<xsd:complexType name="InterfederationIDPType">
 		<xsd:sequence>
 			<xsd:element name="attributeQueryURL" type="xsd:string" minOccurs="0" maxOccurs="1"/>
@@ -502,6 +508,8 @@
 			<xsd:element name="isAdminRequired" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="isInterfederationIDP" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="InterfederationIDP" type="InterfederationIDPType" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="isInterfederationGateway" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="InterfederationGateway" type="InterfederationGatewayType" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="AuthComponent_OA" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter über die OA, die die
@@ -581,7 +589,7 @@
 						</xsd:sequence>
 					</xsd:complexType>
 				</xsd:element>
-			</xsd:sequence>		
+			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:complexType name="ConnectionParameterServerAuthType">
-- 
cgit v1.2.3


From 479f2dc2f37b0bcdc9317e6d740d1e173b34bbb4 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Oct 2014 13:42:13 +0200
Subject: update configtool for STORK-PVP gateway configuration

---
 id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 8f2ba1a41..d4686bd5e 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -491,6 +491,8 @@
 		<xsd:sequence>
 			<xsd:element name="attributeQueryURL" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="storeSSOSession" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="performPassivRequest" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="performLocalAuthenticationOnError" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
 		</xsd:sequence>
 		<xsd:attribute name="inboundSSO" type="xsd:boolean" default="true"/>
 		<xsd:attribute name="outboundSSO" type="xsd:boolean" default="true"/>
-- 
cgit v1.2.3


From d553bf08d1c70d9a1705f38d9fe1c7c3a3730b0d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Oct 2014 13:47:00 +0200
Subject: update STORK <-> PVP gateway functionality

---
 .../at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java
index cdb19340d..3dcfa8aa9 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBUtils.java
@@ -156,8 +156,8 @@ public final class ConfigurationDBUtils {
 		  		tx.begin();
 	  			session.merge(dbo);
 		  		tx.commit();
-		  		
-		  		//session.clear();
+		  				  		
+		  		session.clear();
 		  	}
 		     return true;
 		     
-- 
cgit v1.2.3


From 53c6beba7017b74955818f4768b76133f08e784e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 Oct 2014 12:06:22 +0100
Subject: Update third-party libs   - some implementation updates was required

---
 id/server/moa-id-commons/pom.xml                                    | 4 ++--
 .../at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index e6d708eca..ebda03801 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -82,7 +82,7 @@
 				<dependency>
 					<groupId>com.sun.xml.bind</groupId>
 					<artifactId>jaxb-xjc</artifactId>
-					<version>2.2.7</version>
+					<version>2.2.11</version>
 				</dependency>
 
         <dependency>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.32</version>
+            <version>5.1.33</version>
         </dependency>
     </dependencies>
 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index 46d3ca558..a3f445fcf 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -27,11 +27,13 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
-import org.apache.commons.lang.StringEscapeUtils;
+//import org.apache.commons.lang.StringEscapeUtils;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -70,7 +72,7 @@ public class ConfigurationDBRead {
         
         javax.persistence.Query query = session.createQuery(QUERIES.get("getActiveOnlineApplicationWithID"));
         //query.setParameter("id", id+"%");
-        query.setParameter("id", StringEscapeUtils.escapeHtml(id));
+        query.setParameter("id", StringEscapeUtils.escapeHtml4(id));
         result = query.getResultList();
 
         Logger.trace("Found entries: " + result.size());
-- 
cgit v1.2.3