Skip to content
Snippets Groups Projects
Commit 5402bf37 authored by juanf's avatar juanf
Browse files

SSDM-1340 : Disable Login via a nologin file

SVN: 33294
parent ed77983c
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.mail.MailClient; ...@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.mail.MailClient;
import ch.systemsx.cisd.common.mail.MailClientParameters; import ch.systemsx.cisd.common.mail.MailClientParameters;
import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer; import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer;
import ch.systemsx.cisd.openbis.common.spring.AbstractServiceWithLogger; import ch.systemsx.cisd.openbis.common.spring.AbstractServiceWithLogger;
import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationBean;
import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServiceUtils; import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServiceUtils;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed;
...@@ -465,7 +466,11 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp ...@@ -465,7 +466,11 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
@Override @Override
public final SessionContextDTO tryAuthenticate(final String user, final String password) public final SessionContextDTO tryAuthenticate(final String user, final String password)
{ {
return tryToAuthenticate(sessionManager.tryToOpenSession(user, password)); if(AuthorizationBean.getInstance().isASDisabled()) {
return null;
} else {
return tryToAuthenticate(sessionManager.tryToOpenSession(user, password));
}
} }
@Override @Override
......
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