Commit edf867c4 by Juho Juopperi

fixed it

1 parent 4cce2e7b
...@@ -19,7 +19,6 @@ import fi.insomnia.bortal.facade.EventUserFacade; ...@@ -19,7 +19,6 @@ import fi.insomnia.bortal.facade.EventUserFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.ApplicationPermission; import fi.insomnia.bortal.model.ApplicationPermission;
import fi.insomnia.bortal.model.EventUser; import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -63,14 +62,14 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote { ...@@ -63,14 +62,14 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
} }
EventUser ret = null; EventUser ret = null;
if (user != null) { if (eventUser != null) {
if (user.isAnonymous()) { if (eventUser.isAnonymous()) {
logger.info("logging in as anonymous!!!"); logger.info("logging in as anonymous!!!");
ret = user; ret = eventUser;
} else if (user.checkPassword(password)) { } else if (eventUser.checkPassword(password)) {
ret = user; ret = eventUser;
} else { } else {
secubean.logMessage(SecurityLogType.permissionDenied, user, "Login failed: wrong password for username ", username); secubean.logMessage(SecurityLogType.permissionDenied, eventUser, "Login failed: wrong password for username ", username);
} }
} else { } else {
secubean.logMessage(SecurityLogType.permissionDenied, null, "Login failed: Username not found: ", username); secubean.logMessage(SecurityLogType.permissionDenied, null, "Login failed: Username not found: ", username);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!