Skip to content
Snippets Groups Projects
Commit c0caf224 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

debug messages in authenticaton module

parent 7d48f99b
No related branches found
No related tags found
2 merge requests!412changes from 12.1.0~beta.1 into master,!404Resolve "explicit logging of successful and unsuccessful logins"
Pipeline #6427 passed
...@@ -35,6 +35,7 @@ import lcsb.mapviewer.api.BaseController; ...@@ -35,6 +35,7 @@ import lcsb.mapviewer.api.BaseController;
import lcsb.mapviewer.api.ObjectNotFoundException; import lcsb.mapviewer.api.ObjectNotFoundException;
import lcsb.mapviewer.api.QueryException; import lcsb.mapviewer.api.QueryException;
import lcsb.mapviewer.common.Configuration; import lcsb.mapviewer.common.Configuration;
import lcsb.mapviewer.model.user.User;
import lcsb.mapviewer.services.SecurityException; import lcsb.mapviewer.services.SecurityException;
import lcsb.mapviewer.services.interfaces.IUserService; import lcsb.mapviewer.services.interfaces.IUserService;
...@@ -73,6 +74,20 @@ public class UserController extends BaseController { ...@@ -73,6 +74,20 @@ public class UserController extends BaseController {
Map<String, Object> result = new TreeMap<>(); Map<String, Object> result = new TreeMap<>();
User user = userService.getUserByToken(request.getSession().getId());
if (user == null) {
logger.fatal("Inconsistent state. User doesn't exist");
} else {
if (!user.getLogin().equals(Configuration.ANONYMOUS_LOGIN)) {
String method;
if (user.isConnectedToLdap()) {
method = "LDAP";
} else {
method = "LOCAL";
}
logger.debug("User " + login + " successfully logged in using " + method + " authentication method");
}
}
result.put("info", "Login successful. TOKEN returned as a cookie"); result.put("info", "Login successful. TOKEN returned as a cookie");
return result; return result;
} catch (AuthenticationException e) { } catch (AuthenticationException e) {
......
...@@ -87,8 +87,10 @@ public class LdapService implements ILdapService { ...@@ -87,8 +87,10 @@ public class LdapService implements ILdapService {
if (user != null) { if (user != null) {
try { try {
BindResult result = connection.bind(user.getBindDn(), password); BindResult result = connection.bind(user.getBindDn(), password);
logger.debug("LDAP login status for user " + login + ": " + result.toString());
return result.getResultCode().equals(ResultCode.SUCCESS); return result.getResultCode().equals(ResultCode.SUCCESS);
} catch (Exception e) { } catch (Exception e) {
logger.debug("LDAP login for user " + login + " failed", e);
return false; return false;
} }
} }
...@@ -190,11 +192,11 @@ public class LdapService implements ILdapService { ...@@ -190,11 +192,11 @@ public class LdapService implements ILdapService {
private Filter createObjectClassFilter() throws LDAPException { private Filter createObjectClassFilter() throws LDAPException {
String objectClass = configurationService.getConfigurationValue(ConfigurationElementType.LDAP_OBJECT_CLASS); String objectClass = configurationService.getConfigurationValue(ConfigurationElementType.LDAP_OBJECT_CLASS);
if (objectClass == null || objectClass.trim().isEmpty() || objectClass .equals( "*")) { if (objectClass == null || objectClass.trim().isEmpty() || objectClass.equals("*")) {
return Filter.create("objectClass=*"); return Filter.create("objectClass=*");
} }
return Filter.createEqualityFilter("objectClass", objectClass); return Filter.createEqualityFilter("objectClass", objectClass);
} }
private Filter createAttributeFilter() throws LDAPException { private Filter createAttributeFilter() throws LDAPException {
...@@ -208,7 +210,7 @@ public class LdapService implements ILdapService { ...@@ -208,7 +210,7 @@ public class LdapService implements ILdapService {
} }
private Filter createLoginFilter(String login) { private Filter createLoginFilter(String login) {
return Filter.createEqualityFilter("uid", login); return Filter.createEqualityFilter("uid", login);
} }
public IConfigurationService getConfigurationService() { public IConfigurationService getConfigurationService() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment