Skip to content

The Unified and Autonomous Development Platform

chore: Refator/fix workspace directory permission issues

Robin Shen30cb0ba08735
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index d478fd5c65..6e151c55e4 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -422,7 +422,6 @@ import io.onedev.server.web.websocket.WebSocketService;
import io.onedev.server.web.websocket.WorkspaceEventBroadcaster;
import io.onedev.server.workspace.DefaultWorkspaceQueryPersonalizationService;
import io.onedev.server.workspace.DefaultWorkspaceService;
-import io.onedev.server.workspace.WorkspacePostCommitCallback;
import io.onedev.server.workspace.WorkspaceQueryPersonalizationService;
import io.onedev.server.workspace.WorkspaceService;
import io.onedev.server.xodus.CommitInfoService;
@@ -580,7 +579,6 @@ public class CoreModule extends AbstractPluginModule {
bind(DashboardGroupShareService.class).to(DefaultDashboardGroupShareService.class);
bind(DashboardVisitService.class).to(DefaultDashboardVisitService.class);
bind(WorkspaceService.class).to(DefaultWorkspaceService.class);
- bind(WorkspacePostCommitCallback.class);
bind(LabelSpecService.class).to(DefaultLabelSpecService.class);
bind(ProjectLabelService.class).to(DefaultProjectLabelService.class);
bind(BuildLabelService.class).to(DefaultBuildLabelService.class);
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index b754dca999..4d3207c795 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -2,7 +2,6 @@ package io.onedev.server.git;
import static io.onedev.server.model.Project.decodeFullRepoNameAsPath;
import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static io.onedev.server.workspace.WorkspaceService.GIT_PREFIX;
import static org.apache.commons.lang3.StringUtils.strip;
import java.io.File;
@@ -10,7 +9,6 @@ import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ExecutionException;
@@ -41,7 +39,6 @@ import org.eclipse.jgit.http.server.GitSmartHttpTools;
import org.eclipse.jgit.http.server.ServletUtils;
import org.eclipse.jgit.transport.PacketLineOut;
import org.glassfish.jersey.client.ClientProperties;
-import org.jspecify.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.k8shelper.KubernetesHelper;
@@ -52,7 +49,6 @@ import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Workspace;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.security.CodePullAuthorizationSource;
import io.onedev.server.security.CodePushAuthorizationSource;
@@ -128,25 +124,6 @@ public class GitFilter implements Filter {
response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
}
- @Nullable
- private File getWorkspaceGitDir(String projectInfo) {
- projectInfo = strip(projectInfo, "/");
- int idx = projectInfo.indexOf(GIT_PREFIX);
- if (idx < 0)
- return null;
- String projectPath = strip(projectInfo.substring(0, idx), "/");
- String numberStr = projectInfo.substring(idx + GIT_PREFIX.length());
- numberStr = strip(numberStr, "/");
- var facade = projectService.findFacadeByPath(projectPath);
- if (facade == null)
- throw new EntityNotFoundException("Project not found: " + projectPath);
- long workspaceNumber = Long.parseLong(numberStr);
- File gitDir = new File(Workspace.getWorkDir(facade.getId(), workspaceNumber), ".git");
- if (!gitDir.exists())
- throw new ExplicitException("Workspace git directory not found");
- return gitDir;
- }
-
protected void processPack(final HttpServletRequest request, final HttpServletResponse response)
throws IOException, InterruptedException, ExecutionException {
boolean upload = GitSmartHttpTools.isUploadPack(request);
@@ -158,31 +135,6 @@ public class GitFilter implements Filter {
String principal = (String) SecurityUtils.getSubject().getPrincipal();
boolean clusterAccess = SecurityUtils.isSystem(principal);
- File workspaceGitDir = getWorkspaceGitDir(projectInfo);
- if (workspaceGitDir != null) {
- if (!clusterAccess)
- throw new UnauthorizedException("Cluster credential required to access workspace git");
- if (!upload)
- throw new ExplicitException("Push to workspace git is not supported");
-
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-result");
-
- InputStream stdin = new FilterInputStream(ServletUtils.getInputStream(request)) {
- @Override
- public void close() {
- }
- };
- OutputStream stdout = new OutputStreamWrapper(response.getOutputStream()) {
- @Override
- public void close() {
- }
- };
-
- String protocol = request.getHeader("Git-Protocol");
- CommandUtils.uploadPack(workspaceGitDir, Collections.emptyMap(), protocol, stdin, stdout);
- return;
- }
var projectPath = decodeFullRepoNameAsPath(strip(projectInfo, "/"));
Long projectId = getProjectId(projectPath, clusterAccess, upload);
@@ -363,25 +315,6 @@ public class GitFilter implements Filter {
String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
boolean clusterAccess = SecurityUtils.isSystem();
- File workspaceGitDir = getWorkspaceGitDir(projectInfo);
- if (workspaceGitDir != null) {
- if (!clusterAccess)
- throw new UnauthorizedException("Cluster credential required to access workspace git");
- if (!upload)
- throw new ExplicitException("Push to workspace git is not supported");
-
- writeInitial(response, service);
-
- OutputStream output = new OutputStreamWrapper(response.getOutputStream()) {
- @Override
- public void close() throws IOException {
- }
- };
-
- String protocol = request.getHeader("Git-Protocol");
- new AdvertiseUploadRefsCommand(workspaceGitDir, output).protocol(protocol).run();
- return;
- }
var projectPath = decodeFullRepoNameAsPath(strip(projectInfo, "/"));
Long projectId = getProjectId(projectPath, clusterAccess, upload);
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index 8eaf3759be..2105771fa3 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -5,7 +5,6 @@ import static io.onedev.k8shelper.KubernetesHelper.BEARER;
import static io.onedev.server.model.Project.decodeFullRepoNameAsPath;
import static io.onedev.server.util.CollectionUtils.newHashMap;
import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static io.onedev.server.workspace.WorkspaceService.GIT_PREFIX;
import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_CREATED;
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
@@ -16,7 +15,6 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;
import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static org.apache.commons.lang3.StringUtils.strip;
import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
import static org.apache.tika.mime.MimeTypes.OCTET_STREAM;
import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING;
@@ -69,7 +67,6 @@ import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.model.GitLfsLock;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Workspace;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.CodePullAuthorizationSource;
@@ -167,46 +164,6 @@ public class GitLfsFilter implements Filter {
}
}
- private boolean isWorkspacePath(String pathInfo) {
- return pathInfo.contains(GIT_PREFIX);
- }
-
- @Nullable
- private long[] parseWorkspaceInfo(String pathInfo) {
- int idx = pathInfo.indexOf(GIT_PREFIX);
- if (idx < 0)
- return null;
- String projectPath = strip(pathInfo.substring(0, idx), "/");
- String afterWorkspaces = pathInfo.substring(idx + GIT_PREFIX.length());
- String numberStr;
- int dotGitIdx = afterWorkspaces.indexOf(".git/");
- if (dotGitIdx >= 0) {
- numberStr = afterWorkspaces.substring(0, dotGitIdx);
- } else {
- int slashIdx = afterWorkspaces.indexOf('/');
- numberStr = slashIdx >= 0 ? afterWorkspaces.substring(0, slashIdx) : afterWorkspaces;
- }
- var facade = projectService.findFacadeByPath(projectPath);
- if (facade == null)
- throw new ExplicitException("Project not found: " + projectPath);
- long workspaceNumber = Long.parseLong(numberStr);
- return new long[]{facade.getId(), workspaceNumber};
- }
-
- private File getWorkspaceLfsFile(long projectId, long workspaceNumber, String objectId) {
- File workDir = Workspace.getWorkDir(projectId, workspaceNumber);
- return new File(workDir, ".git/lfs/objects/"
- + objectId.substring(0, 2) + "/"
- + objectId.substring(2, 4) + "/" + objectId);
- }
-
- private String getWorkspaceObjectUrl(long projectId, long workspaceNumber, String objectId) {
- var serverUrl = clusterService.getServerUrl(clusterService.getLocalServerAddress());
- var projectPath = projectService.findFacadeById(projectId).getPath();
- return String.format("%s/%s/%s%d.git/lfs/objects/%s?lfs-objects=true",
- serverUrl, projectPath, GIT_PREFIX, workspaceNumber, objectId);
- }
-
private String getObjectUrl(HttpServletRequest request, String projectPath,
String objectId, boolean clusterAccess) {
var serverUrl = clusterAccess ? clusterService.getServerUrl(clusterService.getLocalServerAddress()) : settingService.getSystemSetting().getServerUrl();
@@ -241,32 +198,6 @@ public class GitLfsFilter implements Filter {
boolean clusterAccess = SecurityUtils.isSystem();
if ("true".equals(httpRequest.getParameter("lfs-objects"))) {
- if (isWorkspacePath(pathInfo)) {
- if (!clusterAccess) {
- sendBatchError(httpResponse, SC_UNAUTHORIZED,
- "Cluster credential required to access workspace LFS");
- return;
- }
- if (!httpRequest.getMethod().equals("GET")) {
- sendBatchError(httpResponse, SC_FORBIDDEN,
- "Upload to workspace LFS is not supported");
- return;
- }
- long[] workspaceInfo = parseWorkspaceInfo(pathInfo);
- String objectId = StringUtils.substringAfterLast(pathInfo, "/");
- File lfsFile = getWorkspaceLfsFile(workspaceInfo[0], workspaceInfo[1], objectId);
- if (lfsFile.exists()) {
- httpResponse.setContentType(OCTET_STREAM);
- try (InputStream is = new FileInputStream(lfsFile);
- OutputStream os = httpResponse.getOutputStream()) {
- IOUtils.copy(is, os, BUFFER_SIZE);
- }
- } else {
- httpResponse.setStatus(SC_NOT_FOUND);
- }
- return;
- }
-
String projectPath = getProjectPath(pathInfo);
String objectId = StringUtils.substringAfterLast(pathInfo, "/");
@@ -394,23 +325,7 @@ public class GitLfsFilter implements Filter {
&& httpRequest.getContentType().startsWith(CONTENT_TYPE)
|| httpRequest.getHeader("Accept") != null
&& httpRequest.getHeader("Accept").startsWith(CONTENT_TYPE)) {
- if (isWorkspacePath(pathInfo)) {
- if (!clusterAccess) {
- sendBatchError(httpResponse, SC_UNAUTHORIZED,
- "Cluster credential required to access workspace LFS");
- return;
- }
- httpResponse.setContentType(CONTENT_TYPE);
- if (pathInfo.endsWith("/batch")) {
- long[] workspaceInfo = parseWorkspaceInfo(pathInfo);
- processWorkspaceBatch(httpRequest, httpResponse, workspaceInfo[0], workspaceInfo[1]);
- } else {
- sendBatchError(httpResponse, SC_NOT_IMPLEMENTED,
- "Locks are not supported for workspace LFS");
- }
- return;
- }
- String projectPath = getProjectPath(pathInfo);
+ String projectPath = getProjectPath(pathInfo);
if (clusterAccess) {
ProjectFacade project = projectService.findFacadeByPath(projectPath);
if (project == null) {
@@ -677,46 +592,6 @@ public class GitLfsFilter implements Filter {
writeTo(httpResponse, batchResponse);
}
}
-
- private void processWorkspaceBatch(HttpServletRequest httpRequest, HttpServletResponse httpResponse,
- long projectId, long workspaceNumber) {
- JsonNode batchRequestNode = parseAndValidateBatchRequest(httpRequest, httpResponse);
- if (batchRequestNode == null)
- return;
-
- boolean upload = batchRequestNode.get("operation").asText().equals("upload");
- if (upload) {
- sendBatchError(httpResponse, SC_FORBIDDEN,
- "Upload to workspace LFS is not supported");
- return;
- }
-
- List<Map<String, Object>> objectsResponse = new ArrayList<>();
- for (JsonNode objectNode : batchRequestNode.get("objects")) {
- String objectId = objectNode.get("oid").asText();
- long objectSize = objectNode.get("size").asLong();
- Map<String, Object> objectResponse = new HashMap<>();
- objectResponse.put("oid", objectId);
- objectResponse.put("size", objectSize);
- File lfsFile = getWorkspaceLfsFile(projectId, workspaceNumber, objectId);
- if (lfsFile.exists()) {
- Map<Object, Object> actionResponse = newHashMap(
- "href", getWorkspaceObjectUrl(projectId, workspaceNumber, objectId));
- actionResponse.put("header", newHashMap(
- "Authorization", BEARER + " " + clusterService.getCredential()));
- objectResponse.put("actions", newHashMap("download", actionResponse));
- } else {
- objectResponse.put("error", newHashMap(
- "code", SC_NOT_FOUND,
- "message", "Object not found"));
- }
- objectsResponse.add(objectResponse);
- }
-
- Map<String, Object> batchResponse = new HashMap<>();
- batchResponse.put("objects", objectsResponse);
- writeTo(httpResponse, batchResponse);
- }
private void sendAuthorizationError(HttpServletResponse response) {
if (SecurityUtils.getUser() != null) {
diff --git a/server-core/src/main/java/io/onedev/server/git/hook/HookUtils.java b/server-core/src/main/java/io/onedev/server/git/hook/HookUtils.java
index 919f97eb00..ba07a46ce9 100644
--- a/server-core/src/main/java/io/onedev/server/git/hook/HookUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/hook/HookUtils.java
@@ -22,8 +22,6 @@ public class HookUtils {
private static final String gitReceiveHook;
- private static final String gitWorkspacePostCommitHook;
-
static {
try (InputStream is = HookUtils.class.getClassLoader().getResourceAsStream("git-receive-hook")) {
Preconditions.checkNotNull(is);
@@ -31,18 +29,12 @@ public class HookUtils {
} catch (IOException e) {
throw new RuntimeException(e);
}
- try (InputStream is = HookUtils.class.getClassLoader().getResourceAsStream("git-workspace-postcommit-hook")) {
- Preconditions.checkNotNull(is);
- gitWorkspacePostCommitHook = StringUtils.join(IOUtils.readLines(is, Charset.defaultCharset()), "\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
}
- public static Map<String, String> getCommonHookEnvs() {
+ public static Map<String, String> getCommonHookEnvs(String host) {
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
SettingService settingService = OneDev.getInstance(SettingService.class);
- String hookUrl = "http://localhost:" + serverConfig.getHttpPort();
+ String hookUrl = "http://" + host + "/" + serverConfig.getHttpPort();
String curl = settingService.getSystemSetting().getCurlLocation().getExecutable();
Map<String, String> envs = new HashMap<>();
@@ -54,7 +46,15 @@ public class HookUtils {
}
public static Map<String, String> getReceiveHookEnvs(Long projectId, String principal) {
- var envs = getCommonHookEnvs();
+ var envs = new HashMap<String, String>();
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ SettingService settingService = OneDev.getInstance(SettingService.class);
+ String hookUrl = "http://localhost:" + serverConfig.getHttpPort();
+ String curl = settingService.getSystemSetting().getCurlLocation().getExecutable();
+
+ envs.put("ONEDEV_CURL", curl);
+ envs.put("ONEDEV_URL", hookUrl);
+
envs.put("ONEDEV_HOOK_TOKEN", RECEIVE_HOOK_TOKEN);
envs.put("ONEDEV_USER_ID", principal);
envs.put("ONEDEV_REPOSITORY_ID", projectId.toString());
@@ -79,28 +79,6 @@ public class HookUtils {
return true;
}
-
- public static Map<String, String> getWorkspacePostCommitHookEnvs(String workspaceToken) {
- var envs = getCommonHookEnvs();
- envs.put("ONEDEV_HOOK_TOKEN", workspaceToken);
- return envs;
- }
-
- public static void setupWorkspacePostCommitHook(File gitDir, boolean lfsEnabled) {
- File hooksDir = new File(gitDir, "hooks");
- FileUtils.createDir(hooksDir);
- File postCommitHookFile = new File(hooksDir, "post-commit");
-
- String lfsAwareHook;
- if (lfsEnabled) {
- lfsAwareHook = String.format(gitWorkspacePostCommitHook, "git lfs post-commit \"$@\"");
- } else {
- lfsAwareHook = String.format(gitWorkspacePostCommitHook, "");
- }
-
- FileUtils.writeFile(postCommitHookFile, lfsAwareHook);
- postCommitHookFile.setExecutable(true);
- }
public static void checkReceiveHooks(File gitDir) {
if (!isReceiveHookValid(gitDir, "pre-receive") || !isReceiveHookValid(gitDir, "post-receive")) {
diff --git a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
index 2bea8333e9..c4a8844a53 100644
--- a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
+++ b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
@@ -119,7 +119,7 @@ public class DefaultLogService implements LogService, Serializable {
LogSnippet snippet = recentSnippets.get(logKey);
if (snippet == null) {
File logFile = loggingSupport.getIdentity().getFile();
- if (!logFile.exists()) {
+ if (!logFile.exists() || logFile.length() == 0) {
snippet = new LogSnippet();
recentSnippets.put(logKey, snippet);
}
@@ -229,7 +229,7 @@ public class DefaultLogService implements LogService, Serializable {
File logFile = loggingSupport.getIdentity().getFile();
- if (logFile.exists()) {
+ if (logFile.exists() && logFile.length() != 0) {
try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
while (true) {
JobLogEntry entry = (JobLogEntry) ois.readObject();
@@ -249,7 +249,7 @@ public class DefaultLogService implements LogService, Serializable {
private List<JobLogEntryEx> readLogEntries(File logFile, int from, int count) {
List<JobLogEntryEx> entries = new ArrayList<>();
- if (logFile.exists()) {
+ if (logFile.exists() && logFile.length() != 0) {
try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
int numOfReadEntries = 0;
while (numOfReadEntries < from) {
@@ -286,7 +286,7 @@ public class DefaultLogService implements LogService, Serializable {
private LogSnippet readLogSnippetReversely(File logFile, int count) {
var snippet = new LogSnippet();
- if (logFile.exists()) {
+ if (logFile.exists() && logFile.length() != 0) {
try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
while (true) {
snippet.entries.add(readLogEntry(ois));
@@ -378,7 +378,7 @@ public class DefaultLogService implements LogService, Serializable {
private ObjectOutputStream newOutputStream(File logFile) {
try {
- if (logFile.exists()) {
+ if (logFile.exists() && logFile.length() != 0) {
return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile, true), BUFFER_SIZE)) {
@Override
@@ -437,7 +437,7 @@ public class DefaultLogService implements LogService, Serializable {
try {
File logFile = loggingIdentity.getFile();
- if (logFile.exists())
+ if (logFile.exists() && logFile.length() != 0)
ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));
LogSnippet snippet = recentSnippets.get(loggingIdentity.getCacheKey());
diff --git a/server-core/src/main/java/io/onedev/server/logging/WorkspaceLoggingSupport.java b/server-core/src/main/java/io/onedev/server/logging/WorkspaceLoggingSupport.java
index ebd5de4665..5d2aeb5989 100644
--- a/server-core/src/main/java/io/onedev/server/logging/WorkspaceLoggingSupport.java
+++ b/server-core/src/main/java/io/onedev/server/logging/WorkspaceLoggingSupport.java
@@ -63,7 +63,6 @@ public class WorkspaceLoggingSupport implements LoggingSupport {
@Override
public void fileModified() {
- getProjectService().directoryModified(identity.getProjectId(), identity.getFile().getParentFile());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
index 6d15dd83fa..dff75c07b8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
@@ -30,6 +30,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.git.location.GitLocation;
import io.onedev.server.model.Project;
+import io.onedev.server.model.Workspace;
import io.onedev.server.model.support.workspace.spec.EnvVar;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.service.ProjectService;
@@ -107,13 +108,13 @@ public abstract class WorkspaceProvisioner implements Serializable {
return getWorkspaceService().getWorkspaceDir(context.getProjectId(), context.getWorkspaceNumber());
}
- protected Map<String, String> setupRepository(WorkspaceContext context, String runtimeWorkspaceDirPath, TaskLogger logger) {
+ protected void setupRepository(WorkspaceContext context, String runtimeWorkspaceDirPath, TaskLogger logger) {
var localServer = getClusterService().getLocalServerAddress();
logger.log(String.format("Provisioning workspace (provisioner: %s, server: %s)...",
getName(), localServer));
var workspaceDir = getWorkspaceDir(context);
- var workDir = new File(workspaceDir, "work");
+ var workDir = Workspace.getWorkDir(context.getProjectId(), context.getWorkspaceNumber());
FileUtils.createDir(workDir);
var cloneInfo = context.getCloneInfo();
@@ -174,7 +175,6 @@ public abstract class WorkspaceProvisioner implements Serializable {
installGitLfs(git, infoLogger, warningLogger);
}
} else {
- // need to reset origin url as the workspace may get active from a backup replica
setupOriginUrl(git, cloneInfo.getCloneUrl(), infoLogger, warningLogger);
if (context.getSpec().isRetrieveLfs())
@@ -182,16 +182,6 @@ public abstract class WorkspaceProvisioner implements Serializable {
logger.log("Repository already exists, skipping clone");
}
-
- HookUtils.setupWorkspacePostCommitHook(
- new File(workDir, ".git"),
- context.getSpec().isRetrieveLfs());
-
- var envVars = context.getSpec().getEnvVars().stream()
- .collect(toMap(EnvVar::getName, it -> it.isSecret() ? it.getSecretValue() : it.getValue()));
- envVars.putAll(HookUtils.getWorkspacePostCommitHookEnvs(context.getToken()));
-
- return envVars;
}
public abstract boolean isApplicable(Project project);
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
index 63c13f82bd..7818e7dd1d 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
@@ -1579,21 +1579,21 @@ public class DefaultProjectService extends BaseEntityService<Project>
@Override
public void syncDirectory(Long projectId, String path, Consumer<String> childSyncer, String activeServer) {
var directory = new File(getProjectDir(projectId), path);
- var sitePath = Bootstrap.getSiteDir().toPath().resolve(directory.toPath()).toString();
+ var sitePath = Bootstrap.getSiteDir().toPath().relativize(directory.toPath()).toString();
SiteSyncUtils.syncDirectory(activeServer, sitePath, childSyncer, true);
}
@Override
public void syncDirectory(Long projectId, String path, String readLock, String activeServer) {
var directory = new File(getProjectDir(projectId), path);
- var sitePath = Bootstrap.getSiteDir().toPath().resolve(directory.toPath()).toString();
+ var sitePath = Bootstrap.getSiteDir().toPath().relativize(directory.toPath()).toString();
SiteSyncUtils.syncDirectory(activeServer, sitePath, true, readLock, null);
}
@Override
public void syncFile(Long projectId, String path, String readLock, String activeServer) {
var file = new File(getProjectDir(projectId), path);
- var sitePath = Bootstrap.getSiteDir().toPath().resolve(file.toPath()).toString();
+ var sitePath = Bootstrap.getSiteDir().toPath().relativize(file.toPath()).toString();
SiteSyncUtils.syncFile(activeServer, sitePath, true, readLock, null);
}
@@ -1615,7 +1615,6 @@ public class DefaultProjectService extends BaseEntityService<Project>
if (version < remoteVersion) {
logger.debug("Syncing project (project: {}, server: {})...", project.getPath(), syncWithServer);
syncGit(projectId, syncWithServer);
- workspaceService.syncWorkspaces(projectId, syncWithServer);
attachmentService.syncAttachments(projectId, syncWithServer);
buildService.syncBuilds(projectId, syncWithServer);
visitInfoService.syncVisitInfo(projectId, syncWithServer);
diff --git a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java
index d16e35090c..72a6720991 100644
--- a/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/SiteSyncUtils.java
@@ -42,7 +42,7 @@ public class SiteSyncUtils {
private static final Logger logger = LoggerFactory.getLogger(SiteSyncUtils.class);
- public static String FILE_VERSION = ".onedev-directory-version";
+ public static final String FILE_VERSION = ".onedev-directory-version";
private static <T> T callWithVersionLock(java.nio.file.Path path, Callable<T> callable) {
Lock lock = getLock("directory-version: " + path.normalize().toString());
@@ -78,7 +78,7 @@ public class SiteSyncUtils {
return null;
});
}
-
+
public static void increaseVersion(File directory) {
callWithVersionLock(directory.toPath(), () -> {
writeVersion(directory, readVersion(directory)+1);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java
index cdb45054b9..26f6cf520c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java
@@ -93,7 +93,7 @@ public class WorkspaceStatsPanel extends Panel {
cssClass = "link-success";
break;
case INACTIVE:
- cssClass = "link-danger";
+ cssClass = "link-warning";
break;
default:
cssClass = "link-warning";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html
index 1ec5eb0f9d..8adeed2155 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/error/GeneralErrorPage.html
@@ -1,8 +1,8 @@
<wicket:extend>
<div wicket:id="error">
<div class="actions">
- <a wicket:id="home" class="btn btn-light-primary"><wicket:t>Back To Home</wicket:t></a>
- <a wicket:id="showDetail" class="btn btn-primary"><wicket:t>Show Error Detail</wicket:t></a>
+ <a wicket:id="home" class="btn btn-light-primary">Back To Home</a>
+ <a wicket:id="showDetail" class="btn btn-primary">Show Error Detail</a>
</div>
<div wicket:id="errorDetail" class="position-relative"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index f8faa95713..b029f8fb15 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -1,16 +1,13 @@
package io.onedev.server.workspace;
-import static io.onedev.k8shelper.KubernetesHelper.installGitLfs;
import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.util.SiteSyncUtils.readVersion;
-import static io.onedev.server.util.SiteSyncUtils.writeVersion;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+import static java.nio.file.StandardOpenOption.WRITE;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.io.UncheckedIOException;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
@@ -56,8 +53,6 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.k8shelper.DefaultCloneInfo;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterService;
@@ -73,8 +68,6 @@ import io.onedev.server.event.project.workspace.WorkspacePending;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.exception.ServerNotFoundException;
-import io.onedev.server.git.CommandUtils;
-import io.onedev.server.git.GitTask;
import io.onedev.server.logging.LogService;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
@@ -236,12 +229,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
}
- @Sessional
- @Listen
- public void on(WorkspaceInactive event) {
- logService.flush(event.getWorkspace().getLoggingSupport());
- }
-
@Transactional
@Listen
public void on(EntityRemoved event) {
@@ -421,14 +408,13 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
workspace.setActiveDate(null);
var projectId = workspace.getProject().getId();
var workspaceNumber = workspace.getNumber();
- projectService.runOnActiveServer(projectId, new ClusterTask<Void>() {
-
- @Override
- public Void call() throws Exception {
- FileUtils.deleteFile(Workspace.getLogFile(projectId, workspaceNumber));
- return null;
- }
-
+ projectService.runOnActiveServer(projectId, (ClusterTask<Void>) () -> {
+ // Clear log file instead of delete as we may not have permission over the
+ // workspace directory upon an abnormal shutdown
+ var logFile = Workspace.getLogFile(projectId, workspaceNumber);
+ if (logFile.exists())
+ Files.newByteChannel(logFile.toPath(), WRITE, TRUNCATE_EXISTING).close();
+ return null;
});
update(workspace);
listenerRegistry.post(new WorkspacePending(workspace));
@@ -522,8 +508,13 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
try {
workspaceFutures.put(workspace.getId(), provision(workspace));
} catch (Throwable t) {
- log(logService.newLogger(workspace.getLoggingSupport()), t);
- markWorkspaceError(workspace);
+ var logger = logService.newLogger(workspace.getLoggingSupport());
+ var explicitException = ExceptionUtils.find(t, ExplicitException.class);
+ if (explicitException != null)
+ logger.error("Error provisioning workspace: " + explicitException.getMessage());
+ else
+ logger.error("Error provisioning workspace", t);
+ markWorkspaceInactive(workspace);
}
}
} else if (workspace.getStatus() == Status.ACTIVE) {
@@ -559,15 +550,20 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
var logger = logService.newLogger(workspace.getLoggingSupport());
try {
future.get();
- logger.error("Workspace runtime stopped for unknown reason");
+ logger.error("Workspace stopped for unknown reason");
} catch (Throwable t) {
- if (ExceptionUtils.find(t, CancellationException.class) != null)
- logger.error("Workspace runtime stopped due to server restart. You may reprovision the workspace to continue your work");
- else
- log(logger, t);
+ if (ExceptionUtils.find(t, CancellationException.class) != null) {
+ logger.error("Workspace stopped due to server restart. You may reprovision the workspace to continue your work");
+ } else if (ExceptionUtils.find(t, InterruptedException.class) == null) {
+ var explicitException = ExceptionUtils.find(t, ExplicitException.class);
+ if (explicitException != null)
+ logger.error("Workspace stopped: " + explicitException.getMessage());
+ else
+ logger.error("Workspace stopped", t);
+ }
} finally {
it.remove();
- markWorkspaceError(workspace);
+ markWorkspaceInactive(workspace);
}
}
}
@@ -671,10 +667,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
spec = interpolator.interpolateProperties(spec);
String token = workspace.getToken();
-
- var logger = logService.newLogger(workspace.getLoggingSupport());
- var provisioner = getProvisioner(workspace, spec, logger);
-
var project = workspace.getProject();
var projectId = project.getId();
var projectPath = project.getPath();
@@ -682,6 +674,12 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
var workspaceId = workspace.getId();
var workspaceNumber = workspace.getNumber();
+ var workspaceDir = getWorkspaceDir(projectId, workspaceNumber);
+ FileUtils.createDir(workspaceDir);
+
+ var logger = logService.newLogger(workspace.getLoggingSupport());
+ var provisioner = getProvisioner(workspace, spec, logger);
+
var gitEmail = workspace.getUser().getGitEmailAddress();
if (gitEmail == null)
throw new ExplicitException("No email address for git operations configured");
@@ -718,9 +716,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
logger.success("Workspace provisioned and is active now");
runtime.await();
- } catch (Throwable t) {
- if (ExceptionUtils.find(t, InterruptedException.class) == null)
- DefaultWorkspaceService.logger.error("Error awaiting workspace runtime", t);
} finally {
for (var shellId : runtime.getShellLabels().keySet())
terminateShell(workspaceId, shellId);
@@ -737,21 +732,14 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
}
- private void markWorkspaceError(Workspace workspace) {
+ private void markWorkspaceInactive(Workspace workspace) {
workspace.setStatus(Workspace.Status.INACTIVE);
workspace.setInactiveDate(new Date());
update(workspace);
+ logService.flush(workspace.getLoggingSupport());
listenerRegistry.post(new WorkspaceInactive(workspace));
}
- private void log(TaskLogger logger, Throwable throwable) {
- var explicitException = ExceptionUtils.find(throwable, ExplicitException.class);
- if (explicitException != null)
- logger.error(explicitException.getMessage());
- else
- logger.error("Error processing workspace", throwable);
- }
-
@Override
public File getWorkspaceDir(Long projectId, Long workspaceNumber) {
return projectService.getSubDir(projectId, Workspace.getProjectRelativeDirPath(workspaceNumber));
@@ -960,117 +948,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
return isAuthorized(request, project);
}
- @Override
- public void onPostCommit(WorkspaceContext context) {
- var workspaceDir = getWorkspaceDir(context.getProjectId(), context.getWorkspaceNumber());
- projectService.directoryModified(context.getProjectId(), workspaceDir);
- }
-
- @Override
- public void syncWorkspaces(Long projectId, String activeServer) {
- projectService.syncDirectory(projectId, Workspace.WORKSPACES_DIR, (suffix) -> {
- projectService.syncDirectory(projectId, Workspace.WORKSPACES_DIR + "/" + suffix, (workspaceNumberStr) -> {
- syncWorkspace(projectId, Long.valueOf(workspaceNumberStr), activeServer);
- }, activeServer);
- }, activeServer);
- }
-
- private void syncWorkspace(Long projectId, Long workspaceNumber, String activeServer) {
- var workDir = Workspace.getWorkDir(projectId, workspaceNumber);
- var workspaceDir = workDir.getParentFile();
- var gitDir = new File(workDir, ".git");
-
- var remoteWorkspaceVersion = clusterService.runOnServer(activeServer, () -> {
- var remoteWorkspaceDir = getWorkspaceDir(projectId, workspaceNumber);
- return readVersion(remoteWorkspaceDir);
- });
- var workspaceVersion = readVersion(workspaceDir);
- if (workspaceVersion < remoteWorkspaceVersion) {
- CommandUtils.callWithClusterCredential(new GitTask<Void>() {
-
- @Override
- public Void call(Commandline git) throws IOException {
- var projectPath = projectService.findFacadeById(projectId).getPath();
- var cloneUrl = clusterService.getServerUrl(activeServer)
- + "/" + projectPath + "/" + GIT_PREFIX + workspaceNumber;
- var debugLogger = new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- };
- var errorLogger = new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- };
-
- if (clusterService.runOnServer(activeServer, new HasLfsObjectsTask(projectId, workspaceNumber)))
- installGitLfs(git, debugLogger, errorLogger);
-
- if (!gitDir.exists()) {
- FileUtils.deleteDir(workDir);
- git.args("clone", cloneUrl, workDir.getAbsolutePath());
- git.execute(debugLogger, new LineConsumer() {
- @Override
- public void consume(String line) {
- if (!line.startsWith("Cloning into"))
- logger.error(line);
- else
- logger.debug(line);
- }
- }).checkReturnCode();
- } else {
- git.args("ls-remote", "--symref", cloneUrl, "HEAD");
- var branchRef = new AtomicReference<String>();
- git.execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- if (line.startsWith("ref: refs/heads/"))
- branchRef.set(line.substring("ref: refs/heads/".length()).split("\\t")[0]);
- }
- }, errorLogger).checkReturnCode();
-
- var branch = branchRef.get();
- if (branch != null) {
- git.workingDir(workDir);
- git.args("remote", "set-url", "origin", cloneUrl);
- git.execute(debugLogger, errorLogger).checkReturnCode();
-
- git.args("fetch", "origin", "refs/heads/" + branch);
- git.execute(debugLogger, new LineConsumer() {
- @Override
- public void consume(String line) {
- if (!line.startsWith("From") && !line.contains("->"))
- logger.error(line);
- else
- logger.debug(line);
- }
- }).checkReturnCode();
-
- git.args("checkout", "-f", "-B", branch, "FETCH_HEAD");
- git.execute(debugLogger, new LineConsumer() {
- @Override
- public void consume(String line) {
- if (!line.startsWith("Reset branch") && !line.startsWith("Switched to"))
- logger.error(line);
- }
- }).checkReturnCode();
- }
- }
- return null;
- }
- });
-
- writeVersion(workspaceDir, remoteWorkspaceVersion);
- }
- }
-
@Sessional
@Override
public GitExecutionResult executeGitCommand(Workspace workspace, String[] gitArgs) {
diff --git a/server-core/src/main/java/io/onedev/server/workspace/WorkspacePostCommitCallback.java b/server-core/src/main/java/io/onedev/server/workspace/WorkspacePostCommitCallback.java
deleted file mode 100644
index e9ebf8323f..0000000000
--- a/server-core/src/main/java/io/onedev/server/workspace/WorkspacePostCommitCallback.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.onedev.server.workspace;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.NotFoundException;
-
-import io.onedev.commons.utils.StringUtils;
-
-@Singleton
-public class WorkspacePostCommitCallback extends HttpServlet {
-
- public static final String PATH = "/git-workspace-postcommit-callback";
-
- private final WorkspaceService workspaceService;
-
- @Inject
- public WorkspacePostCommitCallback(WorkspaceService workspaceService) {
- this.workspaceService = workspaceService;
- }
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- response.setContentType("text/plain");
- List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
- if (fields.size() != 1)
- throw new BadRequestException("Invalid request path");
-
- String workspaceToken = fields.get(0);
-
- var context = workspaceService.getWorkspaceContext(workspaceToken, false);
- if (context == null)
- throw new NotFoundException("No workspace found with specified token");
-
- workspaceService.onPostCommit(context);
- response.setStatus(HttpServletResponse.SC_OK);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
index e7ac2030be..a09e91cd8e 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java
@@ -19,8 +19,6 @@ import io.onedev.server.util.criteria.Criteria;
public interface WorkspaceService extends EntityService<Workspace> {
- public static final String GIT_PREFIX = "~workspaces/";
-
@Nullable Workspace find(Project project, long number);
void create(Workspace workspace);
@@ -61,13 +59,9 @@ public interface WorkspaceService extends EntityService<Workspace> {
@Nullable
WorkspaceContext getWorkspaceContext(String token, boolean mustExist);
-
- void onPostCommit(WorkspaceContext context);
boolean hasLfsObjects(Long projectId, Long workspaceNumber);
- void syncWorkspaces(Long projectId, String activeServer);
-
GitExecutionResult executeGitCommand(Workspace workspace, String[] gitArgs);
@Nullable
diff --git a/server-core/src/main/resources/git-workspace-postcommit-hook b/server-core/src/main/resources/git-workspace-postcommit-hook
deleted file mode 100644
index c85981bdf2..0000000000
--- a/server-core/src/main/resources/git-workspace-postcommit-hook
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-unset http_proxy
-unset https_proxy
-%s
-response=$(${ONEDEV_CURL} -k -s -S -w '\n%%{http_code}' ${ONEDEV_URL}/git-workspace-postcommit-callback/${ONEDEV_HOOK_TOKEN} 2>&1) || {
- echo "$response"
- exit 1
-}
-http_code=$(echo "$response" | tail -n1)
-body=$(echo "$response" | sed '$d')
-if [ "$http_code" -ge 400 ] 2>/dev/null; then
- if [ -n "$body" ]; then
- echo "curl($http_code): $body"
- else
- echo "curl($http_code): HTTP error"
- fi
- exit 1
-fi
diff --git a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
index de317143f0..967c2bd0ca 100644
--- a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
+++ b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java
@@ -6,6 +6,7 @@ import static io.onedev.agent.AgentUtils.getOsIds;
import static io.onedev.agent.AgentUtils.newDockerKiller;
import static io.onedev.k8shelper.RegistryLoginFacade.merge;
import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -24,6 +25,10 @@ import java.util.concurrent.ExecutorService;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
+import io.onedev.server.ServerConfig;
+import io.onedev.server.model.Workspace;
+import io.onedev.server.model.support.workspace.spec.EnvVar;
+import io.onedev.server.util.SiteSyncUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.SystemUtils;
import org.jspecify.annotations.Nullable;
@@ -350,8 +355,6 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
throw new ExplicitException("This workspace can only be provisioned by shell provisioner");
var workspaceDir = getWorkspaceDir(context);
- var workDir = new File(workspaceDir, "work");
- FileUtils.createDir(workDir);
var osIds = getOsIds(logger);
if (SystemUtils.IS_OS_LINUX && !osIds.equals("0:0")) {
@@ -368,8 +371,10 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
var infoLogger = AgentUtils.newInfoLogger(logger);
var warningLogger = AgentUtils.newWarningLogger(logger);
- var envVars = setupRepository(context, CONTAINER_WORKSPACE_PATH, logger);
+ setupRepository(context, CONTAINER_WORKSPACE_PATH, logger);
+ var envVars = context.getSpec().getEnvVars().stream()
+ .collect(toMap(EnvVar::getName, it -> it.isSecret() ? it.getSecretValue() : it.getValue()));
envVars.put("TERM", "xterm-256color");
envVars.put("LANG", "C.UTF-8");
envVars.put("ONEDEV_WORKDIR", CONTAINER_WORKSPACE_PATH + "/work");
@@ -441,7 +446,12 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
if (SystemUtils.IS_OS_LINUX && !runAs.equals("0:0")) {
logger.log("Changing owner of workspace directory to container user...");
+
+ var logFile = new File(workspaceDir, Workspace.LOG_FILE);
+ if (!logFile.exists())
+ FileUtils.touchFile(logFile);
changeOwner(docker, runAs, workspaceDir, osIds, logger);
+ changeOwner(docker, osIds, logFile, osIds, logger);
}
if (!emptyUserDataMounts.isEmpty()) {
@@ -491,7 +501,6 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa
docker.addArgs("--expose", String.valueOf(containerPort));
docker.addArgs("-P");
}
-
docker.addArgs("-v", getHostPath(workspaceDir.getAbsolutePath()) + ":" + containerWorkspacePath);
for (var allocation: cacheProvisioner.getAllocations()) {
diff --git a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
index a1a7f61623..c06674782f 100644
--- a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
+++ b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java
@@ -2,6 +2,7 @@ package io.onedev.server.plugin.provisioner.shell;
import static io.onedev.agent.AgentUtils.newErrorLogger;
import static io.onedev.agent.AgentUtils.newInfoLogger;
+import static java.util.stream.Collectors.toMap;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -13,6 +14,7 @@ import java.util.concurrent.CountDownLatch;
import javax.validation.constraints.NotEmpty;
+import io.onedev.server.model.support.workspace.spec.EnvVar;
import org.apache.commons.io.FilenameUtils;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -119,12 +121,14 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<T
}
var workspaceDir = getWorkspaceDir(context);
+ setupRepository(context, workspaceDir.getAbsolutePath(), logger);
- var envVars = setupRepository(context, workspaceDir.getAbsolutePath(), logger);
+ var envVars = context.getSpec().getEnvVars().stream()
+ .collect(toMap(EnvVar::getName, it -> it.isSecret() ? it.getSecretValue() : it.getValue()));
envVars.put("TERM", "xterm-256color");
envVars.put("LANG", "C.UTF-8");
- var workDir = new File(workspaceDir, "work");
+ var workDir = Workspace.getWorkDir(context.getProjectId(), context.getWorkspaceNumber());
envVars.put("ONEDEV_WORKDIR", workDir.getAbsolutePath());
logger.log("Setting up cache...");
@@ -162,7 +166,6 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<T
public GitExecutionResult executeGitCommand(String[] gitArgs) {
var git = CommandUtils.newGit();
git.workingDir(workDir);
- git.envs().putAll(HookUtils.getWorkspacePostCommitHookEnvs(context.getToken()));
git.args(Arrays.asList(gitArgs));
var stdoutStream = new ByteArrayOutputStream();
@@ -174,7 +177,6 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<T
@Override
public Shell doOpenShell(Terminal terminal) {
var workDir = Workspace.getWorkDir(context.getProjectId(), context.getWorkspaceNumber());
- FileUtils.createDir(workDir);
var tmux = newTmux();
tmux.addArgs("new-session")
.addArgs(context.getSpec().getShell().getFacility().getExecutable())
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index 75679309be..65e5b3457f 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -28,7 +28,6 @@ import io.onedev.server.git.GitLfsFilter;
import io.onedev.server.git.GoGetFilter;
import io.onedev.server.git.hook.GitPostReceiveCallback;
import io.onedev.server.git.hook.GitPreReceiveCallback;
-import io.onedev.server.workspace.WorkspacePostCommitCallback;
import io.onedev.server.jetty.ServletConfigurator;
import io.onedev.server.security.CorsFilter;
import io.onedev.server.security.DefaultWebEnvironment;
@@ -61,9 +60,6 @@ public class ProductServletConfigurator implements ServletConfigurator {
@Inject
private GitPostReceiveCallback postReceiveServlet;
- @Inject
- private WorkspacePostCommitCallback workspacePostCommitServlet;
-
@Inject
private WicketServlet wicketServlet;
@@ -93,8 +89,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(new ServletHolder(preReceiveServlet), GitPreReceiveCallback.PATH + "/*");
context.addServlet(new ServletHolder(postReceiveServlet), GitPostReceiveCallback.PATH + "/*");
- context.addServlet(new ServletHolder(workspacePostCommitServlet), WorkspacePostCommitCallback.PATH + "/*");
-
+
/*
* Add wicket servlet as the default servlet which will serve all requests failed to
* match a path pattern