Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java

6 files changed, 66 insertions, 132 deletions

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 01f5913fa..4e8d77a4f 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -145,11 +145,11 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-        <dependency>
+        <!--  dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
             <version>${hibernate.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
index ecb13ef34..fbbaf9476 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
@@ -24,62 +24,32 @@ package at.gv.egovernment.moa.id.commons.db;
 
 import java.util.Properties;
 
-import org.apache.commons.lang3.StringUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.logging.Logger;
 
-public final class MOASessionDBUtils {
+@Transactional
+public class MOASessionDBUtils {
 
-   private static SessionFactory sessionFactory;
-   private static ServiceRegistry serviceRegistry;
-   
-   @SuppressWarnings("rawtypes")
-   private static final ThreadLocal THREAD_LOCAL = new ThreadLocal();
-   private static boolean automaticSessionHandling = false;
 
-   private static final String[] AUTOMATIC_SESSION_HANDLING_VALUES = new String[] { "jta", "thread" };
-   private static final String SESSION_HANDLING_KEY = "hibernate.current_session_context_class";
-   
-   protected MOASessionDBUtils() { }
+   private SessionFactory sessionFactory;
+
+	@Autowired
+	public void setSessionFactory(SessionFactory sessionFactory) {
+		this.sessionFactory = sessionFactory;
+	}
    	   
-   public static void initHibernate(Configuration config, Properties hibernateProperties) {
-	     
-     String scm = StringUtils.trimToNull(hibernateProperties.getProperty(SESSION_HANDLING_KEY));
-     if (scm != null) {
-        automaticSessionHandling = scm.indexOf(AUTOMATIC_SESSION_HANDLING_VALUES[0]) != -1 || scm.indexOf(AUTOMATIC_SESSION_HANDLING_VALUES[1]) != -1;
-     }
-     Logger.debug("Evaluating hibernate property \"" + SESSION_HANDLING_KEY + "\".");
-     if (automaticSessionHandling) {
-    	 Logger.info("Hibernate is automatically handling session context management.");
-     } else {
-    	 Logger.info("Hibernate is NOT automatically handling session context management. Using build-in ThreadLocal session handling.");
-     }
-     try {
-       //Create the SessionFactory
-       Logger.debug("Creating initial MOASession session factory...");
-              
-       config.configure("hibernate_moasession.cfg.xml");
-       //serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
-       
-       serviceRegistry = new StandardServiceRegistryBuilder().
-    		   applySettings(config.getProperties()).build();
-       
-       sessionFactory = config.buildSessionFactory(serviceRegistry);
-       Logger.debug("Initial MOASession session factory successfully created.");
-       
-     } catch (Throwable ex) {
-    	Logger.error("Initial MOASession session factory creation failed: " + ex.getMessage());
-        throw new ExceptionInInitializerError(ex);
-     }
-   }
+  public void initHibernate(Configuration config, Properties hibernateProperties) {
+
+  }
    
    /**
     * Checks if a session factory is currently available. If necessary a new
@@ -89,102 +59,32 @@ public final class MOASessionDBUtils {
     * @throws HibernateException
     *            thrown if a hibernate error occurs
     */
-   public static Session getCurrentSession() {
-      if (automaticSessionHandling) {
-         return sessionFactory.getCurrentSession();
-      }
-      Session session = (Session) THREAD_LOCAL.get();
-      // Open a new Session, if this Thread has none yet
-      if (session == null || !session.isConnected()) {
-         session = getNewSession();
-      }
-      return session;
-   }
-
-   @SuppressWarnings("unchecked")
-  public static Session getNewSession() {
-      if (automaticSessionHandling) {
-    	  Logger.warn("Session is being automatically handled by hibernate. Therefore this session maybe not being newly created. Use HibernateUtil.getCurrentSession() instead.");
-         return sessionFactory.getCurrentSession();
-      }
-      Session session = (Session) THREAD_LOCAL.get();
-      if (session != null) {
-    	  Logger.warn("Previous MOASession session has not been closed; closing session now.");
-         closeSession();
-      }
-      Logger.debug("Opening new MOASession hibernate session...");
-      try {
-         session = sessionFactory.openSession();
-         THREAD_LOCAL.set(session);
-      } catch (HibernateException hex) {
-    	  Logger.error(hex.getMessage());
-      }
-      return session;
-   }
-
-   /**
-    * Closes the current session.
-    * 
-    * @throws HibernateException
-    *            thrown if session is already closed or a hibernate error
-    *            occurs.
-    */
-   @SuppressWarnings("unchecked")
-  public static void closeSession() {
-      if (automaticSessionHandling) {
-    	  Logger.warn("Session is being automatically handled by hibernate. Therefore the current session cannot be closed on demand.");
-         return;
-      }
-      Logger.debug("Closing current MOASession hibernate session...");
-      Session session = (Session) THREAD_LOCAL.get();
-      THREAD_LOCAL.set(null);
-      if (session != null) {
-         try {
-            session.close();
-            
-         } catch (HibernateException hex) {
-            Logger.error(hex.getMessage());
-         }
-      }
+   public Session getCurrentSession() {
+	   return sessionFactory.getCurrentSession();
    }
    
-   public static boolean saveOrUpdate(Object dbo) throws MOADatabaseException {
-	  	 Transaction tx =  null;
+   public boolean saveOrUpdate(Object dbo) throws MOADatabaseException {
 	  	 try {
-		  	 Session session = MOASessionDBUtils.getCurrentSession();
-		  	 
-		  	synchronized (session) {
-		  		tx = session.beginTransaction();
-		  		session.saveOrUpdate(dbo);
-		  		tx.commit();
-		  	}
-		     return true;
+		  	 Session session = sessionFactory.getCurrentSession();
+		  	session.merge(dbo);
+		  	return true;
 		     
 	  	 } catch(HibernateException e) {
-	  		Logger.warn("Error during MOASession database saveOrUpdate. Rollback.", e);
-	  		if (tx != null)
-	  			tx.rollback();
+	  		Logger.warn("Error during MOASession database saveOrUpdate.", e);
+
 	  		throw new MOADatabaseException(e);
 	  	 }
 	   }
 	   
-	   public static boolean delete(Object dbo) {
-	  	 Transaction tx =  null;
+	   public boolean delete(Object dbo) {
+
 	  	 try {
-		  	 Session session = MOASessionDBUtils.getCurrentSession();
-		  	 
-		  	 synchronized (session) {
-		  		tx = session.beginTransaction();
-			    session.delete(dbo);
-			    tx.commit();
-			}
-		     
+		  	 Session session = sessionFactory.getCurrentSession();
+		  	 session.delete(dbo);
 		     return true;
 		     
 	  	 } catch(HibernateException e) {
-	  		Logger.warn("Error during MOASession database delete. Rollback.", e);
-	  		if (tx != null)
-	  			tx.rollback();
+	  		Logger.warn("Error during MOASession database delete. Rollback.");
 	  		return false;
 	  	 }
 	   }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
index 46683a928..d9528cbed 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
@@ -37,6 +37,8 @@ import javax.persistence.Table;
 
 import org.hibernate.annotations.DynamicUpdate;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 
 
 @Entity
@@ -48,8 +50,19 @@ import org.hibernate.annotations.DynamicUpdate;
 })
 
 public class AssertionStore implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2804964892915004185L;
+
+
+
+	@JsonCreator
+	public AssertionStore(){
+		
+	}
+	
 
-	private static final long serialVersionUID = 1L;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO) 
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 128dd79df..eeaf03544 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
@@ -59,7 +59,9 @@ import org.hibernate.annotations.DynamicUpdate;
     @NamedQuery(name="getMOASessionWithNameIDandOAID", query = "select authenticatedsessionstore from AuthenticatedSessionStore authenticatedsessionstore join fetch authenticatedsessionstore.activeOAsessions activeOAsessions where activeOAsessions.oaurlprefix = :oaID and activeOAsessions.userNameID = :nameID"),
     @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 inderfederations.storeSSOInformation 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")
+    @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"),
+    @NamedQuery(name="getAllActiveOAsForSessionID", query = "select activeOAsessions from AuthenticatedSessionStore authenticatedsessionstore join authenticatedsessionstore.activeOAsessions activeOAsessions where authenticatedsessionstore.sessionid = :sessionID "),
+    @NamedQuery(name="getAllActiveIDPsForSessionID", query = "select inderfederation from AuthenticatedSessionStore authenticatedsessionstore join authenticatedsessionstore.inderfederation inderfederation where authenticatedsessionstore.sessionid = :sessionID ")
 })
 
 public class AuthenticatedSessionStore implements Serializable{
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
index 5a5f4edac..260b2ecb1 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -24,7 +24,10 @@
 
 package at.gv.egovernment.moa.util;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Contains various constants used throughout the system.
@@ -509,6 +512,14 @@ public interface Constants {
   /** 
    * A map used to map namespace prefixes to namespace URIs 
    */ 
-  public static HashMap<String, String> nSMap = new HashMap<String, String>(5);
+  public static final Map<String, String> nSMap = Collections.unmodifiableMap(new HashMap<String, String>(){
+	private static final long serialVersionUID = 3845384324295136490L;
+	  {
+	  put(Constants.SAML_PREFIX, Constants.SAML_NS_URI);
+	  put(Constants.ECDSA_PREFIX, "http://www.w3.org/2001/04/xmldsig-more#");
+	  put(Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);
+  	}
+  });
+
    
 }
diff --git a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
index 9bebfa66f..5c1558507 100644
--- a/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
+++ b/id/server/moa-id-commons/src/main/resources/META-INF/persistence.xml
@@ -12,5 +12,13 @@ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
 		<properties>
 		</properties>
 	</persistence-unit>
+	
+	<persistence-unit name="session" transaction-type="RESOURCE_LOCAL">
+		<provider>org.hibernate.ejb.HibernatePersistence</provider>
+		<class>at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore</class>
+		<!-- <class>at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase</class> -->
+		<properties>
+		</properties>
+	</persistence-unit>
 
 </persistence>
\ No newline at end of file