1 files changed, 52 insertions, 14 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 94651915e..cadaec2a0 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
@@ -40,18 +40,22 @@ import java.io.Serializable;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.apache.commons.collections4.map.HashedMap;
 
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
+import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
+import at.gv.egovernment.moa.id.commons.api.data.AuthProzessDataConstants;
 import at.gv.egovernment.moa.id.commons.api.data.ExtendedSAMLAttribute;
 import at.gv.egovernment.moa.id.commons.api.data.IAuthenticationSession;
-import at.gv.egovernment.moa.id.commons.api.data.IIdentityLink;
 import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
 import at.gv.egovernment.moa.id.commons.api.data.IVerifiyXMLSignatureResponse;
-import at.gv.egovernment.moa.id.commons.api.exceptions.SessionDataStorageException;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -65,7 +69,7 @@ import iaik.x509.X509Certificate;
  * @author Thomas Lenz
  * 
  */
-public class AuthenticationSession implements Serializable, IAuthenticationSession {
+public class AuthenticationSession implements Serializable, IAuthenticationSession, AuthProzessDataConstants {
 	
 	/**
 	 * 
@@ -232,13 +236,17 @@ public class AuthenticationSession implements Serializable, IAuthenticationSessi
 	 */
 	@Override
 	public X509Certificate getSignerCertificate() {
-		try {
-			return new X509Certificate(signerCertificate);
-		}
-		catch (CertificateException e) {
-			Logger.warn("Signer certificate can not be loaded from session database!", e);
-			return null;
+		if (signerCertificate != null && signerCertificate.length > 0) {
+			try {
+				return new X509Certificate(signerCertificate);
+			}
+			catch (CertificateException e) {
+				Logger.warn("Signer certificate can not be loaded from session database!", e);
+			
+			}
 		}
+		
+		return null;
 	}
 	
 	/* (non-Javadoc)
@@ -274,7 +282,7 @@ public class AuthenticationSession implements Serializable, IAuthenticationSessi
 	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#getSessionID()
 	 */
 	@Override
-	public String getSessionID() {
+	public String getSSOSessionID() {
 		return sessionID;
 	}
 	
@@ -290,7 +298,7 @@ public class AuthenticationSession implements Serializable, IAuthenticationSessi
 	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setSessionID(java.lang.String)
 	 */
 	@Override
-	public void setSessionID(String sessionId) {
+	public void setSSOSessionID(String sessionId) {
 		this.sessionID = sessionId;
 	}
 	
@@ -615,17 +623,17 @@ public class AuthenticationSession implements Serializable, IAuthenticationSessi
 	 * @see at.gv.egovernment.moa.id.auth.data.IAuthenticationSession#setGenericDataToSession(java.lang.String, java.lang.Object)
 	 */
 	@Override
-	public void setGenericDataToSession(String key, Object object) throws SessionDataStorageException {
+	public void setGenericDataToSession(String key, Object object) throws EAAFStorageException {
 		if (MiscUtil.isEmpty(key)) {
 			Logger.warn("Generic session-data can not be stored with a 'null' key");
-			throw new SessionDataStorageException("Generic session-data can not be stored with a 'null' key", null);
+			throw new EAAFStorageException("Generic session-data can not be stored with a 'null' key");
 			
 		}
 		
 		if (object != null) {
 			if (!Serializable.class.isInstance(object)) {
 				Logger.warn("Generic session-data can only store objects which implements the 'Seralizable' interface");
-				throw new SessionDataStorageException("Generic session-data can only store objects which implements the 'Seralizable' interface", null);
+				throw new EAAFStorageException("Generic session-data can only store objects which implements the 'Seralizable' interface");
 				
 			}						
 		}
@@ -636,5 +644,35 @@ public class AuthenticationSession implements Serializable, IAuthenticationSessi
 			Logger.trace("Add generic session-data with key:" + key + " to session.");
 		
 		genericSessionDataStorate.put(key, object);
+	}
+
+	@Override
+	public Map<String, Object> getKeyValueRepresentationFromAuthSession() {	
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put(FLAG_IS_AUTHENTICATED, isAuthenticated());
+		
+		result.put(FLAG_IS_FOREIGNER, isForeigner());
+		result.put(FLAG_IS_ORGANWALTER, isOW());		
+		result.put(FLAG_SAMLATTRIBUTEGEBEORWBPK, samlAttributeGebeORwbpk);		
+		result.put(FLAG_USE_MANDATE, isMandateUsed());
+		
+		result.put(VALUE_AUTHBLOCK, getAuthBlock());
+		result.put(VALUE_AUTNBLOCKTOKKEN, getAuthBlockTokken());
+		result.put(VALUE_BKUURL, getBkuURL());
+		result.put(VALUE_EXTENTEDSAMLATTRAUTH, getExtendedSAMLAttributesAUTH());
+		result.put(VALUE_EXTENTEDSAMLATTROA, getExtendedSAMLAttributesOA());
+		result.put(VALUE_IDENTITYLINK, getIdentityLink());
+		result.put(VALUE_ISSUEINSTANT, getIssueInstant());
+		result.put(VALUE_MISMANDATE, getMISMandate());
+		result.put(VALUE_MISREFVALUE, getMandateReferenceValue());
+		result.put(VALUE_MISSESSIONID, getMISSessionID());
+		result.put(VALUE_QAALEVEL, getQAALevel());
+		result.put(VALUE_SIGNER_CERT, getSignerCertificate());
+		result.put(VALUE_VERIFYSIGRESP, getXMLVerifySignatureResponse());
+		
+		for (Entry<String, Object> el : genericSessionDataStorate.entrySet()) 
+			result.put(GENERIC_PREFIX + el.getKey(), el.getValue());
+				
+		return Collections.unmodifiableMap(result);
 	}	
 }