Skip to content

The Unified and Autonomous Development Platform

Add issue link edit permission check

Robin Shen38c9245134fa
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 5dc7125579..b3f5b6b838 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -120,6 +120,7 @@ import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.IssueScheduleManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.LinkAuthorizationManager;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.MilestoneManager;
@@ -162,6 +163,7 @@ import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManag
import io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;
import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;
import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;
+import io.onedev.server.entitymanager.impl.DefaultLinkAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;
import io.onedev.server.entitymanager.impl.DefaultMembershipManager;
import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;
@@ -433,6 +435,7 @@ public class CoreModule extends AbstractPluginModule {
bind(IssueScheduleManager.class).to(DefaultIssueScheduleManager.class);
bind(LinkSpecManager.class).to(DefaultLinkSpecManager.class);
bind(IssueLinkManager.class).to(DefaultIssueLinkManager.class);
+ bind(LinkAuthorizationManager.class).to(DefaultLinkAuthorizationManager.class);
bind(WebHookManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java
new file mode 100644
index 0000000000..6c5f85fc40
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LinkAuthorizationManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import java.util.Collection;
+
+import io.onedev.server.model.LinkAuthorization;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Role;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface LinkAuthorizationManager extends EntityManager<LinkAuthorization> {
+
+ void syncAuthorizations(Role role, Collection<LinkSpec> authorizedLinks);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
index bd0662704a..216f2b92cc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java
@@ -5,6 +5,7 @@ import java.util.Map;
import javax.annotation.Nullable;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@@ -13,7 +14,7 @@ public interface RoleManager extends EntityManager<Role> {
void replicate(Role role);
- void save(Role role, @Nullable String oldName);
+ void save(Role role, Collection<LinkSpec> authorizedLinks, @Nullable String oldName);
@Nullable
Role find(String name);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java
new file mode 100644
index 0000000000..5f91898605
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkAuthorizationManager.java
@@ -0,0 +1,49 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.server.entitymanager.LinkAuthorizationManager;
+import io.onedev.server.model.LinkAuthorization;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Role;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultLinkAuthorizationManager extends BaseEntityManager<LinkAuthorization> implements LinkAuthorizationManager {
+
+ @Inject
+ public DefaultLinkAuthorizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void syncAuthorizations(Role role, Collection<LinkSpec> authorizedLinks) {
+ for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
+ if (!authorizedLinks.contains(authorization.getLink()))
+ delete(authorization);
+ }
+
+ for (LinkSpec link: authorizedLinks) {
+ boolean found = false;
+ for (LinkAuthorization authorization: role.getLinkAuthorizations()) {
+ if (authorization.getLink().equals(link)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ LinkAuthorization authorization = new LinkAuthorization();
+ authorization.setLink(link);
+ authorization.setRole(role);
+ save(authorization);
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index cb24813727..b87c4b2a4a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.entitymanager.impl;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -12,8 +13,10 @@ import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
+import io.onedev.server.entitymanager.LinkAuthorizationManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.role.AllIssueFields;
@@ -40,11 +43,15 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
private final IdManager idManager;
+ private final LinkAuthorizationManager linkAuthorizationManager;
+
@Inject
- public DefaultRoleManager(Dao dao, SettingManager settingManager, IdManager idManager) {
+ public DefaultRoleManager(Dao dao, SettingManager settingManager, IdManager idManager,
+ LinkAuthorizationManager linkAuthorizationManager) {
super(dao);
this.settingManager = settingManager;
this.idManager = idManager;
+ this.linkAuthorizationManager = linkAuthorizationManager;
}
@Transactional
@@ -56,10 +63,12 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Transactional
@Override
- public void save(Role role, String oldName) {
+ public void save(Role role, Collection<LinkSpec> authorizedLinks, String oldName) {
if (oldName != null && !oldName.equals(role.getName()))
settingManager.onRenameRole(oldName, role.getName());
dao.persist(role);
+
+ linkAuthorizationManager.syncAuthorizations(role, authorizedLinks);
}
@Transactional
@@ -111,7 +120,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
jobPrivilege.setJobNames("*");
childCreator.getJobPrivileges().add(jobPrivilege);
- save(childCreator, null);
+ save(childCreator, new ArrayList<>(), null);
Role codeWriter = new Role();
codeWriter.setName("Code Writer");
@@ -124,7 +133,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
jobPrivilege.setRunJob(true);
codeWriter.getJobPrivileges().add(jobPrivilege);
- save(codeWriter, null);
+ save(codeWriter, new ArrayList<>(), null);
Role codeReader = new Role();
codeReader.setName("Code Reader");
@@ -137,7 +146,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
jobPrivilege.setJobNames("*");
codeReader.getJobPrivileges().add(jobPrivilege);
- save(codeReader, null);
+ save(codeReader, new ArrayList<>(), null);
Role issueReporter = new Role();
issueReporter.setName("Issue Reporter");
@@ -150,7 +159,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
jobPrivilege.setJobNames("*");
issueReporter.getJobPrivileges().add(jobPrivilege);
- save(issueReporter, null);
+ save(issueReporter, new ArrayList<>(), null);
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java
new file mode 100644
index 0000000000..425df9a17a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java
@@ -0,0 +1,47 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_link_id"), @Index(columnList="o_role_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_link_id", "o_role_id"})})
+public class LinkAuthorization extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_LINK = "link";
+
+ public static final String PROP_ROLE = "role";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private LinkSpec link;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Role role;
+
+ public LinkSpec getLink() {
+ return link;
+ }
+
+ public void setLink(LinkSpec link) {
+ this.link = link;
+ }
+
+ public Role getRole() {
+ return role;
+ }
+
+ public void setRole(Role role) {
+ this.role = role;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
index c4f98efdcc..ff95d675e4 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -38,6 +38,9 @@ public class LinkSpec extends AbstractEntity {
@OneToMany(mappedBy=IssueLink.PROP_SPEC, cascade=CascadeType.REMOVE)
private Collection<IssueLink> links = new ArrayList<>();
+ @OneToMany(mappedBy=LinkAuthorization.PROP_LINK, cascade=CascadeType.REMOVE)
+ private Collection<LinkAuthorization> authorizations = new ArrayList<>();
+
@Editable(order=100, description="Name of the link")
@NotEmpty
public String getName() {
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 2c3f6462c1..6f41c73b71 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
@@ -2,7 +2,9 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -11,6 +13,7 @@ import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import org.apache.shiro.authz.Permission;
@@ -21,6 +24,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.role.AllIssueFields;
import io.onedev.server.model.support.role.CodePrivilege;
@@ -33,6 +37,7 @@ import io.onedev.server.security.permission.AccessBuildReports;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.CreateChildren;
import io.onedev.server.security.permission.EditIssueField;
+import io.onedev.server.security.permission.EditIssueLink;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ManageBuilds;
import io.onedev.server.security.permission.ManageCodeComments;
@@ -45,7 +50,9 @@ 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.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.ShowCondition;
/**
@@ -83,6 +90,9 @@ public class Role extends AbstractEntity implements Permission {
@Column(length=65535, nullable=false)
private IssueFieldSet editableIssueFields = new AllIssueFields();
+ @Transient
+ private List<String> editableIssueLinks = new ArrayList<>();
+
private boolean manageBuilds;
@Lob
@@ -98,6 +108,9 @@ public class Role extends AbstractEntity implements Permission {
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();
+ @OneToMany(mappedBy=LinkAuthorization.PROP_ROLE, cascade=CascadeType.REMOVE)
+ private Collection<LinkAuthorization> linkAuthorizations = new ArrayList<>();
+
@Editable(order=100)
@NotEmpty
public String getName() {
@@ -214,6 +227,29 @@ public class Role extends AbstractEntity implements Permission {
return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();
}
+ @Editable(order=625, description="Optionally specify issue links allowed to edit")
+ @ChoiceProvider("getIssueLinkChoices")
+ @NameOfEmptyValue("None")
+ public List<String> getEditableIssueLinks() {
+ return editableIssueLinks;
+ }
+
+ public void setEditableIssueLinks(List<String> editableIssueLinks) {
+ this.editableIssueLinks = editableIssueLinks;
+ }
+
+ @SuppressWarnings("unused")
+ private static Map<String, String> getIssueLinkChoices() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (LinkSpec link: OneDev.getInstance(LinkSpecManager.class).queryAndSort()) {
+ if (link.getOpposite() != null)
+ choices.put(link.getName(), link.getName() + " - " + link.getOpposite().getName());
+ else
+ choices.put(link.getName(), link.getName());
+ }
+ return choices;
+ }
+
@Editable(order=650)
@ShowCondition("isManageProjectDisabled")
public boolean isManageBuilds() {
@@ -263,6 +299,14 @@ public class Role extends AbstractEntity implements Permission {
this.groupAuthorizations = groupAuthorizations;
}
+ public Collection<LinkAuthorization> getLinkAuthorizations() {
+ return linkAuthorizations;
+ }
+
+ public void setLinkAuthorizations(Collection<LinkAuthorization> linkAuthorizations) {
+ this.linkAuthorizations = linkAuthorizations;
+ }
+
@Override
public boolean implies(Permission p) {
for (Permission each: getPermissions()) {
@@ -293,6 +337,8 @@ public class Role extends AbstractEntity implements Permission {
if (scheduleIssues)
permissions.add(new ScheduleIssues());
permissions.add(new EditIssueField(editableIssueFields.getIncludeFields()));
+ for (LinkAuthorization linkAuthorization: getLinkAuthorizations())
+ permissions.add(new EditIssueLink(linkAuthorization.getLink()));
if (manageBuilds)
permissions.add(new ManageBuilds());
for (JobPrivilege jobPrivilege: jobPrivileges) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
index 2b13c3bd91..9fa017500f 100644
--- a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
@@ -1,5 +1,6 @@
package io.onedev.server.rest;
+import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
@@ -74,7 +75,7 @@ public class RoleResource {
public Long createOrUpdate(@NotNull Role role) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- roleManager.save(role, (String) role.getCustomData());
+ roleManager.save(role, new ArrayList<>(), (String) role.getCustomData());
return role.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index e0e416146b..7a6a4b25cc 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -36,6 +36,7 @@ import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
@@ -50,6 +51,7 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.CreateChildren;
import io.onedev.server.security.permission.CreateRootProjects;
import io.onedev.server.security.permission.EditIssueField;
+import io.onedev.server.security.permission.EditIssueLink;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ManageBuilds;
import io.onedev.server.security.permission.ManageCodeComments;
@@ -151,6 +153,10 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(fieldName))));
}
+ public static boolean canEditIssueLink(Project project, LinkSpec link) {
+ return getSubject().isPermitted(new ProjectPermission(project, new EditIssueLink(link)));
+ }
+
public static boolean canScheduleIssues(Project project) {
return getSubject().isPermitted(new ProjectPermission(project, new ScheduleIssues()));
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
new file mode 100644
index 0000000000..4a7346f352
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java
@@ -0,0 +1,25 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+
+import io.onedev.server.model.LinkSpec;
+
+public class EditIssueLink implements Permission {
+
+ private final LinkSpec link;
+
+ public EditIssueLink(LinkSpec link) {
+ this.link = link;
+ }
+
+ @Override
+ public boolean implies(Permission p) {
+ if (p instanceof EditIssueLink) {
+ EditIssueLink editIssueLink = (EditIssueLink) p;
+ return link.equals(editIssueLink.link);
+ } else {
+ return new AccessProject().implies(p);
+ }
+ }
+
+}
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 a8dabb7db9..5087d1eff0 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
@@ -218,20 +218,23 @@ public abstract class IssueSidePanel extends Panel {
List<LinkSpec> specs = new ArrayList<>(OneDev.getInstance(LinkSpecManager.class).queryAndSort());
for (LinkSpec spec: specs) {
- if (spec.getOpposite() != null) {
- IssueQuery query = IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
- false, false, false, false, false, false);
- if (query.matches(getIssue()))
- links.add(new LinkSide(spec, false));
- query = IssueQuery.parse(getProject(), spec.getIssueQuery(), false, false, false,
- false, false, false);
- if (query.matches(getIssue()))
- links.add(new LinkSide(spec, true));
- } else {
- IssueQuery query = IssueQuery.parse(getProject(), spec.getIssueQuery(),
- false, false, false, false, false, false);
- if (query.matches(getIssue()))
- links.add(new LinkSide(spec, false));
+ if (SecurityUtils.canEditIssueLink(getProject(), spec)
+ || getIssue().getLinks().stream().anyMatch(it->it.getSpec().equals(spec))) {
+ if (spec.getOpposite() != null) {
+ IssueQuery query = IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
+ false, false, false, false, false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, false));
+ query = IssueQuery.parse(getProject(), spec.getIssueQuery(), false, false, false,
+ false, false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, true));
+ } else {
+ IssueQuery query = IssueQuery.parse(getProject(), spec.getIssueQuery(),
+ false, false, false, false, false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, false));
+ }
}
}
return links;
@@ -257,20 +260,28 @@ public abstract class IssueSidePanel extends Panel {
LinkSpec spec = side.spec;
boolean opposite = side.opposite;
+ boolean canEditIssueLink = SecurityUtils.canEditIssueLink(getProject(), spec);
+
String name = spec.getName(opposite);
fragment.add(new Label("name", name));
RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");
for (Issue linkedIssue: getIssue().findLinkedIssues(spec, opposite)) {
- LinkDeleteListener deleteListener = new LinkDeleteListener() {
-
- @Override
- void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
- getIssueChangeManager().removeLink(model.getObject().spec, getIssue(),
- linkedIssue, opposite);
- }
-
- };
+ LinkDeleteListener deleteListener;
+ if (canEditIssueLink
+ && (linkedIssue.getProject().equals(getProject()) || SecurityUtils.canEditIssueLink(linkedIssue.getProject(), spec))) {
+ deleteListener = new LinkDeleteListener() {
+
+ @Override
+ void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
+ getIssueChangeManager().removeLink(model.getObject().spec, getIssue(),
+ linkedIssue, opposite);
+ }
+
+ };
+ } else {
+ deleteListener = null;
+ }
linkedIssuesView.add(newLinkedIssueContainer(linkedIssuesView.newChildId(),
linkedIssue, deleteListener));
}
@@ -300,12 +311,16 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Issue selection) {
LinkSpec spec = model.getObject().spec;
- if (getIssue().equals(selection))
+ if (getIssue().equals(selection)) {
getSession().warn("Can not link to self");
- else if (getIssue().findLinkedIssues(spec, opposite).contains(selection))
+ } else if (getIssue().findLinkedIssues(spec, opposite).contains(selection)) {
getSession().warn("Issue already added");
- else
+ } else if (!selection.getProject().equals(getProject())
+ && !SecurityUtils.canEditIssueLink(selection.getProject(), spec)) {
+ getSession().warn("Not authorized to link issue in project '" + selection.getProject() + "'");
+ } else {
getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);
+ }
}
@Override
@@ -313,24 +328,28 @@ public abstract class IssueSidePanel extends Panel {
return "Add " + name.toLowerCase();
}
- }.setVisible(SecurityUtils.getUser() != null));
+ }.setVisible(canEditIssueLink));
return fragment;
}
private Fragment newSingleLink(IModel<LinkSide> model) {
Fragment fragment = new Fragment("content", "singleLinkFrag", IssueSidePanel.this);
-
LinkSide side = model.getObject();
fragment.add(new Label("name", side.spec.getName(side.opposite)));
SingleLinkBean bean = new SingleLinkBean();
- Issue linkedIssue = getIssue().findLinkedIssue(side.spec, side.opposite);
- if (linkedIssue != null)
- bean.setIssueId(linkedIssue.getId());
+ Issue prevLinkedIssue = getIssue().findLinkedIssue(side.spec, side.opposite);
+ if (prevLinkedIssue != null)
+ bean.setIssueId(prevLinkedIssue.getId());
- Long linkedIssueId = bean.getIssueId();
+ Long prevLinkedIssueId = bean.getIssueId();
+
+ boolean authorized = SecurityUtils.canEditIssueLink(getProject(), side.spec)
+ && (prevLinkedIssue == null
+ || prevLinkedIssue.getProject().equals(getProject())
+ || SecurityUtils.canEditIssueLink(prevLinkedIssue.getProject(), side.spec));
fragment.add(new InplacePropertyEditLink("edit", new AlignPlacement(100, 0, 100, 0)) {
@@ -359,23 +378,28 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean,
String propertyName) {
+ LinkSide side = model.getObject();
SingleLinkBean singleLinkBean = (SingleLinkBean) bean;
Issue linkedIssue = null;
if (singleLinkBean.getIssueId() != null)
linkedIssue = getIssueManager().load(singleLinkBean.getIssueId());
if (getIssue().equals(linkedIssue)) {
getSession().warn("Can not link to self");
- singleLinkBean.setIssueId(linkedIssueId);
+ singleLinkBean.setIssueId(prevLinkedIssueId);
+ } else if (linkedIssue != null && !linkedIssue.getProject().equals(getProject())
+ && !SecurityUtils.canEditIssueLink(linkedIssue.getProject(), side.spec)) {
+ getSession().warn("Not authorized to link issue in project '" + linkedIssue.getProject() + "'");
+ singleLinkBean.setIssueId(prevLinkedIssueId);
} else {
- getIssueChangeManager().changeLink(model.getObject().spec, getIssue(),
- linkedIssue, model.getObject().opposite);
+ getIssueChangeManager().changeLink(side.spec, getIssue(),
+ linkedIssue, side.opposite);
}
}
- }.setVisible(SecurityUtils.getUser() != null));
+ }.setVisible(authorized));
- if (linkedIssue != null)
- fragment.add(newLinkedIssueContainer("body", linkedIssue, null));
+ if (prevLinkedIssue != null)
+ fragment.add(newLinkedIssueContainer("body", prevLinkedIssue, null));
else
fragment.add(new Label("body", "<i>Not specified</i>").setEscapeModelStrings(false));
@@ -412,7 +436,7 @@ public abstract class IssueSidePanel extends Panel {
deleteListener.onDelete(target, linkedIssue);
}
- }.setVisible(deleteListener != null && SecurityUtils.getUser() != null));
+ }.setVisible(deleteListener != null));
fragment.add(new IssueStateBadge("state", new LoadableDetachableModel<Issue>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
index dbe8fb5882..3f9b8c84d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java
@@ -1,5 +1,8 @@
package io.onedev.server.web.page.admin.role;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
@@ -8,7 +11,9 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
@@ -45,7 +50,10 @@ public class NewRolePage extends AdministrationPage {
"This name has already been used by another role");
}
if (editor.isValid()) {
- roleManager.save(role, null);
+ Collection<LinkSpec> authorizedLinks = new ArrayList<>();
+ for (String linkName: role.getEditableIssueLinks())
+ authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));
+ roleManager.save(role, authorizedLinks, null);
Session.get().success("Role created");
setResponsePage(RoleListPage.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
index bdc6bc20c4..1b870467d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.admin.role;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -18,7 +20,10 @@ import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.model.LinkAuthorization;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Role;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
@@ -51,11 +56,18 @@ public class RoleDetailPage extends AdministrationPage {
@Override
protected Role load() {
- return OneDev.getInstance(RoleManager.class).load(Long.valueOf(roleIdString));
+ Role role = getManager().load(Long.valueOf(roleIdString));
+ for (LinkAuthorization linkAuthorization: role.getLinkAuthorizations())
+ role.getEditableIssueLinks().add(linkAuthorization.getLink().getName());
+ return role;
}
};
}
+
+ private RoleManager getManager() {
+ return OneDev.getInstance(RoleManager.class);
+ }
@Override
protected void onInitialize() {
@@ -98,7 +110,10 @@ public class RoleDetailPage extends AdministrationPage {
"This name has already been used by another role.");
}
if (editor.isValid()) {
- roleManager.save(role, oldName);
+ Collection<LinkSpec> authorizedLinks = new ArrayList<>();
+ for (String linkName: role.getEditableIssueLinks())
+ authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));
+ roleManager.save(role, authorizedLinks, oldName);
setResponsePage(RoleDetailPage.class, RoleDetailPage.paramsOf(role));
Session.get().success("Role updated");
}