The Unified and Autonomous Development Platform
Terminal support in HA mode
Robin Shene65c8f2119c7
diff --git a/server-core/src/main/java/io/onedev/server/ServerSocket.java b/server-core/src/main/java/io/onedev/server/ServerSocket.javaindex c647bb6c2a..6dacd7d042 100644--- a/server-core/src/main/java/io/onedev/server/ServerSocket.java+++ b/server-core/src/main/java/io/onedev/server/ServerSocket.java@@ -30,7 +30,7 @@ import io.onedev.server.job.JobContext;import io.onedev.server.job.JobManager;import io.onedev.server.job.ResourceAllocator;import io.onedev.server.job.log.LogManager;-import io.onedev.server.terminal.RemoteSession;+import io.onedev.server.terminal.AgentShell;@WebSocketpublic class ServerSocket {@@ -145,25 +145,31 @@ public class ServerSocket {String dataString = new String(messageData, StandardCharsets.UTF_8);String jobToken = StringUtils.substringBefore(dataString, ":");String jobWorkspace = StringUtils.substringAfter(dataString, ":");- JobManager jobManager = OneDev.getInstance(JobManager.class);- JobContext jobContext = jobManager.getJobContext(jobToken, false);+ JobContext jobContext = getJobManager().getJobContext(jobToken, false);if (jobContext != null)- jobManager.reportJobWorkspace(jobContext, jobWorkspace);+ getJobManager().reportJobWorkspace(jobContext, jobWorkspace);break;case SHELL_OUTPUT:dataString = new String(messageData, StandardCharsets.UTF_8);String sessionId = StringUtils.substringBefore(dataString, ":");String output = StringUtils.substringAfter(dataString, ":");- RemoteSession.sendOutput(sessionId, output);+ AgentShell shell = (AgentShell) getJobManager().getShellLocal(sessionId);+ if (shell != null)+ shell.getTerminal().sendOutput(output);break;case SHELL_ERROR:dataString = new String(messageData, StandardCharsets.UTF_8);sessionId = StringUtils.substringBefore(dataString, ":");String error = StringUtils.substringAfter(dataString, ":");- RemoteSession.sendError(sessionId, error);+ shell = (AgentShell) getJobManager().getShellLocal(sessionId);+ if (shell != null)+ shell.getTerminal().sendError(error);break;case SHELL_CLOSED:- RemoteSession.onRemoteClosed(new String(messageData, StandardCharsets.UTF_8));+ sessionId = new String(messageData, StandardCharsets.UTF_8);+ shell = (AgentShell) getJobManager().getShellLocal(sessionId);+ if (shell != null)+ shell.getTerminal().close();break;default:}@@ -176,6 +182,10 @@ public class ServerSocket {}}+ private JobManager getJobManager() {+ return OneDev.getInstance(JobManager.class);+ }+private Serializable service(Serializable request) {try {if (request instanceof WaitingForAgentResourceToBeReleased) {diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex e8fc0e3b05..4e438a12b5 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -45,6 +45,7 @@ import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.HttpHeaders;import javax.ws.rs.core.Response;+import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.quartz.CronScheduleBuilder;@@ -142,6 +143,9 @@ import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.storage.StorageManager;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;+import io.onedev.server.terminal.WebShell;import io.onedev.server.util.CommitAware;import io.onedev.server.util.JobSecretAuthorizationContext;import io.onedev.server.util.MatrixRunner;@@ -169,8 +173,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final Map<String, List<Action>> jobActions = new ConcurrentHashMap<>();+ private final Map<String, JobExecutor> jobExecutors = new ConcurrentHashMap<>();+private final Map<Long, Collection<String>> scheduledTasks = new ConcurrentHashMap<>();+ private final Map<String, Shell> jobShells = new ConcurrentHashMap<>();+private final ProjectManager projectManager;private final BuildManager buildManager;@@ -209,6 +217,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate volatile Map<String, JobContext> jobContexts;+ private volatile Map<String, UUID> jobServers;+private volatile Map<String, Collection<String>> allocatedCaches;@Inject@@ -838,19 +848,140 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}@Transactional+ @Overridepublic void resume(Build build) {- JobContext jobContext = getJobContext(build);- if (jobContext != null)- jobContext.getJobExecutor().resume(jobContext);- build.setPaused(false);- listenerRegistry.post(new BuildUpdated(build));+ Long buildId = build.getId();+ JobContext jobContext = getJobContext(buildId);+ if (jobContext != null) {+ UUID jobServerUUID = jobServers.get(jobContext.getJobToken());+ if (jobServerUUID != null) {+ clusterManager.runOnServer(jobServerUUID, new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Void call() throws Exception {+ JobContext jobContext = getJobContext(buildId);+ if (jobContext != null) {+ JobExecutor jobExecutor = jobExecutors.get(jobContext.getJobToken());+ if (jobExecutor != null)+ jobExecutor.resume(jobContext);+ }+ return null;+ }++ });+ build.setPaused(false);+ listenerRegistry.post(new BuildUpdated(build));+ }+ }}++ @Override+ public WebShell openShell(Long buildId, Terminal terminal) {+ JobContext jobContext = getJobContext(buildId);+ if (jobContext!= null) {+ String jobToken = jobContext.getJobToken();+ UUID shellServerUUID = jobServers.get(jobToken);+ if (shellServerUUID != null) {+ if (SecurityUtils.isAdministrator() || jobContext.getJobExecutor().isShellAccessEnabled()) {+ clusterManager.runOnServer(shellServerUUID, new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Void call() throws Exception {+ JobContext jobContext = getJobContext(jobToken, true);+ JobExecutor jobExecutor = jobExecutors.get(jobContext.getJobToken());+ if (jobExecutor != null) {+ Shell shell = jobExecutor.openShell(jobContext, terminal);+ jobShells.put(terminal.getSessionId(), shell);+ } else {+ throw new ExplicitException("Job shell not ready");+ }+ return null;+ }++ });++ return new WebShell(buildId, terminal.getSessionId()) {++ private static final long serialVersionUID = 1L;++ @Override+ public void sendInput(String input) {+ clusterManager.submitToServer(shellServerUUID, new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Void call() throws Exception {+ Shell shell = jobShells.get(terminal.getSessionId());+ if (shell != null)+ shell.sendInput(input);+ return null;+ }++ });+ }++ @Override+ public void resize(int rows, int cols) {+ clusterManager.submitToServer(shellServerUUID, new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;+ @Override+ public Void call() throws Exception {+ Shell shell = jobShells.get(terminal.getSessionId());+ if (shell != null)+ shell.resize(rows, cols);+ return null;+ }++ });+ }++ @Override+ public void exit() {+ clusterManager.submitToServer(shellServerUUID, new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Void call() throws Exception {+ Shell shell = jobShells.remove(terminal.getSessionId());+ if (shell != null)+ shell.exit();+ return null;+ }++ });+ }++ };+ } else {+ throw new UnauthorizedException();+ }+ } else {+ throw new ExplicitException("Job shell not ready");+ }+ } else {+ throw new ExplicitException("Job shell not ready");+ }++ }++ @Override+ public Shell getShellLocal(String sessionId) {+ return jobShells.get(sessionId);+ }+@Override- public JobContext getJobContext(Build build) {+ public JobContext getJobContext(Long buildId) {for (Map.Entry<String, JobContext> entry: jobContexts.entrySet()) {JobContext jobContext = entry.getValue();- if (jobContext.getBuildId().equals(build.getId()))+ if (jobContext.getBuildId().equals(buildId))return jobContext;}return null;@@ -899,6 +1030,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizpublic void on(SystemStarted event) {jobContexts = clusterManager.getHazelcastInstance().getMap("jobContexts");allocatedCaches = clusterManager.getHazelcastInstance().getMap("allocatedCaches");+ jobServers = clusterManager.getHazelcastInstance().getMap("jobRunServers");thread = new Thread(this);thread.start();@@ -1302,24 +1434,32 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});- TaskLogger jobLogger = logManager.getJobLogger(jobToken);- if (jobLogger == null) {- jobLogger = new TaskLogger() {+ jobServers.put(jobToken, clusterManager.getLocalServerUUID());+ JobExecutor jobExecutor = jobContext.getJobExecutor();+ jobExecutors.put(jobToken, jobExecutor);+ try {+ TaskLogger jobLogger = logManager.getJobLogger(jobToken);+ if (jobLogger == null) {+ jobLogger = new TaskLogger() {- @Override- public void log(String message, String sessionId) {- projectManager.runOnProjectServer(jobContext.getProjectId(), new LogTask(jobToken, message, sessionId));+ @Override+ public void log(String message, String sessionId) {+ projectManager.runOnProjectServer(jobContext.getProjectId(), new LogTask(jobToken, message, sessionId));+ }++ };+ logManager.addJobLogger(jobToken, jobLogger);+ try {+ jobExecutor.execute(jobContext, jobLogger, agentInfo);+ } finally {+ logManager.removeJobLogger(jobToken);}-- };- logManager.addJobLogger(jobToken, jobLogger);- try {- jobContext.getJobExecutor().execute(jobContext, jobLogger, agentInfo);- } finally {- logManager.removeJobLogger(jobToken);+ } else {+ jobExecutor.execute(jobContext, jobLogger, agentInfo);}- } else {- jobContext.getJobExecutor().execute(jobContext, jobLogger, agentInfo);+ } finally {+ jobExecutors.remove(jobToken);+ jobServers.remove(jobToken);}}diff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.javaindex 081165643a..9b3eebd344 100644--- a/server-core/src/main/java/io/onedev/server/job/JobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/JobManager.java@@ -14,6 +14,9 @@ import io.onedev.k8shelper.CacheInstance;import io.onedev.server.buildspec.job.SubmitReason;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;+import io.onedev.server.terminal.WebShell;public interface JobManager {@@ -30,12 +33,17 @@ public interface JobManager {void resume(Build build);+ WebShell openShell(Long buildId, Terminal terminal);+JobContext getJobContext(String jobToken, boolean mustExist);+ @Nullable+ Shell getShellLocal(String sessionId);+void reportJobWorkspace(JobContext jobContext, String jobWorkspace);@Nullable- JobContext getJobContext(Build build);+ JobContext getJobContext(Long buildId);Map<CacheInstance, String> allocateCaches(JobContext jobContext, CacheAllocationRequest request);diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex a377b88a2f..6ed510348f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -13,8 +13,6 @@ import javax.annotation.Nullable;import javax.validation.constraints.NotEmpty;import javax.ws.rs.core.Response;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;-import com.google.common.base.Splitter;import com.google.common.base.Throwables;@@ -26,7 +24,8 @@ import io.onedev.server.ServerConfig;import io.onedev.server.job.AgentInfo;import io.onedev.server.job.JobContext;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.terminal.TerminalManager;import io.onedev.server.util.ExceptionUtils;import io.onedev.server.util.PKCS12CertExtractor;@@ -120,7 +119,7 @@ public abstract class JobExecutor implements Serializable {public abstract void resume(JobContext jobContext);- public abstract ShellSession openShell(IWebSocketConnection connection, JobContext jobContext);+ public abstract Shell openShell(JobContext jobContext, Terminal terminal);public boolean isPlaceholderAllowed() {return true;diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javaindex 5554f2ad2d..7e961b3348 100644--- a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -40,11 +40,11 @@ public class DefaultStorageManager implements StorageManager, Serializable {private static final String DELETE_MARK = "to-be-deleted-when-onedev-is-restarted";- private final ProjectManager projectManager;+ protected final ProjectManager projectManager;- private final TransactionManager transactionManager;+ protected final TransactionManager transactionManager;- private final ClusterManager clusterManager;+ protected final ClusterManager clusterManager;@Injectpublic DefaultStorageManager(ProjectManager projectManager, TransactionManager transactionManager,@@ -178,7 +178,7 @@ public class DefaultStorageManager implements StorageManager, Serializable {@Overridepublic void run() {- clusterManager.runOnServer(storageServerUUID, new ClusterTask<Void>() {+ clusterManager.submitToServer(storageServerUUID, new ClusterTask<Void>() {private static final long serialVersionUID = 1L;@@ -216,7 +216,7 @@ public class DefaultStorageManager implements StorageManager, Serializable {@Overridepublic void run() {if (storageServerUUID != null) {- clusterManager.runOnServer(storageServerUUID, new ClusterTask<Void>() {+ clusterManager.submitToServer(storageServerUUID, new ClusterTask<Void>() {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/terminal/AgentShell.java b/server-core/src/main/java/io/onedev/server/terminal/AgentShell.javanew file mode 100644index 0000000000..d0756aa408--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/terminal/AgentShell.java@@ -0,0 +1,39 @@+package io.onedev.server.terminal;++import org.eclipse.jetty.websocket.api.Session;++import io.onedev.agent.Message;++public class AgentShell implements Shell {++ private final Terminal terminal;++ private final Session agent;++ public AgentShell(Terminal terminal, Session agent, String jobToken) {+ this.terminal = terminal;+ this.agent = agent;+ new Message(io.onedev.agent.MessageTypes.SHELL_OPEN, terminal.getSessionId() + ":" + jobToken).sendBy(agent);+ }++ public Terminal getTerminal() {+ return terminal;+ }++ @Override+ public void sendInput(String input) {+ new Message(io.onedev.agent.MessageTypes.SHELL_INPUT, terminal.getSessionId() + ":" + input).sendBy(agent);+ }++ @Override+ public void resize(int rows, int cols) {+ new Message(io.onedev.agent.MessageTypes.SHELL_RESIZE, terminal.getSessionId() + ":" + rows + ":" + cols).sendBy(agent);+ }++ @Override+ public void exit() {+ terminal.sendError("Shell exited");+ new Message(io.onedev.agent.MessageTypes.SHELL_EXIT, terminal.getSessionId()).sendBy(agent);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/terminal/CommandlineSession.java b/server-core/src/main/java/io/onedev/server/terminal/CommandlineShell.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/terminal/CommandlineSession.javarename to server-core/src/main/java/io/onedev/server/terminal/CommandlineShell.javaindex b67989f28c..cf86d961de 100644--- a/server-core/src/main/java/io/onedev/server/terminal/CommandlineSession.java+++ b/server-core/src/main/java/io/onedev/server/terminal/CommandlineShell.java@@ -6,7 +6,6 @@ import java.nio.charset.StandardCharsets;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -22,9 +21,9 @@ import io.onedev.commons.utils.command.PtyMode.ResizeSupport;import io.onedev.commons.utils.command.PumpInputToOutput;import io.onedev.server.OneDev;-public class CommandlineSession implements ShellSession {+public class CommandlineShell implements Shell {- private static final Logger logger = LoggerFactory.getLogger(CommandlineSession.class);+ private static final Logger logger = LoggerFactory.getLogger(CommandlineShell.class);private final PtyMode ptyMode;@@ -32,7 +31,7 @@ public class CommandlineSession implements ShellSession {private final Future<?> execution;- public CommandlineSession(IWebSocketConnection connection, Commandline cmdline) {+ public CommandlineShell(Terminal terminal, Commandline cmdline) {ptyMode = new PtyMode();cmdline.ptyMode(ptyMode);@@ -46,7 +45,7 @@ public class CommandlineSession implements ShellSession {@Overridepublic void write(byte[] b, int off, int len) throws IOException {- TerminalUtils.sendOutput(connection, new String(b, off, len, StandardCharsets.UTF_8));+ terminal.sendOutput(new String(b, off, len, StandardCharsets.UTF_8));}@Override@@ -59,7 +58,7 @@ public class CommandlineSession implements ShellSession {@Overridepublic void write(byte[] b, int off, int len) throws IOException {- TerminalUtils.sendError(connection, new String(b, off, len, StandardCharsets.UTF_8));+ terminal.sendError(new String(b, off, len, StandardCharsets.UTF_8));}@Override@@ -80,20 +79,20 @@ public class CommandlineSession implements ShellSession {};ExecutionResult result = cmdline.execute(outputHandler, errorHandler, shellInput, processKiller);if (result.getReturnCode() != 0)- TerminalUtils.sendError(connection, "Shell exited");+ terminal.sendError("Shell exited");else- TerminalUtils.close(connection);+ terminal.close();} catch (ExplicitException e) {- TerminalUtils.sendError(connection, e.getMessage());+ terminal.sendError(e.getMessage());} catch (Throwable e) {ExplicitException explicitException = ExceptionUtils.find(e, ExplicitException.class);if (explicitException != null) {- TerminalUtils.sendError(connection, explicitException.getMessage());+ terminal.sendError(explicitException.getMessage());} else if (ExceptionUtils.find(e, InterruptedException.class) != null) {- TerminalUtils.sendError(connection, "Shell exited");+ terminal.sendError("Shell exited");} else {logger.error("Error running shell", e);- TerminalUtils.sendError(connection, "Error running shell, check server log for details");+ terminal.sendError("Error running shell, check server log for details");}}}diff --git a/server-core/src/main/java/io/onedev/server/terminal/RemoteSession.java b/server-core/src/main/java/io/onedev/server/terminal/RemoteSession.javadeleted file mode 100644index 89ade9f5c4..0000000000--- a/server-core/src/main/java/io/onedev/server/terminal/RemoteSession.java+++ /dev/null@@ -1,65 +0,0 @@-package io.onedev.server.terminal;--import java.util.Map;-import java.util.UUID;-import java.util.concurrent.ConcurrentHashMap;--import org.apache.wicket.protocol.ws.api.IWebSocketConnection;-import org.eclipse.jetty.websocket.api.Session;--import io.onedev.agent.Message;--public class RemoteSession implements ShellSession {-- private static final Map<String, RemoteSession> sessions = new ConcurrentHashMap<>();-- private final String sessionId = UUID.randomUUID().toString();-- private final IWebSocketConnection connection;-- private final Session agentSession;-- public RemoteSession(IWebSocketConnection connection, Session agentSession, String jobToken) {- this.connection = connection;- this.agentSession = agentSession;-- sessions.put(sessionId, this);- new Message(io.onedev.agent.MessageTypes.SHELL_OPEN, sessionId + ":" + jobToken).sendBy(agentSession);- }-- public static void sendOutput(String sessionId, String output) {- RemoteSession session = sessions.get(sessionId);- if (session != null)- TerminalUtils.sendOutput(session.connection, output);- }-- public static void sendError(String sessionId, String error) {- RemoteSession session = sessions.get(sessionId);- if (session != null)- TerminalUtils.sendError(session.connection, error);- }-- public static void onRemoteClosed(String sessionId) {- RemoteSession session = sessions.remove(sessionId);- if (session != null)- TerminalUtils.close(session.connection);- }-- @Override- public void sendInput(String input) {- new Message(io.onedev.agent.MessageTypes.SHELL_INPUT, sessionId + ":" + input).sendBy(agentSession);- }-- @Override- public void resize(int rows, int cols) {- new Message(io.onedev.agent.MessageTypes.SHELL_RESIZE, sessionId + ":" + rows + ":" + cols).sendBy(agentSession);- }-- @Override- public void exit() {- sessions.remove(sessionId);- TerminalUtils.sendError(connection, "Shell exited");- new Message(io.onedev.agent.MessageTypes.SHELL_EXIT, sessionId).sendBy(agentSession);- }--}diff --git a/server-core/src/main/java/io/onedev/server/terminal/ShellSession.java b/server-core/src/main/java/io/onedev/server/terminal/Shell.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/terminal/ShellSession.javarename to server-core/src/main/java/io/onedev/server/terminal/Shell.javaindex 88bd29eda5..7117299199 100644--- a/server-core/src/main/java/io/onedev/server/terminal/ShellSession.java+++ b/server-core/src/main/java/io/onedev/server/terminal/Shell.java@@ -1,6 +1,6 @@package io.onedev.server.terminal;-public interface ShellSession {+public interface Shell {void sendInput(String input);diff --git a/server-core/src/main/java/io/onedev/server/terminal/Terminal.java b/server-core/src/main/java/io/onedev/server/terminal/Terminal.javanew file mode 100644index 0000000000..a1d0f24c66--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/terminal/Terminal.java@@ -0,0 +1,13 @@+package io.onedev.server.terminal;++public interface Terminal {++ String getSessionId();++ void sendOutput(String output);++ void sendError(String error);++ void close();++}diff --git a/server-core/src/main/java/io/onedev/server/terminal/TerminalUtils.java b/server-core/src/main/java/io/onedev/server/terminal/TerminalUtils.javadeleted file mode 100644index dcfb420ea0..0000000000--- a/server-core/src/main/java/io/onedev/server/terminal/TerminalUtils.java+++ /dev/null@@ -1,28 +0,0 @@-package io.onedev.server.terminal;--import org.apache.wicket.protocol.ws.api.IWebSocketConnection;--public class TerminalUtils {-- public static void sendOutput(IWebSocketConnection connection, String output) {- try {- connection.sendMessage(MessageTypes.TERMINAL_OUTPUT + ":" + output);- } catch (Exception e) {- }- }-- public static void sendError(IWebSocketConnection connection, String error) {- try {- connection.sendMessage(MessageTypes.TERMINAL_OUTPUT + ":\r\n\033[31m" + error + "\033[0m");- } catch (Exception e) {- }- }-- public static void close(IWebSocketConnection connection) {- try {- connection.sendMessage(MessageTypes.TERMINAL_CLOSE.name());- } catch (Exception e) {- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/terminal/WebShell.java b/server-core/src/main/java/io/onedev/server/terminal/WebShell.javanew file mode 100644index 0000000000..7eefb11901--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/terminal/WebShell.java@@ -0,0 +1,26 @@+package io.onedev.server.terminal;++import java.io.Serializable;++public abstract class WebShell implements Shell, Serializable {++ private static final long serialVersionUID = 1L;++ private final Long buildId;++ private final String sessionId;++ public WebShell(Long buildId, String sessionId) {+ this.buildId = buildId;+ this.sessionId = sessionId;+ }++ public Long getBuildId() {+ return buildId;+ }++ public String getSessionId() {+ return sessionId;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex acaa90d24c..f7d8f670e2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -327,7 +327,8 @@ public abstract class BuildDetailPage extends ProjectPagesuper.onConfigure();if (getTerminalManager().isTerminalSupported()) {- JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(getBuild());+ JobManager jobManager = OneDev.getInstance(JobManager.class);+ JobContext jobContext = jobManager.getJobContext(getBuild().getId());if (jobContext!= null) {setVisible(SecurityUtils.isAdministrator()|| SecurityUtils.canManage(getProject()) && jobContext.getJobExecutor().isShellAccessEnabled());diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 9c2c3ff040..d6884a258d 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -36,7 +36,6 @@ import org.apache.commons.codec.binary.Hex;import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.SystemUtils;import org.apache.commons.text.WordUtils;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.yaml.snakeyaml.Yaml;@@ -86,8 +85,9 @@ import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.CommandlineSession;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.CommandlineShell;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.PKCS12CertExtractor;import io.onedev.server.web.editable.annotation.Editable;@@ -258,7 +258,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}@Override- public ShellSession openShell(IWebSocketConnection connection, JobContext jobContext) {+ public Shell openShell(JobContext jobContext, Terminal terminal) {String containerNameCopy = containerName;if (osInfo != null && containerNameCopy != null) {Commandline kubectl = newKubeCtl();@@ -301,7 +301,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}}kubectl.addArgs(shell);- return new CommandlineSession(connection, kubectl);+ return new CommandlineShell(terminal, kubectl);} else {throw new ExplicitException("Shell not ready");}diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex 1d50df0788..4dec31c49d 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -8,7 +8,6 @@ import java.util.Map;import java.util.UUID;import java.util.concurrent.TimeoutException;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.eclipse.jetty.websocket.api.Session;import io.onedev.agent.AgentData;@@ -31,8 +30,9 @@ import io.onedev.server.job.log.LogTask;import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.RemoteSession;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.AgentShell;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.util.CollectionUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -166,9 +166,9 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {}@Override- public ShellSession openShell(IWebSocketConnection connection, JobContext jobContext) {+ public Shell openShell(JobContext jobContext, Terminal terminal) {if (agentSession != null)- return new RemoteSession(connection, agentSession, jobContext.getJobToken());+ return new AgentShell(terminal, agentSession, jobContext.getJobToken());elsethrow new ExplicitException("Shell not ready");}diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex 9e759ef90b..93c79ed4e2 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -6,7 +6,6 @@ import java.util.List;import java.util.UUID;import java.util.concurrent.TimeoutException;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import org.eclipse.jetty.websocket.api.Session;import io.onedev.agent.AgentData;@@ -28,8 +27,9 @@ import io.onedev.server.job.log.LogManager;import io.onedev.server.job.log.LogTask;import io.onedev.server.plugin.executor.servershell.ServerShellExecutor;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.RemoteSession;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.AgentShell;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -141,9 +141,9 @@ public class RemoteShellExecutor extends ServerShellExecutor {}@Override- public ShellSession openShell(IWebSocketConnection connection, JobContext jobContext) {+ public Shell openShell(JobContext jobContext, Terminal terminal) {if (agentSession != null)- return new RemoteSession(connection, agentSession, jobContext.getJobToken());+ return new AgentShell(terminal, agentSession, jobContext.getJobToken());elsethrow new ExplicitException("Shell not ready");}diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 0c796cfd89..fc35fb08fb 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -27,7 +27,6 @@ import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.NotEmpty;import org.apache.commons.lang3.SystemUtils;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;@@ -73,8 +72,9 @@ import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor.TestData;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.CommandlineSession;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.CommandlineShell;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -647,7 +647,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa}@Override- public ShellSession openShell(IWebSocketConnection connection, JobContext jobContext) {+ public Shell openShell(JobContext jobContext, Terminal terminal) {String containerNameCopy = containerName;if (containerNameCopy != null) {Commandline docker = newDocker();@@ -660,7 +660,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa} else {docker.addArgs("sh");}- return new CommandlineSession(connection, docker);+ return new CommandlineShell(terminal, docker);} else if (hostBuildHome != null) {Commandline shell;if (SystemUtils.IS_OS_WINDOWS)@@ -668,7 +668,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaelseshell = new Commandline("sh");shell.workingDir(new File(hostBuildHome, "workspace"));- return new CommandlineSession(connection, shell);+ return new CommandlineShell(terminal, shell);} else {throw new ExplicitException("Shell not ready");}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 86e79928f4..8f13ead950 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -16,7 +16,6 @@ import java.util.Map;import javax.validation.constraints.Size;import org.apache.commons.lang.SystemUtils;-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;import com.hazelcast.cluster.Member;@@ -52,8 +51,9 @@ import io.onedev.server.job.JobManager;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.plugin.executor.servershell.ServerShellExecutor.TestData;import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.terminal.CommandlineSession;-import io.onedev.server.terminal.ShellSession;+import io.onedev.server.terminal.CommandlineShell;+import io.onedev.server.terminal.Shell;+import io.onedev.server.terminal.Terminal;import io.onedev.server.util.validation.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -310,7 +310,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat}@Override- public ShellSession openShell(IWebSocketConnection connection, JobContext jobContext) {+ public Shell openShell(JobContext jobContext, Terminal terminal) {if (buildDir != null) {Commandline shell;if (runningStep instanceof CommandFacade) {@@ -322,7 +322,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatshell = new Commandline("sh");}shell.workingDir(new File(buildDir, "workspace"));- return new CommandlineSession(connection, shell);+ return new CommandlineShell(terminal, shell);} else {throw new ExplicitException("Shell not ready");}