From 756a29771c154c3f330060bb758a42eeebb14739 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 24 Aug 2019 12:48:14 +0000 Subject: [PATCH] First parts of SAML login module git-svn-id: https://svn.libreccm.org/ccm/trunk@6167 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/kernel/security/SamlLoginModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java index 936849989..bd0e12ca0 100644 --- a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java +++ b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java @@ -63,7 +63,7 @@ public class SamlLoginModule implements LoginModule { auth = new Auth(OneLoginUtil.buildSettings(httpRequest), httpRequest, httpResponse); - } catch (IOException | SettingsException | Error ex) { + } catch (SettingsException ex) { LOGGER.error("SAML Login failed.", ex); throw new LoginException("SAML Login failed. Configuration error?"); } @@ -87,6 +87,7 @@ public class SamlLoginModule implements LoginModule { @Override public boolean commit() throws LoginException { + if (userId != null) { subject.getPrincipals().add(new PartyPrincipal(userId)); } @@ -100,6 +101,7 @@ public class SamlLoginModule implements LoginModule { @Override public boolean logout() throws LoginException { + getRequest().getSession().invalidate(); return true; }