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

SAML Login Form 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6169 8810af33-2d31-482b-a856-94f89814c4df
master^2
jensp 2019-08-29 10:00:32 +00:00 committed by Jens Pelzetter
parent aac273d23a
commit 6378c6dc8b
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,17 +55,6 @@ public class SamlLoginModule implements LoginModule {
@Override @Override
public boolean login() throws LoginException { public boolean login() throws LoginException {
<<<<<<< HEAD
final HttpServletRequest httpRequest = getRequest();
final HttpServletResponse httpResponse = getResponse();
final Auth auth;
try {
auth = new Auth(OneLoginUtil.buildSettings(httpRequest),
httpRequest,
httpResponse);
} catch (SettingsException ex) {
=======
final HttpServletRequest request = getRequest(); final HttpServletRequest request = getRequest();
final HttpServletResponse response = getResponse(); final HttpServletResponse response = getResponse();
@ -73,7 +62,7 @@ public class SamlLoginModule implements LoginModule {
try { try {
auth = new Auth(request, response); auth = new Auth(request, response);
} catch (IOException | SettingsException | Error ex) { } 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?");
} }
@ -97,11 +86,6 @@ 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));
} }
@ -161,4 +145,5 @@ public class SamlLoginModule implements LoginModule {
); );
} }
} }
} }