Skip to content

The Unified and Autonomous Development Platform

chore: Remove CodePushAuthorizationSource as it is not necessary

Robin Sheneb80815d0201
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 6e151c55e4..066e5c20a2 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -173,7 +173,6 @@ import io.onedev.server.security.AuthorizingService;
import io.onedev.server.security.BasicAuthenticationFilter;
import io.onedev.server.security.BearerAuthenticationFilter;
import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.CodePushAuthorizationSource;
import io.onedev.server.security.DefaultAuthenticatingService;
import io.onedev.server.security.DefaultAuthorizingService;
import io.onedev.server.security.DefaultFilterChainResolver;
@@ -611,8 +610,6 @@ public class CoreModule extends AbstractPluginModule {
bind(WebHookManager.class);
contribute(CodePullAuthorizationSource.class, DefaultJobService.class);
- contribute(CodePullAuthorizationSource.class, DefaultWorkspaceService.class);
- contribute(CodePushAuthorizationSource.class, DefaultWorkspaceService.class);
bind(CodeIndexService.class).to(DefaultCodeIndexService.class);
bind(CodeSearchService.class).to(DefaultCodeSearchService.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 4d3207c795..820b783a5f 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
@@ -51,7 +51,6 @@ import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.CodePushAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.ProjectService;
import io.onedev.server.util.IOUtils;
@@ -76,21 +75,17 @@ public class GitFilter implements Filter {
private final ClusterService clusterService;
private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;
-
- private final Set<CodePushAuthorizationSource> codePushAuthorizationSources;
-
+
@Inject
public GitFilter(OneDev oneDev, ProjectService projectService, WorkExecutionService workExecutionService,
SessionService sessionService, ClusterService clusterService,
- Set<CodePullAuthorizationSource> codePullAuthorizationSources,
- Set<CodePushAuthorizationSource> codePushAuthorizationSources) {
+ Set<CodePullAuthorizationSource> codePullAuthorizationSources) {
this.onedev = oneDev;
this.projectService = projectService;
this.workExecutionService = workExecutionService;
this.sessionService = sessionService;
this.clusterService = clusterService;
this.codePullAuthorizationSources = codePullAuthorizationSources;
- this.codePushAuthorizationSources = codePushAuthorizationSources;
}
private String getPathInfo(HttpServletRequest request) {
@@ -280,17 +275,8 @@ public class GitFilter implements Filter {
}
private void checkPushPermission(HttpServletRequest request, Project project) {
- if (!SecurityUtils.canWriteCode(project)) {
- boolean isAuthorized = false;
- for (CodePushAuthorizationSource source: codePushAuthorizationSources) {
- if (source.canPushCode(request, project)) {
- isAuthorized = true;
- break;
- }
- }
- if (!isAuthorized)
- throw new UnauthorizedException("You do not have permission to push to this project.");
- }
+ if (!SecurityUtils.canWriteCode(project))
+ throw new UnauthorizedException("You do not have permission to push to this project.");
}
private boolean canAccessProject(HttpServletRequest request, Project project) {
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 bfa74323d6..d65ddf1f4a 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
@@ -68,7 +68,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.CodePushAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.GitLfsLockService;
import io.onedev.server.service.ProjectService;
@@ -100,14 +99,11 @@ public class GitLfsFilter implements Filter {
private final ClusterService clusterService;
private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;
-
- private final Set<CodePushAuthorizationSource> codePushAuthorizationSources;
@Inject
public GitLfsFilter(ProjectService projectService, ObjectMapper objectMapper, SessionService sessionService,
SettingService settingService, GitLfsLockService lockService, ClusterService clusterService,
- Set<CodePullAuthorizationSource> codePullAuthorizationSources,
- Set<CodePushAuthorizationSource> codePushAuthorizationSources) {
+ Set<CodePullAuthorizationSource> codePullAuthorizationSources) {
this.projectService = projectService;
this.objectMapper = objectMapper;
this.sessionService = sessionService;
@@ -115,7 +111,6 @@ public class GitLfsFilter implements Filter {
this.lockService = lockService;
this.clusterService = clusterService;
this.codePullAuthorizationSources = codePullAuthorizationSources;
- this.codePushAuthorizationSources = codePushAuthorizationSources;
}
@Override
@@ -138,18 +133,6 @@ public class GitLfsFilter implements Filter {
}
}
- private boolean canWriteCode(HttpServletRequest request, Project project) {
- if (!SecurityUtils.canWriteCode(project)) {
- for (CodePushAuthorizationSource source: codePushAuthorizationSources) {
- if (source.canPushCode(request, project))
- return true;
- }
- return false;
- } else {
- return true;
- }
- }
-
private boolean canAccessProject(HttpServletRequest request, Project project) {
if (!SecurityUtils.canAccessProject(project)) {
for (CodePullAuthorizationSource source: codePullAuthorizationSources) {
@@ -260,7 +243,7 @@ public class GitLfsFilter implements Filter {
Project project = projectService.findByPath(getProjectPath(pathInfo));
if (project == null || !canAccessProject(httpRequest, project))
reportProjectNotFoundOrInaccessible(httpResponse, projectPath);
- else if (canWriteCode(httpRequest, project))
+ else if (SecurityUtils.canWriteCode(project))
lfsObject = new LfsObject(project.getId(), objectId);
else
sendAuthorizationError(httpResponse);
@@ -347,11 +330,11 @@ public class GitLfsFilter implements Filter {
String accessToken = SecurityUtils.createTemporalAccessTokenIfUserPrincipal(300);
processBatch(httpRequest, httpResponse, project.getFacade(),
() -> canReadCode(httpRequest, project),
- () -> canWriteCode(httpRequest, project),
+ () -> SecurityUtils.canWriteCode(project),
accessToken);
} else if (pathInfo.endsWith("/locks")) {
if (httpRequest.getMethod().equals("POST")) {
- if (canWriteCode(httpRequest, project)) {
+ if (SecurityUtils.canWriteCode(project)) {
JsonNode lockRequestNode;
try (InputStream is = httpRequest.getInputStream()) {
lockRequestNode = objectMapper.readTree(is);
@@ -413,7 +396,7 @@ public class GitLfsFilter implements Filter {
}
}
} else if (pathInfo.endsWith("/locks/verify")) {
- if (canWriteCode(httpRequest, project)) {
+ if (SecurityUtils.canWriteCode(project)) {
JsonNode lockVerifyNode;
try (InputStream is = httpRequest.getInputStream()) {
lockVerifyNode = objectMapper.readTree(is);
@@ -466,7 +449,7 @@ public class GitLfsFilter implements Filter {
sendAuthorizationError(httpResponse);
}
} else if (pathInfo.endsWith("/unlock")) {
- if (canWriteCode(httpRequest, project)) {
+ if (SecurityUtils.canWriteCode(project)) {
Long id = Long.valueOf(StringUtils.substringAfterLast(
substringBeforeLast(pathInfo, "/"), "/"));
diff --git a/server-core/src/main/java/io/onedev/server/security/CodePushAuthorizationSource.java b/server-core/src/main/java/io/onedev/server/security/CodePushAuthorizationSource.java
deleted file mode 100644
index 375bed6a08..0000000000
--- a/server-core/src/main/java/io/onedev/server/security/CodePushAuthorizationSource.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.security;
-
-import javax.servlet.http.HttpServletRequest;
-
-import io.onedev.server.model.Project;
-
-public interface CodePushAuthorizationSource {
-
- boolean canPushCode(HttpServletRequest request, Project project);
-
-}
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 2dfdd2aee1..42c1b6d8a7 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
@@ -36,7 +36,6 @@ import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import javax.servlet.http.HttpServletRequest;
import org.apache.shiro.subject.Subject;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
@@ -88,8 +87,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.workspace.WorkspaceQuery;
-import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.CodePushAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.WriteCode;
import io.onedev.server.service.ProjectService;
@@ -110,7 +107,7 @@ import oshi.SystemInfo;
@Singleton
public class DefaultWorkspaceService extends BaseEntityService<Workspace>
- implements WorkspaceService, Runnable, SchedulableTask, CodePullAuthorizationSource, CodePushAuthorizationSource, Serializable {
+ implements WorkspaceService, Runnable, SchedulableTask, Serializable {
private static final long serialVersionUID = 1L;
@@ -910,18 +907,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
return context;
}
- private boolean isAuthorized(HttpServletRequest request, Project project) {
- String token = SecurityUtils.getBearerToken(request);
- if (token != null) {
- var context = projectService.runOnActiveServer(project.getId(), () -> {
- return workspaceContexts.get(token);
- });
- if (context != null)
- return context.getProjectId().equals(project.getId());
- }
- return false;
- }
-
@Override
public boolean hasLfsObjects(Long projectId, Long workspaceNumber) {
var workDir = Workspace.getWorkDir(projectId, workspaceNumber);
@@ -929,16 +914,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
return new File(gitDir, "lfs/objects").exists();
}
- @Override
- public boolean canPullCode(HttpServletRequest request, Project project) {
- return isAuthorized(request, project);
- }
-
- @Override
- public boolean canPushCode(HttpServletRequest request, Project project) {
- return isAuthorized(request, project);
- }
-
@Sessional
@Override
public GitExecutionResult executeGitCommand(Workspace workspace, String[] gitArgs) {