First moves for SLO to the IDP side

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/UserLoginInfoDao.java

@@ -12,15 +12,17 @@ package edu.kit.scc.webreg.dao;
 
 import java.util.List;
 
+import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.UserLoginInfoEntity;
 import edu.kit.scc.webreg.entity.UserLoginMethod;
 
 public interface UserLoginInfoDao extends BaseDao<UserLoginInfoEntity, Long> {
 
 	List<UserLoginInfoEntity> findByUser(Long userId);
-
+	List<UserLoginInfoEntity> findByIdentity(Long identityId);
 	List<UserLoginInfoEntity> findByRegistry(Long registryId);
-
+	List<UserLoginInfoEntity> findByUserList(List<UserEntity> userList);
+	
 	UserLoginInfoEntity findLastByRegistryAndMethod(Long registryId, UserLoginMethod method);
 	
 	void deleteLoginInfo(long millis);

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/JpaUserLoginInfoDao.java

@@ -18,6 +18,7 @@ import javax.inject.Named;
 import javax.persistence.Query;
 
 import edu.kit.scc.webreg.dao.UserLoginInfoDao;
+import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.UserLoginInfoEntity;
 import edu.kit.scc.webreg.entity.UserLoginMethod;
 
@@ -32,6 +33,20 @@ public class JpaUserLoginInfoDao extends JpaBaseDao<UserLoginInfoEntity, Long> i
 				.setParameter("userId", userId).getResultList();	
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<UserLoginInfoEntity> findByUserList(List<UserEntity> userList) {
+		return em.createQuery("select e from UserLoginInfoEntity e where e.user in :userList")
+				.setParameter("userList", userList).getResultList();	
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<UserLoginInfoEntity> findByIdentity(Long identityId) {
+		return em.createQuery("select e from UserLoginInfoEntity e where e.identity.id = :identityId")
+				.setParameter("identityId", identityId).getResultList();	
+	}
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public List<UserLoginInfoEntity> findByRegistry(Long registryId) {

bwreg-service/src/main/java/edu/kit/scc/webreg/service/UserLoginInfoService.java

@@ -10,9 +10,14 @@
  ******************************************************************************/
 package edu.kit.scc.webreg.service;
 
+import java.util.List;
+
+import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.UserLoginInfoEntity;
 
 public interface UserLoginInfoService extends BaseService<UserLoginInfoEntity, Long> {
 
+	List<UserLoginInfoEntity> findByIdentity(Long identityId);
+	List<UserLoginInfoEntity> findByUserList(List<UserEntity> userList);
 	void deleteLoginInfo(long millis);
 }

bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserLoginInfoServiceImpl.java

 package edu.kit.scc.webreg.service.impl;
 
+import java.util.List;
+
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
@@ -7,6 +9,7 @@ import org.slf4j.Logger;
 
 import edu.kit.scc.webreg.dao.BaseDao;
 import edu.kit.scc.webreg.dao.UserLoginInfoDao;
+import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.UserLoginInfoEntity;
 import edu.kit.scc.webreg.service.UserLoginInfoService;
 
@@ -21,6 +24,16 @@ public class UserLoginInfoServiceImpl extends BaseServiceImpl<UserLoginInfoEntit
 	@Inject
 	private UserLoginInfoDao dao;
 
+	@Override
+	public List<UserLoginInfoEntity> findByIdentity(Long identityId) {
+		return dao.findByIdentity(identityId);
+	}
+
+	@Override
+	public List<UserLoginInfoEntity> findByUserList(List<UserEntity> userList) {
+		return dao.findByUserList(userList);
+	}
+
 	@Override
 	public void deleteLoginInfo(long millis) {
 		Long start = System.currentTimeMillis();

bwreg-service/src/main/java/edu/kit/scc/webreg/service/oidc/client/OidcClientCallbackServiceImpl.java

@@ -245,6 +245,7 @@ public class OidcClientCallbackServiceImpl implements OidcClientCallbackService
 			session.setLoginTime(Instant.now());
 			session.setTheme(user.getTheme());
 			session.setLocale(user.getLocale());
+			session.getLoggedInUserList().add(user.getId());
 			
 			UserLoginInfoEntity loginInfo = userLoginInfoDao.createNew();
 			loginInfo.setUser(user);

bwreg-service/src/main/java/edu/kit/scc/webreg/service/saml/MetadataHelper.java

@@ -50,6 +50,7 @@ import org.opensaml.saml.saml2.metadata.Extensions;
 import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
 import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
 import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
+import org.opensaml.saml.saml2.metadata.SingleLogoutService;
 import org.opensaml.saml.saml2.metadata.SingleSignOnService;
 import org.slf4j.Logger;
 import org.w3c.dom.Document;
@@ -373,6 +374,19 @@ public class MetadataHelper implements Serializable {
 		return null;
 	}
 	
+	public SingleLogoutService getSLO(EntityDescriptor entityDesc, String binding) {
+		IDPSSODescriptor idpSsoDesc = entityDesc.getIDPSSODescriptor(SAMLConstants.SAML20P_NS);
+		if (idpSsoDesc != null) {
+			List<SingleLogoutService> slos = idpSsoDesc.getSingleLogoutServices();
+			for (SingleLogoutService slo : slos) {
+				if (slo.getBinding().equals(binding)) {
+					return slo;
+				}
+			}
+		}
+		return null;
+	}
+	
 	public AttributeService getAttributeService(EntityDescriptor entityDesc) {
 		AttributeAuthorityDescriptor idpAtrDesc = entityDesc.getAttributeAuthorityDescriptor(SAMLConstants.SAML20P_NS);
 		if (idpAtrDesc != null) {

bwreg-service/src/main/java/edu/kit/scc/webreg/service/saml/SamlSpLogoutService.java

+package edu.kit.scc.webreg.service.saml;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface SamlSpLogoutService {
+
+	void redirectLogout(HttpServletRequest request, HttpServletResponse response, Long userId)
+					throws Exception;
+	
+}

bwreg-service/src/main/java/edu/kit/scc/webreg/service/saml/SamlSpLogoutServiceImpl.java

+package edu.kit.scc.webreg.service.saml;
+
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.joda.time.DateTime;
+import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.saml.common.SAMLObject;
+import org.opensaml.saml.common.SAMLVersion;
+import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
+import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
+import org.opensaml.saml.common.xml.SAMLConstants;
+import org.opensaml.saml.saml2.binding.encoding.impl.HTTPRedirectDeflateEncoder;
+import org.opensaml.saml.saml2.core.Assertion;
+import org.opensaml.saml.saml2.core.AuthnRequest;
+import org.opensaml.saml.saml2.core.Issuer;
+import org.opensaml.saml.saml2.core.LogoutRequest;
+import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml.saml2.metadata.SingleLogoutService;
+import org.opensaml.saml.saml2.metadata.SingleSignOnService;
+import org.slf4j.Logger;
+import org.slf4j.MDC;
+
+import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
+import edu.kit.scc.webreg.dao.SamlIdpMetadataDao;
+import edu.kit.scc.webreg.dao.SamlUserDao;
+import edu.kit.scc.webreg.dao.UserLoginInfoDao;
+import edu.kit.scc.webreg.drools.impl.KnowledgeSessionSingleton;
+import edu.kit.scc.webreg.entity.SamlIdpMetadataEntity;
+import edu.kit.scc.webreg.entity.SamlIdpMetadataEntityStatus;
+import edu.kit.scc.webreg.entity.SamlSpConfigurationEntity;
+import edu.kit.scc.webreg.entity.SamlUserEntity;
+import edu.kit.scc.webreg.entity.UserEntity;
+import edu.kit.scc.webreg.entity.UserLoginInfoEntity;
+import edu.kit.scc.webreg.entity.UserLoginInfoStatus;
+import edu.kit.scc.webreg.entity.UserLoginMethod;
+import edu.kit.scc.webreg.exc.UserUpdateException;
+import edu.kit.scc.webreg.service.impl.UserUpdater;
+import edu.kit.scc.webreg.service.saml.exc.SamlAuthenticationException;
+import edu.kit.scc.webreg.session.SessionManager;
+
+@Stateless
+public class SamlSpLogoutServiceImpl implements SamlSpLogoutService {
+
+	@Inject
+	private Logger logger;
+
+	@Inject 
+	private SamlIdpMetadataDao idpDao;
+	
+	@Inject
+	private SamlUserDao userDao;
+	
+	@Inject
+	private SamlHelper samlHelper;
+	
+	@Inject
+	private MetadataHelper metadataHelper;
+	
+	@Inject
+	private ApplicationConfig appConfig;
+	
+	@Inject
+	private SessionManager session;
+	
+	@Override
+	public void redirectLogout(HttpServletRequest request, HttpServletResponse response, Long userId)
+			throws Exception {
+
+		logger.debug("Init SAML redirect logout for {}", userId);
+		
+		if (! session.getLoggedInUserList().contains(userId)) {
+			logger.warn("SAML logout for userId {}, not in logged in list", userId);
+			return;
+		}
+		
+		UserEntity tempUser = userDao.findById(userId);
+		if (! (tempUser instanceof SamlUserEntity)) {
+			logger.warn("SAML logout for userId {}: User is not SAML Type, but {}", tempUser.getClass().getName());
+			return;
+		}
+		
+		SamlUserEntity user = (SamlUserEntity) tempUser;
+		SamlIdpMetadataEntity idpEntity = user.getIdp();
+		
+		EntityDescriptor entityDesc = samlHelper.unmarshal(
+				idpEntity.getEntityDescriptor(), EntityDescriptor.class);
+		SingleLogoutService slo = metadataHelper.getSLO(entityDesc, SAMLConstants.SAML2_REDIRECT_BINDING_URI);
+
+		LogoutRequest logoutRequest = samlHelper.create(LogoutRequest.class, LogoutRequest.DEFAULT_ELEMENT_NAME);
+		logoutRequest.setID(samlHelper.getRandomId());
+		logoutRequest.setVersion(SAMLVersion.VERSION_20);
+		logoutRequest.setIssueInstant(new DateTime());
+
+		NameID nameId = samlHelper.create(NameID.class, NameID.DEFAULT_ELEMENT_NAME);
+		nameId.setFormat(NameID.PERSISTENT);
+		nameId.setValue(user.getPersistentId());
+		logoutRequest.setNameID(nameId);
+
+		Issuer issuer = samlHelper.create(Issuer.class, Issuer.DEFAULT_ELEMENT_NAME);
+		issuer.setValue(user.getPersistentSpId());
+		logoutRequest.setIssuer(issuer);
+		
+		logger.debug("Logout Request: {}", samlHelper.prettyPrint(logoutRequest));
+		
+		/**
+		 * Need to sign logout message. Doesn't get accepted unsigned.
+		 */
+		
+		MessageContext<SAMLObject> messageContext = new MessageContext<SAMLObject>();
+		messageContext.setMessage(logoutRequest);
+		SAMLPeerEntityContext entityContext = new SAMLPeerEntityContext();
+		entityContext.setEntityId(idpEntity.getEntityId());
+		SAMLEndpointContext endpointContext = new SAMLEndpointContext();
+		endpointContext.setEndpoint(slo);
+		entityContext.addSubcontext(endpointContext);
+		messageContext.addSubcontext(entityContext);
+		
+		HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
+		encoder.setHttpServletResponse(response);
+		encoder.setMessageContext(messageContext);
+		encoder.initialize();
+		encoder.prepareContext();
+		encoder.encode();
+	}
+}

bwreg-service/src/main/java/edu/kit/scc/webreg/service/saml/SamlSpPostServiceImpl.java

@@ -185,6 +185,7 @@ public class SamlSpPostServiceImpl implements SamlSpPostService {
 		session.setLoginTime(Instant.now());
 		session.setTheme(user.getTheme());
 		session.setLocale(user.getLocale());
+		session.getLoggedInUserList().add(user.getId());
 		
 		UserLoginInfoEntity loginInfo = userLoginInfoDao.createNew();
 		loginInfo.setUser(user);

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/LogoutBean.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.bean;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.view.ViewScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.slf4j.Logger;
+
+import edu.kit.scc.webreg.entity.UserEntity;
+import edu.kit.scc.webreg.entity.identity.IdentityEntity;
+import edu.kit.scc.webreg.service.UserService;
+import edu.kit.scc.webreg.service.identity.IdentityService;
+import edu.kit.scc.webreg.session.SessionManager;
+
+@Named
+@ViewScoped
+public class LogoutBean implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private IdentityEntity identity;
+	
+	@Inject
+	private Logger logger;
+	
+	@Inject
+	private IdentityService identityService;
+	
+	@Inject
+	private UserService userService;
+	
+    @Inject 
+    private SessionManager sessionManager;
+    
+    private List<UserEntity> userList;
+    private List<UserEntity> userLoginList;
+    
+	public void preRenderView(ComponentSystemEvent ev) {
+	}
+	
+	public void startLocalLogout() {
+		try {
+			FacesContext.getCurrentInstance().getExternalContext().redirect("/logout/local");
+		} catch (IOException e) {
+			logger.warn("Redirect failed", e);
+		}
+	}
+
+	public void startLogout() {
+		try {
+			FacesContext.getCurrentInstance().getExternalContext().redirect("/logout/all");
+		} catch (IOException e) {
+			logger.warn("Redirect failed", e);
+		}
+	}
+
+	public IdentityEntity getIdentity() {
+		if (identity == null) {
+			identity = identityService.findById(sessionManager.getIdentityId());
+		}
+		
+		return identity;
+	}
+
+	public List<UserEntity> getUserList() {
+		if (userList == null) {
+			userList = userService.findByIdentity(getIdentity());
+		}
+		return userList;
+	}
+	
+	public List<UserEntity> getUserLoginList() {
+		if (userLoginList == null) {
+			userLoginList = userService.findByMultipleId(new ArrayList<Long>(sessionManager.getLoggedInUserList()));
+		}
+		return userLoginList;
+	}
+}

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/UserPropertiesBean.java

@@ -100,7 +100,12 @@ public class UserPropertiesBean implements Serializable {
 
 	public UserEntity getUser() {
 		if (user == null) {
-			user = userService.findByIdWithStore(getUserList().get(0).getId());
+			if (sessionManager.getLoggedInUserList().size() > 0) {
+				user = userService.findByIdWithStore(sessionManager.getLoggedInUserList().iterator().next());
+			}
+			else {
+				user = userService.findByIdWithStore(getUserList().get(0).getId());
+			}
 		}
 		return user;
 	}

bwreg-webapp/src/main/java/edu/kit/scc/webreg/sec/LogoutServlet.java

@@ -26,6 +26,8 @@ import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 
+import edu.kit.scc.webreg.service.saml.SamlSpLogoutService;
+import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.ViewIds;
 
 @Named
@@ -35,6 +37,9 @@ public class LogoutServlet implements Servlet {
 	@Inject
 	private Logger logger;
 
+	@Inject
+	private SamlSpLogoutService samlSpLogoutService;
+	
 	@Override
 	public void init(ServletConfig config) throws ServletException {
 		
@@ -53,12 +58,14 @@ public class LogoutServlet implements Servlet {
 		
 		logger.debug("logout request context '{}' path '{}'", context, path);
 
-		HttpSession session = request.getSession(false);
-		if(session != null) {
-			session.invalidate();
-		}
 		String redirect = request.getParameter("redirect");
-		if (redirect != null && (! redirect.equals(""))) {
+		if (redirect == null) redirect = "";
+		
+		if (path.startsWith("/logout/local")) {
+			HttpSession session = request.getSession(false);
+			if(session != null) {
+				session.invalidate();
+			}
 			if (redirect.equalsIgnoreCase("delete"))
 				response.sendRedirect(ViewIds.DELETE_ALL_PERSONAL_DATA_DONE);
 			else if (redirect.equalsIgnoreCase("local_logout"))
@@ -67,10 +74,30 @@ public class LogoutServlet implements Servlet {
 				response.sendRedirect("/idp-debug-login/");
 			else
 				response.sendRedirect(ViewIds.INDEX_USER);
+
 		}
-		else {
-			response.sendRedirect(ViewIds.INDEX_USER);
+		else if (path.startsWith("/logout/saml")) {
+			
+			Long userId = Long.parseLong(request.getParameter("user_id"));
+			
+			if (userId != null) {
+				try {
+					samlSpLogoutService.redirectLogout(request, response, userId);
+				} catch (Exception e) {
+					logger.info("Could SAML Logout", e);
+				}
+			}
+/*			
+			HttpSession session = request.getSession(false);
+			if(session != null) {
+				session.invalidate();
+			}			
+
+			response.sendRedirect(ViewIds.ALL_LOGOUT_DONE);
+*/
 		}
+
+//		response.sendRedirect(ViewIds.INDEX_USER);
 	}
 	
 	@Override

bwreg-webapp/src/main/java/edu/kit/scc/webreg/util/ViewIds.java

@@ -160,6 +160,7 @@ public class ViewIds {
 	public static final String DISCOVERY_LOGIN = "/welcome/index.xhtml";	
 	public static final String DELETE_ALL_PERSONAL_DATA_DONE = "/welcome/delete-all-personal-data-done.xhtml";	
 	public static final String LOCAL_LOGOUT_DONE = "/welcome/local-logout-done.xhtml";	
+	public static final String ALL_LOGOUT_DONE = "/welcome/logout-done.xhtml";	
 	public static final String APPROVE_USER = "/service-approver/approve-user.xhtml";	
 	
 }

bwreg-webapp/src/main/webapp/user/index.xhtml

@@ -35,12 +35,14 @@
 	    	        	<h:outputText value="#{u.email} - " rendered="#{u.eppn == null and u.email != null}"/>
 	    	        	<h:outputText value="#{u.persistentId} - " rendered="#{u.eppn == null and u.email == null}"/>
 	    	        	<h:outputText value="#{u.idp.displayName}" />
+    	        		<h:outputText value=" (#{messages.currently_logged_id})"  rendered="#{sessionManager.loggedInUserList.contains(u.id)}"/>
     	        	</p:outputPanel>
     	        	<p:outputPanel rendered="#{u.class.simpleName eq 'OidcUserEntity'}">
     	        		<h:outputText value="#{u.eppn} - " rendered="#{u.eppn != null}"/>
 	    	        	<h:outputText value="#{u.email} - " rendered="#{u.eppn == null and u.email != null}"/>
 	    	        	<h:outputText value="#{u.subjectId} - " rendered="#{u.eppn == null and u.email == null}"/>
 	    	        	<h:outputText value="#{u.issuer.displayName}" />
+    	        		<h:outputText value=" (#{messages.currently_logged_id})"  rendered="#{sessionManager.loggedInUserList.contains(u.id)}"/>
     	        	</p:outputPanel>
     	        </p:column>
 	           	<f:ajax render=":form:tabVw" execute="@this" />

bwreg-webapp/src/main/webapp/user/logout.xhtml

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:bw="http://www.scc.kit.edu/bwfacelets"
+	xmlns:p="http://primefaces.org/ui">
+<head>
+<title></title>
+</head>
+<body>
+
+<ui:composition template="/template/default.xhtml">
+	<ui:param name="title" value="#{messages.title}"/>
+
+	<ui:define name="content">
+	<h:form id="form" prependId="false" class="full fancy form">
+
+		<h3 class="full">#{messages.logout_header}</h3>
+		<div class="full"><h:outputText value="#{messages.logout_text}"/></div>
+
+		<div class="full"><h:outputText value="#{logoutBean.identity.id}"/></div>
+	
+		<p:dataTable value="#{logoutBean.userLoginList}" var="userLogin">
+			<p:column>#{userLogin.id}</p:column>
+		</p:dataTable>
+	
+		<p:panel id="logoutPanel">
+			<p:commandButton id="logout" action="#{logoutBean.startLocalLogout()}" 
+					value="#{messages.local_logout}" />
+
+			<p:commandButton id="logoutAll" action="#{logoutBean.startLogout()}" 
+					value="#{messages.logout_all}" />
+		
+			<p:blockUI block="logoutPanel" trigger="logout,logoutAll">  
+		     			<p:graphicImage value="#{resource['/img/ajax-loader.gif']}" alt="#{messages.loading}" />  
+			</p:blockUI>					
+		</p:panel>
+	</h:form>	
+	</ui:define>
+</ui:composition>
+</body>
+</html>