Skip to content

The Unified and Autonomous Development Platform

Allow anonymous to access all projects if anonymous group is an administration group

Robin Shen63adbc6e92cc
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 6cc29cf7bc..3d55cb7835 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -521,9 +521,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>
}
Group group = groupManager.findAnonymous();
if (group != null) {
- for (GroupAuthorization authorization: group.getAuthorizations()) {
- if (authorization.getRole().implies(permission))
- projects.add(authorization.getProject());
+ if (group.isAdministrator()) {
+ projects.addAll(query());
+ } else {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
+ if (authorization.getRole().implies(permission))
+ projects.add(authorization.getProject());
+ }
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
index c4430ea53a..416c1124a2 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
@@ -221,7 +221,7 @@ public class PullRequestUpdate extends AbstractEntity {
try (RevWalk revWalk = new RevWalk(getRequest().getWorkProject().getRepository())) {
revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash())));
revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash())));
-
+
/*
* Instead of excluding commits reachable from target branch, we exclude commits reachable
* from the merge commit to achieve two purposes: