add interfederation attribute query

4 files changed, 84 insertions, 2 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
index 29cc5ebdc..cfab6b0d5 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AuthenticatedSessionStore.java
@@ -53,7 +53,12 @@ import org.hibernate.annotations.DynamicUpdate;
     @NamedQuery(name="getSessionWithID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore where authenticatedsessionstore.sessionid = :sessionid"),
     @NamedQuery(name="getSessionWithSSOID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore where authenticatedsessionstore.SSOsessionid = :sessionid"),
     @NamedQuery(name="getSessionWithPendingRequestID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore where authenticatedsessionstore.pendingRequestID = :sessionid"),
-    @NamedQuery(name="getMOAISessionsWithTimeOut", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore where authenticatedsessionstore.created < :timeoutcreate or authenticatedsessionstore.updated < :timeoutupdate")
+    @NamedQuery(name="getMOAISessionsWithTimeOut", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore where authenticatedsessionstore.created < :timeoutcreate or authenticatedsessionstore.updated < :timeoutupdate"),
+    @NamedQuery(name="getMOAISessionWithUserNameID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.activeOAsessions activeOAsessions where activeOAsessions.userNameID = :usernameid and activeOAsessions.attributeQueryUsed is false"),
+    @NamedQuery(name="getActiveOAWithSessionIDandOAIDandProtocol", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.activeOAsessions activeOAsessions where activeOAsessions.oaurlprefix = :oaID and activeOAsessions.protocolType = :protocol and authenticatedsessionstore.sessionid = :sessionID"),
+    @NamedQuery(name="getInterfederatedIDPForAttributeQueryWithSessionID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.inderfederation inderfederations where inderfederations.attributesRequested is false and authenticatedsessionstore.sessionid = :sessionID"),
+    @NamedQuery(name="getInterfederatedIDPForSSOWithSessionID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.inderfederation inderfederations where inderfederations.attributesRequested is true and authenticatedsessionstore.sessionid = :sessionID order by inderfederations.QAALevel DESC"),
+    @NamedQuery(name="getInterfederatedIDPForSSOWithSessionIDIDPID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.inderfederation inderfederations where inderfederations.attributesRequested is true and authenticatedsessionstore.sessionid = :sessionID and inderfederations.idpurlprefix = :idpID")
 })
 
 public class AuthenticatedSessionStore implements Serializable{
@@ -82,6 +87,9 @@ public class AuthenticatedSessionStore implements Serializable{
 	
 	@Column(name = "isSSOSession", nullable=false)
 	private boolean isSSOSession =  false;
+
+	@Column(name = "isInterfederatedSSOSession", nullable=false)
+	private boolean isInterfederatedSSOSession =  false;
 	
 	@Column(name = "pendingRequestID", nullable=false)
 	private String pendingRequestID =  "";
@@ -238,8 +246,21 @@ public class AuthenticatedSessionStore implements Serializable{
 	public void setIv(byte[] iv) {
 		this.iv = iv;
 	}
+
+	/**
+	 * @return the isInterfederatedSSOSession
+	 */
+	public boolean isInterfederatedSSOSession() {
+		return isInterfederatedSSOSession;
+	}
+
+	/**
+	 * @param isInterfederatedSSOSession the isInterfederatedSSOSession to set
+	 */
+	public void setInterfederatedSSOSession(boolean isInterfederatedSSOSession) {
+		this.isInterfederatedSSOSession = isInterfederatedSSOSession;
+	}
 	
 	
 
-
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
index 25b48310e..539de990f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
@@ -59,9 +59,15 @@ public class OASessionStore implements Serializable{
 	@Column(name = "userNameID", unique=false, nullable=true)
 	private String userNameID;
 	
+	@Column(name = "userNameIDFormat", unique=false, nullable=true)
+	private String userNameIDFormat;
+	
 	@Column(name = "protocolType", unique=false, nullable=true)
 	private String protocolType;
 	
+	@Column(name = "attributequeryused", unique=false, nullable=false)
+	private boolean attributeQueryUsed = false;
+	
 	@Column(name = "created", updatable=false, nullable=false)
 //    @Temporal(TemporalType.TIMESTAMP)
     private Date created;
@@ -149,6 +155,36 @@ public class OASessionStore implements Serializable{
 		this.protocolType = protocolType;
 	}
 
+	/**
+	 * @return the attributeQueryUsed
+	 */
+	public boolean isAttributeQueryUsed() {
+		return attributeQueryUsed;
+	}
+
+	/**
+	 * @param attributeQueryUsed the attributeQueryUsed to set
+	 */
+	public void setAttributeQueryUsed(boolean attributeQueryUsed) {
+		this.attributeQueryUsed = attributeQueryUsed;
+	}
+
+	/**
+	 * @return the userNameIDFormat
+	 */
+	public String getUserNameIDFormat() {
+		return userNameIDFormat;
+	}
+
+	/**
+	 * @param userNameIDFormat the userNameIDFormat to set
+	 */
+	public void setUserNameIDFormat(String userNameIDFormat) {
+		this.userNameIDFormat = userNameIDFormat;
+	}
+
+	
+	
 
 
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
index 65c9003e3..b557d2dc9 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
@@ -78,6 +78,9 @@ public class StatisticLog implements Serializable{
 	@Column(name = "isSSOLogin", unique=false)
 	private boolean ssosession;
 	
+	@Column(name = "isInterfederatedSSOLogin", unique=false)
+	private boolean interfederatedSSOSession;
+	
 	@Column(name = "isBusinessService", unique=false)
 	private boolean businessservice;
 	
@@ -390,6 +393,21 @@ public class StatisticLog implements Serializable{
 	public void setErrortype(String errortype) {
 		this.errortype = errortype;
 	}
+
+	/**
+	 * @return the interfederatedSSOSession
+	 */
+	public boolean isInterfederatedSSOSession() {
+		return interfederatedSSOSession;
+	}
+
+	/**
+	 * @param interfederatedSSOSession the interfederatedSSOSession to set
+	 */
+	public void setInterfederatedSSOSession(boolean interfederatedSSOSession) {
+		this.interfederatedSSOSession = interfederatedSSOSession;
+	}
+	
 	
 	
 	
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 49d919978..32b4f4ba7 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,11 +481,18 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:complexType name="InterfederationIDPType">
+		<xsd:sequence>
+			<xsd:element name="attributeQueryURL" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+		<xsd:attribute name="publicService" type="xsd:boolean" default="false"/>
+	</xsd:complexType>
 	<xsd:complexType name="OnlineApplicationType">
 		<xsd:sequence>
 			<xsd:element name="isActive" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
 			<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="AuthComponent_OA" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter über die OA, die die