1 files changed, 110 insertions, 101 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SLOInformationContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SLOInformationContainer.java
index a4bba8b19..20588ad0b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SLOInformationContainer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SLOInformationContainer.java
@@ -24,171 +24,180 @@ package at.gv.egovernment.moa.id.data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.saml2.metadata.SingleLogoutService;
-
-import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.session.OASessionStore;
-import at.gv.egovernment.moa.id.protocols.pvp2x.PVP2XProtocol;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPTargetConfiguration;
-import at.gv.egovernment.moa.id.protocols.pvp2x.builder.SingleLogOutBuilder;
-import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NOSLOServiceDescriptorException;
 
 /**
  * @author tlenz
  *
  */
-public class SLOInformationContainer implements Serializable {
-
+public class SLOInformationContainer implements Serializable, ISLOInformationContainer {
+ 	
 	private static final long serialVersionUID = 7148730740582881862L;
 	
 	private PVPTargetConfiguration sloRequest = null;
-	private LinkedHashMap<String, SLOInformationImpl> activeFrontChannalOAs = null;
-	private LinkedHashMap<String, SLOInformationImpl> activeBackChannelOAs = null;
+	private LinkedHashMap<String, SLOInformationImpl> activeFrontChannalOAs;
+	private LinkedHashMap<String, SLOInformationImpl> activeBackChannelOAs;
 	private List<String> sloFailedOAs = null;
+	private String transactionID = null;
+	private String sessionID = null;
 	
+	/**
+	 * 
+	 */
+	public SLOInformationContainer() {
+		this.activeBackChannelOAs = new LinkedHashMap<String, SLOInformationImpl>(); 
+		this.activeFrontChannalOAs = new LinkedHashMap<String, SLOInformationImpl>(); 
+		this.sloFailedOAs = new ArrayList<String>();
+		
+	}
 	
-	public void parseActiveOAs(List<OASessionStore> dbOAs, String removeOAID) {
-		if (activeBackChannelOAs == null)
-			activeBackChannelOAs = new LinkedHashMap<String, SLOInformationImpl>();
-		if (activeFrontChannalOAs == null)
-			activeFrontChannalOAs = new LinkedHashMap<String, SLOInformationImpl>();
 		
-		if (dbOAs != null) {
-			for (OASessionStore oa : dbOAs) {
-				if (!oa.getOaurlprefix().equals(removeOAID)) {
-					
-					//Actually only PVP 2.1 support Single LogOut
-					if (PVP2XProtocol.PATH.equals(oa.getProtocolType())) {					
-						SingleLogoutService sloDesc;
-						try {
-							sloDesc = SingleLogOutBuilder.getRequestSLODescriptor(oa.getOaurlprefix());
-						
-							if (sloDesc.getBinding().equals(SAMLConstants.SAML2_SOAP11_BINDING_URI))										
-								activeBackChannelOAs.put(oa.getOaurlprefix(), 
-										new SLOInformationImpl(
-											oa.getAuthURL(),	
-											oa.getAssertionSessionID(), 
-											oa.getUserNameID(), 
-											oa.getUserNameIDFormat(), 
-											oa.getProtocolType(),
-											sloDesc));
-						
-							else
-								activeFrontChannalOAs.put(oa.getOaurlprefix(), 
-										new SLOInformationImpl(
-											oa.getAuthURL(),
-											oa.getAssertionSessionID(), 
-											oa.getUserNameID(), 
-											oa.getUserNameIDFormat(), 
-											oa.getProtocolType(),
-											sloDesc));
-							
-						} catch (NOSLOServiceDescriptorException e) {
-							putFailedOA(oa.getOaurlprefix());
-													
-						}
-					
-					} else
-						putFailedOA(oa.getOaurlprefix());
-				}
-			}			
-		}		
+	/**
+	 * @return the activeFrontChannalOAs
+	 */
+	public LinkedHashMap<String, SLOInformationImpl> getActiveFrontChannalOAs() {
+		return activeFrontChannalOAs;
 	}
 
 	/**
-	 * @param dbIDPs
-	 * @param value
-	 */
-	public void parseActiveIDPs(List<InterfederationSessionStore> dbIDPs,
-			String removeIDP) {		
-		if (activeBackChannelOAs == null)
-			activeBackChannelOAs = new LinkedHashMap<String, SLOInformationImpl>();
-		if (activeFrontChannalOAs == null)
-			activeFrontChannalOAs = new LinkedHashMap<String, SLOInformationImpl>();
-		
-		if (dbIDPs != null) {
-			for (InterfederationSessionStore el : dbIDPs) {				
-				if (!el.getIdpurlprefix().equals(removeIDP)) {
-					
-					SingleLogoutService sloDesc;
-					try {
-						sloDesc = SingleLogOutBuilder.getRequestSLODescriptor(el.getIdpurlprefix());
-					
-						activeFrontChannalOAs.put(el.getIdpurlprefix(), 
-								new SLOInformationImpl(
-										el.getAuthURL(),
-										el.getSessionIndex(), 
-										el.getUserNameID(), 
-										NameID.TRANSIENT, 
-										PVP2XProtocol.PATH,
-										sloDesc));
-						
-					} catch (NOSLOServiceDescriptorException e) {
-						putFailedOA(el.getIdpurlprefix());
-												
-					}
-				}				
-			}			
-		}		
+	 * @param activeFrontChannalOAs the activeFrontChannalOAs to set
+	 */
+	public void setActiveFrontChannalOAs(LinkedHashMap<String, SLOInformationImpl> activeFrontChannalOAs) {
+		this.activeFrontChannalOAs = activeFrontChannalOAs;
 	}
-	
+
+	/**
+	 * @return the activeBackChannelOAs
+	 */
+	public LinkedHashMap<String, SLOInformationImpl> getActiveBackChannelOAs() {
+		return activeBackChannelOAs;
+	}
+
+	/**
+	 * @param activeBackChannelOAs the activeBackChannelOAs to set
+	 */
+	public void setActiveBackChannelOAs(LinkedHashMap<String, SLOInformationImpl> activeBackChannelOAs) {
+		this.activeBackChannelOAs = activeBackChannelOAs;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#hasFrontChannelOA()
+	 */
+	@Override
 	public boolean hasFrontChannelOA() {
 		return !activeFrontChannalOAs.isEmpty();
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#getFrontChannelOASessionDescriptions()
+	 */
+	@Override
 	public Set<Entry<String, SLOInformationImpl>> getFrontChannelOASessionDescriptions() {
 		return activeFrontChannalOAs.entrySet();
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#removeFrontChannelOA(java.lang.String)
+	 */
+	@Override
 	public void removeFrontChannelOA(String oaID) {
 		activeFrontChannalOAs.remove(oaID);
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#getNextBackChannelOA()
+	 */
+	@Override
 	public Iterator<String> getNextBackChannelOA() {
 		return activeBackChannelOAs.keySet().iterator();	
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#getBackChannelOASessionDescripten(java.lang.String)
+	 */
+	@Override
 	public SLOInformationImpl getBackChannelOASessionDescripten(String oaID) {
 		return activeBackChannelOAs.get(oaID);
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#removeBackChannelOA(java.lang.String)
+	 */
+	@Override
 	public void removeBackChannelOA(String oaID) {
 		activeBackChannelOAs.remove(oaID);
 	}
 	
-	/**
-	 * @return the sloRequest
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#getSloRequest()
 	 */
+	@Override
 	public PVPTargetConfiguration getSloRequest() {
 		return sloRequest;
 	}
 	
-	/**
-	 * @param sloRequest the sloRequest to set
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#setSloRequest(at.gv.egovernment.moa.id.protocols.pvp2x.PVPTargetConfiguration)
 	 */
+	@Override
 	public void setSloRequest(PVPTargetConfiguration sloRequest) {
 		this.sloRequest = sloRequest;
+		
 	}
 
-	/**
-	 * @return the sloFailedOAs
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#getSloFailedOAs()
 	 */
+	@Override
 	public List<String> getSloFailedOAs() {
 		return sloFailedOAs;
 	}
 	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.data.ISLOInformationContainer#putFailedOA(java.lang.String)
+	 */
+	@Override
 	public void putFailedOA(String oaID) {
 		if (sloFailedOAs == null)
 			sloFailedOAs = new ArrayList<String>();
 		sloFailedOAs.add(oaID);
-	}	
+	}
+
+
+	/**
+	 * @return the transactionID
+	 */
+	public String getTransactionID() {
+		return transactionID;
+	}
+
+
+	/**
+	 * @param transactionID the transactionID to set
+	 */
+	public void setTransactionID(String transactionID) {
+		this.transactionID = transactionID;
+	}
+	
+	public String getSessionID() {
+		return this.sessionID;
+		
+	}
+
+
+	/**
+	 * @param sessionID the sessionID to set
+	 */
+	public void setSessionID(String sessionID) {
+		this.sessionID = sessionID;
+	}
+	
+	
+	
 }