PVP2.X Post and Redirect binding, signing and verification, added PVP2.x Citizen Token attributes

2 files changed, 49 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/SAML2Utils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/SAML2Utils.java
index fa2ce4f79..0fa5a7193 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/SAML2Utils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/SAML2Utils.java
@@ -11,15 +11,12 @@ import javax.xml.transform.TransformerException;
 import org.opensaml.Configuration;
 import org.opensaml.saml2.core.Status;
 import org.opensaml.saml2.core.StatusCode;
-import org.opensaml.saml2.core.StatusMessage;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.XMLObjectBuilderFactory;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.io.MarshallingException;
 import org.w3c.dom.Document;
 
-import at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException;
-
 public class SAML2Utils {
 
 	public static <T> T createSAMLObject(final Class<T> clazz) {
@@ -29,6 +26,7 @@ public class SAML2Utils {
 
 			QName defaultElementName = (QName) clazz.getDeclaredField(
 					"DEFAULT_ELEMENT_NAME").get(null);
+			@SuppressWarnings("unchecked")
 			T object = (T) builderFactory.getBuilder(defaultElementName)
 					.buildObject(defaultElementName);
 			return object;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/StoredAssertion.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/StoredAssertion.java
new file mode 100644
index 000000000..70793d073
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/utils/StoredAssertion.java
@@ -0,0 +1,48 @@
+package at.gv.egovernment.moa.id.protocols.pvp2x.utils;
+
+import org.joda.time.DateTime;
+import org.opensaml.common.SAMLObject;
+import org.opensaml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry;
+
+public class StoredAssertion implements SAMLArtifactMapEntry {
+	private String artifact;
+	private String relyingPartyId;
+	private String issuerId;
+	private SAMLObject samlMessage;
+	private DateTime expirationTime; 
+	
+	public StoredAssertion(String artifact,
+			String relyingPartyId,
+			String issuerId,
+			SAMLObject samlMessage) {
+		this.artifact = artifact;
+		this.relyingPartyId = relyingPartyId;
+		this.issuerId = issuerId;
+		this.samlMessage = samlMessage;
+		this.expirationTime = new DateTime();
+		this.expirationTime.plusMinutes(5);
+	}
+	
+	public DateTime getExpirationTime() {
+		return expirationTime;
+	}
+	
+	public boolean isExpired() {
+		return this.expirationTime.isAfterNow();
+	}
+	
+	public void onExpire() {
+	}
+	public String getArtifact() {
+		return artifact;
+	}
+	public String getIssuerId() {
+		return issuerId;
+	}
+	public String getRelyingPartyId() {
+		return relyingPartyId;
+	}
+	public SAMLObject getSamlMessage() {
+		return samlMessage;
+	}
+}