Setting IssueInstant from the identity link as verification date for identity link.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@789 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 27 insertions, 1 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
index 27cefaa77..844451035 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
@@ -60,7 +60,11 @@ public class IdentityLink {
    * transformation elements
    */
   private Element[] dsigReferenceTransforms;
-
+  
+  /**
+   * The issuing time of the identity link SAML assertion.
+   */
+  private String issueInstant;
 
   /**
    * we need all public keys stored in 
@@ -240,5 +244,23 @@ public class IdentityLink {
   public void setPrPerson(Element prPerson) {
     this.prPerson = prPerson;
   }
+  
+   /**
+   * Returns the issuing time of the identity link SAML assertion.
+   *
+   * @return The issuing time of the identity link SAML assertion.
+   */
+  public String getIssueInstant() {
+    return issueInstant;
+  }
+
+  /**
+   * Sets the issuing time of the identity link SAML assertion.
+   *
+   * @param issueInstant The issueInstant to set.
+   */
+  public void setIssueInstant(String issueInstant) {
+    this.issueInstant = issueInstant;
+  }
 
 }
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
index 9d8cff6f5..d8a57fd2f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
@@ -157,6 +157,9 @@ public class IdentityLinkAssertionParser {
    + "Reference/" 
    + DSIG 
    + "Transforms";
+ 
+ /** The IssueInstant attribute of the SAML assertion */
+ private static final String ISSUE_INSTANT_ATTR = "IssueInstant";
       
   /**This is the root element of the XML-Document provided by the Security Layer Card*/
   private Element assertionElem;
@@ -212,6 +215,7 @@ public class IdentityLinkAssertionParser {
     try {
       identityLink = new IdentityLink();
       identityLink.setSamlAssertion(assertionElem);
+      identityLink.setIssueInstant(assertionElem.getAttribute(ISSUE_INSTANT_ATTR));
       identityLink.setPrPerson((Element)
       	XPathUtils.selectSingleNode(assertionElem, PERSON_XPATH));
       identityLink.setIdentificationValue(