From 5402bf37e80496b66ad92be54145b864e96febe5 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 21 Jan 2015 12:24:58 +0000
Subject: [PATCH] SSDM-1340 : Disable Login via a nologin file
SVN: 33294
---
.../cisd/openbis/generic/server/AbstractServer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index 0886c6c3c7e..7b051c2ca75 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.mail.MailClient;
import ch.systemsx.cisd.common.mail.MailClientParameters;
import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer;
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.annotation.ReturnValueFilter;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed;
@@ -465,7 +466,11 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
@Override
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
--
GitLab