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

Merge branch 'master' of git.libreccm.org:libreccm_legacy

master^2^2^2
Jens Pelzetter 2019-09-20 20:38:08 +02:00
parent a725963e30 d0cdca28ae
commit 6724e9b93e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,15 +55,14 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean login() throws LoginException { public boolean login() throws LoginException {
final HttpServletRequest httpRequest = getRequest(); final HttpServletRequest request = getRequest();
final HttpServletResponse httpResponse = getResponse(); final HttpServletResponse response = getResponse();
final Auth auth; final Auth auth;
try { try {
auth = new Auth(OneLoginUtil.buildSettings(httpRequest), auth = new Auth(request, response);
httpRequest, } catch (IOException | SettingsException | Error ex) {
httpResponse);
} catch (SettingsException ex) {
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?");
} }
@ -100,6 +99,10 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean logout() throws LoginException { public boolean logout() throws LoginException {
getRequest().getSession().invalidate();
return true;
}
protected HttpServletRequest getRequest() throws LoginException { protected HttpServletRequest getRequest() throws LoginException {
try { try {