Skip to content

The Unified and Autonomous Development Platform

Add more permissions and fix some permission check bugs

Robin Shen7a7ce70bfcc6
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 1d5cce3ded..9201f3482e 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -127,6 +127,7 @@ public class DefaultDataManager implements DataManager, Serializable {
Role developer = new Role();
developer.setName("Developer");
developer.setCodePrivilege(CodePrivilege.WRITE);
+ developer.setScheduleIssues(true);
developer.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
JobPrivilege jobPrivilege = new JobPrivilege();
@@ -139,6 +140,7 @@ public class DefaultDataManager implements DataManager, Serializable {
Role tester = new Role();
tester.setName("Tester");
tester.setCodePrivilege(CodePrivilege.READ);
+ tester.setScheduleIssues(true);
tester.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
jobPrivilege = new JobPrivilege();
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 64ace7503c..c190fbc172 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -18,6 +18,8 @@ import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.role.CodePrivilege;
@@ -28,11 +30,14 @@ import io.onedev.server.security.permission.AccessBuildReports;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.EditIssueField;
import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.ManagePullRequests;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.security.permission.RunJob;
+import io.onedev.server.security.permission.ScheduleIssues;
import io.onedev.server.security.permission.WriteCode;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.SecurityUtils;
@@ -57,10 +62,16 @@ public class Role extends AbstractEntity implements Permission {
private boolean manageProject;
+ private boolean managePullRequests;
+
+ private boolean manageCodeComments;
+
private CodePrivilege codePrivilege = CodePrivilege.NONE;
private boolean manageIssues;
+ private boolean scheduleIssues;
+
@Lob
@Column(length=65535, nullable=false)
private ArrayList<String> editableIssueFields = new ArrayList<>();
@@ -87,8 +98,7 @@ public class Role extends AbstractEntity implements Permission {
this.name = name;
}
- @Editable(order=200, description="This permission is required to edit project settings. "
- + "It implies all other project permissions")
+ @Editable(order=200)
public boolean isManageProject() {
return manageProject;
}
@@ -102,8 +112,28 @@ public class Role extends AbstractEntity implements Permission {
return !(boolean)EditContext.get().getInputValue("manageProject");
}
- @Editable(order=300)
+ @Editable(order=250)
+ @ShowCondition("isManageProjectDisabled")
+ public boolean isManagePullRequests() {
+ return managePullRequests;
+ }
+
+ public void setManagePullRequests(boolean managePullRequests) {
+ this.managePullRequests = managePullRequests;
+ }
+
+ @Editable(order=260)
@ShowCondition("isManageProjectDisabled")
+ public boolean isManageCodeComments() {
+ return manageCodeComments;
+ }
+
+ public void setManageCodeComments(boolean manageCodeComments) {
+ this.manageCodeComments = manageCodeComments;
+ }
+
+ @Editable(order=300)
+ @ShowCondition("isCodePrivilegeVisible")
@NotNull
public CodePrivilege getCodePrivilege() {
return codePrivilege;
@@ -113,8 +143,13 @@ public class Role extends AbstractEntity implements Permission {
this.codePrivilege = codePrivilege;
}
- @Editable(order=400, description="This permission is required to manage issue milestones and boards. "
- + "It implies all other issue permissions")
+ @SuppressWarnings("unused")
+ private static boolean isCodePrivilegeVisible() {
+ return !(boolean)EditContext.get().getInputValue("managePullRequests")
+ && !(boolean)EditContext.get().getInputValue("manageCodeComments");
+ }
+
+ @Editable(order=400)
@ShowCondition("isManageProjectDisabled")
public boolean isManageIssues() {
return manageIssues;
@@ -123,14 +158,25 @@ public class Role extends AbstractEntity implements Permission {
public void setManageIssues(boolean manageIssues) {
this.manageIssues = manageIssues;
}
-
+
@SuppressWarnings("unused")
private static boolean isManageIssuesDisabled() {
return !(boolean)EditContext.get().getInputValue("manageIssues");
}
+ @Editable(order=500, description="This permission enables one to schedule issues into milestones")
+ @ShowCondition("isManageIssuesDisabled")
+ public boolean isScheduleIssues() {
+ return scheduleIssues;
+ }
+
+ public void setScheduleIssues(boolean scheduleIssues) {
+ this.scheduleIssues = scheduleIssues;
+ }
+
@Editable(order=600, description="Optionally specify custom fields allowed to edit when open new issues")
@ChoiceProvider("getIssueFieldChoices")
+ @ShowCondition("isManageIssuesDisabled")
public List<String> getEditableIssueFields() {
return editableIssueFields;
}
@@ -180,60 +226,52 @@ public class Role extends AbstractEntity implements Permission {
}
private Collection<Permission> getPermissions() {
- Collection<Permission> permissions = new ArrayList<>();
+ Collection<Permission> permissions = Lists.newArrayList(new AccessProject());
+
if (SecurityUtils.getUser() != null) {
- if (manageProject) {
+ if (manageProject)
permissions.add(new ManageProject());
- } else {
- if (codePrivilege == CodePrivilege.READ)
- permissions.add(new ReadCode());
- else if (codePrivilege == CodePrivilege.WRITE)
- permissions.add(new WriteCode());
-
- if (manageIssues) {
- permissions.add(new ManageIssues());
- } else if (!editableIssueFields.isEmpty()) {
- for (String issueField: editableIssueFields)
- permissions.add(new EditIssueField(issueField));
- }
- permissions.add(new AccessProject());
-
- for (JobPrivilege jobPrivilege: jobPrivileges) {
- if (jobPrivilege.isManageJob()) {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new ManageJob()));
- } else if (jobPrivilege.isRunJob()) {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new RunJob()));
- } else if (jobPrivilege.isAccessLog()) {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));
- } else if (jobPrivilege.getAccessibleReports() != null) {
- AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
- } else {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
- }
- }
+ if (manageCodeComments)
+ permissions.add(new ManageCodeComments());
+ if (managePullRequests)
+ permissions.add(new ManagePullRequests());
+ if (codePrivilege == CodePrivilege.READ)
+ permissions.add(new ReadCode());
+ if (codePrivilege == CodePrivilege.WRITE)
+ permissions.add(new WriteCode());
+ if (manageIssues)
+ permissions.add(new ManageIssues());
+ if (scheduleIssues)
+ permissions.add(new ScheduleIssues());
+ for (String issueField: editableIssueFields)
+ permissions.add(new EditIssueField(issueField));
+ for (JobPrivilege jobPrivilege: jobPrivileges) {
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
+ if (jobPrivilege.isManageJob())
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new ManageJob()));
+ if (jobPrivilege.isRunJob())
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new RunJob()));
+ if (jobPrivilege.isAccessLog())
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));
+ if (jobPrivilege.getAccessibleReports() != null) {
+ AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
+ }
}
} else {
- if (manageProject) {
+ if (manageProject || managePullRequests || manageCodeComments || codePrivilege != CodePrivilege.NONE)
permissions.add(new ReadCode());
+ if (manageProject)
permissions.add(new JobPermission("*", new AccessBuildLog()));
- } else {
- if (codePrivilege != CodePrivilege.NONE)
- permissions.add(new ReadCode());
-
- permissions.add(new AccessProject());
-
- for (JobPrivilege jobPrivilege: jobPrivileges) {
- if (jobPrivilege.isManageJob() || jobPrivilege.isRunJob() || jobPrivilege.isAccessLog()) {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));
- } else if (jobPrivilege.getAccessibleReports() != null) {
- AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
- } else {
- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
- }
+ for (JobPrivilege jobPrivilege: jobPrivileges) {
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
+ if (jobPrivilege.isManageJob() || jobPrivilege.isRunJob() || jobPrivilege.isAccessLog())
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));
+ if (jobPrivilege.getAccessibleReports() != null) {
+ AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
}
- }
+ }
}
return permissions;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index f824d44f1b..c85b4e2bdd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.hibernate.validator.constraints.NotEmpty;
import edu.emory.mathcs.backport.java.util.Collections;
@@ -97,9 +99,10 @@ public class JobPrivilege implements Serializable {
return !(boolean) EditContext.get().getInputValue("accessLog");
}
- @Editable(order=400, name="Access Build Reports", description="Specify space-separated reports. Use * or ? for wildcard match")
+ @Editable(order=400, name="Access Build Reports", description="Optionally specify space-separated reports. Use * or ? for wildcard match")
@ShowCondition("isAccessLogDisabled")
@Patterns
+ @Nullable
public String getAccessibleReports() {
return accessibleReports;
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
index 1166898e13..2256de008e 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java
@@ -1,12 +1,14 @@
package io.onedev.server.security.permission;
+import javax.annotation.Nullable;
+
import org.apache.shiro.authz.Permission;
public class EditIssueField implements Permission {
private final String fieldName;
- public EditIssueField(String fieldName) {
+ public EditIssueField(@Nullable String fieldName) {
this.fieldName = fieldName;
}
@@ -14,7 +16,7 @@ public class EditIssueField implements Permission {
public boolean implies(Permission p) {
if (p instanceof EditIssueField) {
EditIssueField editIssueField = (EditIssueField) p;
- return fieldName.equals(editIssueField.fieldName);
+ return fieldName == null || fieldName.equals(editIssueField.fieldName);
} else {
return new AccessProject().implies(p);
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
new file mode 100644
index 0000000000..ac55528a20
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
@@ -0,0 +1,12 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+
+public class ManageCodeComments implements Permission {
+
+ @Override
+ public boolean implies(Permission p) {
+ return p instanceof ManageCodeComments || new WriteCode().implies(p);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
index 8e1862fd40..38a5d93e29 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java
@@ -6,7 +6,7 @@ public class ManageIssues implements Permission {
@Override
public boolean implies(Permission p) {
- return p instanceof ManageIssues || p instanceof EditIssueField || new AccessProject().implies(p);
+ return p instanceof ManageIssues || new EditIssueField(null).implies(p) || new ScheduleIssues().implies(p);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
new file mode 100644
index 0000000000..156a714dcd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
@@ -0,0 +1,12 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+
+public class ManagePullRequests implements Permission {
+
+ @Override
+ public boolean implies(Permission p) {
+ return p instanceof ManagePullRequests || new WriteCode().implies(p);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
new file mode 100644
index 0000000000..36702daa51
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
@@ -0,0 +1,12 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+
+public class ScheduleIssues implements Permission {
+
+ @Override
+ public boolean implies(Permission p) {
+ return p instanceof ScheduleIssues || new AccessProject().implies(p);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
index 69af95466a..0945b031ba 100644
--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
@@ -36,12 +36,15 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.CreateProjects;
import io.onedev.server.security.permission.EditIssueField;
import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.ManagePullRequests;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.security.permission.RunJob;
+import io.onedev.server.security.permission.ScheduleIssues;
import io.onedev.server.security.permission.SystemAdministration;
import io.onedev.server.security.permission.WriteCode;
@@ -122,6 +125,10 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(fieldName)));
}
+ public static boolean canScheduleIssues(Project project) {
+ return getSubject().isPermitted(new ProjectPermission(project, new ScheduleIssues()));
+ }
+
public static boolean isAuthorizedWithRole(Project project, String roleName) {
Role role = OneDev.getInstance(RoleManager.class).find(roleName);
if (role != null) {
@@ -176,6 +183,14 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return getSubject().isPermitted(new ProjectPermission(project, new ManageIssues()));
}
+ public static boolean canManagePullRequests(Project project) {
+ return getSubject().isPermitted(new ProjectPermission(project, new ManagePullRequests()));
+ }
+
+ public static boolean canManageCodeComments(Project project) {
+ return getSubject().isPermitted(new ProjectPermission(project, new ManageCodeComments()));
+ }
+
public static boolean canManage(Build build) {
return getSubject().isPermitted(new ProjectPermission(build.getProject(),
new JobPermission(build.getJobName(), new ManageJob())));
@@ -208,19 +223,19 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModifyOrDelete(CodeComment comment) {
User user = SecurityUtils.getUser();
return user != null && user.equals(comment.getUser())
- || canManage(comment.getProject());
+ || canManageCodeComments(comment.getProject());
}
public static boolean canModifyOrDelete(CodeCommentReply reply) {
User user = SecurityUtils.getUser();
return user != null && user.equals(reply.getUser())
- || canManage(reply.getComment().getProject());
+ || canManageCodeComments(reply.getComment().getProject());
}
public static boolean canModifyOrDelete(PullRequestComment comment) {
User user = SecurityUtils.getUser();
return user != null && user.equals(comment.getUser())
- || canManage(comment.getRequest().getTargetProject());
+ || canManagePullRequests(comment.getRequest().getTargetProject());
}
public static boolean canModifyOrDelete(IssueComment comment) {
@@ -232,7 +247,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModifyOrDelete(PullRequestChange change) {
User user = SecurityUtils.getUser();
return user != null && user.equals(change.getUser())
- || canManage(change.getRequest().getTargetProject());
+ || canManagePullRequests(change.getRequest().getTargetProject());
}
public static boolean canModifyOrDelete(IssueChange change) {
@@ -244,7 +259,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModify(PullRequest request) {
User user = SecurityUtils.getUser();
return user != null && user.equals(request.getSubmitter())
- || canManage(request.getTargetProject());
+ || canManagePullRequests(request.getTargetProject());
}
public static boolean canModify(Issue issue) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
index 3b7b416c1a..5378df580a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
@@ -71,7 +71,7 @@ public abstract class AffinalBranchPicker extends Panel {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
List<Project> affinals = project.getForkRoot().getForkDescendants();
for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {
- if (!SecurityUtils.canAccess(it.next()))
+ if (!SecurityUtils.canReadCode(it.next()))
it.remove();
}
return affinals;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
index 1226b1d468..caeea6f513 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html
@@ -9,12 +9,14 @@
<label class="control-label">Description</label>
<div wicket:id="description"></div>
</div>
+ <wicket:enclosure child="milestone">
<div class="form-group">
<label class="control-label">Milestone</label>
<div>
<input wicket:id="milestone" type="hidden" class="form-control">
</div>
</div>
+ </wicket:enclosure>
<div wicket:id="fields"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 30775e137b..0a2b185d57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -122,6 +122,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
};
milestoneChoice.setRequired(false);
+ milestoneChoice.setVisible(SecurityUtils.canScheduleIssues(getProject()));
add(milestoneChoice);
Collection<String> properties = IssueUtils.getPropertyNames(getProject(),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 3dd54badc5..10bf8f5817 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -409,7 +409,8 @@ public abstract class IssueListPanel extends Panel {
super.onConfigure();
setVisible(getProject() != null
&& selectionColumn != null
- && !selectionColumn.getSelections().isEmpty());
+ && !selectionColumn.getSelections().isEmpty()
+ && SecurityUtils.canManageIssues(getProject()));
}
});
@@ -458,8 +459,8 @@ public abstract class IssueListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setVisible(getProject() != null
- && SecurityUtils.canWriteCode(getProject())
- && issuesTable.getItemCount() != 0);
+ && issuesTable.getItemCount() != 0
+ && SecurityUtils.canManageIssues(getProject()));
}
});
@@ -512,7 +513,7 @@ public abstract class IssueListPanel extends Panel {
}
});
- if (getProject() != null && SecurityUtils.canWriteCode(getProject())) {
+ if (getProject() != null && SecurityUtils.canManageIssues(getProject())) {
columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index b124161a17..f3d2838b66 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -50,6 +50,7 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
+import io.onedev.server.model.support.administration.IssueSetting;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.Input;
@@ -198,8 +199,22 @@ public abstract class IssueSidePanel extends Panel {
super.onConfigure();
User user = SecurityUtils.getUser();
String initialState = OneDev.getInstance(SettingManager.class).getIssueSetting().getInitialStateSpec().getName();
- setVisible(SecurityUtils.canWriteCode(getIssue().getProject())
- || user != null && user.equals(getIssue().getSubmitter()) && getIssue().getState().equals(initialState));
+ if (SecurityUtils.canManageIssues(getProject())) {
+ setVisible(true);
+ } else {
+ IssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ boolean hasEditableFields = false;
+ for (String fieldName: setting.getFieldNames()) {
+ if (SecurityUtils.canEditIssueField(getProject(), fieldName)) {
+ hasEditableFields = true;
+ break;
+ }
+ }
+ setVisible(hasEditableFields
+ && user != null
+ && user.equals(getIssue().getSubmitter())
+ && getIssue().getState().equals(initialState));
+ }
}
@Override
@@ -353,7 +368,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.canWriteCode(getIssue().getProject()));
+ setVisible(SecurityUtils.canScheduleIssues(getIssue().getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
index b68ffcf2b5..761767b626 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
@@ -71,7 +71,7 @@ public abstract class AffinalRevisionPicker extends Panel {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
List<Project> affinals = project.getForkRoot().getForkDescendants();
for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {
- if (!SecurityUtils.canAccess(it.next()))
+ if (!SecurityUtils.canReadCode(it.next()))
it.remove();
}
return affinals;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index bd8cffd6a6..5c8c7e47c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -138,7 +138,7 @@ abstract class BacklogColumnPanel extends Panel {
protected void respond(AjaxRequestTarget target) {
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());
- if (!SecurityUtils.canWriteCode(issue.getProject()))
+ if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, null, SecurityUtils.getUser());
target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));
@@ -159,7 +159,7 @@ abstract class BacklogColumnPanel extends Panel {
if (event.getPayload() instanceof IssueDragging && getQuery() != null) {
IssueDragging issueDragging = (IssueDragging) event.getPayload();
Issue issue = issueDragging.getIssue();
- if (SecurityUtils.canWriteCode(issue.getProject())) {
+ if (SecurityUtils.canScheduleIssues(issue.getProject())) {
issue = SerializationUtils.clone(issue);
issue.setMilestone(null);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index bfe7c1d9db..6c94b5f895 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -163,14 +163,14 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
break;
}
}
- } else if (SecurityUtils.canWriteCode(issue.getProject())) {
+ } else {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
if (fieldSpec != null && SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName())) {
issue = SerializationUtils.clone(issue);
issue.setFieldValue(identifyField, getColumn());
}
}
- } else if (SecurityUtils.canWriteCode(issue.getProject())) {
+ } else if (SecurityUtils.canScheduleIssues(issue.getProject())) {
// move issue between backlog column and board column
issue = SerializationUtils.clone(issue);
issue.setMilestone(getMilestone());
@@ -334,7 +334,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
String fieldName = getBoard().getIdentifyField();
if (issue.getMilestone() == null && getMilestone() != null) {
// move a backlog issue to board
- if (!SecurityUtils.canWriteCode(issue.getProject()))
+ if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());
@@ -402,9 +402,6 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
markAccepted(target, issue, true);
}
} else {
- if (!SecurityUtils.canWriteCode(issue.getProject()))
- throw new UnauthorizedException("Permission denied");
-
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (fieldSpec == null)
throw new OneException("Undefined custom field: " + fieldName);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 0f5f5e8ec1..8d78d6b7d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -843,7 +843,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
protected boolean isPermitted() {
- return SecurityUtils.canReadCode(getProject());
+ return SecurityUtils.canReadCode(getProject()) && SecurityUtils.canReadCode(source.getProject());
}
@Override