Generic Artifact/Assertion management by using Hibernate for SAML1 and PVP2

1 files changed, 19 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPAssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPAssertionStorage.java
index c188914df..a61dc53be 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPAssertionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPAssertionStorage.java
@@ -1,13 +1,12 @@
 package at.gv.egovernment.moa.id.protocols.pvp2x;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.binding.artifact.SAMLArtifactMap;
 import org.opensaml.xml.io.MarshallingException;
 
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.StoredAssertion;
+import at.gv.egovernment.moa.id.storage.AssertionStorage;
 
 public class PVPAssertionStorage implements SAMLArtifactMap {
 
@@ -20,7 +19,8 @@ public class PVPAssertionStorage implements SAMLArtifactMap {
 		return instance;
 	}
 	
-	private Map<String, SAMLArtifactMapEntry> assertions = new HashMap<String, SAMLArtifactMapEntry>();
+	//private Map<String, SAMLArtifactMapEntry> assertions = new HashMap<String, SAMLArtifactMapEntry>();
+	private AssertionStorage assertions = AssertionStorage.getInstance();
 	
 	public boolean contains(String artifact) {
 		return assertions.containsKey(artifact);
@@ -33,11 +33,24 @@ public class PVPAssertionStorage implements SAMLArtifactMap {
 				issuerId,
 				samlMessage);
 		
-		assertions.put(artifact, assertion);
+		try {
+			assertions.put(artifact, assertion);
+			
+		} catch (MOADatabaseException e) {
+			// TODO Insert Error Handling, if Assertion could not be stored
+			throw new MarshallingException("Assertion are not stored in Database.",e);
+		}
 	}
 
 	public SAMLArtifactMapEntry get(String artifact) {
-		return assertions.get(artifact);
+		try {
+			return (SAMLArtifactMapEntry) assertions.get(artifact);
+			
+		} catch (MOADatabaseException e) {
+			// TODO Insert Error Handling, if Assertion could not be read
+			e.printStackTrace();
+			return null;
+		}
 	}
 
 	public void remove(String artifact) {