Skip to content

The Unified and Autonomous Development Platform

fix: Various security vulnerabilities in restful api (OD-2762)

Robin Shenbd7e41a55d76
diff --git a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
index 7c927d5f5a..33bf707ead 100644
--- a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
+++ b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java
@@ -37,6 +37,11 @@ public class IssueHelper {
summary.remove("pinDate");
summary.remove("boardPosition");
summary.remove("numberScopeId");
+ summary.remove("totalEstimatedTime");
+ summary.remove("totalSpentTime");
+ summary.remove("ownEstimatedTime");
+ summary.remove("ownSpentTime");
+ summary.remove("progress");
summary.put("reference", issue.getReference().toString(currentProject));
summary.remove("submitterId");
summary.put("submitter", issue.getSubmitter().getName());
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
index 62a058bae6..a790de672a 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.shiro.subject.Subject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -120,13 +121,27 @@ public class IssueResource {
@Api(order=100)
@Path("/{issueId}")
@GET
- public Issue getIssue(@PathParam("issueId") Long issueId) {
+ public Map<String, Object> getIssue(@PathParam("issueId") Long issueId) {
Issue issue = issueService.load(issueId);
- if (!SecurityUtils.canAccessIssue(issue))
+ var subject = SecurityUtils.getSubject();
+ if (!SecurityUtils.canAccessIssue(subject, issue))
throw new UnauthorizedException();
- return issue;
+ return getIssueMap(subject, issue);
}
+ private Map<String, Object> getIssueMap(Subject subject, Issue issue) {
+ var typeReference = new TypeReference<Map<String, Object>>() {};
+ var issueMap = objectMapper.convertValue(issue, typeReference);
+ if (!SecurityUtils.canAccessTimeTracking(issue.getProject())) {
+ issueMap.remove("totalEstimatedTime");
+ issueMap.remove("totalSpentTime");
+ issueMap.remove("ownEstimatedTime");
+ issueMap.remove("ownSpentTime");
+ issueMap.remove("progress");
+ }
+ return issueMap;
+ }
+
@Api(order=200, exampleProvider = "getFieldsExample")
@Path("/{issueId}/fields")
@GET
@@ -176,7 +191,7 @@ public class IssueResource {
@GET
public Collection<IssueWork> getWorks(@PathParam("issueId") Long issueId) {
Issue issue = issueService.load(issueId);
- if (!SecurityUtils.canAccessIssue(issue))
+ if (!SecurityUtils.canAccessIssue(issue) || !SecurityUtils.canAccessTimeTracking(issue.getProject()))
throw new UnauthorizedException();
return issue.getWorks();
}
@@ -269,10 +284,9 @@ public class IssueResource {
throw new NotAcceptableException("Error parsing query", e);
}
- var typeReference = new TypeReference<Map<String, Object>>() {};
var issues = new ArrayList<Map<String, Object>>();
for (var issue: issueService.query(subject, null, parsedQuery, false, offset, count)) {
- var issueMap = objectMapper.convertValue(issue, typeReference);
+ var issueMap = getIssueMap(subject, issue);
if (withFields != null && withFields)
issueMap.put("fields", issue.getFields());
issues.add(issueMap);
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index 4ac6fa43aa..0bc27827d6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -296,12 +296,14 @@ public class ProjectResource {
checkProjectCreationPermission(subject, project.getParent());
if (project.getParent() != null && project.isSelfOrAncestorOf(project.getParent()))
- throw new ExplicitException("Can not use current or descendant project as parent");
+ throw new NotAcceptableException("Can not use current or descendant project as parent");
checkProjectNameDuplication(project);
if (project.getForkedFrom() != null) {
var forkedFrom = project.getForkedFrom();
+ if (!SecurityUtils.canReadCode(subject, forkedFrom))
+ throw new UnauthorizedException("Not authorized to read code of project '" + forkedFrom.getPath() + "'");
project.getBuildSetting().setBuildPreservations(forkedFrom.getBuildSetting().getBuildPreservations());
project.getBuildSetting().setCachePreserveDays(forkedFrom.getBuildSetting().getCachePreserveDays());
project.getBuildSetting().setJobProperties(forkedFrom.getBuildSetting().getJobProperties());
@@ -329,15 +331,20 @@ public class ProjectResource {
@Path("/{projectId}")
@POST
public Response updateProject(@PathParam("projectId") Long projectId, @NotNull @Valid ProjectData data) {
- Project project = projectService.load(projectId);
+ Project project = projectService.load(projectId);
+
+ var subject = SecurityUtils.getSubject();
+ if (!SecurityUtils.canManageProject(subject, project))
+ throw new UnauthorizedException();
+
+ Long oldParentId = Project.idOf(project.getParent());
var oldAuditContent = VersionedXmlDoc.fromBean(ProjectData.from(project)).toXML();
+
data.populate(project, projectService);
-
+
Project parent = data.getParentId() != null? projectService.load(data.getParentId()) : null;
- Long oldParentId = Project.idOf(project.getParent());
- var subject = SecurityUtils.getSubject();
- if (!Objects.equals(oldParentId, Project.idOf(parent)))
+ if (!Objects.equals(oldParentId, Project.idOf(parent)))
checkProjectCreationPermission(subject, parent);
if (parent != null && project.isSelfOrAncestorOf(parent))
@@ -345,13 +352,9 @@ public class ProjectResource {
checkProjectNameDuplication(project);
- if (!SecurityUtils.canManageProject(subject, project)) {
- throw new UnauthorizedException();
- } else {
- projectService.update(project);
- auditService.audit(project, "changed project via RESTful API", oldAuditContent,
- VersionedXmlDoc.fromBean(ProjectData.from(project)).toXML());
- }
+ projectService.update(project);
+ auditService.audit(project, "changed project via RESTful API", oldAuditContent,
+ VersionedXmlDoc.fromBean(ProjectData.from(project)).toXML());
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
index f5f3fae2f5..8863a42d9c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
@@ -115,7 +115,7 @@ public class RepositoryResource {
@POST
public Response setDefaultBranch(@PathParam("projectId") Long projectId, @NotNull String defaultBranch) {
Project project = projectService.load(projectId);
- if (!SecurityUtils.canWriteCode(project))
+ if (!SecurityUtils.canManageProject(project))
throw new UnauthorizedException();
try {