The Unified and Autonomous Development Platform
feat: User should be logged out if disabled (OD-2412)
Robin Shen071a64134cba
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 375b3288a5..7374c49908 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -269,9 +269,9 @@ import io.onedev.server.git.service.GitService;import io.onedev.server.git.signatureverification.DefaultSignatureVerificationManager;import io.onedev.server.git.signatureverification.SignatureVerificationManager;import io.onedev.server.git.signatureverification.SignatureVerifier;-import io.onedev.server.jetty.DefaultJettyLauncher;+import io.onedev.server.jetty.DefaultJettyManager;import io.onedev.server.jetty.DefaultSessionDataStoreFactory;-import io.onedev.server.jetty.JettyLauncher;+import io.onedev.server.jetty.JettyManager;import io.onedev.server.job.DefaultJobManager;import io.onedev.server.job.DefaultResourceAllocator;import io.onedev.server.job.JobManager;@@ -418,8 +418,8 @@ public class CoreModule extends AbstractPluginModule {super.configure();bind(ListenerRegistry.class).to(DefaultListenerRegistry.class);- bind(JettyLauncher.class).to(DefaultJettyLauncher.class);- bind(ServletContextHandler.class).toProvider(DefaultJettyLauncher.class);+ bind(JettyManager.class).to(DefaultJettyManager.class);+ bind(ServletContextHandler.class).toProvider(DefaultJettyManager.class);bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class).in(Singleton.class);diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex d435ad9e80..8c906a596b 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -52,7 +52,7 @@ import io.onedev.server.event.system.SystemStarting;import io.onedev.server.event.system.SystemStopped;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.exception.ServerNotReadyException;-import io.onedev.server.jetty.JettyLauncher;+import io.onedev.server.jetty.JettyManager;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.SessionFactoryManager;@@ -68,7 +68,7 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {private static final Logger logger = LoggerFactory.getLogger(OneDev.class);- private final Provider<JettyLauncher> jettyLauncherProvider;+ private final Provider<JettyManager> jettyLauncherProvider;private final SessionManager sessionManager;@@ -100,7 +100,7 @@ public class OneDev extends AbstractPlugin implements Serializable, Runnable {// Some are injected via provider as instantiation might encounter problem during upgrade@Inject- public OneDev(Provider<JettyLauncher> jettyLauncherProvider, TaskScheduler taskScheduler,+ public OneDev(Provider<JettyManager> jettyLauncherProvider, TaskScheduler taskScheduler,SessionManager sessionManager, Provider<ServerConfig> serverConfigProvider,DataManager dataManager, ExecutorService executorService,ListenerRegistry listenerRegistry, ClusterManager clusterManager,diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.javaindex 7b365a927f..d4392fa260 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java@@ -28,15 +28,15 @@ public interface UserManager extends EntityManager<User> {void update(User user, @Nullable String oldName);void replicate(User user);-+void delete(User user);-+void delete(Collection<User> users);void enable(User user);-- void enable(Collection<User> users);+ void enable(Collection<User> users);+void disable(User user);void disable(Collection<User> users);@@ -93,4 +93,5 @@ public interface UserManager extends EntityManager<User> {int count(String term);UserCache cloneCache();+}diff --git a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyManager.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.javarename to server-core/src/main/java/io/onedev/server/jetty/DefaultJettyManager.javaindex 4f697307f7..57ef87c872 100644--- a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java+++ b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyManager.java@@ -27,13 +27,13 @@ import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;@Singleton-public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletContextHandler> {+public class DefaultJettyManager implements JettyManager, Provider<ServletContextHandler> {private static final int MAX_CONTENT_SIZE = 5000000;private final SessionDataStoreFactory sessionDataStoreFactory;- private Server jettyServer;+ private Server server;private ServletContextHandler servletContextHandler;@@ -50,7 +50,7 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont* Inject providers here to avoid circurlar dependencies when dependency graph gets complicated*/@Inject- public DefaultJettyLauncher(+ public DefaultJettyManager(SessionDataStoreFactory sessionDataStoreFactory,Provider<Set<ServerConfigurator>> serverConfiguratorsProvider,Provider<Set<ServletConfigurator>> servletConfiguratorsProvider) {@@ -61,14 +61,14 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont@Overridepublic void start() {- jettyServer = new Server();+ server = new Server();- jettyServer.addBean(sessionDataStoreFactory);+ server.addBean(sessionDataStoreFactory);servletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);servletContextHandler.setMaxFormContentSize(MAX_CONTENT_SIZE);- servletContextHandler.setClassLoader(DefaultJettyLauncher.class.getClassLoader());+ servletContextHandler.setClassLoader(DefaultJettyManager.class.getClassLoader());servletContextHandler.setErrorHandler(new ErrorPageErrorHandler());servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));@@ -103,14 +103,14 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletContgzipHandler.setIncludedMethods(HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.PUT.name());gzipHandler.setExcludedMimeTypes(MimeTypes.OCTET_STREAM);- jettyServer.setHandler(gzipHandler);+ server.setHandler(gzipHandler);for (ServerConfigurator configurator: serverConfiguratorsProvider.get())- configurator.configure(jettyServer);+ configurator.configure(server);if (Bootstrap.command == null) {try {- jettyServer.start();+ server.start();} catch (Exception e) {throw ExceptionUtils.unchecked(e);}@@ -119,9 +119,9 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont@Overridepublic void stop() {- if (jettyServer != null && jettyServer.isStarted()) {+ if (server != null && server.isStarted()) {try {- jettyServer.stop();+ server.stop();} catch (Exception e) {throw ExceptionUtils.unchecked(e);}diff --git a/server-core/src/main/java/io/onedev/server/jetty/JettyLauncher.java b/server-core/src/main/java/io/onedev/server/jetty/JettyManager.javasimilarity index 67%rename from server-core/src/main/java/io/onedev/server/jetty/JettyLauncher.javarename to server-core/src/main/java/io/onedev/server/jetty/JettyManager.javaindex 44d32c6fbd..195d378273 100644--- a/server-core/src/main/java/io/onedev/server/jetty/JettyLauncher.java+++ b/server-core/src/main/java/io/onedev/server/jetty/JettyManager.java@@ -1,6 +1,6 @@package io.onedev.server.jetty;-public interface JettyLauncher {+public interface JettyManager {void start();diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex 32c0fb6fee..a8f4beb9b8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -16,6 +16,7 @@ import javax.validation.Valid;import javax.validation.constraints.Email;import javax.validation.constraints.NotEmpty;import javax.validation.constraints.NotNull;+import javax.ws.rs.BadRequestException;import javax.ws.rs.Consumes;import javax.ws.rs.DELETE;import javax.ws.rs.GET;@@ -359,6 +360,36 @@ public class UserResource {throw new UnauthenticatedException();}}++ @Api(order=1960, description="Disable user")+ @Path("/{userId}/disable")+ @POST+ public Response disable(@PathParam("userId") Long userId) {+ if (SecurityUtils.isAdministrator()) {+ if (userId <= User.ROOT_ID)+ throw new BadRequestException("Should only disable normal users");+ var user = userManager.load(userId);+ userManager.disable(user);+ return Response.ok().build();+ } else {+ throw new UnauthenticatedException();+ }+ }++ @Api(order=1970, description="Enable user")+ @Path("/{userId}/enable")+ @POST+ public Response enable(@PathParam("userId") Long userId) {+ if (SecurityUtils.isAdministrator()) {+ if (userId <= User.ROOT_ID)+ throw new BadRequestException("Should only enable normal users");+ var user = userManager.load(userId);+ userManager.enable(user);+ return Response.ok().build();+ } else {+ throw new UnauthenticatedException();+ }+ }@Api(order=2000)@Path("/{userId}/password")diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex acfe60ef42..30d2d6e5d8 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -142,10 +142,12 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {@Nullablepublic static User getAuthUser(String principal) {var userId = getAuthUserId(principal);- if (userId != null)- return OneDev.getInstance(UserManager.class).get(userId);- else- return null;+ if (userId != null) {+ var user = OneDev.getInstance(UserManager.class).get(userId);+ if (user != null && !user.isDisabled())+ return user;+ }+ return null;}@Nullable