LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAML support for CCM 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6168 8810af33-2d31-482b-a856-94f89814c4df
master^2^2
jensp 2019-08-29 08:52:02 +00:00 committed by Jens Pelzetter
parent de8ce94864
commit 694ff350e3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
View File

@ -55,6 +55,7 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean login() throws LoginException { public boolean login() throws LoginException {
<<<<<<< HEAD
final HttpServletRequest httpRequest = getRequest(); final HttpServletRequest httpRequest = getRequest();
final HttpServletResponse httpResponse = getResponse(); final HttpServletResponse httpResponse = getResponse();
@ -64,6 +65,15 @@ public class SamlLoginModule implements LoginModule {
httpRequest, httpRequest,
httpResponse); httpResponse);
} catch (SettingsException ex) { } catch (SettingsException ex) {
=======
final HttpServletRequest request = getRequest();
final HttpServletResponse response = getResponse();
final Auth auth;
try {
auth = new Auth(request, response);
} catch (IOException | SettingsException | Error ex) {
>>>>>>> SAML support for CCM
LOGGER.error("SAML Login failed.", ex); LOGGER.error("SAML Login failed.", ex);
throw new LoginException("SAML Login failed. Configuration error?"); throw new LoginException("SAML Login failed. Configuration error?");
} }
@ -87,7 +97,11 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean commit() throws LoginException { public boolean commit() throws LoginException {
<<<<<<< HEAD
=======
>>>>>>> SAML support for CCM
if (userId != null) { if (userId != null) {
subject.getPrincipals().add(new PartyPrincipal(userId)); subject.getPrincipals().add(new PartyPrincipal(userId));
} }
@ -101,7 +115,6 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean logout() throws LoginException { public boolean logout() throws LoginException {
getRequest().getSession().invalidate(); getRequest().getSession().invalidate();
return true; return true;
} }
@ -148,5 +161,4 @@ public class SamlLoginModule implements LoginModule {
); );
} }
} }
} }