Skip to content

The Unified and Autonomous Development Platform

Fix issue #419 - Default group for registered users

Robin Shen478d9620a546
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 7861340bb6..0506256b1d 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
@@ -365,9 +365,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
child = find(project, name);
if (child == null) {
if (project == null && !SecurityUtils.canCreateRootProjects())
- throw new UnauthorizedException("Not authorized to create root project '" + name + "'");
+ throw new UnauthorizedException("Not authorized to create project under root");
if (project != null && !SecurityUtils.canCreateChildren(project))
- throw new UnauthorizedException("Not authorized to create project '" + name + "' under '" + project.getPath() + "'");
+ throw new UnauthorizedException("Not authorized to create project under '" + project.getPath() + "'");
child = new Project();
child.setName(name);
child.setParent(project);
@@ -406,6 +406,10 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
public void fork(Project from, Project to) {
+ Project parent = to.getParent();
+ if (parent != null && parent.isNew())
+ create(parent);
+
dao.persist(to);
UserAuthorization authorization = new UserAuthorization();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 35d243e10b..7e08f0847b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -691,6 +691,7 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
if (authenticator != null)
authenticator.onRenameGroup(oldName, newName);
getIssueSetting().onRenameGroup(oldName, newName);
+ getSecuritySetting().onRenameGroup(oldName, newName);
}
@Override
@@ -698,6 +699,7 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
Usage usage = new Usage();
usage.add(getIssueSetting().onDeleteGroup(groupName));
+ usage.add(getSecuritySetting().onDeleteGroup(groupName));
Authenticator authenticator = getAuthenticator();
if (authenticator != null)
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 ee7f1a2dd8..3634025f86 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,7 +2,9 @@ package io.onedev.server.model.support.administration;
import java.io.Serializable;
+import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.GroupChoice;
@Editable
public class SecuritySetting implements Serializable {
@@ -13,6 +15,8 @@ public class SecuritySetting implements Serializable {
private boolean enableSelfRegister = true;
+ private String defaultLoginGroup;
+
@Editable(order=100, description="Whether or not to allow anonymous users to access this server")
public boolean isEnableAnonymousAccess() {
return enableAnonymousAccess;
@@ -31,4 +35,27 @@ 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")
+ @GroupChoice
+ public String getDefaultLoginGroup() {
+ return defaultLoginGroup;
+ }
+
+ public void setDefaultLoginGroup(String defaultLoginGroup) {
+ this.defaultLoginGroup = defaultLoginGroup;
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ if (oldName.equals(defaultLoginGroup))
+ defaultLoginGroup = newName;
+ }
+
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ if (groupName.equals(defaultLoginGroup))
+ usage.add("default group for sign-in users");
+ return usage.prefix("security setting");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 99b9ce0dab..3a3bf054b9 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -7,6 +7,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Objects;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -27,6 +28,7 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.GitContribution;
@@ -214,10 +216,20 @@ public class ProjectResource {
@POST
public Long createOrUpdate(@NotNull Project project) {
Project parent = project.getParent();
- if (parent != null && !SecurityUtils.canCreateChildren(parent))
- throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");
- if (parent == null && !SecurityUtils.canCreateRootProjects())
- throw new UnauthorizedException("Not authorized to create root project");
+ String customData = (String) project.getCustomData();
+
+ Long prevParentId;
+ if (customData != null && customData.contains(":"))
+ prevParentId = Long.valueOf(StringUtils.substringBefore(customData, ":"));
+ else
+ prevParentId = null;
+
+ if (project.isNew() || !Objects.equals(prevParentId, Project.idOf(parent))) {
+ if (parent != null && !SecurityUtils.canCreateChildren(parent))
+ throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");
+ if (parent == null && !SecurityUtils.canCreateRootProjects())
+ throw new UnauthorizedException("Not authorized to create root project");
+ }
if (parent != null && project.isSelfOrAncestorOf(parent))
throw new ExplicitException("Can not use current or descendant project as parent");
@@ -232,12 +244,16 @@ public class ProjectResource {
}
}
- if (project.isNew())
+ if (project.isNew()) {
projectManager.create(project);
- else if (!SecurityUtils.canManage(project))
+ } else if (!SecurityUtils.canManage(project)) {
throw new UnauthorizedException();
- else
- projectManager.save(project, (String) project.getCustomData());
+ } else {
+ String oldPath = customData;
+ if (oldPath.contains(":"))
+ oldPath = StringUtils.substringAfter(oldPath, ":");
+ projectManager.save(project, oldPath);
+ }
return project.getId();
}
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 5858ddb3c6..b94c211e3b 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
@@ -7,7 +7,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import org.apache.shiro.authz.AuthorizationInfo;
@@ -16,10 +15,9 @@ 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 com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -29,19 +27,16 @@ import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.SessionManager;
-import io.onedev.server.security.permission.AccessBuildLog;
import io.onedev.server.security.permission.CreateRootProjects;
-import io.onedev.server.security.permission.EditIssueField;
-import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ProjectPermission;
-import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.security.permission.SystemAdministration;
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;
@@ -67,22 +62,12 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
this.settingManager = settingManager;
}
- private Collection<Permission> getGroupPermissions(Group group, @Nullable User user) {
+ private Collection<Permission> getGroupPermissions(Group group, User user) {
Collection<Permission> permissions = new ArrayList<>();
- if (group.isAdministrator()) {
- if (user != null) {
- permissions.add(new SystemAdministration());
- } else {
- for (Project project: projectManager.query()) {
- permissions.add(new ProjectPermission(project, new ReadCode()));
- for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())
- permissions.add(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(field.getName()))));
- permissions.add(new ProjectPermission(project, new JobPermission("*", new AccessBuildLog())));
- }
- }
- } else if (group.isCreateRootProjects() && user != null) {
+ if (group.isAdministrator())
+ permissions.add(new SystemAdministration());
+ else if (group.isCreateRootProjects())
permissions.add(new CreateRootProjects());
- }
for (GroupAuthorization authorization: group.getAuthorizations())
permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
return permissions;
@@ -102,6 +87,15 @@ 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));
+ }
+
for (UserAuthorization authorization: user.getAuthorizations())
permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
index 6b7749c4fc..95b9d7bea1 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
@@ -57,14 +57,19 @@ public class EntityDeserializer extends BeanDeserializer {
if (property.getName().equals("id") && value != null) {
jp.nextToken();
AbstractEntity entity = dao.load(entityClass, (Long)value);
- if (entity instanceof Project)
- entity.setCustomData(((Project) entity).getPath());
- else if (entity instanceof User)
+ if (entity instanceof Project) {
+ Project project = (Project) entity;
+ if (project.getParent() != null)
+ entity.setCustomData(project.getParent().getId() + ":" + project.getPath());
+ else
+ entity.setCustomData(project.getPath());
+ } else if (entity instanceof User) {
entity.setCustomData(((User) entity).getName());
- else if (entity instanceof Group)
+ } else if (entity instanceof Group) {
entity.setCustomData(((Group) entity).getName());
- else if (entity instanceof Role)
+ } else if (entity instanceof Role) {
entity.setCustomData(((Role) entity).getName());
+ }
Object bean;
if (entity instanceof HibernateProxy)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
index 17c9785b9c..3d7c4ef8f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java
@@ -1,6 +1,5 @@
package io.onedev.server.web.component.project.info;
-import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT_ENABLED;
import static io.onedev.server.model.Project.PROP_DESCRIPTION;
import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT_ENABLED;
import static io.onedev.server.model.Project.PROP_NAME;
@@ -27,8 +26,6 @@ import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.children.ProjectChildrenPage;
-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;
import io.onedev.server.web.page.project.setting.general.ParentBean;
@@ -50,10 +47,8 @@ abstract class ForkOptionPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- Project project = new Project();
- project.setForkedFrom(getProject());
- project.setName(getProject().getName());
- project.setIssueManagementEnabled(false);
+ Project editProject = new Project();
+ editProject.setName(getProject().getName());
ParentBean parentBean = new ParentBean();
@@ -61,23 +56,17 @@ abstract class ForkOptionPanel extends Panel {
Project parent = getProjectManager().find(userName);
if (parent != null) {
if (SecurityUtils.canCreateChildren(parent))
- parentBean.setParent(parent);
+ parentBean.setParentPath(parent.getPath());
} else if (SecurityUtils.canCreateRootProjects()) {
- parent = new Project();
- parent.setName(userName);
- parent.setCodeManagementEnabled(false);
- parent.setIssueManagementEnabled(false);
- getProjectManager().create(parent);
- parentBean.setParent(parent);
+ parentBean.setParentPath(userName);
}
DefaultRoleBean defaultRoleBean = new DefaultRoleBean();
defaultRoleBean.setRole(getProject().getDefaultRole());
- Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION,
- PROP_CODE_MANAGEMENT_ENABLED, PROP_ISSUE_MANAGEMENT_ENABLED);
+ Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION, PROP_ISSUE_MANAGEMENT_ENABLED);
- BeanEditor editor = BeanContext.edit("editor", project, properties, false);
+ BeanEditor editor = BeanContext.edit("editor", editProject, properties, false);
BeanEditor defaultRoleEditor = BeanContext.edit("defaultRoleEditor", defaultRoleBean);
BeanEditor parentEditor = BeanContext.edit("parentEditor", parentBean);
@@ -94,34 +83,27 @@ abstract class ForkOptionPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- Project parent = parentBean.getParent();
- if (parent != null && !SecurityUtils.canCreateChildren(parent)
- || parent == null && !SecurityUtils.canCreateRootProjects()) {
- throw new UnauthorizedException();
- }
-
- project.setParent(parent);
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- Project projectWithSameName = projectManager.find(parent, project.getName());
- if (projectWithSameName != null) {
- if (parent != null) {
+ try {
+ String projectPath = editProject.getName();
+ if (parentBean.getParentPath() != null)
+ projectPath = parentBean.getParentPath() + "/" + projectPath;
+ Project newProject = getProjectManager().initialize(projectPath);
+ if (!newProject.isNew()) {
editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another child project");
+ "This name has already been used by another project");
+ target.add(form);
} else {
- editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another root project");
+ newProject.setForkedFrom(getProject());
+ newProject.setDescription(editProject.getDescription());
+ newProject.setIssueManagementEnabled(editProject.isIssueManagementEnabled());
+ newProject.setDefaultRole(defaultRoleBean.getRole());
+ getProjectManager().fork(getProject(), newProject);
+ Session.get().success("Project forked");
+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(newProject));
}
+ } catch (UnauthorizedException e) {
+ parentEditor.error(new Path(new PathNode.Named("parentPath")), e.getMessage());
target.add(form);
- } else {
- project.setDefaultRole(defaultRoleBean.getRole());
- projectManager.fork(getProject(), project);
- Session.get().success("Project forked");
- if (project.isCodeManagementEnabled())
- setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
- else if (project.isIssueManagementEnabled())
- setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project));
- else
- setResponsePage(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(project));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
index b7db39d50c..51e66782fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
@@ -9,7 +9,7 @@
</div>
</wicket:enclosure>
</div>
- <div class="btn-group">
+ <div wicket:id="forkInfo" class="btn-group">
<a wicket:id="forks" class="btn btn-sm btn-light btn-hover-primary"><span wicket:id="label"></span></a>
<a wicket:id="forkNow" class="btn btn-sm btn-light btn-hover-primary btn-icon" title="Fork now"><wicket:svg href="fork" class="icon"/></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index d995f27ed5..86297c8a78 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -42,6 +42,10 @@ public abstract class ProjectInfoPanel extends Panel {
add(new ProjectPathPanel("path", projectModel));
+ WebMarkupContainer forkInfo = new WebMarkupContainer("forkInfo");
+ forkInfo.setVisible(getProject().isCodeManagementEnabled());
+ add(forkInfo);
+
String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "
+ Criteria.quote(getProject().getPath());
PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());
@@ -56,9 +60,10 @@ public abstract class ProjectInfoPanel extends Panel {
};
forksLink.add(new Label("label", getProject().getForks().size() + " forks"));
- add(forksLink);
+ forksLink.setVisible(getProject().isCodeManagementEnabled());
+ forkInfo.add(forksLink);
- add(new ModalLink("forkNow") {
+ forkInfo.add(new ModalLink("forkNow") {
@Override
protected String getModalCssClass() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index 17335604c4..14cb85915a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -17,12 +17,10 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.BeanUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.editable.annotation.ParentChoice;
import io.onedev.server.web.editable.annotation.ShowCondition;
public class PropertyDescriptor implements Serializable {
@@ -110,15 +108,11 @@ public class PropertyDescriptor implements Serializable {
}
public boolean isPropertyRequired() {
- if (getPropertyGetter().getAnnotation(ParentChoice.class) != null) {
- return !SecurityUtils.canCreateRootProjects();
- } else {
- Size size;
- return getPropertyGetter().getReturnType().isPrimitive()
- || findAnnotation(NotNull.class) != null
- || findAnnotation(NotEmpty.class) != null
- || (size = findAnnotation(Size.class)) != null && size.min()>=1;
- }
+ Size size;
+ return getPropertyGetter().getReturnType().isPrimitive()
+ || findAnnotation(NotNull.class) != null
+ || findAnnotation(NotEmpty.class) != null
+ || (size = findAnnotation(Size.class)) != null && size.min()>=1;
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ParentChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ParentChoice.java
index 6e0e4b9e2c..8dd942ca30 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ParentChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ParentChoice.java
@@ -8,4 +8,5 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ParentChoice {
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
index 82e07767d9..00d8d2efbc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
@@ -12,7 +12,6 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -33,22 +32,11 @@ public class ParentChoiceEditor extends PropertyEditor<String> {
super.onInitialize();
Map<String, String> projectPaths = new LinkedHashMap<>();
- for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new CreateChildren())) {
+ for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new CreateChildren()))
projectPaths.put(project.getPath(), project.getPath());
- }
-
String selection = getModelObject();
- if (!SecurityUtils.canCreateRootProjects()) {
- if (projectPaths.size() == 1)
- selection = projectPaths.entrySet().iterator().next().getKey();
- else if (!projectPaths.containsKey(selection))
- selection = null;
- } else if (!projectPaths.containsKey(selection)) {
- selection = null;
- }
-
- input = new StringSingleChoice("input", Model.of(selection), Model.ofMap(projectPaths), false) {
+ input = new StringSingleChoice("input", Model.of(selection), Model.ofMap(projectPaths), true) {
@Override
protected void onInitialize() {
@@ -57,10 +45,8 @@ public class ParentChoiceEditor extends PropertyEditor<String> {
}
};
+ input.setRequired(false);
- if (!SecurityUtils.canCreateRootProjects())
- input.setRequired(true);
-
input.setLabel(Model.of(getDescriptor().getDisplayName()));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index 6d3f5cceab..30c4340397 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -193,7 +193,8 @@ public class GroupListPage extends AdministrationPage {
@Override
public void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,
IModel<Group> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().isCreateRootProjects()));
+ Group group = rowModel.getObject();
+ cellItem.add(new Label(componentId, group.isAdministrator() || group.isCreateRootProjects()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
index 0484193c94..1718542ac3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
@@ -1,11 +1,15 @@
package io.onedev.server.web.page.project;
+import static io.onedev.server.model.Project.PROP_CODE_MANAGEMENT_ENABLED;
+import static io.onedev.server.model.Project.PROP_DESCRIPTION;
+import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT_ENABLED;
+import static io.onedev.server.model.Project.PROP_NAME;
+
import java.util.Collection;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -15,7 +19,6 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import static io.onedev.server.model.Project.*;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
@@ -44,15 +47,20 @@ public class NewProjectPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- Project project = new Project();
+ Project editProject = new Project();
Collection<String> properties = Sets.newHashSet(PROP_NAME, PROP_DESCRIPTION,
PROP_CODE_MANAGEMENT_ENABLED, PROP_ISSUE_MANAGEMENT_ENABLED);
DefaultRoleBean defaultRoleBean = new DefaultRoleBean();
ParentBean parentBean = new ParentBean();
+ if (parentId != null)
+ parentBean.setParentPath(getProjectManager().load(parentId).getPath());
- BeanEditor editor = BeanContext.edit("editor", project, properties, false);
+ BeanEditor editor = BeanContext.edit("editor", editProject, properties, false);
+ BeanEditor parentEditor = BeanContext.edit("parentEditor", parentBean);
+ if (parentId != null)
+ parentEditor.setVisible(false);
Form<?> form = new Form<Void>("form") {
@@ -60,53 +68,50 @@ public class NewProjectPage extends LayoutPage {
protected void onSubmit() {
super.onSubmit();
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- Project parent;
- if (parentId != null) {
- parent = projectManager.load(parentId);
- } else {
- parent = parentBean.getParent();
- if (parent != null && !SecurityUtils.canCreateChildren(parent)
- || parent == null && !SecurityUtils.canCreateRootProjects()) {
- throw new UnauthorizedException();
- }
- }
- project.setParent(parent);
- Project projectWithSameName = projectManager.find(parent, project.getName());
- if (projectWithSameName != null) {
- if (parent != null) {
+ try {
+ String projectPath = editProject.getName();
+ if (parentBean.getParentPath() != null)
+ projectPath = parentBean.getParentPath() + "/" + projectPath;
+ Project newProject = getProjectManager().initialize(projectPath);
+ if (!newProject.isNew()) {
editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another child project");
+ "This name has already been used by another project");
} else {
- editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another root project");
+ newProject.setDescription(editProject.getDescription());
+ newProject.setCodeManagementEnabled(editProject.isCodeManagementEnabled());
+ newProject.setIssueManagementEnabled(editProject.isIssueManagementEnabled());
+ newProject.setDefaultRole(defaultRoleBean.getRole());
+
+ getProjectManager().create(newProject);
+
+ Session.get().success("New project created");
+ if (newProject.isCodeManagementEnabled())
+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(newProject));
+ else if (newProject.isIssueManagementEnabled())
+ setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(newProject));
+ else
+ setResponsePage(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(newProject));
}
- } else {
- project.setDefaultRole(defaultRoleBean.getRole());
- projectManager.create(project);
- Session.get().success("New project created");
- if (project.isCodeManagementEnabled())
- setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
- else if (project.isIssueManagementEnabled())
- setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project));
+ } catch (UnauthorizedException e) {
+ if (parentEditor.isVisible())
+ parentEditor.error(new Path(new PathNode.Named("parentPath")), e.getMessage());
else
- setResponsePage(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(project));
+ throw e;
}
}
};
form.add(editor);
-
form.add(BeanContext.edit("defaultRoleEditor", defaultRoleBean));
-
- if (parentId != null)
- form.add(new WebMarkupContainer("parentEditor").setVisible(false));
- else
- form.add(BeanContext.edit("parentEditor", parentBean));
+ form.add(parentEditor);
add(form);
}
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
@Override
protected boolean isPermitted() {
return SecurityUtils.getUser() != null;
@@ -114,7 +119,10 @@ public class NewProjectPage extends LayoutPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Create Project");
+ if (parentId != null)
+ return new Label(componentId, "Create Child Project");
+ else
+ return new Label(componentId, "Create Project");
}
public static PageParameters paramsOf(Project parent) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
index 43f6d7b571..3e7bd60ae4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="alert alert-notice alert-light-info mb-4">
+ <div class="alert alert-notice bg-white text-gray mb-4">
<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
When authorize a user, the user will also be authorized with the role for all child projects
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index 94f2a6f827..15ef8dcb57 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -8,7 +8,6 @@ import static io.onedev.server.model.Project.PROP_NAME;
import java.io.Serializable;
import java.util.Collection;
-import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -19,6 +18,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
@@ -56,7 +56,8 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
defaultRoleBean.setRole(getProject().getDefaultRole());
ParentBean parentBean = new ParentBean();
- parentBean.setParent(getProject().getParent());
+ if (getProject().getParent() != null)
+ parentBean.setParentPath(getProject().getParent().getPath());
editor = BeanContext.editModel("editor", new IModel<Serializable>() {
@@ -92,35 +93,46 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
protected void onSubmit() {
super.onSubmit();
- Project parent = parentBean.getParent();
- if (parent != null && !SecurityUtils.canCreateChildren(parent)
- || parent == null && !SecurityUtils.canCreateRootProjects()) {
- throw new UnauthorizedException();
+ Project project = getProject();
+ String prevParentPath;
+ if (project.getParent() != null)
+ prevParentPath = project.getParent().getPath();
+ else
+ prevParentPath = null;
+
+ String parentError = null;
+ if (!Objects.equal(prevParentPath, parentBean.getParentPath())) {
+ if (parentBean.getParentPath() != null) {
+ Project parent = getProjectManager().find(parentBean.getParentPath());
+ if (parent == null)
+ parentError = "Parent project not found";
+ else if (project.isSelfOrAncestorOf(parent))
+ parentError = "Can not use current or descendant project as parent";
+ else if (!SecurityUtils.canCreateChildren(parent))
+ parentError = "Not authorized to move project under this parent";
+ project.setParent(parent);
+ } else if (!SecurityUtils.canCreateRootProjects()) {
+ parentError = "Not authorized to move project under root";
+ } else {
+ project.setParent(null);
+ }
}
- Project project = getProject();
- if (parent != null && project.isSelfOrAncestorOf(parent)) {
- parentEditor.error(new Path(new PathNode.Named("parentPath")),
- "Can not use current or descendant project as parent");
+ if (parentError != null) {
+ parentEditor.error(new Path(new PathNode.Named("parentPath")), parentError);
} else {
- project.setParent(parent);
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- Project projectWithSameName = projectManager.find(parent, project.getName());
+ Project projectWithSameName = getProjectManager().find(project.getParent(), project.getName());
if (projectWithSameName != null && !projectWithSameName.equals(project)) {
- if (parent != null) {
- editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another child project");
- } else {
- editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another root project");
- }
+ editor.error(new Path(new PathNode.Named("name")),
+ "This name has already been used by another project");
} else {
project.setDefaultRole(defaultRoleBean.getRole());
- projectManager.save(project, oldPath);
+ getProjectManager().save(project, oldPath);
Session.get().success("General setting has been updated");
setResponsePage(GeneralProjectSettingPage.class, paramsOf(project));
}
}
+
}
};
@@ -156,6 +168,10 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
add(form);
}
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
@Override
protected Component newProjectTitle(String componentId) {
return new Label(componentId, "<span class='text-truncate'>General Setting</span>").setEscapeModelStrings(false);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
index a07e5dbe34..2cb659e8d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/ParentBean.java
@@ -4,9 +4,7 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
+import io.onedev.server.util.validation.annotation.ProjectPath;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.ParentChoice;
@@ -20,6 +18,7 @@ public class ParentBean implements Serializable {
@Editable(name="Parent Project", description="Settings and permissions of parent project will be inherited "
+ "by this project")
+ @ProjectPath
@ParentChoice
@NameOfEmptyValue("No parent")
public String getParentPath() {
@@ -30,19 +29,4 @@ public class ParentBean implements Serializable {
this.parentPath = parentPath;
}
- public void setParent(@Nullable Project parent) {
- if (parent != null)
- parentPath = parent.getPath();
- else
- parentPath = null;
- }
-
- @Nullable
- public Project getParent() {
- if (parentPath != null)
- return OneDev.getInstance(ProjectManager.class).find(parentPath);
- else
- return null;
- }
-
}