MOA-ID 2.x Configuration implemented

  -SSO deaktivated
  -Login with mandate and normal tested

1 files changed, 25 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index 4001fdd1a..ffe938d89 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -25,6 +25,7 @@ package at.gv.egovernment.moa.id.auth.data;
 
 import iaik.x509.X509Certificate;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
@@ -34,13 +35,19 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 import at.gv.egovernment.moa.id.auth.validator.InfoboxValidator;
 import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;
 import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
+import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.DOMUtils;
 import eu.stork.mw.messages.saml.STORKAuthnRequest;
 
 /**
@@ -125,7 +132,7 @@ public class AuthenticationSession implements Serializable {
 	 * 
 	 * Mandate element 
 	 */
-	private Element mandate;
+	private MISMandate mandate;
 	
 	/**
 	 * Reference value for mandate
@@ -1081,11 +1088,26 @@ public class AuthenticationSession implements Serializable {
 		XMLVerifySignatureResponse = xMLVerifySignatureResponse;
 	}
 
-	public Element getMandate() {
+	public MISMandate getMISMandate() {
 		return mandate;
 	}
 
-	public void setMandate(Element mandate) {
+	public void setMISMandate(MISMandate mandate) {
 		this.mandate = mandate;
 	}
+	
+	public Element getMandate() {
+		try {
+			byte[] byteMandate = mandate.getMandate();
+			String stringMandate = new String(byteMandate);
+			return DOMUtils.parseDocument(stringMandate, false,
+				null, null).getDocumentElement();
+			
+		}catch (Throwable e) {
+			Logger.warn("Mandate content could not be generated from MISMandate.");
+			return null;
+		}
+		
+		
+	}
 }