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
Jens Pelzetter 2019-11-30 09:33:22 +01:00
parent 756a29771c 56aa434330
commit c45098b06f
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,15 +55,14 @@ public class SamlLoginModule implements LoginModule {
@Override
public boolean login() throws LoginException {
final HttpServletRequest httpRequest = getRequest();
final HttpServletResponse httpResponse = getResponse();
final HttpServletRequest request = getRequest();
final HttpServletResponse response = getResponse();
final Auth auth;
try {
auth = new Auth(OneLoginUtil.buildSettings(httpRequest),
httpRequest,
httpResponse);
} catch (SettingsException ex) {
auth = new Auth(request, response);
} catch (IOException | SettingsException | Error ex) {
LOGGER.error("SAML Login failed.", ex);
throw new LoginException("SAML Login failed. Configuration error?");
}
@ -87,10 +86,6 @@ public class SamlLoginModule implements LoginModule {
@Override
public boolean commit() throws LoginException {
if (userId != null) {
subject.getPrincipals().add(new PartyPrincipal(userId));
}
return true;
}
@ -101,11 +96,6 @@ public class SamlLoginModule implements LoginModule {
@Override
public boolean logout() throws LoginException {
getRequest().getSession().invalidate();
return true;
}
protected HttpServletRequest getRequest() throws LoginException {
try {