Skip to content

The Unified and Autonomous Development Platform

chore: Hide inaccessible confidential issues

Robin Shenbef7e9f46d99
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java
index e6de4a07dc..77e489550d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.component.issue.link;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
+import io.onedev.server.security.SecurityUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.ComponentTag;
@@ -34,15 +35,13 @@ public abstract class IssueLinksPanel extends Panel {
int count = 0;
for (IssueLink link: getIssue().getTargetLinks()) {
LinkSpec spec = link.getSpec();
- if (spec.getName().equals(linkName))
+ if (spec.getName().equals(linkName) && SecurityUtils.canAccessIssue(link.getTarget()))
count++;
}
for (IssueLink link: getIssue().getSourceLinks()) {
LinkSpec spec = link.getSpec();
- if (spec.getOpposite() == null && spec.getName().equals(linkName)
- || spec.getOpposite() != null && spec.getOpposite().getName().equals(linkName)) {
+ if (SecurityUtils.canAccessIssue(link.getSource()) && (spec.getOpposite() == null && spec.getName().equals(linkName) || spec.getOpposite() != null && spec.getOpposite().getName().equals(linkName)))
count++;
- }
}
if (count != 0) {
AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {
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 7385d604f7..d42a3dbb98 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
@@ -155,6 +155,10 @@ public abstract class IssueListPanel extends Panel {
return OneDev.getInstance(IssueManager.class);
}
+ private IssueLinkManager getIssueLinkManager() {
+ return OneDev.getInstance(IssueLinkManager.class);
+ }
+
@Override
protected void onDetach() {
queryStringModel.detach();
@@ -1750,9 +1754,9 @@ public abstract class IssueListPanel extends Panel {
@Override
protected List<Issue> load() {
Issue issue = (Issue) fragment.getDefaultModelObject();
- OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
+ getIssueLinkManager().loadDeepLinks(issue);
LinkSide side = new LinkSide(linksPanel.getExpandedLink());
- return issue.findLinkedIssues(side.getSpec(), side.isOpposite());
+ return issue.findLinkedIssues(side.getSpec(), side.isOpposite()).stream().filter(SecurityUtils::canAccessIssue).collect(toList());
}
}) {
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 2a8d76fbb2..d6c1fcf912 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
@@ -84,6 +84,7 @@ import java.util.*;
import java.util.stream.Collectors;
import static io.onedev.server.search.entity.issue.IssueQuery.parse;
+import static io.onedev.server.security.SecurityUtils.canAccessIssue;
import static io.onedev.server.security.SecurityUtils.canEditIssueLink;
import static io.onedev.server.util.EmailAddressUtils.describe;
import static java.util.Comparator.comparing;
@@ -139,7 +140,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected boolean isAuthorized(User user) {
- return SecurityUtils.canAccessIssue(user.asSubject(), getIssue());
+ return canAccessIssue(user.asSubject(), getIssue());
}
});
@@ -320,7 +321,7 @@ public abstract class IssueSidePanel extends Panel {
List<LinkSide> links = new ArrayList<>();
for (LinkSpec spec : linkSpecsModel.getObject()) {
if (canEditIssueLink(getProject(), spec) && (spec.isShowAlways() || showAllLinks)
- || getIssue().getLinks().stream().anyMatch(it -> it.getSpec().equals(spec))) {
+ || getIssue().getLinks().stream().anyMatch(it -> it.getSpec().equals(spec) && (it.getSource().equals(getIssue()) || canAccessIssue(it.getSource())) && (it.getTarget().equals(getIssue()) || canAccessIssue(it.getTarget())))) {
if (spec.getOpposite() != null) {
IssueQuery query = spec.getOpposite().getParsedIssueQuery(getProject());
if (query.matches(getIssue()))
@@ -537,7 +538,7 @@ public abstract class IssueSidePanel extends Panel {
private Component newLinkedIssueContainer(String componentId, Issue linkedIssue,
@Nullable LinkDeleteListener deleteListener) {
- if (SecurityUtils.canAccessIssue(linkedIssue)) {
+ if (canAccessIssue(linkedIssue)) {
Long linkedIssueId = linkedIssue.getId();
Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);
Link<Void> link = new BookmarkablePageLink<Void>("reference", IssueActivitiesPage.class,