Skip to content

The Unified and Autonomous Development Platform

Minor bug fixes introduced by hierarchical projects

Robin Shen2084db06c064
diff --git a/doc/incompatibilities.md b/doc/incompatibilities.md
index 42d04a4dff..433dd0ecd0 100644
--- a/doc/incompatibilities.md
+++ b/doc/incompatibilities.md
@@ -1,6 +1,6 @@
# 5.2.0
-1. User by default is not able to create/fork projects now. To allow it, add the user to a group with *create root projects* permission or grant the user *create children* permission for desired projects.
+1. User by default is not able to create/fork projects now. To allow it, specify default login group with appropriate project create permissions in security setting.
2. URL of project is changed from *http(s)://\<onedev-server\>/projects/\<project name\>* to *http(s)://\<onedev-server\>/projects/\<project id\>*. This only affects web UI, clone url and REStful api url is not changed.
3. Job variable *@project_name@* should be replaced by *@project_path@*.
4. Job match condition in job executor is renamed as job requirement, and the criteria to match job name is no longer valid. Executor can now be specified when define the job.
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 0a9c9fd34b..830b42ba4e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -50,6 +50,7 @@ import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
@@ -111,6 +112,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
private final TransactionManager transactionManager;
+ private final SettingManager settingManager;
+
private final Map<Long, BuildFacade> builds = new HashMap<>();
private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();
@@ -125,7 +128,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,
TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,
StorageManager storageManager, ProjectManager projectManager,
- SessionManager sessionManager, TransactionManager transactionManager) {
+ SessionManager sessionManager, TransactionManager transactionManager,
+ SettingManager settingManager) {
super(dao);
this.buildParamManager = buildParamManager;
this.buildDependenceManager = buildDependenceManager;
@@ -134,6 +138,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
this.taskScheduler = taskScheduler;
this.sessionManager = sessionManager;
this.transactionManager = transactionManager;
+ this.settingManager = settingManager;
}
@Transactional
@@ -891,23 +896,6 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
}
}
- private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,
- Map<Long, Collection<String>> availableJobNames, Project project, Role role) {
- Collection<String> availableJobNamesOfProject = availableJobNames.get(project.getId());
- if (availableJobNamesOfProject != null) {
- for (String jobName: availableJobNamesOfProject) {
- if (role.implies(new JobPermission(jobName, new AccessBuild()))) {
- Collection<String> accessibleJobNamesOfProject = accessibleJobNames.get(project);
- if (accessibleJobNamesOfProject == null) {
- accessibleJobNamesOfProject = new HashSet<>();
- accessibleJobNames.put(project, accessibleJobNamesOfProject);
- }
- accessibleJobNamesOfProject.add(jobName);
- }
- }
- }
- }
-
private void populateAccessibleJobNames(Collection<String> accessibleJobNames,
Collection<String> availableJobNames, Role role) {
for (String jobName: availableJobNames) {
@@ -921,28 +909,11 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
jobNamesLock.readLock().lock();
try {
Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();
- User user = SecurityUtils.getUser();
-
- if (SecurityUtils.isAdministrator()) {
- for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())
- accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));
- } else {
- if (user != null) {
- for (UserAuthorization authorization: user.getAuthorizations()) {
- populateAccessibleJobNames(accessibleJobNames, jobNames,
- authorization.getProject(), authorization.getRole());
- }
- for (Group group: user.getGroups()) {
- for (GroupAuthorization authorization: group.getAuthorizations()) {
- populateAccessibleJobNames(accessibleJobNames, jobNames,
- authorization.getProject(), authorization.getRole());
- }
- }
- }
- for (Project project: projectManager.query()) {
- if (project.getDefaultRole() != null)
- populateAccessibleJobNames(accessibleJobNames, jobNames, project, project.getDefaultRole());
- }
+ for (Long projectId: jobNames.keySet()) {
+ Project project = projectManager.load(projectId);
+ Collection<String> accessibleJobNamsOfProject = getAccessibleJobNames(project);
+ if (!accessibleJobNamsOfProject.isEmpty())
+ accessibleJobNames.put(project, accessibleJobNamsOfProject);
}
return accessibleJobNames;
} finally {
@@ -963,22 +934,34 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
User user = SecurityUtils.getUser();
if (user != null) {
for (UserAuthorization authorization: user.getAuthorizations()) {
- if (project.equals(authorization.getProject())) {
+ if (authorization.getProject().isSelfOrAncestorOf(project)) {
populateAccessibleJobNames(accessibleJobNames, availableJobNames,
authorization.getRole());
}
}
- for (Group group: user.getGroups()) {
+
+ Set<Group> groups = new HashSet<>(user.getGroups());
+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null)
+ groups.add(defaultLoginGroup);
+
+ for (Group group: groups) {
for (GroupAuthorization authorization: group.getAuthorizations()) {
- if (project.equals(authorization.getProject())) {
+ if (authorization.getProject().isSelfOrAncestorOf(project)) {
populateAccessibleJobNames(accessibleJobNames, availableJobNames,
authorization.getRole());
}
}
}
}
- if (project.getDefaultRole() != null)
- populateAccessibleJobNames(accessibleJobNames, availableJobNames, project.getDefaultRole());
+
+ Project current = project;
+ do {
+ Role defaultRole = current.getDefaultRole();
+ if (defaultRole != null)
+ populateAccessibleJobNames(accessibleJobNames, availableJobNames, defaultRole);
+ current = current.getParent();
+ } while (current != null);
}
}
return accessibleJobNames;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
index 3634025f86..d9cacd5336 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
@@ -2,6 +2,14 @@ package io.onedev.server.model.support.administration;
import java.io.Serializable;
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.model.Group;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.GroupChoice;
@@ -10,12 +18,14 @@ import io.onedev.server.web.editable.annotation.GroupChoice;
public class SecuritySetting implements Serializable {
private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(SecuritySetting.class);
private boolean enableAnonymousAccess = false;
private boolean enableSelfRegister = true;
- private String defaultLoginGroup;
+ private String defaultLoginGroupName;
@Editable(order=100, description="Whether or not to allow anonymous users to access this server")
public boolean isEnableAnonymousAccess() {
@@ -35,25 +45,37 @@ public class SecuritySetting implements Serializable {
this.enableSelfRegister = enableSelfRegister;
}
- @Editable(order=300, name="Default Group for Sign-In Users", description="Optionally specify a default group "
- + "for all users signed in")
+ @Editable(order=300, name="Default Login Group", description="Optionally specify a default group "
+ + "for all users logged in")
@GroupChoice
- public String getDefaultLoginGroup() {
- return defaultLoginGroup;
+ public String getDefaultLoginGroupName() {
+ return defaultLoginGroupName;
}
- public void setDefaultLoginGroup(String defaultLoginGroup) {
- this.defaultLoginGroup = defaultLoginGroup;
+ public void setDefaultLoginGroupName(String defaultLoginGroupName) {
+ this.defaultLoginGroupName = defaultLoginGroupName;
}
+ @Nullable
+ public Group getDefaultLoginGroup() {
+ if (defaultLoginGroupName != null) {
+ Group group = OneDev.getInstance(GroupManager.class).find(defaultLoginGroupName);
+ if (group == null)
+ logger.error("Unable to find default login group: " + defaultLoginGroupName);
+ return group;
+ } else {
+ return null;
+ }
+ }
+
public void onRenameGroup(String oldName, String newName) {
- if (oldName.equals(defaultLoginGroup))
- defaultLoginGroup = newName;
+ if (oldName.equals(defaultLoginGroupName))
+ defaultLoginGroupName = newName;
}
public Usage onDeleteGroup(String groupName) {
Usage usage = new Usage();
- if (groupName.equals(defaultLoginGroup))
+ if (groupName.equals(defaultLoginGroupName))
usage.add("default group for sign-in users");
return usage.prefix("security setting");
}
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 a10d03f993..e0e416146b 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
@@ -2,6 +2,8 @@ package io.onedev.server.security;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
@@ -24,6 +26,7 @@ import io.onedev.commons.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
@@ -162,7 +165,14 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
if (authorization.getRole().equals(role) && authorizedProject.isSelfOrAncestorOf(project))
return true;
}
- for (Group group: user.getGroups()) {
+
+ Set<Group> groups = new HashSet<>(user.getGroups());
+ Group defaultLoginGroup = OneDev.getInstance(SettingManager.class)
+ .getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null)
+ groups.add(defaultLoginGroup);
+
+ for (Group group: groups) {
for (GroupAuthorization authorization: group.getAuthorizations()) {
Project authorizedProject = authorization.getProject();
if (authorization.getRole().equals(role) && authorizedProject.isSelfOrAncestorOf(project))
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
index b94c211e3b..17c2673795 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
@@ -15,8 +15,6 @@ import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -35,8 +33,6 @@ import io.onedev.server.security.permission.UserAdministration;
public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
- private static final Logger logger = LoggerFactory.getLogger(AbstractAuthorizingRealm.class);
-
protected final UserManager userManager;
protected final GroupManager groupManager;
@@ -87,14 +83,9 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
permissions.add(new UserAdministration(user));
for (Group group: user.getGroups())
permissions.addAll(getGroupPermissions(group, user));
- String defaultGroupName = settingManager.getSecuritySetting().getDefaultLoginGroup();
- if (defaultGroupName != null) {
- Group group = groupManager.find(defaultGroupName);
- if (group == null)
- logger.error("Unable to find default group for sign-in user: " + defaultGroupName);
- else
- permissions.addAll(getGroupPermissions(group, user));
- }
+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null)
+ permissions.addAll(getGroupPermissions(defaultLoginGroup, user));
for (UserAuthorization authorization: user.getAuthorizations())
permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));