The Unified and Autonomous Development Platform
Role based permission management
Robin Shene79be8d35567
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 841ad2348d..6689897f30 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -71,10 +71,8 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.schedule.DefaultTaskScheduler;import io.onedev.commons.utils.schedule.TaskScheduler;-import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CodeCommentRelationInfoManager;import io.onedev.server.cache.CommitInfoManager;-import io.onedev.server.cache.DefaultCacheManager;import io.onedev.server.cache.DefaultCodeCommentRelationInfoManager;import io.onedev.server.cache.DefaultCommitInfoManager;import io.onedev.server.cache.DefaultUserInfoManager;@@ -113,6 +111,7 @@ import io.onedev.server.entitymanager.PullRequestQuerySettingManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.entitymanager.PullRequestWatchManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserAuthorizationManager;@@ -146,6 +145,7 @@ import io.onedev.server.entitymanager.impl.DefaultPullRequestQuerySettingManagerimport io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;+import io.onedev.server.entitymanager.impl.DefaultRoleManager;import io.onedev.server.entitymanager.impl.DefaultSettingManager;import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;import io.onedev.server.entitymanager.impl.DefaultUserManager;@@ -322,13 +322,14 @@ public class CoreModule extends AbstractPluginModule {bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);bind(BuildParamManager.class).to(DefaultBuildParamManager.class);+ bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);+ bind(GroupAuthorizationManager.class).to(DefaultGroupAuthorizationManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);+ bind(RoleManager.class).to(DefaultRoleManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(UserInfoManager.class).to(DefaultUserInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);bind(GroupManager.class).to(DefaultGroupManager.class);- bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);- bind(GroupAuthorizationManager.class).to(DefaultGroupAuthorizationManager.class);bind(MembershipManager.class).to(DefaultMembershipManager.class);bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);@@ -346,7 +347,6 @@ public class CoreModule extends AbstractPluginModule {bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);bind(IssueVoteManager.class).to(DefaultIssueVoteManager.class);- bind(CacheManager.class).to(DefaultCacheManager.class);bind(MilestoneManager.class).to(DefaultMilestoneManager.class);bind(Session.class).toProvider(SessionProvider.class);bind(EntityManager.class).toProvider(SessionProvider.class);diff --git a/server-core/src/main/java/io/onedev/server/cache/CacheManager.java b/server-core/src/main/java/io/onedev/server/cache/CacheManager.javadeleted file mode 100644index faefe679f4..0000000000--- a/server-core/src/main/java/io/onedev/server/cache/CacheManager.java+++ /dev/null@@ -1,65 +0,0 @@-package io.onedev.server.cache;--import java.util.Collection;-import java.util.Map;--import javax.annotation.Nullable;--import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;--public interface CacheManager {-- Map<Long, ProjectFacade> getProjects();-- Map<Long, UserFacade> getUsers();-- Map<Long, GroupFacade> getGroups();-- Map<Long, UserAuthorizationFacade> getUserAuthorizations();-- Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();-- Map<Long, MembershipFacade> getMemberships();-- @Nullable- ProjectFacade getProject(Long id);-- @Nullable- UserFacade getUser(Long id);-- @Nullable- GroupFacade getGroup(Long id);-- @Nullable- MembershipFacade getMembership(Long id);-- @Nullable- Long getUserIdByName(String name);-- @Nullable- Long getUserIdByEmail(String email);-- @Nullable- Long getGroupIdByName(String name);-- Map<String, Long> getProjectIds();-- @Nullable- Long getProjectIdByName(String name);-- Collection<Long> getIssueNumbers(Long projectId);-- Collection<Long> getBuildIdsByProject(Long projectId);-- Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);-- Collection<String> getBuildParamNames();-- Collection<String> getBuildParamValues(String paramName);--}diff --git a/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.javaindex c3a0961c5c..a715a1f32a 100644--- a/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/cache/CommitInfoManager.java@@ -10,15 +10,14 @@ import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;import io.onedev.server.git.NameAndEmail;import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.util.Day;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;public interface CommitInfoManager {List<String> getFiles(Project project);- int getEdits(ProjectFacade project, UserFacade user, String path);+ int getEdits(Project project, User user, String path);int getCommitCount(Project project);diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javadeleted file mode 100644index 139a906883..0000000000--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java+++ /dev/null@@ -1,646 +0,0 @@-package io.onedev.server.cache;--import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.query.Query;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;--import io.onedev.commons.launcher.loader.Listen;-import io.onedev.server.ci.job.paramspec.ParamSpec;-import io.onedev.server.event.entity.EntityPersisted;-import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.model.Build;-import io.onedev.server.model.BuildParam;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Membership;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.facade.EntityFacade;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.IssueFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;--@Singleton-public class DefaultCacheManager implements CacheManager {-- private static final Logger logger = LoggerFactory.getLogger(DefaultCacheManager.class);-- private static final int MAX_PARAM_VALUES = 100;-- private final Dao dao;-- private final TransactionManager transactionManager;-- private final Map<Long, UserFacade> users = new HashMap<>();-- private final BiMap<String, Long> userIdsByName = HashBiMap.create();-- private final BiMap<String, Long> userIdsByEmail = HashBiMap.create();-- private final ReadWriteLock usersLock = new ReentrantReadWriteLock();-- private final Map<Long, ProjectFacade> projects = new HashMap<>();-- private final BiMap<String, Long> projectIdsByName = HashBiMap.create();-- private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();-- private final Map<Long, GroupFacade> groups = new HashMap<>();-- private final BiMap<String, Long> groupIdsByName = HashBiMap.create();-- private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();-- private final Map<Long, MembershipFacade> memberships = new HashMap<>();-- private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();-- private final Map<Long, BuildFacade> builds= new HashMap<>();-- private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();-- private final Map<Long, IssueFacade> issues = new HashMap<>();-- private final ReadWriteLock issuesLock = new ReentrantReadWriteLock();-- private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();-- private final ReadWriteLock groupAuthorizationsLock = new ReentrantReadWriteLock();-- private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();-- private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();-- private final Map<String, Set<String>> buildParams = new HashMap<>();-- private final ReadWriteLock buildParamsLock = new ReentrantReadWriteLock();-- @Inject- public DefaultCacheManager(Dao dao, TransactionManager transactionManager) {- this.dao = dao;- this.transactionManager = transactionManager;- }-- @SuppressWarnings("unchecked")- @Sessional- @Listen- public void on(SystemStarted event) {- logger.info("Caching meta data...");- for (Project project: dao.query(Project.class)) {- projects.put(project.getId(), project.getFacade());- projectIdsByName.inverse().put(project.getId(), project.getName());- }- for (User user: dao.query(User.class)) {- users.put(user.getId(), user.getFacade());- userIdsByName.inverse().put(user.getId(), user.getName());- if (user.getEmail() != null)- userIdsByEmail.inverse().put(user.getId(), user.getEmail());- }- for (Group group: dao.query(Group.class)) {- groups.put(group.getId(), group.getFacade());- groupIdsByName.inverse().put(group.getId(), group.getName());- }-- for (Membership membership: dao.query(Membership.class))- memberships.put(membership.getId(), membership.getFacade());-- Query<?> query = dao.getSession().createQuery("select id, project.id, commitHash from Build");- for (Object[] fields: (List<Object[]>)query.list()) {- Long buildId = (Long) fields[0];- builds.put(buildId, new BuildFacade(buildId, (Long)fields[1], (String)fields[2]));- }-- query = dao.getSession().createQuery("select id, project.id, number from Issue");- for (Object[] fields: (List<Object[]>)query.list()) {- Long issueId = (Long) fields[0];- issues.put(issueId, new IssueFacade(issueId, (Long)fields[1], (Long)fields[2]));- }-- for (GroupAuthorization groupAuthorization: dao.query(GroupAuthorization.class))- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());- for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))- userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());-- query = dao.getSession().createQuery("select distinct name, type, value, id from BuildParam order by id");- for (Object[] fields: (List<Object[]>)query.list()) {- if (!fields[1].equals(ParamSpec.SECRET))- addBuildParam((String) fields[0], (String) fields[2]);- }- }-- @Transactional- @Listen- public void on(EntityPersisted event) {- EntityFacade facade;-- if (event.getEntity() instanceof Project) {- facade = ((Project) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof User) {- facade = ((User) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Group) {- facade = ((Group) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Membership) {- facade = ((Membership) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Build) {- facade = ((Build)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Issue) {- facade = ((Issue)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof UserAuthorization) {- facade = ((UserAuthorization) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof GroupAuthorization) {- facade = ((GroupAuthorization) event.getEntity()).getFacade();- } else {- facade = null;- }-- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- if (facade instanceof ProjectFacade) {- ProjectFacade project = (ProjectFacade) facade;- projectsLock.writeLock().lock();- try {- projects.put(project.getId(), project);- projectIdsByName.inverse().put(project.getId(), project.getName());- } finally {- projectsLock.writeLock().unlock();- }- } else if (facade instanceof UserFacade) {- UserFacade user = (UserFacade) facade;- usersLock.writeLock().lock();- try {- users.put(user.getId(), user);- userIdsByName.inverse().put(user.getId(), user.getName());- if (user.getEmail() != null)- userIdsByEmail.inverse().put(user.getId(), user.getEmail());- } finally {- usersLock.writeLock().unlock();- }- } else if (facade instanceof GroupFacade) {- GroupFacade group = (GroupFacade) facade;- groupsLock.writeLock().lock();- try {- groups.put(group.getId(), group);- groupIdsByName.inverse().put(group.getId(), group.getName());- } finally {- groupsLock.writeLock().unlock();- }- } else if (facade instanceof IssueFacade) {- IssueFacade issue = (IssueFacade) facade;- issuesLock.writeLock().lock();- try {- issues.put(issue.getId(), issue);- } finally {- issuesLock.writeLock().unlock();- }- } else if (facade instanceof BuildFacade) {- BuildFacade build = (BuildFacade) facade;- buildsLock.writeLock().lock();- try {- builds.put(build.getId(), build);- } finally {- buildsLock.writeLock().unlock();- }- } else if (facade instanceof MembershipFacade) {- MembershipFacade membership = (MembershipFacade) facade;- membershipsLock.writeLock().lock();- try {- memberships.put(membership.getId(), membership);- } finally {- membershipsLock.writeLock().unlock();- }- } else if (facade instanceof UserAuthorizationFacade) {- UserAuthorizationFacade userAuthorization = (UserAuthorizationFacade) facade;- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.put(userAuthorization.getId(), userAuthorization);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (facade instanceof GroupAuthorizationFacade) {- GroupAuthorizationFacade groupAuthorization = (GroupAuthorizationFacade) facade;- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }-- if (event.getEntity() instanceof BuildParam) {- buildParamsLock.writeLock().lock();- try {- BuildParam param = (BuildParam) event.getEntity();- if (!param.getType().equals(ParamSpec.SECRET))- addBuildParam(param.getName(), param.getValue());- } finally {- buildParamsLock.writeLock().unlock();- }- }- }-- });-- }-- private void addBuildParam(String name, String value) {- Set<String> values = buildParams.get(name);- if (values == null) {- values = new LinkedHashSet<>();- buildParams.put(name, values);- }- values.add(value);- if (values.size() > MAX_PARAM_VALUES)- values.iterator().remove();- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- Long id = event.getEntity().getId();- Class<?> clazz = event.getEntity().getClass();-- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- if (Project.class.isAssignableFrom(clazz)) {- projectsLock.writeLock().lock();- try {- projects.remove(id);- projectIdsByName.inverse().remove(id);- } finally {- projectsLock.writeLock().unlock();- }- userAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))- it.remove();- }- } finally {- userAuthorizationsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- issuesLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, IssueFacade>> it = issues.entrySet().iterator(); it.hasNext();) {- IssueFacade issue = it.next().getValue();- if (issue.getProjectId().equals(id))- it.remove();- }- } finally {- issuesLock.writeLock().unlock();- }- } else if (User.class.isAssignableFrom(clazz)) {- usersLock.writeLock().lock();- try {- users.remove(id);- userIdsByName.inverse().remove(id);- userIdsByEmail.inverse().remove(id);- } finally {- usersLock.writeLock().unlock();- }- userAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(id))- it.remove();- }- } finally {- userAuthorizationsLock.writeLock().unlock();- }- membershipsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(id))- it.remove();- }- } finally {- membershipsLock.writeLock().unlock();- }- } else if (Group.class.isAssignableFrom(clazz)) {- groupsLock.writeLock().lock();- try {- groups.remove(id);- groupIdsByName.inverse().remove(id);- } finally {- groupsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- membershipsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))- it.remove();- }- } finally {- membershipsLock.writeLock().unlock();- }- } else if (Build.class.isAssignableFrom(clazz)) {- buildsLock.writeLock().lock();- try {- builds.remove(id);- } finally {- buildsLock.writeLock().unlock();- }- } else if (Issue.class.isAssignableFrom(clazz)) {- issuesLock.writeLock().lock();- try {- issues.remove(id);- } finally {- issuesLock.writeLock().unlock();- }- } else if (Membership.class.isAssignableFrom(clazz)) {- membershipsLock.writeLock().lock();- try {- memberships.remove(id);- } finally {- membershipsLock.writeLock().unlock();- }- } else if (UserAuthorization.class.isAssignableFrom(clazz)) {- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.remove(id);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (GroupAuthorization.class.isAssignableFrom(clazz)) {- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.remove(id);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }- }- });- }-- @Override- public Map<Long, ProjectFacade> getProjects() {- projectsLock.readLock().lock();- try {- return new HashMap<>(projects);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Map<Long, UserFacade> getUsers() {- usersLock.readLock().lock();- try {- return new HashMap<>(users);- } finally {- usersLock.readLock().unlock();- }- }-- public Map<Long, GroupFacade> getGroups() {- groupsLock.readLock().lock();- try {- return new HashMap<>(groups);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public Map<Long, MembershipFacade> getMemberships() {- membershipsLock.readLock().lock();- try {- return new HashMap<>(memberships);- } finally {- membershipsLock.readLock().unlock();- }- }-- @Override- public ProjectFacade getProject(Long id) {- projectsLock.readLock().lock();- try {- return projects.get(id);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public UserFacade getUser(Long id) {- usersLock.readLock().lock();- try {- return users.get(id);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getUserIdByName(String name) {- usersLock.readLock().lock();- try {- return userIdsByName.get(name);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getUserIdByEmail(String email) {- usersLock.readLock().lock();- try {- return userIdsByEmail.get(email);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getProjectIdByName(String name) {- projectsLock.readLock().lock();- try {- return projectIdsByName.get(name);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Map<String, Long> getProjectIds() {- projectsLock.readLock().lock();- try {- return new HashMap<>(projectIdsByName);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Long getGroupIdByName(String name) {- groupsLock.readLock().lock();- try {- return groupIdsByName.get(name);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public GroupFacade getGroup(Long id) {- groupsLock.readLock().lock();- try {- return groups.get(id);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public MembershipFacade getMembership(Long id) {- membershipsLock.readLock().lock();- try {- return memberships.get(id);- } finally {- membershipsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> getIssueNumbers(Long projectId) {- issuesLock.readLock().lock();- try {- Collection<Long> issueNumbers = new HashSet<>();- for (IssueFacade issue: issues.values()) {- if (projectId.equals(issue.getProjectId()))- issueNumbers.add(issue.getNumber());- }- return issueNumbers;- } finally {- issuesLock.readLock().unlock();- }- }-- @Override- public Collection<Long> getBuildIdsByProject(Long projectId) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getProjectId().equals(projectId))- buildIds.add(build.getId());- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getProjectId().equals(projectId)- && commitHashes.contains(build.getCommitHash())) {- buildIds.add(build.getId());- }- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-- @Override- public Map<Long, UserAuthorizationFacade> getUserAuthorizations() {- userAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(userAuthorizations);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public Map<Long, GroupAuthorizationFacade> getGroupAuthorizations() {- groupAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(groupAuthorizations);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }-- @Override- public Collection<String> getBuildParamNames() {- buildParamsLock.readLock().lock();- try {- return new HashSet<>(buildParams.keySet());- } finally {- buildParamsLock.readLock().unlock();- }- }-- @Override- public Collection<String> getBuildParamValues(String paramName) {- buildParamsLock.readLock().lock();- try {- Set<String> paramValues = buildParams.get(paramName);- if (paramValues != null)- return new HashSet<>(paramValues);- else- return new HashSet<>();- } finally {- buildParamsLock.readLock().unlock();- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.javaindex 2752894336..863ce4271c 100644--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java@@ -63,13 +63,12 @@ import io.onedev.server.git.command.RevListCommand;import io.onedev.server.git.command.RevListCommand.Order;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.Day;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.work.BatchWorkManager;import io.onedev.server.util.work.BatchWorker;import jetbrains.exodus.ArrayByteIterable;@@ -897,7 +896,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}@Override- public int getEdits(ProjectFacade project, UserFacade user, String path) {+ public int getEdits(Project project, User user, String path) {if (user.getEmail() != null) {Environment env = getEnv(project.getId().toString());Store emailToIndexStore = getStore(env, EMAIL_TO_INDEX_STORE);diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java b/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.javaindex dea0e518f0..6c8b2716de 100644--- a/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java@@ -23,8 +23,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;import jetbrains.exodus.env.Environment;import jetbrains.exodus.env.Store;import jetbrains.exodus.env.Transaction;@@ -79,7 +77,7 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement}@Override- public Date getVisitDate(UserFacade user, ProjectFacade project) {+ public Date getVisitDate(User user, Project project) {Environment env = getEnv(user.getId().toString());Store store = getStore(env, PROJECT_VISIT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {diff --git a/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java b/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.javaindex d192b4d504..7de5b27d41 100644--- a/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/cache/UserInfoManager.java@@ -9,15 +9,13 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;public interface UserInfoManager {void visit(User user, Project project);@Nullable- Date getVisitDate(UserFacade user, ProjectFacade project);+ Date getVisitDate(User user, Project project);void visitPullRequest(User user, PullRequest request);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex 86ecc753f9..cff9dcd239 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -89,7 +89,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.BuildCommitAware;import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;@@ -273,8 +273,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {subject = User.asSubject(0L);}- if (!subject.isPermitted(new ProjectPermission(dependencyProject.getFacade(),- ProjectPrivilege.CODE_READ))) {+ if (!subject.isPermitted(new ProjectPermission(dependencyProject, new ReadCode()))) {throw new OneException("Unable to access dependency project '"+ dependency.getProjectName() + "': permission denied");}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.javaindex a77bd4f315..292f378e1b 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java@@ -56,7 +56,7 @@ public class ProjectDependency implements Serializable {List<String> choices = new ArrayList<>();Project project = ((ProjectPage)WicketUtils.getPage()).getProject();for (Project each: OneDev.getInstance(ProjectManager.class).query()) {- if (!each.equals(project) && SecurityUtils.canReadCode(each.getFacade()))+ if (!each.equals(project) && SecurityUtils.canReadCode(each))choices.add(each.getName());}@@ -82,7 +82,7 @@ public class ProjectDependency implements Serializable {String projectName = (String) EditContext.get().getInputValue("projectName");if (projectName != null) {Project project = OneDev.getInstance(ProjectManager.class).find(projectName);- if (project != null && SecurityUtils.canReadCode(project.getFacade()))+ if (project != null && SecurityUtils.canReadCode(project))return project;}return null;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.javaindex 59fd30fd45..25e377586c 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java@@ -10,8 +10,8 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.IssueReaders;import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -21,7 +21,7 @@ public class UserChoiceParam extends ParamSpec {private static final long serialVersionUID = 1L;- private ChoiceProvider choiceProvider = new IssueReaders();+ private ChoiceProvider choiceProvider = new AllUsers();private DefaultValueProvider defaultValueProvider;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex bbf068875e..3999c6f40a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -35,12 +35,16 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> queryUnfinished();- List<Build> query(Project project, String term, int count);+ List<Build> query(Project project, @Nullable User user, String term, int count);- List<Build> queryAfter(Project project, Long afterBuildId, int count);-- List<Build> query(Project project, User user, EntityQuery<Build> buildQuery, int firstResult, int maxResults);+ List<Build> query(Project project, @Nullable User user, EntityQuery<Build> buildQuery, int firstResult, int maxResults);++ int count(Project project, @Nullable User user, EntityCriteria<Build> buildCriteria);- int count(Project project, User user, EntityCriteria<Build> buildCriteria);+ Collection<Long> getBuildIdsByProject(Long projectId);++ Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);++ Collection<String> getJobNames(@Nullable Long projectId);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.javaindex 6f508907bb..e7238f85a4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java@@ -1,5 +1,7 @@package io.onedev.server.entitymanager;+import java.util.Collection;+import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;import io.onedev.server.persistence.dao.EntityManager;@@ -8,4 +10,8 @@ public interface BuildParamManager extends EntityManager<BuildParam> {void deleteParams(Build build);+ Collection<String> getBuildParamNames();++ Collection<String> getBuildParamValues(String paramName);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.javaindex 15de904440..82524d8407 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java@@ -2,11 +2,12 @@ package io.onedev.server.entitymanager;import java.util.Collection;+import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.persistence.dao.EntityManager;public interface GroupAuthorizationManager extends EntityManager<GroupAuthorization> {-- void delete(Collection<GroupAuthorization> authorizations);++ void authorize(Group group, Collection<GroupAuthorization> authorizations);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.javaindex b2d7975482..82baf7d355 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java@@ -21,4 +21,7 @@ public interface GroupManager extends EntityManager<Group> {@NullableGroup find(String name);++ @Nullable+ Group findAnonymous();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex b034084e3b..a016e087f0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -49,4 +49,7 @@ public interface IssueManager extends EntityManager<Issue> {void fixFieldValueOrders();void delete(Issue issue);++ Collection<Long> getIssueNumbers(Long projectId);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex b2d01a84c8..d5d3ef9686 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -9,7 +9,6 @@ import org.eclipse.jgit.lib.Repository;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;-import io.onedev.server.util.facade.ProjectFacade;public interface ProjectManager extends EntityManager<Project> {@@ -42,6 +41,6 @@ public interface ProjectManager extends EntityManager<Project> {Repository getRepository(Project project);- Collection<ProjectFacade> getAccessibleProjects(@Nullable User user);+ Collection<Project> getAccessibleProjects(@Nullable User user);}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.javanew file mode 100644index 0000000000..764744fba8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java@@ -0,0 +1,13 @@+package io.onedev.server.entitymanager;++import javax.annotation.Nullable;++import io.onedev.server.model.Role;+import io.onedev.server.persistence.dao.EntityManager;++public interface RoleManager extends EntityManager<Role> {+ void save(Role role, @Nullable String oldName);++ @Nullable+ Role find(String name);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex df666a81de..6862311cba 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -7,11 +7,11 @@ import javax.annotation.Nullable;import io.onedev.server.model.Setting;import io.onedev.server.model.support.administration.BackupSetting;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.dao.EntityManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.javaindex 51aad047d2..07e80d0ac9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java@@ -2,11 +2,15 @@ package io.onedev.server.entitymanager;import java.util.Collection;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.dao.EntityManager;public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {-- void delete(Collection<UserAuthorization> authorizations);+ void authorize(User user, Collection<UserAuthorization> authorizations);++ void authorize(Project project, Collection<UserAuthorization> authorizations);+}\ No newline at end of filediff --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.javaindex 1d36f6c3b6..5524c3fbc7 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@@ -5,10 +5,14 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;+import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.atomic.AtomicInteger;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;import java.util.stream.Collectors;import javax.inject.Inject;@@ -26,6 +30,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.Session;+import org.hibernate.criterion.Criterion;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -40,20 +45,28 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.match.StringMatcher;import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.BuildDependence;import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;+import io.onedev.server.model.Role;import io.onedev.server.model.User;+import io.onedev.server.model.UserAuthorization;+import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -64,8 +77,12 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.security.permission.ManageProject;+import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.util.patternset.PatternSet;@Singletonpublic class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {@@ -82,20 +99,28 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsprivate final StorageManager storageManager;+ private final GroupManager groupManager;+private final TaskScheduler taskScheduler;private final TransactionManager transactionManager;+ private final Map<Long, BuildFacade> builds = new HashMap<>();++ private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();+private String taskId;@Injectpublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,- TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,- StorageManager storageManager, TransactionManager transactionManager) {+ TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,+ GroupManager groupManager, StorageManager storageManager,+ TransactionManager transactionManager) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;this.storageManager = storageManager;+ this.groupManager = groupManager;this.taskScheduler = taskScheduler;this.transactionManager = transactionManager;}@@ -103,8 +128,22 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Transactional@Overridepublic void delete(Build build) {- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));super.delete(build);++ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getNumber()));+ Long buildId = build.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ builds.remove(buildId);+ } finally {+ buildsLock.writeLock().unlock();+ }+ }+ });}@Sessional@@ -117,6 +156,51 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn find(criteria);}+ @Transactional+ @Override+ public void save(Build build) {+ super.save(build);++ BuildFacade facade = build.getFacade();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ builds.put(facade.getId(), facade);+ } finally {+ buildsLock.writeLock().unlock();+ }+ }++ });+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {+ BuildFacade build = it.next().getValue();+ if (build.getProjectId().equals(projectId))+ it.remove();+ }+ } finally {+ buildsLock.writeLock().unlock();+ }+ }+ });+ }+ }+@Sessional@Overridepublic Collection<Build> query(Project project, ObjectId commitId) {@@ -174,11 +258,18 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<Build> query(Project project, String term, int count) {+ public List<Build> query(Project project, User user, String term, int count) {List<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.eq("project", project));+ Collection<String> accessibleJobNames = getAccessibleJobNames(project, user);+ if (accessibleJobNames != null) {+ List<Criterion> jobCriterions = new ArrayList<>();+ for (String jobName: accessibleJobNames)+ jobCriterions.add(Restrictions.eq("jobName", jobName));+ criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));+ }if (StringUtils.isNotBlank(term)) {if (term.startsWith("#")) {@@ -203,16 +294,6 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn builds;}- @Override- public List<Build> queryAfter(Project project, Long afterBuildId, int count) {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.addOrder(Order.asc("id"));- if (afterBuildId != null)- criteria.add(Restrictions.gt("id", afterBuildId));- return query(criteria, 0, count);- }-@Transactional@Overridepublic void create(Build build) {@@ -231,6 +312,15 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsRoot<Build> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));++ Collection<String> accessibleJobNames = getAccessibleJobNames(project, user);+ if (accessibleJobNames != null) {+ List<Predicate> jobPredicates = new ArrayList<>();+ for (String jobName: accessibleJobNames)+ jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));+ predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));+ }+if (criteria != null)predicates.add(criteria.getPredicate(project, root, builder, user));return predicates.toArray(new Predicate[0]);@@ -387,8 +477,16 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}+ @SuppressWarnings("unchecked")@Listenpublic void on(SystemStarted event) {+ logger.info("Caching build info...");++ Query<?> query = dao.getSession().createQuery("select id, project.id, commitHash, jobName from Build");+ for (Object[] fields: (List<Object[]>)query.list()) {+ Long buildId = (Long) fields[0];+ builds.put(buildId, new BuildFacade(buildId, (Long)fields[1], (String)fields[2], (String)fields[3]));+ }taskId = taskScheduler.schedule(this);}@@ -436,4 +534,139 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn null;}+ @Override+ public Collection<Long> getBuildIdsByProject(Long projectId) {+ buildsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (build.getProjectId().equals(projectId))+ buildIds.add(build.getId());+ }+ return buildIds;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes) {+ buildsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (build.getProjectId().equals(projectId)+ && commitHashes.contains(build.getCommitHash())) {+ buildIds.add(build.getId());+ }+ }+ return buildIds;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<String> getJobNames(Long projectId) {+ buildsLock.readLock().lock();+ try {+ Set<String> jobNames = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (projectId == null || projectId.equals(build.getProjectId()))+ jobNames.add(build.getJobName());+ }+ return jobNames;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ private Collection<String> getAccessibleJobNames(Role role, Collection<String> jobNames) {+ StringMatcher matcher = new StringMatcher();+ Collection<String> accessibleJobNames = new HashSet<>();+ for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {+ for (String jobName: jobNames) {+ if (PatternSet.fromString(jobPrivilege.getJobNames()).matches(matcher, jobName))+ accessibleJobNames.add(jobName);+ }+ }+ return accessibleJobNames;+ }++ private Collection<String> getAccessibleJobNames(Project project, User user) {+ if (User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {+ return null;+ } else {+ Collection<String> jobNames = getJobNames(project.getId());+ Collection<String> accessibleJobNames = new HashSet<>();+ if (user != null) {+ for (UserAuthorization authorization: user.getAuthorizations()) {+ if (authorization.getProject().equals(project))+ accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));+ }+ for (Group group: user.getGroups()) {+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (authorization.getProject().equals(project))+ accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));+ }+ }+ }+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (authorization.getProject().equals(project))+ accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));+ }+ }+ return accessibleJobNames;+ }+ }++ private void populateAccessibleJobNames(Map<Long, Collection<String>> accessibleJobNames, Map<Long, Collection<String>> jobNames,+ Project project, Role role) {+ Collection<String> jobNamesOfProject = jobNames.get(project.getId());+ if (jobNamesOfProject != null) {+ Collection<String> accessibleJobNamesOfProject = getAccessibleJobNames(role, jobNamesOfProject);+ Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project.getId());+ if (currentAccessibleJobNamesOfProject == null) {+ currentAccessibleJobNamesOfProject = new HashSet<>();+ accessibleJobNames.put(project.getId(), currentAccessibleJobNamesOfProject);+ }+ currentAccessibleJobNamesOfProject.addAll(accessibleJobNamesOfProject);+ }+ }++ private Map<Long, Collection<String>> getAccessibleJobNames(User user) {+ Map<Long, Collection<String>> jobNames = new HashMap<>();+ buildsLock.readLock().lock();+ try {+ for (BuildFacade build: builds.values()) {+ Collection<String> jobNamesOfBuild = jobNames.get(build.getId());+ if (jobNamesOfBuild == null) {+ jobNamesOfBuild = new HashSet<>();+ jobNames.put(build.getId(), jobNamesOfBuild);+ }+ jobNamesOfBuild.add(build.getJobName());+ }+ } finally {+ buildsLock.readLock().unlock();+ }++ Map<Long, Collection<String>> accessibleJobNames = new HashMap<>();+ 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());+ }+ }+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getAuthorizations())+ populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());+ }+ return accessibleJobNames;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.javaindex b5704f00f8..6f183fad28 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java@@ -1,12 +1,30 @@package io.onedev.server.entitymanager.impl;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;+import javax.inject.Inject;import javax.inject.Singleton;-import javax.persistence.Query;+import org.hibernate.query.Query;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -14,18 +32,103 @@ import io.onedev.server.persistence.dao.Dao;@Singletonpublic class DefaultBuildParamManager extends AbstractEntityManager<BuildParam> implements BuildParamManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultBuildParamManager.class);++ private static final int MAX_PARAM_VALUES = 100;++ private final TransactionManager transactionManager;++ private final Map<String, Set<String>> buildParams = new HashMap<>();++ private final ReadWriteLock buildParamsLock = new ReentrantReadWriteLock();+@Inject- public DefaultBuildParamManager(Dao dao) {+ public DefaultBuildParamManager(Dao dao, TransactionManager transactionManager) {super(dao);+ this.transactionManager = transactionManager;}@Transactional@Overridepublic void deleteParams(Build build) {- Query query = getSession().createQuery("delete from BuildParam where build = :build");+ Query<?> query = getSession().createQuery("delete from BuildParam where build = :build");query.setParameter("build", build);query.executeUpdate();build.getParams().clear();}+ @SuppressWarnings("unchecked")+ @Sessional+ @Listen+ public void on(SystemStarted event) {+ logger.info("Caching build param info...");++ Query<?> query = dao.getSession().createQuery("select distinct name, type, value, id from BuildParam order by id");+ for (Object[] fields: (List<Object[]>)query.list()) {+ if (!fields[1].equals(ParamSpec.SECRET))+ addBuildParam((String) fields[0], (String) fields[2]);+ }+ }++ @Transactional+ @Override+ public void save(BuildParam param) {+ super.save(param);++ if (!param.getType().equals(ParamSpec.SECRET)) {+ String paramName = param.getName();+ String paramValue = param.getValue();++ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ buildParamsLock.writeLock().lock();+ try {+ if (!param.getType().equals(ParamSpec.SECRET))+ addBuildParam(paramName, paramValue);+ } finally {+ buildParamsLock.writeLock().unlock();+ }+ }++ });+ }+ }++ private void addBuildParam(String name, String value) {+ Set<String> values = buildParams.get(name);+ if (values == null) {+ values = new LinkedHashSet<>();+ buildParams.put(name, values);+ }+ values.add(value);+ if (values.size() > MAX_PARAM_VALUES)+ values.iterator().remove();+ }++ @Override+ public Collection<String> getBuildParamNames() {+ buildParamsLock.readLock().lock();+ try {+ return new HashSet<>(buildParams.keySet());+ } finally {+ buildParamsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<String> getBuildParamValues(String paramName) {+ buildParamsLock.readLock().lock();+ try {+ Set<String> paramValues = buildParams.get(paramName);+ if (paramValues != null)+ return new HashSet<>(paramValues);+ else+ return new HashSet<>();+ } finally {+ buildParamsLock.readLock().unlock();+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javaindex 19860874a4..5799332b4b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java@@ -1,11 +1,13 @@package io.onedev.server.entitymanager.impl;import java.util.Collection;+import java.util.Iterator;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.server.entitymanager.GroupAuthorizationManager;+import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -22,9 +24,36 @@ public class DefaultGroupAuthorizationManager extends AbstractEntityManager<Grou@Transactional@Override- public void delete(Collection<GroupAuthorization> authorizations) {- for (GroupAuthorization authorization: authorizations)- delete(authorization);- }+ public void authorize(Group group, Collection<GroupAuthorization> authorizations) {+ for (Iterator<GroupAuthorization> it = group.getAuthorizations().iterator(); it.hasNext();) {+ GroupAuthorization authorization = it.next();+ boolean found = false;+ for (GroupAuthorization newAuthorization: authorizations) {+ if (newAuthorization.getProject().equals(authorization.getProject())) {+ found = true;+ authorization.setRole(newAuthorization.getRole());+ save(authorization);+ }+ }+ if (!found) {+ it.remove();+ delete(authorization);+ }+ }+ for (GroupAuthorization newAuthorization: authorizations) {+ boolean found = false;+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (authorization.getProject().equals(newAuthorization.getProject())) {+ found = true;+ break;+ }+ }+ if (!found) {+ group.getAuthorizations().add(newAuthorization);+ save(newAuthorization);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 4888b747c6..1e637a7c36 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -1,9 +1,15 @@package io.onedev.server.entitymanager.impl;+import java.util.List;+import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.cache.CacheManager;+import org.hibernate.criterion.Restrictions;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.ProjectManager;@@ -12,32 +18,33 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.Usage;@Singletonpublic class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultGroupManager.class);+private final ProjectManager projectManager;private final SettingManager settingManager;private final IssueFieldManager issueFieldManager;- private final CacheManager cacheManager;-@Injectpublic DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldManager issueFieldManager, CacheManager cacheManager) {+ IssueFieldManager issueFieldManager) {super(dao);this.projectManager = projectManager;this.settingManager = settingManager;this.issueFieldManager = issueFieldManager;- this.cacheManager = cacheManager;}@Transactional@@ -49,7 +56,6 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsprotection.onRenameGroup(oldName, group.getName());for (TagProtection protection: project.getTagProtections())protection.onRenameGroup(oldName, group.getName());- project.getIssueSetting().onRenameGroup(oldName, group.getName());}Authenticator authenticator = settingManager.getAuthenticator();@@ -60,10 +66,16 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsissueFieldManager.onRenameGroup(oldName, group.getName());settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());+ settingManager.getSecuritySetting().onRenameGroup(oldName, group.getName());}dao.persist(group);}+ @Override+ public List<Group> query() {+ return query(true);+ }+@Transactional@Overridepublic void delete(Group group) {@@ -73,15 +85,16 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsusage.add(protection.onDeleteGroup(group.getName()));for (TagProtection protection: project.getTagProtections())usage.add(protection.onDeleteGroup(group.getName()));- usage.add(project.getIssueSetting().onDeleteGroup(group.getName()));usage.prefix("project '" + project.getName() + "': setting");}usage.add(settingManager.getIssueSetting().onDeleteGroup(group.getName()).prefix("administration"));Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null && authenticator.getDefaultGroupNames().contains(group.getName()))- usage.add("administration: authenticator");+ if (authenticator != null)+ usage.add(authenticator.onDeleteGroup(group.getName()).prefix("administration"));++ usage.add(settingManager.getSecuritySetting().onDeleteGroup(group.getName()).prefix("administration"));usage.checkInUse("Group '" + group.getName() + "'");@@ -91,11 +104,23 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements@Sessional@Overridepublic Group find(String name) {- Long id = cacheManager.getGroupIdByName(name);- if (id != null)- return load(id);- else- return null;+ EntityCriteria<Group> criteria = newCriteria();+ criteria.add(Restrictions.eq("name", name));+ criteria.setCacheable(true);+ return find(criteria);+ }++ @Override+ public Group findAnonymous() {+ SecuritySetting securitySetting = OneDev.getInstance(SettingManager.class).getSecuritySetting();+ if (securitySetting.isEnableAnonymousAccess()) {+ Group group = OneDev.getInstance(GroupManager.class).find(securitySetting.getAnonymousGroup());+ if (group != null)+ return group;+ else+ logger.error("Undefined anonymous group: " + securitySetting.getAnonymousGroup());+ }+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 7138f8b8b5..3c6109c0ce 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -2,11 +2,14 @@ package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;import javax.annotation.Nullable;import javax.inject.Inject;@@ -24,6 +27,8 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;@@ -34,9 +39,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.IssueQuerySettingManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.issue.IssueOpened;+import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.IssueQuerySetting;@@ -44,10 +51,11 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -62,6 +70,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;@@ -69,6 +78,8 @@ import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateRe@Singletonpublic class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);+private final IssueFieldManager issueFieldManager;private final ListenerRegistry listenerRegistry;@@ -79,18 +90,38 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final ProjectManager projectManager;+ private final TransactionManager transactionManager;++ private final Map<Long, IssueFacade> issues = new HashMap<>();++ private final ReadWriteLock issuesLock = new ReentrantReadWriteLock();+@Injectpublic DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,- IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,- ListenerRegistry listenerRegistry, ProjectManager projectManager) {+ TransactionManager transactionManager, IssueQuerySettingManager issueQuerySettingManager,+ SettingManager settingManager, ListenerRegistry listenerRegistry, ProjectManager projectManager) {super(dao);this.issueFieldManager = issueFieldManager;this.issueQuerySettingManager = issueQuerySettingManager;this.listenerRegistry = listenerRegistry;this.settingManager = settingManager;this.projectManager = projectManager;+ this.transactionManager = transactionManager;}+ @SuppressWarnings("unchecked")+ @Sessional+ @Listen+ public void on(SystemStarted event) {+ logger.info("Caching issue info...");++ Query<?> query = dao.getSession().createQuery("select id, project.id, number from Issue");+ for (Object[] fields: (List<Object[]>)query.list()) {+ Long issueId = (Long) fields[0];+ issues.put(issueId, new IssueFacade(issueId, (Long)fields[1], (Long)fields[2]));+ }+ }+@Sessional@Overridepublic Issue find(Project project, long number) {@@ -114,6 +145,27 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementslistenerRegistry.post(new IssueOpened(issue));}++ @Transactional+ @Override+ public void save(Issue issue) {+ super.save(issue);++ IssueFacade facade = issue.getFacade();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ issuesLock.writeLock().lock();+ try {+ issues.put(facade.getId(), facade);+ } finally {+ issuesLock.writeLock().unlock();+ }+ }++ });+ }private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, Root<Issue> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();@@ -469,4 +521,62 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}+ @Transactional+ @Override+ public void delete(Issue issue) {+ super.delete(issue);++ Long issueId = issue.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ issuesLock.writeLock().lock();+ try {+ issues.remove(issueId);+ } finally {+ issuesLock.writeLock().unlock();+ }+ }+ });+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ issuesLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, IssueFacade>> it = issues.entrySet().iterator(); it.hasNext();) {+ IssueFacade issue = it.next().getValue();+ if (issue.getProjectId().equals(projectId))+ it.remove();+ }+ } finally {+ issuesLock.writeLock().unlock();+ }+ }+ });+ }+ }++ @Override+ public Collection<Long> getIssueNumbers(Long projectId) {+ issuesLock.readLock().lock();+ try {+ Collection<Long> issueNumbers = new HashSet<>();+ for (IssueFacade issue: issues.values()) {+ if (projectId.equals(issue.getProjectId()))+ issueNumbers.add(issue.getNumber());+ }+ return issueNumbers;+ } finally {+ issuesLock.readLock().unlock();+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex 4632f5fe8f..51e88f2393 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -73,6 +73,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> imEntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);criteria.add(Restrictions.eq("project", project));criteria.add(Restrictions.eq("name", name));+ criteria.setCacheable(true);return find(criteria);}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.javaindex f284a0058f..ef8aa33fcf 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@@ -7,6 +7,7 @@ import java.nio.charset.Charset;import java.util.Collection;import java.util.HashSet;import java.util.Iterator;+import java.util.List;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;@@ -22,6 +23,7 @@ import org.eclipse.jgit.lib.ConfigConstants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.lib.StoredConfig;+import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -33,37 +35,36 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.OneDev;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.CloneCommand;import io.onedev.server.model.Build;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Membership;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.avatar.AvatarManager;@@ -74,11 +75,9 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemprivate final CommitInfoManager commitInfoManager;- private final UserAuthorizationManager userAuthorizationManager;-private final BuildManager buildManager;- private final CacheManager cacheManager;+ private final GroupManager groupManager;private final AvatarManager avatarManager;@@ -96,16 +95,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Injectpublic DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,- UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,- CacheManager cacheManager, AvatarManager avatarManager, SettingManager settingManager,- TransactionManager transactionManager, SessionManager sessionManager,- ListenerRegistry listenerRegistry) {+ BuildManager buildManager, AvatarManager avatarManager, GroupManager groupManager,+ SettingManager settingManager, TransactionManager transactionManager,+ SessionManager sessionManager, ListenerRegistry listenerRegistry) {super(dao);this.commitInfoManager = commitInfoManager;- this.userAuthorizationManager = userAuthorizationManager;this.buildManager = buildManager;- this.cacheManager = cacheManager;+ this.groupManager = groupManager;this.avatarManager = avatarManager;this.settingManager = settingManager;this.transactionManager = transactionManager;@@ -153,7 +150,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemdao.persist(project);if (isNew) {- authorizeCreator(project, SecurityUtils.getUser());+ project.setOwner(SecurityUtils.getUser());checkSanity(project);}@@ -200,31 +197,22 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Overridepublic Project find(String projectName) {- Long id = cacheManager.getProjectIdByName(projectName);- if (id != null)- return load(id);- else- return null;+ EntityCriteria<Project> criteria = newCriteria();+ criteria.add(Restrictions.eq("name", projectName));+ criteria.setCacheable(true);+ return find(criteria);}- private void authorizeCreator(Project project, User user) {- UserAuthorization authorization = new UserAuthorization();- authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);- authorization.setProject(project);- authorization.setUser(user);- userAuthorizationManager.save(authorization);- }-@Transactional@Overridepublic void fork(Project from, Project to) {dao.persist(to);- authorizeCreator(to, SecurityUtils.getUser());+ to.setOwner(SecurityUtils.getUser());FileUtils.cleanDir(to.getGitDir());new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();checkSanity(to);commitInfoManager.cloneInfo(from, to);- avatarManager.copyAvatar(from.getFacade(), to.getFacade());+ avatarManager.copyAvatar(from, to);}private boolean isGitHookValid(File gitDir, String hookName) {@@ -414,30 +402,29 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}@Override- public Collection<ProjectFacade> getAccessibleProjects(User user) {- Collection<ProjectFacade> projects = new HashSet<>();+ public List<Project> query() {+ return query(true);+ }++ @Override+ public Collection<Project> getAccessibleProjects(User user) {+ Collection<Project> projects = new HashSet<>();if (SecurityUtils.isAdministrator()) {- projects.addAll(cacheManager.getProjects().values());+ projects.addAll(OneDev.getInstance(ProjectManager.class).query());} else {if (user != null) {- Collection<Long> groupIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(user.getId()))- groupIds.add(membership.getGroupId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (groupIds.contains(authorization.getGroupId()))- projects.add(cacheManager.getProject(authorization.getProjectId()));- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(user.getId()))- projects.add(cacheManager.getProject(authorization.getProjectId()));+ for (Membership membership: user.getMemberships()) {+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations())+ projects.add(authorization.getProject());}+ for (UserAuthorization authorization: user.getAuthorizations())+ projects.add(authorization.getProject());}- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (project.getDefaultPrivilege() != null)- projects.add(project);+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getAuthorizations())+ projects.add(authorization.getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex bb416e08c6..e98527ee49 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -122,11 +122,9 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.scriptidentity.JobIdentity;@@ -706,11 +704,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcheckBuilds(request);- ProjectFacade project = request.getTargetProject().getFacade();- Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);+ Project project = request.getTargetProject();+ Permission writeCode = new ProjectPermission(project, new WriteCode());if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {Collection<User> writers = new ArrayList<>();- for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))+ for (User facade: SecurityUtils.getAuthorizedUsers(project, new WriteCode()))writers.add(userManager.load(facade.getId()));checkReviews(writers, 1, request.getLatestUpdate());}@@ -944,7 +942,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestfor (Map.Entry<User, Long> entry: contributions.entrySet()) {User user = entry.getKey();int pathEdits = commitInfoManager.getEdits(- update.getRequest().getTargetProject().getFacade(), user.getFacade(), path);+ update.getRequest().getTargetProject(), user, path);entry.setValue(entry.getValue() + edits*pathEdits);addedContributions += pathEdits;}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.javanew file mode 100644index 0000000000..aa3ebb5743--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -0,0 +1,77 @@+package io.onedev.server.entitymanager.impl;++import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;++import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.Role;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.util.Usage;++@Singleton+public class DefaultRoleManager extends AbstractEntityManager<Role> implements RoleManager {++ private final SettingManager settingManager;++ private final ProjectManager projectManager;++ @Inject+ public DefaultRoleManager(Dao dao, SettingManager settingManager, ProjectManager projectManager) {+ super(dao);+ this.settingManager = settingManager;+ this.projectManager = projectManager;+ }++ @Transactional+ @Override+ public void save(Role role, String oldName) {+ if (oldName != null && !oldName.equals(role.getName())) {+ for (Project project: projectManager.query())+ project.getIssueSetting().onRenameRole(oldName, role.getName());+ settingManager.getIssueSetting().onRenameRole(oldName, role.getName());+ }+ dao.persist(role);+ }++ @Transactional+ @Override+ public void delete(Role role) {+ Usage usage = new Usage();+ for (Project project: projectManager.query()) {+ usage.add(project.getIssueSetting().onDeleteRole(role.getName()));+ usage.prefix("project '" + project.getName() + "': setting");+ }++ usage.add(settingManager.getIssueSetting().onDeleteRole(role.getName()).prefix("administration"));++ usage.checkInUse("Role '" + role.getName() + "'");++ dao.remove(role);+ }++ @Override+ public List<Role> query() {+ return query(true);+ }++ @Sessional+ @Override+ public Role find(String name) {+ EntityCriteria<Role> criteria = newCriteria();+ criteria.add(Restrictions.eq("name", name));+ criteria.setCacheable(true);+ return dao.find(criteria);+ }++}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.javaindex b5c3a44e05..44caa217c2 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@@ -16,11 +16,11 @@ import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.support.administration.BackupSetting;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.javaindex 53724d99ad..b229e4c60e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java@@ -1,11 +1,14 @@package io.onedev.server.entitymanager.impl;import java.util.Collection;+import java.util.Iterator;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.server.entitymanager.UserAuthorizationManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -19,12 +22,73 @@ public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserApublic DefaultUserAuthorizationManager(Dao dao) {super(dao);}++ @Transactional+ @Override+ public void authorize(User user, Collection<UserAuthorization> authorizations) {+ for (Iterator<UserAuthorization> it = user.getAuthorizations().iterator(); it.hasNext();) {+ UserAuthorization authorization = it.next();+ boolean found = false;+ for (UserAuthorization newAuthorization: authorizations) {+ if (newAuthorization.getProject().equals(authorization.getProject())) {+ found = true;+ authorization.setRole(newAuthorization.getRole());+ save(authorization);+ }+ }+ if (!found) {+ it.remove();+ delete(authorization);+ }+ }++ for (UserAuthorization newAuthorization: authorizations) {+ boolean found = false;+ for (UserAuthorization authorization: user.getAuthorizations()) {+ if (authorization.getProject().equals(newAuthorization.getProject())) {+ found = true;+ break;+ }+ }+ if (!found) {+ user.getAuthorizations().add(newAuthorization);+ save(newAuthorization);+ }+ }+ }@Transactional@Override- public void delete(Collection<UserAuthorization> authorizations) {- for (UserAuthorization authorization: authorizations)- dao.remove(authorization);+ public void authorize(Project project, Collection<UserAuthorization> authorizations) {+ for (Iterator<UserAuthorization> it = project.getUserAuthorizations().iterator(); it.hasNext();) {+ UserAuthorization authorization = it.next();+ boolean found = false;+ for (UserAuthorization newAuthorization: authorizations) {+ if (newAuthorization.getUser().equals(authorization.getUser())) {+ found = true;+ authorization.setRole(newAuthorization.getRole());+ save(authorization);+ }+ }+ if (!found) {+ it.remove();+ delete(authorization);+ }+ }++ for (UserAuthorization newAuthorization: authorizations) {+ boolean found = false;+ for (UserAuthorization authorization: project.getUserAuthorizations()) {+ if (authorization.getUser().equals(newAuthorization.getUser())) {+ found = true;+ break;+ }+ }+ if (!found) {+ project.getUserAuthorizations().add(newAuthorization);+ save(newAuthorization);+ }+ }}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex e6ec7ebf01..96b43b5260 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -1,17 +1,19 @@package io.onedev.server.entitymanager.impl;+import java.util.List;+import javax.inject.Inject;import javax.inject.Singleton;import org.apache.shiro.authc.credential.PasswordService;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.ReplicationMode;+import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -26,6 +28,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.Usage;@Singleton@@ -39,21 +42,17 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final IssueFieldManager issueFieldManager;- private final CacheManager cacheManager;-private final ListenerRegistry listenerRegistry;@Injectpublic DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldManager issueFieldManager, CacheManager cacheManager,- PasswordService passwordService, ListenerRegistry listenerRegistry) {+ IssueFieldManager issueFieldManager, PasswordService passwordService, ListenerRegistry listenerRegistry) {super(dao);this.passwordService = passwordService;this.projectManager = projectManager;this.settingManager = settingManager;this.issueFieldManager = issueFieldManager;- this.cacheManager = cacheManager;this.listenerRegistry = listenerRegistry;}@@ -167,6 +166,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery = getSession().createQuery("update IssueChange set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update Project set owner=null where owner=:user");+ query.setParameter("user", user);query.executeUpdate();dao.remove(user);@@ -175,21 +178,24 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U@Sessional@Overridepublic User findByName(String userName) {- Long id = cacheManager.getUserIdByName(userName);- if (id != null)- return load(id);- else- return null;+ EntityCriteria<User> criteria = newCriteria();+ criteria.add(Restrictions.eq("name", userName));+ criteria.setCacheable(true);+ return find(criteria);}+ @Override+ public List<User> query() {+ return query(true);+ }+@Sessional@Overridepublic User findByEmail(String email) {- Long id = cacheManager.getUserIdByEmail(email);- if (id != null)- return load(id);- else- return null;+ EntityCriteria<User> criteria = newCriteria();+ criteria.add(Restrictions.eq("email", email));+ criteria.setCacheable(true);+ return find(criteria);}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex c26e6a7eff..e248ff28ec 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -40,7 +40,7 @@ import io.onedev.server.git.command.UploadCommand;import io.onedev.server.git.exception.GitException;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.SecurityUtils;@@ -68,18 +68,21 @@ public class GitFilter implements Filter {private final SettingManager configManager;+ private final SessionManager sessionManager;+private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;@Injectpublic GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager,- WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager,- Set<CodePullAuthorizationSource> codePullAuthorizationSources) {+ WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager,+ SessionManager sessionManager, Set<CodePullAuthorizationSource> codePullAuthorizationSources) {this.oneDev = oneDev;this.storageManager = storageManager;this.projectManager = projectManager;this.workExecutor = workManager;this.serverConfig = serverConfig;this.configManager = configManager;+ this.sessionManager = sessionManager;this.codePullAuthorizationSources = codePullAuthorizationSources;}@@ -88,8 +91,7 @@ public class GitFilter implements Filter {return StringUtils.stripStart(pathInfo, "/");}- @Sessional- protected Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)+ private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)throws IOException {projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");@@ -118,38 +120,54 @@ public class GitFilter implements Filter {protected void processPacks(final HttpServletRequest request, final HttpServletResponse response)throws ServletException, IOException, InterruptedException, ExecutionException {- String pathInfo = getPathInfo(request);+ File gitDir;+ boolean upload;+ Map<String, String> environments = new HashMap<>();- String service = StringUtils.substringAfterLast(pathInfo, "/");+ sessionManager.openSession();+ try {+ String pathInfo = getPathInfo(request);++ String service = StringUtils.substringAfterLast(pathInfo, "/");- String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");- Project project = getProject(request, response, projectInfo);-- doNotCache(response);- response.setHeader("Content-Type", "application/x-" + service + "-result");+ String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");+ Project project = getProject(request, response, projectInfo);++ doNotCache(response);+ response.setHeader("Content-Type", "application/x-" + service + "-result");- Map<String, String> environments = new HashMap<>();- String serverUrl;- if (serverConfig.getHttpPort() != 0)- serverUrl = "http://localhost:" + serverConfig.getHttpPort();- else- serverUrl = "https://localhost:" + serverConfig.getHttpsPort();+ String serverUrl;+ if (serverConfig.getHttpPort() != 0)+ serverUrl = "http://localhost:" + serverConfig.getHttpPort();+ else+ serverUrl = "https://localhost:" + serverConfig.getHttpsPort();- environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());- environments.put("ONEDEV_URL", serverUrl);- environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());- environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());-- // to be compatible with old repository- environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());- environments.put("GITPLEX_URL", serverUrl);- environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());- environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());-- File gitDir = storageManager.getProjectGitDir(project.getId());+ environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());+ environments.put("ONEDEV_URL", serverUrl);+ environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());+ environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());++ // to be compatible with old repository+ environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());+ environments.put("GITPLEX_URL", serverUrl);+ environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());+ environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());++ gitDir = storageManager.getProjectGitDir(project.getId());- if (GitSmartHttpTools.isUploadPack(request)) {- checkPullPermission(request, project);+ if (GitSmartHttpTools.isUploadPack(request)) {+ checkPullPermission(request, project);+ upload = true;+ } else {+ if (!SecurityUtils.canWriteCode(project))+ throw new UnauthorizedException("You do not have permission to push to this project.");+ upload = false;+ }+ } finally {+ sessionManager.closeSession();+ }++ if (upload) {workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@Override@@ -165,8 +183,6 @@ public class GitFilter implements Filter {}).get();} else {- if (!SecurityUtils.canWriteCode(project.getFacade()))- throw new UnauthorizedException("You do not have permission to push to this project.");workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@Override@@ -195,7 +211,7 @@ public class GitFilter implements Filter {}private void checkPullPermission(HttpServletRequest request, Project project) {- if (!SecurityUtils.canReadCode(project.getFacade())) {+ if (!SecurityUtils.canReadCode(project)) {boolean isAuthorized = false;for (CodePullAuthorizationSource source: codePullAuthorizationSources) {if (source.canPullCode(request, project)) {@@ -209,26 +225,38 @@ public class GitFilter implements Filter {}protected void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {- String pathInfo = request.getRequestURI().substring(request.getContextPath().length());- pathInfo = StringUtils.stripStart(pathInfo, "/");-- String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());- Project project = getProject(request, response, projectInfo);- String service = request.getParameter("service");+ File gitDir;+ boolean upload;- File gitDir = storageManager.getProjectGitDir(project.getId());+ sessionManager.openSession();+ try {+ String pathInfo = request.getRequestURI().substring(request.getContextPath().length());+ pathInfo = StringUtils.stripStart(pathInfo, "/");- if (service.contains("upload")) {- checkPullPermission(request, project);- writeInitial(response, service);- new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();- } else {- if (!SecurityUtils.canWriteCode(project.getFacade())) {- throw new UnauthorizedException("You do not have permission to push to this project.");+ String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());+ Project project = getProject(request, response, projectInfo);+ String service = request.getParameter("service");++ gitDir = storageManager.getProjectGitDir(project.getId());++ if (service.contains("upload")) {+ checkPullPermission(request, project);+ writeInitial(response, service);+ upload = true;+ } else {+ if (!SecurityUtils.canWriteCode(project)) {+ throw new UnauthorizedException("You do not have permission to push to this project.");+ }+ writeInitial(response, service);+ upload = false;}- writeInitial(response, service);- new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();+ } finally {+ sessionManager.closeSession();}+ if (upload)+ new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();+ else+ new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex b6e1f10204..cfe41e26c6 100644--- a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -34,8 +34,8 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.PullRequestConstants;@SuppressWarnings("serial")@@ -136,8 +136,7 @@ public class GitPreReceiveCallback extends HttpServlet {Preconditions.checkNotNull(user);if (refName.startsWith(PullRequestConstants.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {- if (!user.asSubject().isPermitted(- new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMINISTRATION))) {+ if (!user.asSubject().isPermitted(new ProjectPermission(project, new ManageProject()))) {error(output, refName, Lists.newArrayList("Only project administrators can update onedev refs."));break;}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 9b751e3c1f..585a5383ac 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -32,9 +32,11 @@ import io.onedev.commons.utils.init.Skippable;import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.model.Role;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;@@ -44,6 +46,8 @@ import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;+import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.notification.MailManager;import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.PersistManager;@@ -69,13 +73,15 @@ public class DefaultDataManager implements DataManager, Serializable {private final TaskScheduler taskScheduler;+ private final RoleManager roleManager;+private String backupTaskId;@Injectpublic DefaultDataManager(IdManager idManager, UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,- PasswordService passwordService) {+ PasswordService passwordService, RoleManager roleManager) {this.userManager = userManager;this.settingManager = settingManager;this.validator = validator;@@ -84,6 +90,7 @@ public class DefaultDataManager implements DataManager, Serializable {this.persistManager = persistManager;this.mailManager = mailManager;this.passwordService = passwordService;+ this.roleManager = roleManager;}@SuppressWarnings("serial")@@ -112,6 +119,56 @@ public class DefaultDataManager implements DataManager, Serializable {}});++ Role manager = new Role();+ manager.setName("Manager");+ manager.setManageProject(true);+ roleManager.save(manager, null);++ Role developer = new Role();+ developer.setName("Developer");+ developer.setCodePrivilege(CodePrivilege.WRITE);+ developer.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));++ JobPrivilege jobPrivilege = new JobPrivilege();+ jobPrivilege.setJobNames("-Release -Production");+ jobPrivilege.setManageJob(true);+ developer.getJobPrivileges().add(jobPrivilege);++ jobPrivilege = new JobPrivilege();+ jobPrivilege.setJobNames("Release Production");+ jobPrivilege.setAccessLog(true);+ developer.getJobPrivileges().add(jobPrivilege);++ roleManager.save(developer, null);++ Role tester = new Role();+ tester.setName("Tester");+ tester.setCodePrivilege(CodePrivilege.READ);+ tester.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));++ jobPrivilege = new JobPrivilege();+ jobPrivilege.setJobNames("QA");+ jobPrivilege.setManageJob(true);+ tester.getJobPrivileges().add(jobPrivilege);++ jobPrivilege = new JobPrivilege();+ jobPrivilege.setJobNames("-QA");+ jobPrivilege.setAccessLog(true);+ tester.getJobPrivileges().add(jobPrivilege);++ roleManager.save(tester, null);++ Role reporter = new Role();+ reporter.setName("Reporter");+ reporter.setCodePrivilege(CodePrivilege.NONE);+ reporter.setEditableIssueFields(Lists.newArrayList("Type", "Priority"));++ jobPrivilege = new JobPrivilege();+ jobPrivilege.setJobNames("Release Production");+ reporter.getJobPrivileges().add(jobPrivilege);++ roleManager.save(reporter, null);}Setting setting = settingManager.getSetting(Key.SYSTEM);diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex 152f3a721d..21e4ac1aaf 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -25,7 +25,7 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;-import io.onedev.server.migration.DatabaseMigrator;+import io.onedev.server.migration.DataMigrator;import io.onedev.server.migration.MigrationHelper;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;@@ -192,7 +192,7 @@ public class Upgrade extends DefaultPersistManager {System.exit(1);}- int newDataVersion = Integer.parseInt(MigrationHelper.getVersion(DatabaseMigrator.class));+ int newDataVersion = Integer.parseInt(MigrationHelper.getVersion(DataMigrator.class));if (oldDataVersion.get() > newDataVersion) {logger.error("Unable to upgrade as specified installation is more recent");diff --git a/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javarename to server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 1a9182e9e4..a01ce3ea9b 100644--- a/server-core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -20,7 +20,7 @@ import io.onedev.commons.utils.StringUtils;@Singleton@SuppressWarnings("unused")-public class DatabaseMigrator {+public class DataMigrator {private void migrate1(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {@@ -1035,7 +1035,4 @@ public class DatabaseMigrator {}}- private void migrate25(File dataDir, Stack<Integer> versions) {- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 5bfa7317b6..1e9dd9e2eb 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -501,7 +501,7 @@ public class Build extends AbstractEntity implements Referenceable {}public BuildFacade getFacade() {- return new BuildFacade(getId(), getProject().getId(), getCommitHash());+ return new BuildFacade(getId(), getProject().getId(), getCommitHash(), getJobName());}public Collection<String> getSecretValuesToMask() {diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex f9c9305dc1..85a053e466 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -13,8 +13,9 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.ShowCondition;@Entity@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -30,12 +31,14 @@ public class Group extends AbstractEntity {private boolean administrator;- private boolean canCreateProjects = true;+ private boolean createProjects = true;@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> authorizations = new ArrayList<>();@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Membership> memberships = new ArrayList<>();private transient Collection<User> members;@@ -59,7 +62,7 @@ public class Group extends AbstractEntity {this.description = description;}- @Editable(order=300)+ @Editable(order=300, name="Site Administrator")public boolean isAdministrator() {return administrator;}@@ -68,13 +71,19 @@ public class Group extends AbstractEntity {this.administrator = administrator;}- @Editable(order=400)- public boolean isCanCreateProjects() {- return canCreateProjects;+ @SuppressWarnings("unused")+ private static boolean isAdministratorDisabled() {+ return !(boolean) EditContext.get().getInputValue("administrator");+ }++ @Editable(order=400, description="This permission is required to fork projects")+ @ShowCondition("isAdministratorDisabled")+ public boolean isCreateProjects() {+ return createProjects;}- public void setCanCreateProjects(boolean canCreateProjects) {- this.canCreateProjects = canCreateProjects;+ public void setCreateProjects(boolean createProjects) {+ this.createProjects = createProjects;}public Collection<GroupAuthorization> getAuthorizations() {@@ -108,9 +117,5 @@ public class Group extends AbstractEntity {Group group = (Group) entity;return getName().compareTo(group.getName());}-- public GroupFacade getFacade() {- return new GroupFacade(this);- }}diff --git a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.javaindex 16b501da2f..44f3c1ef49 100644--- a/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/GroupAuthorization.java@@ -1,6 +1,5 @@package io.onedev.server.model;-import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;import javax.persistence.Index;@@ -9,14 +8,15 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.facade.GroupAuthorizationFacade;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(indexes={@Index(columnList="o_group_id"), @Index(columnList="o_project_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_project_id"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class GroupAuthorization extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -29,8 +29,9 @@ public class GroupAuthorization extends AbstractEntity {@JoinColumn(nullable=false)private Group group;- @Column(nullable=false)- private ProjectPrivilege privilege = ProjectPrivilege.CODE_READ;+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Role role;public Project getProject() {return project;@@ -48,16 +49,12 @@ public class GroupAuthorization extends AbstractEntity {this.group = group;}- public ProjectPrivilege getPrivilege() {- return privilege;+ public Role getRole() {+ return role;}- public void setPrivilege(ProjectPrivilege privilege) {- this.privilege = privilege;+ public void setRole(Role role) {+ this.role = role;}- public GroupAuthorizationFacade getFacade() {- return new GroupAuthorizationFacade(this);- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/Membership.java b/server-core/src/main/java/io/onedev/server/model/Membership.javaindex 9189332f66..fc6ba7ee36 100644--- a/server-core/src/main/java/io/onedev/server/model/Membership.java+++ b/server-core/src/main/java/io/onedev/server/model/Membership.java@@ -8,8 +8,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.util.facade.MembershipFacade;-@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_group_id")},@@ -43,8 +41,4 @@ public class Membership extends AbstractEntity {this.group = group;}- public MembershipFacade getFacade() {- return new MembershipFacade(this);- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 69e19c46ee..c79f4909c2 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -30,6 +30,7 @@ import javax.persistence.Lob;import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;+import javax.persistence.Transient;import javax.persistence.Version;import javax.validation.Valid;@@ -74,6 +75,7 @@ import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.UserInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildQuerySettingManager;@@ -111,11 +113,9 @@ import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.security.permission.DefaultPrivilege;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usermatcher.UserMatcher;@@ -123,6 +123,8 @@ import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.RoleChoice;+import io.onedev.server.web.editable.annotation.UserChoice;import io.onedev.server.web.util.ProjectAware;import io.onedev.server.web.util.WicketUtils;@@ -159,6 +161,13 @@ public class Project extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=true)private Project forkedFrom;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=true)+ private User owner;++ @Transient+ private String ownerName;@Column(nullable=false, unique=true)private String name;@@ -167,8 +176,6 @@ public class Project extends AbstractEntity {@Column(length=65535)private String description;- private DefaultPrivilege defaultPrivilege;-@Lob@Column(length=65535, name="COMMIT_MSG_TRANSFORM")@JsonView(DefaultView.class)@@ -212,12 +219,15 @@ public class Project extends AbstractEntity {private Collection<Issue> issues = new ArrayList<>();@OneToMany(mappedBy="forkedFrom")+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Project> forks = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)@@ -367,15 +377,26 @@ public class Project extends AbstractEntity {this.description = description;}- @Editable(order=300, description="Optionally specify default privilege of the project")- @NameOfEmptyValue("No default privilege")- @Nullable- public DefaultPrivilege getDefaultPrivilege() {- return defaultPrivilege;+ @Editable(order=300, name="Default Role", description="Optionally specify default role to access the project. ")+ @RoleChoice+ @NameOfEmptyValue("No default role")+ public String getDefaultRoleName() {+ return ownerName;}- public void setDefaultPrivilege(DefaultPrivilege defaultPrivilege) {- this.defaultPrivilege = defaultPrivilege;+ public void setDefaultRoleName(String ownerName) {+ this.ownerName = ownerName;+ }++ @Editable(order=500, name="Owner", description="Projects without owners are considered orphan projects")+ @UserChoice+ @NameOfEmptyValue("No owner")+ public String getOwnerName() {+ return ownerName;+ }++ public void setOwnerName(String ownerName) {+ this.ownerName = ownerName;}@Editable@@ -441,10 +462,11 @@ public class Project extends AbstractEntity {return userAuthorizations;}- public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {+ public void setUserAuthorizations(Collection<UserAuthorization> userAuthorizations) {this.userAuthorizations = userAuthorizations;}+ @Nullablepublic Project getForkedFrom() {return forkedFrom;}@@ -453,6 +475,15 @@ public class Project extends AbstractEntity {this.forkedFrom = forkedFrom;}+ @Nullable+ public User getOwner() {+ return owner;+ }++ public void setOwner(User owner) {+ this.owner = owner;+ }+public Collection<Project> getForks() {return forks;}@@ -1252,10 +1283,6 @@ public class Project extends AbstractEntity {return null;}- public ProjectFacade getFacade() {- return new ProjectFacade(this);- }-public RevCommit getLastCommit() {if (lastCommitOptional == null) {RevCommit lastCommit = null;@@ -1477,4 +1504,26 @@ public class Project extends AbstractEntity {}}+ public static int compareLastVisit(Project project1, Project project2) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);+ Date date1 = userInfoManager.getVisitDate(user, project1);+ Date date2 = userInfoManager.getVisitDate(user, project2);+ if (date1 != null) {+ if (date2 != null)+ return date2.compareTo(date1);+ else+ return -1;+ } else {+ if (date2 != null)+ return 1;+ else+ return project1.compareTo(project2);+ }+ } else {+ return project1.compareTo(project2);+ }+ }+}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.javaindex e3e59c6525..9175c398f5 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@@ -1,12 +1,44 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Index;+import javax.persistence.Lob;+import javax.persistence.OneToMany;import javax.persistence.Table;+import javax.validation.constraints.NotNull;+import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.security.permission.AccessBuild;+import io.onedev.server.security.permission.AccessBuildLog;+import io.onedev.server.security.permission.AccessBuildReports;+import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.security.permission.EditIssueField;+import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.security.permission.ManageIssues;+import io.onedev.server.security.permission.ManageJob;+import io.onedev.server.security.permission.ManageProject;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.security.permission.RunJob;+import io.onedev.server.security.permission.WriteCode;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.ShowCondition;/*** @author robin@@ -15,18 +47,36 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;@Entity@Table(indexes={@Index(columnList="name")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-public class Role extends AbstractEntity {+@Editable+public class Role extends AbstractEntity implements Permission {private static final long serialVersionUID = 1L;@Column(nullable=false, unique=true)private String name;- @Column(nullable=false)- private boolean viewIssues;+ private boolean manageProject;- private boolean viewCode;-+ private CodePrivilege codePrivilege = CodePrivilege.NONE;++ private boolean manageIssues;++ @Lob+ @Column(length=65535, nullable=false)+ private ArrayList<String> editableIssueFields = new ArrayList<>();++ @Lob+ @Column(length=65535, nullable=false)+ private ArrayList<JobPrivilege> jobPrivileges = new ArrayList<>();++ @OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();++ @OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)+ private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();++ @Editable(order=100)+ @NotEmptypublic String getName() {return name;}@@ -35,20 +85,157 @@ public class Role extends AbstractEntity {this.name = name;}- public boolean isViewIssues() {- return viewIssues;+ @Editable(order=200, description="This permission is required to edit project settings. "+ + "It implies all other project permissions")+ public boolean isManageProject() {+ return manageProject;+ }++ public void setManageProject(boolean manageProject) {+ this.manageProject = manageProject;+ }++ @SuppressWarnings("unused")+ private static boolean isManageProjectDisabled() {+ return !(boolean)EditContext.get().getInputValue("manageProject");+ }++ @Editable(order=300)+ @ShowCondition("isManageProjectDisabled")+ @NotNull+ public CodePrivilege getCodePrivilege() {+ return codePrivilege;}- public void setViewIssues(boolean viewIssues) {- this.viewIssues = viewIssues;+ public void setCodePrivilege(CodePrivilege codePrivilege) {+ this.codePrivilege = codePrivilege;}- public boolean isViewCode() {- return viewCode;+ @Editable(order=400, description="This permission is required to manage issue milestones and boards. "+ + "It implies all other issue permissions")+ @ShowCondition("isManageProjectDisabled")+ public boolean isManageIssues() {+ return manageIssues;}- public void setViewCode(boolean viewCode) {- this.viewCode = viewCode;+ public void setManageIssues(boolean manageIssues) {+ this.manageIssues = manageIssues;}-}+ @SuppressWarnings("unused")+ private static boolean isManageIssuesDisabled() {+ return !(boolean)EditContext.get().getInputValue("manageIssues");+ }++ @Editable(order=600, description="Optionally specify custom fields allowed to edit when open new issues")+ @ChoiceProvider("getIssueFieldChoices")+ public List<String> getEditableIssueFields() {+ return editableIssueFields;+ }++ public void setEditableIssueFields(List<String> editableIssueFields) {+ this.editableIssueFields = (ArrayList<String>)editableIssueFields;+ }++ @SuppressWarnings("unused")+ private static List<String> getIssueFieldChoices() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();+ }++ @Editable(order=700)+ @ShowCondition("isManageProjectDisabled")+ public List<JobPrivilege> getJobPrivileges() {+ return jobPrivileges;+ }++ public void setJobPrivileges(List<JobPrivilege> jobPrivileges) {+ this.jobPrivileges = (ArrayList<JobPrivilege>) jobPrivileges;+ }++ public Collection<UserAuthorization> getUserAuthorizations() {+ return userAuthorizations;+ }++ public void setUserAuthorizations(Collection<UserAuthorization> userAuthorizations) {+ this.userAuthorizations = userAuthorizations;+ }++ public Collection<GroupAuthorization> getGroupAuthorizations() {+ return groupAuthorizations;+ }++ public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {+ this.groupAuthorizations = groupAuthorizations;+ }++ @Override+ public boolean implies(Permission p) {+ for (Permission each: getPermissions()) {+ if (each.implies(p))+ return true;+ }+ return false;+ }++ private Collection<Permission> getPermissions() {+ Collection<Permission> permissions = new ArrayList<>();+ if (SecurityUtils.getUser() != null) {+ if (manageProject) {+ permissions.add(new ManageProject());+ } else {+ if (codePrivilege == CodePrivilege.READ)+ permissions.add(new ReadCode());+ else if (codePrivilege == CodePrivilege.WRITE)+ permissions.add(new WriteCode());++ if (manageIssues) {+ permissions.add(new ManageIssues());+ } else if (!editableIssueFields.isEmpty()) {+ for (String issueField: editableIssueFields)+ permissions.add(new EditIssueField(issueField));+ }+ permissions.add(new AccessProject());++ for (JobPrivilege jobPrivilege: jobPrivileges) {+ if (jobPrivilege.isManageJob()) {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new ManageJob()));+ } else if (jobPrivilege.isRunJob()) {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new RunJob()));+ } else if (jobPrivilege.isAccessLog()) {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));+ } else if (jobPrivilege.getAccessibleReports() != null) {+ AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));+ } else {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));+ }+ }+ }+ } else {+ if (manageProject) {+ permissions.add(new ReadCode());+ permissions.add(new AccessProject());+ permissions.add(new JobPermission("*", new AccessBuildLog()));+ } else {+ if (codePrivilege != CodePrivilege.NONE)+ permissions.add(new ReadCode());++ permissions.add(new AccessProject());++ for (JobPrivilege jobPrivilege: jobPrivileges) {+ if (jobPrivilege.isManageJob() || jobPrivilege.isRunJob() || jobPrivilege.isAccessLog()) {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));+ } else if (jobPrivilege.getAccessibleReports() != null) {+ AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));+ } else {+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));+ }+ }+ }+ }++ return permissions;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 5ddb8138c1..94693c9b88 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -2,7 +2,9 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.Collection;+import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;@@ -28,7 +30,7 @@ import com.google.common.base.MoreObjects;import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.validation.annotation.UserName;import io.onedev.server.web.editable.annotation.Editable;@@ -41,7 +43,7 @@ import io.onedev.server.web.editable.annotation.Password;public class User extends AbstractEntity implements AuthenticationInfo {private static final long serialVersionUID = 1L;-+public static final Long ROOT_ID = 1L;@Column(unique=true, nullable=false)@@ -64,9 +66,11 @@ public class User extends AbstractEntity implements AuthenticationInfo {private long version;@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<UserAuthorization> authorizations = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Membership> memberships = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)@@ -81,6 +85,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ private transient Collection<Group> groups;+@Overridepublic PrincipalCollection getPrincipals() {return new SimplePrincipalCollection(getId(), "");@@ -110,6 +116,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();}+ public static Subject asSubject(@Nullable User user) {+ if (user != null)+ return user.asSubject();+ else+ return User.asSubject(0L);+ }+@Editable(name="Login Name", order=100)@UserName@NotEmpty@@ -200,6 +213,14 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.issueQuerySettings = issueQuerySettings;}+ public Collection<UserAuthorization> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizations(Collection<UserAuthorization> authorizations) {+ this.authorizations = authorizations;+ }+@Overridepublic int compareTo(AbstractEntity entity) {User user = (User) entity;@@ -210,8 +231,16 @@ public class User extends AbstractEntity implements AuthenticationInfo {}}- public UserFacade getFacade() {- return new UserFacade(this);+ public double getMatchScore(@Nullable String queryTerm) {+ double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);+ double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);+ return Math.max(scoreOfName, scoreOfFullName);}+ public Collection<Group> getGroups() {+ if (groups == null)+ groups = getMemberships().stream().map(it->it.getGroup()).collect(Collectors.toList());+ return groups;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.javaindex 67003b188d..20aff0dee7 100644--- a/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/UserAuthorization.java@@ -1,6 +1,5 @@package io.onedev.server.model;-import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;import javax.persistence.Index;@@ -9,9 +8,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.facade.UserAuthorizationFacade;-@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_project_id")},@@ -28,9 +24,10 @@ public class UserAuthorization extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private User user;-- @Column(nullable=false)- private ProjectPrivilege privilege = ProjectPrivilege.CODE_READ;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Role role;public Project getProject() {return project;@@ -48,16 +45,12 @@ public class UserAuthorization extends AbstractEntity {this.user = user;}- public ProjectPrivilege getPrivilege() {- return privilege;- }-- public void setPrivilege(ProjectPrivilege privilege) {- this.privilege = privilege;+ public Role getRole() {+ return role;}- public UserAuthorizationFacade getFacade() {- return new UserAuthorizationFacade(this);+ public void setRole(Role role) {+ this.role = role;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 7bb5d9ad52..d85320198e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -17,6 +17,9 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneException;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.model.support.issue.BoardSpec;@@ -27,9 +30,6 @@ import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;@@ -38,7 +38,6 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.usermatcher.CodeWriters;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -129,8 +128,6 @@ public class GlobalIssueSetting implements Serializable {fieldSpecs.add(priority);UserChoiceField assignee = new UserChoiceField();- assignee.setChoiceProvider(new io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.CodeWriters());- assignee.setCanBeChangedBy(new CodeWriters().toString());assignee.setAllowEmpty(true);assignee.setNameOfEmptyValue("Not assigned");assignee.setName("Assignee");@@ -195,7 +192,7 @@ public class GlobalIssueSetting implements Serializable {transition.setToState("Closed");PressButtonTrigger pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Close");- pressButton.setAuthorized(new CodeWriters().toString());+ pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));transition.setTrigger(pressButton);@@ -207,7 +204,7 @@ public class GlobalIssueSetting implements Serializable {pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Reopen");transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));- pressButton.setAuthorized(new CodeWriters().toString());+ pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));transition.setTrigger(pressButton);defaultTransitionSpecs.add(transition);@@ -441,8 +438,6 @@ public class GlobalIssueSetting implements Serializable {}public void onRenameUser(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs())- transition.onRenameUser(oldName, newName);for (FieldSpec field: getFieldSpecs())field.onRenameUser(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())@@ -451,8 +446,6 @@ public class GlobalIssueSetting implements Serializable {public Usage onDeleteUser(String userName) {Usage usage = new Usage();- for (TransitionSpec transition: getDefaultTransitionSpecs())- usage.add(transition.onDeleteUser(userName));for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {Usage usageInBoard = it.next().onDeleteUser(this, userName);if (usageInBoard != null)@@ -467,16 +460,12 @@ public class GlobalIssueSetting implements Serializable {}public void onRenameGroup(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs())- transition.onRenameGroup(oldName, newName);for (FieldSpec field: getFieldSpecs())field.onRenameGroup(oldName, newName);}public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- for (TransitionSpec transition: getDefaultTransitionSpecs())- usage.add(transition.onDeleteGroup(groupName));for (FieldSpec field: getFieldSpecs())usage.add(field.onDeleteGroup(groupName));@@ -484,6 +473,20 @@ public class GlobalIssueSetting implements Serializable {return usage.prefix("issue setting");}+ public void onRenameRole(String oldName, String newName) {+ for (TransitionSpec transition: getDefaultTransitionSpecs())+ transition.onRenameRole(oldName, newName);+ }++ public Usage onDeleteRole(String roleName) {+ Usage usage = new Usage();++ for (TransitionSpec transition: getDefaultTransitionSpecs())+ usage.add(transition.onDeleteRole(roleName));++ return usage.prefix("issue setting");+ }+public StateSpec getInitialStateSpec() {if (!getStateSpecs().isEmpty())return getStateSpecs().iterator().next();diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javasimilarity index 61%rename from server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 27e657b1f1..383a4bb62a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -1,31 +1,84 @@-package io.onedev.server.model.support.administration.groovyscript;+package io.onedev.server.model.support.administration;+import java.io.Serializable;import java.util.List;+import javax.validation.constraints.Size;++import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;+import io.onedev.server.util.EditContext;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.scriptidentity.JobIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.validation.annotation.DnsName;+import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.editable.annotation.ShowCondition;import io.onedev.server.web.util.SuggestionUtils;@Editable-public class JobAuthorization implements ScriptAuthorization {+public class GroovyScript implements Serializable {private static final long serialVersionUID = 1L;++ private String name;++ private List<String> content;++ private boolean canBeUsedByJobs = true;private String allowedProjects;private String allowedBranches;+ @Editable(order=100)+ @DnsName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=300)+ @Code(language = Code.GROOVY)+ @Size(min=1, message="May not be empty")+ public List<String> getContent() {+ return content;+ }++ public void setContent(List<String> content) {+ this.content = content;+ }++ @Editable(order=350)+ public boolean isCanBeUsedByJobs() {+ return canBeUsedByJobs;+ }++ public void setCanBeUsedByJobs(boolean canBeUsedByJobs) {+ this.canBeUsedByJobs = canBeUsedByJobs;+ }++ @SuppressWarnings("unused")+ private static boolean isCanBeUsedByJobsEnabled() {+ return (boolean) EditContext.get().getInputValue("canBeUsedByJobs");+ }+@Editable(order=400, description="Optionally specify space-separated projects allowed to "+ "execute this script. Use * or ? for wildcard match. Leave empty to allow all")@Patterns(suggester = "suggestProjects")+ @ShowCondition("isCanBeUsedByJobsEnabled")@NameOfEmptyValue("All")public String getAllowedProjects() {return allowedProjects;@@ -38,6 +91,7 @@ public class JobAuthorization implements ScriptAuthorization {@Editable(order=500, description="Optionally specify space-separated branches allowed to "+ "execute this script. Use * or ? for wildcard match. Leave empty to allow all")@Patterns+ @ShowCondition("isCanBeUsedByJobsEnabled")@NameOfEmptyValue("All")public String getAllowedBranches() {return allowedBranches;@@ -51,10 +105,11 @@ public class JobAuthorization implements ScriptAuthorization {private static List<InputSuggestion> suggestProjects(String matchWith) {return SuggestionUtils.suggestProjects(matchWith);}-- @Override- public boolean isAuthorized(ScriptIdentity identity) {- if (identity instanceof JobIdentity) {++ public final boolean isAuthorized(ScriptIdentity identity) {+ if (identity instanceof SiteAdministrator) {+ return true;+ } else if (isCanBeUsedByJobs() && identity instanceof JobIdentity) {JobIdentity jobIdentity = (JobIdentity) identity;Matcher matcher = new PathMatcher();return (getAllowedProjects() == null || PatternSet.fromString(getAllowedProjects()).matches(matcher, jobIdentity.getProject().getName()))@@ -63,15 +118,15 @@ public class JobAuthorization implements ScriptAuthorization {return false;}}-- public Usage onDeleteProject(String projectName) {++ public Usage onDeleteProject(String projectName, int index) {Usage usage = new Usage();if (getAllowedProjects() != null) {PatternSet patternSet = PatternSet.fromString(getAllowedProjects());if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))usage.add("allowed projects");}- return usage.prefix("job authorization");+ return usage.prefix("groovy script #" + index);}public void onRenameProject(String oldName, String newName) {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.javaindex a939b55027..7474b510cf 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,13 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.EditContext;+import io.onedev.server.util.Usage;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.GroupChoice;+import io.onedev.server.web.editable.annotation.ShowCondition;@Editablepublic class SecuritySetting implements Serializable {@@ -10,6 +16,8 @@ public class SecuritySetting implements Serializable {private static final long serialVersionUID = 1L;private boolean enableAnonymousAccess = false;++ private String anonymousGroup;private boolean enableSelfRegister = true;@@ -22,6 +30,23 @@ public class SecuritySetting implements Serializable {this.enableAnonymousAccess = enableAnonymousAccess;}+ @Editable(order=150, description="Specify the group to grant permissions for anonymous access")+ @GroupChoice+ @ShowCondition("isAnonymousGroupVisible")+ @NotEmpty+ public String getAnonymousGroup() {+ return anonymousGroup;+ }++ public void setAnonymousGroup(String anonymousGroup) {+ this.anonymousGroup = anonymousGroup;+ }++ @SuppressWarnings("unused")+ private static boolean isAnonymousGroupVisible() {+ return (boolean) EditContext.get().getInputValue("enableAnonymousAccess");+ }+@Editable(order=200, description="User can self-register if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;@@ -30,5 +55,17 @@ public class SecuritySetting implements Serializable {public void setEnableSelfRegister(boolean enableSelfRegister) {this.enableSelfRegister = enableSelfRegister;}++ public void onRenameGroup(String oldName, String newName) {+ if (enableAnonymousAccess && oldName.equals(anonymousGroup))+ anonymousGroup = newName;+ }++ public Usage onDeleteGroup(String groupName) {+ Usage usage = new Usage();+ if (enableAnonymousAccess && groupName.equals(anonymousGroup))+ usage.add("anonymous group");+ return usage.prefix("security setting");+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.javaindex 4b9f3a1e99..a0c7611736 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java@@ -1,11 +1,11 @@package io.onedev.server.model.support.administration.authenticator;import java.io.Serializable;-import java.util.List;import org.apache.shiro.authc.AuthenticationException;import org.apache.shiro.authc.UsernamePasswordToken;+import io.onedev.server.util.Usage;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;@@ -14,7 +14,7 @@ public abstract class Authenticator implements Serializable {private static final long serialVersionUID = 1L;- private List<String> defaultGroupNames;+ private String defaultGroup;private int timeout = 300;@@ -27,21 +27,27 @@ public abstract class Authenticator implements Serializable {this.timeout = timeout;}- @Editable(order=20000, description="Optionally add newly authenticated user to specified groups if group "+ @Editable(order=20000, description="Optionally add newly authenticated user to specified group if group "+ "information is not available in external authentication system")@GroupChoice- public List<String> getDefaultGroupNames() {- return defaultGroupNames;+ public String getDefaultGroup() {+ return defaultGroup;}- public void setDefaultGroupNames(List<String> defaultGroupNames) {- this.defaultGroupNames = defaultGroupNames;+ public void setDefaultGroup(String defaultGroup) {+ this.defaultGroup = defaultGroup;}public void onRenameGroup(String oldName, String newName) {- int index = defaultGroupNames.indexOf(oldName);- if (index != -1)- defaultGroupNames.set(index, newName);+ if (oldName.equals(defaultGroup))+ defaultGroup = newName;+ }++ public Usage onDeleteGroup(String groupName) {+ Usage usage = new Usage();+ if (groupName.equals(defaultGroup))+ usage.add("default group");+ return usage.prefix("external authenticator");}public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.javadeleted file mode 100644index 391cb1eb53..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.java+++ /dev/null@@ -1,78 +0,0 @@-package io.onedev.server.model.support.administration.groovyscript;--import java.io.Serializable;-import java.util.List;--import javax.validation.constraints.Size;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.util.Usage;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.SiteAdministrator;-import io.onedev.server.util.validation.annotation.DnsName;-import io.onedev.server.web.editable.annotation.Code;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;--@Editable-public class GroovyScript implements Serializable {-- private static final long serialVersionUID = 1L;-- private String name;-- private List<String> content;-- private JobAuthorization jobAuthorization = new JobAuthorization();-- @Editable(order=100)- @DnsName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=300)- @Code(language = Code.GROOVY)- @Size(min=1, message="May not be empty")- public List<String> getContent() {- return content;- }-- public void setContent(List<String> content) {- this.content = content;- }-- @Editable(order=400, name="Can be Used by Jobs")- @NameOfEmptyValue("No")- public JobAuthorization getJobAuthorization() {- return jobAuthorization;- }-- public void setJobAuthorization(JobAuthorization jobAuthorization) {- this.jobAuthorization = jobAuthorization;- }-- public final boolean isAuthorized(ScriptIdentity identity) {- return identity instanceof SiteAdministrator- || jobAuthorization != null && jobAuthorization.isAuthorized(identity);- }-- public Usage onDeleteProject(String projectName, int index) {- Usage usage = new Usage();- if (jobAuthorization != null)- usage = jobAuthorization.onDeleteProject(projectName);- return usage.prefix("groovy script #" + index);- }-- public void onRenameProject(String oldName, String newName) {- if (jobAuthorization != null)- jobAuthorization.onRenameProject(oldName, newName);- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.javadeleted file mode 100644index 8c66b7d3fc..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.model.support.administration.groovyscript;--import java.io.Serializable;--import io.onedev.server.util.scriptidentity.ScriptIdentity;--public interface ScriptAuthorization extends Serializable {-- boolean isAuthorized(ScriptIdentity identity);--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 3194b463b3..3b0f005cd6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -1,15 +1,19 @@package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;+import java.util.ArrayList;import java.util.List;import org.eclipse.jgit.lib.ObjectId;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.launcher.loader.ExtensionPoint;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;+import io.onedev.server.OneDev;import io.onedev.server.ci.job.JobContext;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Project;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;@@ -30,7 +34,7 @@ public abstract class JobExecutor implements Serializable {private String applicableBranches;- private String applicAppAppableJobNames;+ private String applicableJobNames;private String applicableJobImages;@@ -78,14 +82,21 @@ public abstract class JobExecutor implements Serializable {@Editable(order=10200, group="Job Applicability",description="Optionally specify space-separated jobs applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")- @Patterns+ @Patterns(suggester = "suggestJobNames")@NameOfEmptyValue("All")public String getApplicableJobNames() {- return applicAppAppableJobNames;+ return applicableJobNames;}public void setApplicableJobNames(String applicableJobNames) {- this.applicAppAppableJobNames = applicableJobNames;+ this.applicableJobNames = applicableJobNames;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestJobNames(String matchWith) {+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));+ Collections.sort(jobNames);+ return SuggestionUtils.suggest(jobNames, matchWith);}@Editable(order=10300, group="Job Applicability",diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 09cd67c9ec..44d113042e 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -13,14 +13,14 @@ import io.onedev.server.OneDev;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;public class GroupChoiceInput {public static List<String> getPossibleValues(ChoiceProvider choiceProvider) {List<String> possibleValues = new ArrayList<>();if (OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty()) {- for (GroupFacade group: choiceProvider.getChoices(true))+ for (Group group: choiceProvider.getChoices(true))possibleValues.add(group.getName());}return possibleValues;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.javaindex 4cba04ca14..df43f7b878 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java@@ -1,13 +1,12 @@package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;-import java.util.ArrayList;import java.util.Comparator;import java.util.List;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Group;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=100, name="All groups")@@ -16,12 +15,12 @@ public class AllGroups implements ChoiceProvider {private static final long serialVersionUID = 1L;@Override- public List<GroupFacade> getChoices(boolean allPossible) {- List<GroupFacade> groups = new ArrayList<>(OneDev.getInstance(CacheManager.class).getGroups().values());- Collections.sort(groups, new Comparator<GroupFacade>() {+ public List<Group> getChoices(boolean allPossible) {+ List<Group> groups = OneDev.getInstance(GroupManager.class).query();+ Collections.sort(groups, new Comparator<Group>() {@Override- public int compare(GroupFacade o1, GroupFacade o2) {+ public int compare(Group o1, Group o2) {return o1.getName().compareTo(o2.getName());}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javaindex 9cb7d3a00c..58896ee074 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java@@ -3,12 +3,12 @@ package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceproviderimport java.io.Serializable;import java.util.List;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface ChoiceProvider extends Serializable {- List<GroupFacade> getChoices(boolean allPossible);+ List<Group> getChoices(boolean allPossible);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaindex 72ff8d03b9..780df4f637 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java@@ -10,7 +10,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ScriptChoice;@@ -39,11 +39,11 @@ public class ScriptingChoices implements ChoiceProvider {@SuppressWarnings("unchecked")@Override- public List<GroupFacade> getChoices(boolean allPossible) {+ public List<Group> getChoices(boolean allPossible) {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<GroupFacade>) GroovyUtils.evalScriptByName(scriptName, variables);+ return (List<Group>) GroovyUtils.evalScriptByName(scriptName, variables);} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 4d5e0de339..4cc217488c 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -11,7 +11,7 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.EditContext;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;import io.onedev.server.web.editable.annotation.OmitName;@@ -41,7 +41,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {}@SuppressWarnings("unused")- private static List<GroupFacade> getValueChoices() {+ private static List<Group> getValueChoices() {ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.javanew file mode 100755index 0000000000..7d29139c04--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java@@ -0,0 +1,20 @@+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;++import java.util.List;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=130, name="All Users in System")+public class AllUsers implements ChoiceProvider {++ private static final long serialVersionUID = 1L;++ @Override+ public List<User> getChoices(boolean allPossible) {+ return OneDev.getInstance(UserManager.class).query();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javaindex 4f0dfda544..d896bba494 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java@@ -3,12 +3,12 @@ package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface ChoiceProvider extends Serializable {- List<UserFacade> getChoices(boolean allPossible);+ List<User> getChoices(boolean allPossible);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.javadeleted file mode 100755index 140b1c2b25..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=130, name="Users allowed to read code")-public class CodeReaders implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public List<UserFacade> getChoices(boolean allPossible) {- Project project = Project.get();- if (project != null)- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_READ));- else- return new ArrayList<>();- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.javadeleted file mode 100755index faa390f1a1..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=130, name="Users allowed to write code")-public class CodeWriters implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public List<UserFacade> getChoices(boolean allPossible) {- Project project = Project.get();- if (project != null)- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_WRITE));- else- return new ArrayList<>();- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.javadeleted file mode 100755index 778ff2d30e..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.java+++ /dev/null@@ -1,47 +0,0 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.GroupChoice;--@Editable(order=150, name="Users belonging to group")-public class GroupUsers implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- private String groupName;-- @Editable(name="Group")- @GroupChoice- @OmitName- @NotEmpty- public String getGroupName() {- return groupName;- }-- public void setGroupName(String groupName) {- this.groupName = groupName;- }-- @Override- public List<UserFacade> getChoices(boolean allPossible) {- List<UserFacade> choices = new ArrayList<>();- Group group = OneDev.getInstance(GroupManager.class).find(groupName);- if (group != null) {- for (User user: group.getMembers())- choices.add(user.getFacade());- }- return choices;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.javadeleted file mode 100755index 8a25344044..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=130, name="Users allowed to read issues")-public class IssueReaders implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public List<UserFacade> getChoices(boolean allPossible) {- Project project = Project.get();- if (project != null)- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ISSUE_READ));- else- return new ArrayList<>();- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.javadeleted file mode 100755index fb1d0cadd3..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;--import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=130, name="Project administrators")-public class ProjectAdministrators implements ChoiceProvider {-- private static final long serialVersionUID = 1L;-- @Override- public List<UserFacade> getChoices(boolean allPossible) {- Project project = Project.get();- if (project != null)- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMINISTRATION));- else- return new ArrayList<>();- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 9e9f4ba1a2..0d38b4beab 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -10,7 +10,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ScriptChoice;@@ -39,11 +39,11 @@ public class ScriptingChoices implements ChoiceProvider {@SuppressWarnings("unchecked")@Override- public List<UserFacade> getChoices(boolean allPossible) {+ public List<User> getChoices(boolean allPossible) {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<UserFacade>) GroovyUtils.evalScriptByName(scriptName, variables);+ return (List<User>) GroovyUtils.evalScriptByName(scriptName, variables);} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 6a5c3f79ad..4139c7cb10 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,13 +1,12 @@package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;import java.util.List;-import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.UserChoice;@@ -37,8 +36,8 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {}@SuppressWarnings("unused")- private static List<UserFacade> getValueChoices() {- return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getFacade()).collect(Collectors.toList());+ private static List<User> getValueChoices() {+ return OneDev.getInstance(UserManager.class).query();}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex 0ba2d23f6d..cf87e22ca9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -115,10 +115,6 @@ public class IssueSetting implements Serializable {}public void onRenameUser(String oldName, String newName) {- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- transition.onRenameUser(oldName, newName);- }if (boardSpecs != null) {for (BoardSpec board: boardSpecs)board.onRenameUser(getGlobalSetting(), oldName, newName);@@ -136,10 +132,6 @@ public class IssueSetting implements Serializable {public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- usage.add(transition.onDeleteUser(userName));- }if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {Usage usageInBoard = it.next().onDeleteUser(getGlobalSetting(), userName);@@ -152,18 +144,18 @@ public class IssueSetting implements Serializable {return usage.prefix("issue setting");}- public void onRenameGroup(String oldName, String newName) {+ public void onRenameRole(String oldName, String newName) {if (transitionSpecs != null) {for (TransitionSpec transition: transitionSpecs)- transition.onRenameGroup(oldName, newName);+ transition.onRenameRole(oldName, newName);}}- public Usage onDeleteGroup(String groupName) {+ public Usage onDeleteRole(String roleName) {Usage usage = new Usage();if (transitionSpecs != null) {for (TransitionSpec transition: transitionSpecs)- usage.add(transition.onDeleteGroup(groupName));+ usage.add(transition.onDeleteRole(roleName));}return usage.prefix("issue setting");}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 2d61bf5146..cb8a182ce1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -18,8 +18,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;@@ -31,7 +31,6 @@ import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.util.Input;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;@@ -131,14 +130,6 @@ public class TransitionSpec implements Serializable {return fields;}- public void onRenameUser(String oldName, String newName) {- TransitionTrigger trigger = getTrigger();- if (trigger instanceof PressButtonTrigger) {- PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- pressButton.setAuthorized(UserMatcher.onRenameUser(pressButton.getAuthorized(), oldName, newName));- }- }-public Usage onDeleteBranch(String branchName) {Usage usage = new Usage();TransitionTrigger trigger = getTrigger();@@ -153,32 +144,23 @@ public class TransitionSpec implements Serializable {return usage.prefix("transitions: " + fromStates + "->" + toState);}- public Usage onDeleteUser(String userName) {- Usage usage = new Usage();- TransitionTrigger trigger = getTrigger();- if (trigger instanceof PressButtonTrigger) {- PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- if (UserMatcher.isUsingUser(pressButton.getAuthorized(), userName))- usage.add("press button trigger: authorization");- }- return usage.prefix("transitions: " + fromStates + "->" + toState);- }-- public void onRenameGroup(String oldName, String newName) {+ public void onRenameRole(String oldName, String newName) {TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- pressButton.setAuthorized(UserMatcher.onRenameGroup(pressButton.getAuthorized(), oldName, newName));+ int index = pressButton.getAuthorizedRoles().indexOf(oldName);+ if (index != -1)+ pressButton.getAuthorizedRoles().set(index, newName);}}- public Usage onDeleteGroup(String groupName) {+ public Usage onDeleteRole(String roleName) {Usage usage = new Usage();TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- if (UserMatcher.isUsingGroup(pressButton.getAuthorized(), groupName))- usage.add("press button trigger: authorization");+ if (pressButton.getAuthorizedRoles().contains(roleName))+ usage.add("press button trigger: authorized roles");}return usage.prefix("transitions: " + fromStates + "->" + toState);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.javaindex 6e8fe13e53..593602703e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java@@ -7,11 +7,9 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.util.EditContext;-import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.validation.annotation.FieldName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.UserMatcher;@Editablepublic abstract class FieldSpec extends InputSpec {@@ -20,8 +18,6 @@ public abstract class FieldSpec extends InputSpec {private String nameOfEmptyValue;- private String canBeChangedBy = new Anyone().toString();-@Editable(order=10)@FieldName@NotEmpty@@ -93,17 +89,6 @@ public abstract class FieldSpec extends InputSpec {this.nameOfEmptyValue = nameOfEmptyValue;}- @Editable(order=65, description="This setting tells who can change this field")- @UserMatcher- @NotEmpty- public String getCanBeChangedBy() {- return canBeChangedBy;- }-- public void setCanBeChangedBy(String canBeChangedBy) {- this.canBeChangedBy = canBeChangedBy;- }-@SuppressWarnings("unused")private static boolean isNameOfEmptyValueVisible() {return (boolean) EditContext.get().getInputValue("allowEmpty");diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.javaindex bff3a8595d..88037077d4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java@@ -9,11 +9,9 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.GroupUsers;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.IssueReaders;import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.Usage;@@ -25,7 +23,7 @@ public class UserChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;- private ChoiceProvider choiceProvider = new IssueReaders();+ private ChoiceProvider choiceProvider = new AllUsers();private DefaultValueProvider defaultValueProvider;@@ -84,24 +82,6 @@ public class UserChoiceField extends FieldSpec {return new Usage();}- public void onRenameGroup(ChoiceProvider choiceProvider, String oldName, String newName) {- if (choiceProvider instanceof GroupUsers) {- GroupUsers groupUsers = (GroupUsers) choiceProvider;- if (groupUsers.getGroupName().equals(oldName))- groupUsers.setGroupName(newName);- }- }-- public Usage onDeleteGroup(InputSpec inputSpec, ChoiceProvider choiceProvider, String groupName) {- Usage usage = new Usage();- if (choiceProvider instanceof GroupUsers) {- GroupUsers groupUsers = (GroupUsers) choiceProvider;- if (groupUsers.getGroupName().equals(groupName))- usage.add("available choices");- }- return usage.prefix("field '" + getName() + "'");- }-@Overridepublic Object convertToObject(List<String> strings) {return UserChoiceInput.convertToObject(strings);diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 3e167fc745..d12ab7ce65 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -1,23 +1,20 @@package io.onedev.server.model.support.issue.transitiontrigger;import java.util.ArrayList;-import java.util.Iterator;import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.User;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.usermatcher.UserMatcher;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.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;+import io.onedev.server.web.editable.annotation.RoleChoice;@Editable(order=100, name="Button is pressed")public class PressButtonTrigger implements TransitionTrigger {@@ -26,7 +23,7 @@ public class PressButtonTrigger implements TransitionTrigger {private String buttonLabel;- private String authorized;+ private List<String> authorizedRoles = new ArrayList<>();private List<String> promptFields = new ArrayList<>();@@ -40,15 +37,15 @@ public class PressButtonTrigger implements TransitionTrigger {this.buttonLabel = buttonLabel;}- @Editable(order=200, name="Authorization")- @io.onedev.server.web.editable.annotation.UserMatcher- @NotEmpty(message="may not be empty")- public String getAuthorized() {- return authorized;+ @Editable(order=200, description="Optionally specify authorized roles to press this button. "+ + "If not specified, all users are allowed")+ @RoleChoice+ public List<String> getAuthorizedRoles() {+ return authorizedRoles;}- public void setAuthorized(String authorized) {- this.authorized = authorized;+ public void setAuthorizedRoles(List<String> authorizedRoles) {+ this.authorizedRoles = authorizedRoles;}@Editable(order=500, description="Optionally select fields to prompt when this button is pressed")@@ -71,24 +68,20 @@ public class PressButtonTrigger implements TransitionTrigger {return fields;}- public void onRenameField(String oldName, String newName) {- for (int i=0; i<getPromptFields().size(); i++) {- if (getPromptFields().get(i).equals(oldName))- getPromptFields().set(i, newName);+ public boolean isAuthorized(Project project) {+ if (!getAuthorizedRoles().isEmpty()) {+ if (SecurityUtils.canManageIssues(Project.get())) {+ return true;+ } else {+ for (String roleName: getAuthorizedRoles()) {+ if (SecurityUtils.isAuthorizedWithRole(project, roleName))+ return true;+ }+ return false;+ }+ } else {+ return true;}}- public void onDeleteField(String fieldName) {- for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {- if (it.next().equals(fieldName))- it.remove();- }- }-- public boolean isAuthorized() {- ProjectPage page = (ProjectPage) WicketUtils.getPage();- User user = SecurityUtils.getUser();- return user != null && UserMatcher.fromString(getAuthorized()).matches(page.getProject(), user);- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/CodePrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/CodePrivilege.javanew file mode 100644index 0000000000..cd6ad5bde9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/CodePrivilege.java@@ -0,0 +1,3 @@+package io.onedev.server.model.support.role;++public enum CodePrivilege {NONE, READ, WRITE}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.javanew file mode 100644index 0000000000..441e691ecd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java@@ -0,0 +1,109 @@+package io.onedev.server.model.support.role;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.editable.annotation.ShowCondition;+import io.onedev.server.web.util.SuggestionUtils;++@Editable+public class JobPrivilege implements Serializable {++ private static final long serialVersionUID = 1L;++ private String jobNames;++ private boolean manageJob;++ private boolean runJob;++ private boolean accessLog;++ private String accessibleReports;++ @Editable(order=100, description="Specify space-separated jobs. Use * or ? for wildcard match")+ @Patterns(suggester = "suggestJobNames")+ @NotEmpty+ public String getJobNames() {+ return jobNames;+ }++ public void setJobNames(String jobNames) {+ this.jobNames = jobNames;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestJobNames(String matchWith) {+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));+ Collections.sort(jobNames);+ return SuggestionUtils.suggest(jobNames, matchWith);+ }++ @Editable(order=100, description="This permission is required to delete builds. It implies all other job permissions")+ public boolean isManageJob() {+ return manageJob;+ }++ public void setManageJob(boolean manageJob) {+ this.manageJob = manageJob;+ }++ @SuppressWarnings("unused")+ private static boolean isManageJobDisabled() {+ return !(boolean) EditContext.get().getInputValue("manageJob");+ }++ @Editable(order=200, description="The permission to run job manually. It also implies the permission "+ + "to access build log, published artifacts and reports")+ @ShowCondition("isManageJobDisabled")+ public boolean isRunJob() {+ return runJob;+ }++ public void setRunJob(boolean runJob) {+ this.runJob = runJob;+ }++ @SuppressWarnings("unused")+ private static boolean isRunJobDisabled() {+ return !(boolean) EditContext.get().getInputValue("runJob");+ }++ @Editable(order=300, name="Access Build Log", description="The permission to access build log. It also implies the permission "+ + "to access published artifacts and reports")+ @ShowCondition("isRunJobDisabled")+ public boolean isAccessLog() {+ return accessLog;+ }++ public void setAccessLog(boolean accessLog) {+ this.accessLog = accessLog;+ }++ @SuppressWarnings("unused")+ private static boolean isAccessLogDisabled() {+ return !(boolean) EditContext.get().getInputValue("accessLog");+ }++ @Editable(order=400, description="Specify space-separated reports. Use * or ? for wildcard match")+ @ShowCondition("isAccessLogDisabled")+ @Patterns+ public String getAccessibleReports() {+ return accessibleReports;+ }++ public void setAccessibleReports(String accessibleReports) {+ this.accessibleReports = accessibleReports;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 86f0981bb6..4bf9cafbd9 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -51,7 +51,7 @@ import io.onedev.commons.utils.BeanUtils;import io.onedev.commons.utils.ClassUtils;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.migration.DatabaseMigrator;+import io.onedev.server.migration.DataMigrator;import io.onedev.server.migration.MigrationHelper;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.model.AbstractEntity;@@ -145,7 +145,7 @@ public class DefaultPersistManager implements PersistManager {logger.error("Database is not populated yet");System.exit(1);}- String appDataVersion = MigrationHelper.getVersion(DatabaseMigrator.class);+ String appDataVersion = MigrationHelper.getVersion(DataMigrator.class);if (dbDataVersion != null && !dbDataVersion.equals(appDataVersion)) {logger.error("Data version mismatch (app data version: {}, db data version: {})", appDataVersion, dbDataVersion);System.exit(1);@@ -187,7 +187,7 @@ public class DefaultPersistManager implements PersistManager {@Overridepublic void run() {ModelVersion dataVersion = new ModelVersion();- dataVersion.versionColumn = MigrationHelper.getVersion(DatabaseMigrator.class);+ dataVersion.versionColumn = MigrationHelper.getVersion(DataMigrator.class);transactionManager.getSession().save(dataVersion);}@@ -297,14 +297,14 @@ public class DefaultPersistManager implements PersistManager {throw new RuntimeException("Incorrect data format: no data version");}- if (MigrationHelper.migrate(versionElement.getText(), new DatabaseMigrator(), dataDir)) {+ if (MigrationHelper.migrate(versionElement.getText(), new DataMigrator(), dataDir)) {// load version file again in case we changed something of it while migratingversionFile = getVersionFile(dataDir);dom = VersionedDocument.fromFile(versionFile);elements = dom.getRootElement().elements();Preconditions.checkState(elements.size() == 1);versionElement = Preconditions.checkNotNull(elements.iterator().next().element(getVersionFieldName()));- versionElement.setText(MigrationHelper.getVersion(DatabaseMigrator.class));+ versionElement.setText(MigrationHelper.getVersion(DataMigrator.class));dom.writeToFile(versionFile, false);}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.javaindex 2c74207d60..3feff47ce7 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java@@ -97,10 +97,15 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements}@Override- public List<T> query() {- return dao.query(entityClass);+ public List<T> query(boolean cacheable) {+ return dao.query(entityClass, cacheable);}+ @Override+ public List<T> query() {+ return query(false);+ }+@Overridepublic T find(EntityCriteria<T> entityCriteria) {return dao.find(entityCriteria);diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.javaindex 11107dffbf..2050f62350 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java@@ -77,6 +77,8 @@ public interface Dao {<T extends AbstractEntity> List<T> query(Class<T> entityClass);+ <T extends AbstractEntity> List<T> query(Class<T> entityClass, boolean cacheable);+/*** This method expects to lookup a single entity with specified criteria*diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex 7a531669c8..4628576fe7 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -100,7 +100,15 @@ public class DefaultDao implements Dao, Serializable {@Sessional@Overridepublic <T extends AbstractEntity> List<T> query(Class<T> entityClass) {- return query(EntityCriteria.of(entityClass), 0, Integer.MAX_VALUE);+ return query(entityClass, false);+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> List<T> query(Class<T> entityClass, boolean cacheable) {+ EntityCriteria<T> criteria = EntityCriteria.of(entityClass);+ criteria.setCacheable(cacheable);+ return query(criteria, 0, Integer.MAX_VALUE);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.javaindex c97bbc37d4..0c6704dec7 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java@@ -71,6 +71,8 @@ public interface EntityManager<T extends AbstractEntity> {List<T> query(EntityCriteria<T> criteria);+ List<T> query(boolean cacheable);+List<T> query();EntityCriteria<T> newCriteria();diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.javaindex b76f8fc18c..59f9e36a9b 100644--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java@@ -58,7 +58,7 @@ public class BuildResource {Collection<Build> builds = buildManager.query(criteria, offset, count);for (Build build: builds) {- if (!SecurityUtils.canReadIssues(build.getProject().getFacade()))+ if (!SecurityUtils.canAccess(build.getProject()))throw new UnauthorizedException("Unable to access project '" + build.getProject().getName() + "'");}@@ -70,7 +70,7 @@ public class BuildResource {@GETpublic Build get(@PathParam("buildId") Long buildId) {Build build = buildManager.load(buildId);- if (!SecurityUtils.canReadIssues(build.getProject().getFacade()))+ if (!SecurityUtils.canAccess(build.getProject()))throw new UnauthorizedException("Unauthorized access to project " + build.getProject().getName());elsereturn build;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.javaindex f1d11c3c85..e408398069 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@@ -53,7 +53,7 @@ public class ProjectResource {Collection<Project> projects = projectManager.query(criteria, offset, count);for (Project project: projects) {- if (!SecurityUtils.canReadIssues(project.getFacade()))+ if (!SecurityUtils.canAccess(project))throw new UnauthorizedException("Unable to access project '" + project.getName() + "'");}@@ -64,7 +64,7 @@ public class ProjectResource {@GETpublic Project get(@PathParam("projectId") Long projectId) {Project project = projectManager.load(projectId);- if (!SecurityUtils.canReadIssues(project.getFacade()))+ if (!SecurityUtils.canAccess(project))throw new UnauthorizedException("Unauthorized access to project " + project.getName());elsereturn project;diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 197608c3db..97ea918cf6 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -43,7 +43,7 @@ public class PullRequestResource {@GETpublic PullRequest get(@PathParam("pullRequestId") Long pullRequestId) {PullRequest request = pullRequestManager.load(pullRequestId);- if (!SecurityUtils.canReadCode(request.getTargetProject().getFacade()))+ if (!SecurityUtils.canReadCode(request.getTargetProject()))throw new UnauthorizedException();return request;}@@ -102,7 +102,7 @@ public class PullRequestResource {Collection<PullRequest> requests = pullRequestManager.query(criteria, offset, count);for (PullRequest request: requests) {- if (!SecurityUtils.canReadCode(request.getTargetProject().getFacade())) {+ if (!SecurityUtils.canReadCode(request.getTargetProject())) {throw new UnauthorizedException("Unable to access pull requests of project '"+ request.getTargetProject() + "'");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex d367889cf9..11a615d894 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -2,12 +2,12 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;import static io.onedev.server.util.BuildConstants.FIELD_FINISH_DATE;-import static io.onedev.server.util.BuildConstants.FIELD_VERSION;import static io.onedev.server.util.BuildConstants.FIELD_JOB;import static io.onedev.server.util.BuildConstants.FIELD_NUMBER;import static io.onedev.server.util.BuildConstants.FIELD_QUEUEING_DATE;import static io.onedev.server.util.BuildConstants.FIELD_RUNNING_DATE;import static io.onedev.server.util.BuildConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.util.BuildConstants.FIELD_VERSION;import java.util.ArrayList;import java.util.Collection;@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.search.entity.AndCriteriaHelper;@@ -247,7 +247,7 @@ public class BuildQuery extends EntityQuery<Build> {}public static void checkField(Project project, String fieldName, int operator) {- Collection<String> paramNames = OneDev.getInstance(CacheManager.class).getBuildParamNames();+ Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames();if (!BuildConstants.QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 1253340cb1..a409bd7313 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -11,8 +11,8 @@ import javax.persistence.criteria.Root;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;@@ -42,9 +42,9 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {Collection<String> descendents = new HashSet<>();for (ObjectId each: getCommitInfoManager().getDescendants(project, fixCommits))descendents.add(each.name());- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Collection<Long> inBuildIds = cacheManager.filterBuildIds(project.getId(), descendents);- return inManyValues(builder, attribute, inBuildIds, cacheManager.getBuildIdsByProject(project.getId()));+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ Collection<Long> inBuildIds = buildManager.filterBuildIds(project.getId(), descendents);+ return inManyValues(builder, attribute, inBuildIds, buildManager.getBuildIdsByProject(project.getId()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex f98827f488..ae701cb9f1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -19,7 +19,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -70,7 +70,7 @@ public class FixedBetweenCriteria extends IssueCriteria {Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);if (fixedIssueNumbers.size() > IN_CLAUSE_LIMIT) {- Collection<Long> allIssueNumbers = OneDev.getInstance(CacheManager.class).getIssueNumbers(project.getId());+ Collection<Long> allIssueNumbers = OneDev.getInstance(IssueManager.class).getIssueNumbers(project.getId());return inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);} else if (!fixedIssueNumbers.isEmpty()) {return root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 37d2991f0b..a408c17127 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -25,14 +25,15 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Membership;import io.onedev.server.model.User;+import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.administration.authenticator.Authenticated;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.TransactionManager;@@ -40,12 +41,6 @@ import io.onedev.server.security.permission.CreateProjects;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.UserAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;@Singletonpublic class OneAuthorizingRealm extends AuthorizingRealm {@@ -54,8 +49,6 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final UserManager userManager;- private final CacheManager cacheManager;-private final SettingManager configManager;private final MembershipManager membershipManager;@@ -63,31 +56,22 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final GroupManager groupManager;private final TransactionManager transactionManager;-+@Inject- public OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, SettingManager configManager,- MembershipManager membershipManager, GroupManager groupManager, TransactionManager transactionManager) {+ public OneAuthorizingRealm(UserManager userManager, SettingManager configManager,+ MembershipManager membershipManager, GroupManager groupManager,+ TransactionManager transactionManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);this.userManager = userManager;- this.cacheManager = cacheManager;this.configManager = configManager;this.membershipManager = membershipManager;this.groupManager = groupManager;this.transactionManager = transactionManager;}- private Collection<Permission> getDefaultPermissions() {- Collection<Permission> defaultPermissions = new ArrayList<>();- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (project.getDefaultPrivilege() != null)- defaultPermissions.add(new ProjectPermission(project, project.getDefaultPrivilege().getProjectPrivilege()));- }- return defaultPermissions;- }-@Overrideprotected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {return new AuthorizationInfo() {@@ -113,41 +97,27 @@ public class OneAuthorizingRealm extends AuthorizingRealm {Long userId = (Long) principals.getPrimaryPrincipal();Collection<Permission> permissions = new ArrayList<>();- UserFacade user = null;- if (userId != 0L)- user = cacheManager.getUser(userId);- if (user != null) {- permissions.addAll(getDefaultPermissions());+ if (userId != 0L) {+ User user = userManager.load(userId);if (user.isRoot())permissions.add(new SystemAdministration());permissions.add(new UserAdministration(user));- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(userId)) {- GroupFacade group = cacheManager.getGroup(membership.getGroupId());- if (group.isAdministrator())- permissions.add(new SystemAdministration());- if (group.isCanCreateProjects())- permissions.add(new CreateProjects());- for (GroupAuthorizationFacade authorization:- cacheManager.getGroupAuthorizations().values()) {- if (authorization.getGroupId().equals(group.getId())) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));- }- }- }- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(userId)) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));- }+ for (Group group: user.getGroups()) {+ if (group.isAdministrator())+ permissions.add(new SystemAdministration());+ if (group.isCreateProjects())+ permissions.add(new CreateProjects());+ for (GroupAuthorization authorization: group.getAuthorizations())+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));}- } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {- permissions.addAll(getDefaultPermissions());- }+ for (UserAuthorization authorization: user.getAuthorizations())+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));+ }+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getAuthorizations())+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));+ }return permissions;}@@ -226,19 +196,18 @@ public class OneAuthorizingRealm extends AuthorizingRealm {if (authenticated.getFullName() != null)user.setFullName(authenticated.getFullName());userManager.save(user);- if (authenticated.getGroupNames().isEmpty()) {- for (String groupName: authenticator.getDefaultGroupNames()) {- Group group = groupManager.find(groupName);- if (group != null) {- Membership membership = new Membership();- membership.setGroup(group);- membership.setUser(user);- user.getMemberships().add(membership);- membershipManager.save(membership);- } else {- logger.warn("Default group '{}' of external authenticator is not defined", groupName);- }- }+ if (authenticated.getGroupNames().isEmpty() && authenticator.getDefaultGroup() != null) {+ Group group = groupManager.find(authenticator.getDefaultGroup());+ if (group != null) {+ Membership membership = new Membership();+ membership.setGroup(group);+ membership.setUser(user);+ user.getMemberships().add(membership);+ membershipManager.save(membership);+ } else {+ logger.error("Default group '{}' of external authenticator is not defined",+ authenticator.getDefaultGroup());+ }}}} else {diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.javanew file mode 100644index 0000000000..709bf46135--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class AccessBuild implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof AccessBuild;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.javanew file mode 100644index 0000000000..35c9ba0469--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class AccessBuildLog implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof AccessBuildLog || new AccessBuildReports("*").implies(p);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.javanew file mode 100644index 0000000000..4673ca74f9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java@@ -0,0 +1,26 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++import io.onedev.commons.utils.match.StringMatcher;+import io.onedev.server.util.patternset.PatternSet;++public class AccessBuildReports implements Permission {++ private final String reportNames;++ public AccessBuildReports(String reportNames) {+ this.reportNames = reportNames;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof AccessBuildReports) {+ AccessBuildReports accessBuildReports = (AccessBuildReports) p;+ return PatternSet.fromString(reportNames).matches(new StringMatcher(), accessBuildReports.reportNames);+ } else {+ return new AccessBuild().implies(p);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessProject.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessProject.javanew file mode 100644index 0000000000..6727e35a83--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessProject.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class AccessProject implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof AccessProject;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/DefaultPrivilege.java b/server-core/src/main/java/io/onedev/server/security/permission/DefaultPrivilege.javadeleted file mode 100644index 01d1380ad1..0000000000--- a/server-core/src/main/java/io/onedev/server/security/permission/DefaultPrivilege.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.security.permission;--public enum DefaultPrivilege {- ISSUE_READ {-- @Override- public ProjectPrivilege getProjectPrivilege() {- return ProjectPrivilege.ISSUE_READ;- }-- },- CODE_READ {-- @Override- public ProjectPrivilege getProjectPrivilege() {- return ProjectPrivilege.CODE_READ;- }-- };-- public abstract ProjectPrivilege getProjectPrivilege();--}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.javanew file mode 100644index 0000000000..1166898e13--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java@@ -0,0 +1,23 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class EditIssueField implements Permission {++ private final String fieldName;++ public EditIssueField(String fieldName) {+ this.fieldName = fieldName;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof EditIssueField) {+ EditIssueField editIssueField = (EditIssueField) p;+ return fieldName.equals(editIssueField.fieldName);+ } else {+ return new AccessProject().implies(p);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.javanew file mode 100644index 0000000000..5d6711e7b5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java@@ -0,0 +1,29 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++import io.onedev.commons.utils.match.StringMatcher;+import io.onedev.server.util.patternset.PatternSet;++public class JobPermission implements Permission {++ private final String jobNames;++ private final Permission privilege;++ public JobPermission(String jobNames, Permission privilege) {+ this.jobNames = jobNames;+ this.privilege = privilege;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof JobPermission) {+ JobPermission jobPermission = (JobPermission) p;+ return PatternSet.fromString(jobNames).matches(new StringMatcher(), jobPermission.jobNames)+ && privilege.implies(jobPermission.privilege);+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.javanew file mode 100644index 0000000000..8e1862fd40--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class ManageIssues implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof ManageIssues || p instanceof EditIssueField || new AccessProject().implies(p);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.javanew file mode 100644index 0000000000..f819876fc2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageJob.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class ManageJob implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof ManageJob || new RunJob().implies(p);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.javanew file mode 100644index 0000000000..33b1394d18--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageProject.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class ManageProject implements Permission {++ @Override+ public boolean implies(Permission p) {+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.javaindex fb3673f0d7..25334798c4 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java@@ -2,32 +2,24 @@ package io.onedev.server.security.permission;import org.apache.shiro.authz.Permission;-import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.model.Project;public class ProjectPermission implements Permission {- private final ProjectFacade project;+ private final Project project;- private final ProjectPrivilege privilege;+ private final Permission privilege;- public ProjectPermission(ProjectFacade project, ProjectPrivilege privilege) {+ public ProjectPermission(Project project, Permission privilege) {this.project = project;this.privilege = privilege;}- public ProjectFacade getProject() {- return project;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }-@Overridepublic boolean implies(Permission p) {if (p instanceof ProjectPermission) {ProjectPermission projectPermission = (ProjectPermission) p;- return project.equals(projectPermission.getProject()) && privilege.implies(projectPermission.getPrivilege());+ return project.equals(projectPermission.project) && privilege.implies(projectPermission.privilege);} else {return false;}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.javadeleted file mode 100644index d6f82d3551..0000000000--- a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPrivilege.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.security.permission;--public enum ProjectPrivilege {- ISSUE_READ("Issue read") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == ISSUE_READ;- }-- },- CODE_READ("Code read") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == CODE_READ || ISSUE_READ.implies(privilege);- }-- },- CODE_WRITE("Code write") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return privilege == CODE_WRITE || CODE_READ.implies(privilege);- }-- },- ADMINISTRATION("Administration") {-- @Override- public boolean implies(ProjectPrivilege privilege) {- return true;- }-- };-- public abstract boolean implies(ProjectPrivilege privilege);-- private final String displayName;-- ProjectPrivilege(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }--}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.java b/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.javanew file mode 100644index 0000000000..5d46a4ded5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class ReadCode implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof ReadCode;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.javanew file mode 100644index 0000000000..9388e8aab7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class RunJob implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof RunJob || new AccessBuildLog().implies(p);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/UserAdministration.java b/server-core/src/main/java/io/onedev/server/security/permission/UserAdministration.javaindex 0fdf29b9e6..4cc45ddd94 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/UserAdministration.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/UserAdministration.java@@ -2,17 +2,17 @@ package io.onedev.server.security.permission;import org.apache.shiro.authz.Permission;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;public class UserAdministration implements Permission {- private final UserFacade user;+ private final User user;- public UserAdministration(UserFacade user) {+ public UserAdministration(User user) {this.user = user;}- public UserFacade getUser() {+ public User getUser() {return user;}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java b/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.javanew file mode 100644index 0000000000..b9adfbb914--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/WriteCode.java@@ -0,0 +1,12 @@+package io.onedev.server.security.permission;++import org.apache.shiro.authz.Permission;++public class WriteCode implements Permission {++ @Override+ public boolean implies(Permission p) {+ return p instanceof WriteCode || new ReadCode().implies(p);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.javaindex 18fd8ef24d..c64210ff9a 100644--- a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java+++ b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java@@ -2,7 +2,7 @@ package io.onedev.server.storage;import java.io.File;-import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.model.Project;public interface AttachmentStorageManager {@@ -13,6 +13,6 @@ public interface AttachmentStorageManager {* directory to store attachment of specified project and uuid. The directory may not exist* if there is no any attachment saved*/- File getAttachmentStorage(ProjectFacade project, String attachmentStorageUUID);+ File getAttachmentStorage(Project project, String attachmentStorageUUID);}diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.javaindex d10e620385..f18b7b93a6 100644--- a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java@@ -24,7 +24,6 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.facade.ProjectFacade;@Singletonpublic class DefaultAttachmentStorageManager implements AttachmentStorageManager, SchedulableTask {@@ -57,7 +56,7 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager}@Override- public File getAttachmentStorage(ProjectFacade project, String attachmentStorageUUID) {+ public File getAttachmentStorage(Project project, String attachmentStorageUUID) {File attachmentBase = storageManager.getProjectAttachmentDir(project.getId());File attachmentStorage = getPermanentAttachmentStorage(attachmentBase, attachmentStorageUUID);if (attachmentStorage.exists())diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java b/server-core/src/main/java/io/onedev/server/util/ComponentContext.javaindex b5763fb0ce..9bb0260c70 100644--- a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java+++ b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java@@ -1,5 +1,6 @@package io.onedev.server.util;+import java.io.Serializable;import java.util.Stack;import javax.annotation.Nullable;@@ -9,7 +10,9 @@ import org.apache.wicket.Page;import io.onedev.server.web.util.WicketUtils;-public class ComponentContext {+public class ComponentContext implements Serializable {++ private static final long serialVersionUID = 1L;private static ThreadLocal<Stack<ComponentContext>> stack = new ThreadLocal<Stack<ComponentContext>>() {diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 0fe1c847ef..52008ae499 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -15,7 +15,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.scriptidentity.ScriptIdentity;public class GroovyUtils {diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 102ab4c02d..02010c13b0 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -23,10 +23,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;@@ -64,12 +62,11 @@ public class IssueUtils {public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {Collection<String> propertyNames = new HashSet<>();SettingManager settingManager = OneDev.getInstance(SettingManager.class);- User user = SecurityUtils.getUser();for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getProperties().values()) {for (PropertyDescriptor property: groupProperties) {if (fieldNames.contains(property.getDisplayName())) {FieldSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());- if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))+ if (field != null && SecurityUtils.canEditIssueField(project, field.getName()))propertyNames.add(property.getPropertyName());}}diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex 3fa40b824e..3fa0c7b70c 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -2,17 +2,21 @@ package io.onedev.server.util;import java.util.Collection;import java.util.HashSet;-import java.util.Set;--import javax.annotation.Nullable;+import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.ObjectId;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.IssueComment;@@ -20,53 +24,51 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.Role;import io.onedev.server.model.User;+import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.security.permission.AccessBuild;+import io.onedev.server.security.permission.AccessBuildLog;+import io.onedev.server.security.permission.AccessBuildReports;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.security.permission.CreateProjects;+import io.onedev.server.security.permission.EditIssueField;+import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.security.permission.ManageIssues;+import io.onedev.server.security.permission.ManageJob;+import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.security.permission.RunJob;import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.security.permission.UserAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.security.permission.WriteCode;public class SecurityUtils extends org.apache.shiro.SecurityUtils {- public static Collection<UserFacade> getAuthorizedUsers(ProjectFacade project, ProjectPrivilege privilege) {- Collection<UserFacade> authorizedUsers = new HashSet<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- if (project.getDefaultPrivilege() != null && project.getDefaultPrivilege().getProjectPrivilege().implies(privilege)) {- authorizedUsers.addAll(cacheManager.getUsers().values());- } else {- authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot().getFacade());-- Set<Long> authorizedGroupIds = new HashSet<>();- for (GroupFacade group: cacheManager.getGroups().values()) {- if (group.isAdministrator())- authorizedGroupIds.add(group.getId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getProjectId().equals(project.getId()) && authorization.getPrivilege().implies(privilege))- authorizedGroupIds.add(authorization.getGroupId());- }- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (authorizedGroupIds.contains(membership.getGroupId()))- authorizedUsers.add(cacheManager.getUser(membership.getUserId()));- }+ private static final Logger logger = LoggerFactory.getLogger(SecurityUtils.class);++ public static Collection<User> getAuthorizedUsers(Project project, Permission permission) {+ Collection<User> authorizedUsers = new HashSet<>();+ authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot());- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(project.getId())- && authorization.getPrivilege().implies(privilege)) {- authorizedUsers.add(cacheManager.getUser(authorization.getUserId()));- }+ Group anonymousGroup = OneDev.getInstance(GroupManager.class).findAnonymous();+ for (GroupAuthorization authorization: project.getGroupAuthorizations()) {+ Group group = authorization.getGroup();+ if (group.isAdministrator() || authorization.getRole().implies(permission)) {+ if (group.equals(anonymousGroup))+ authorizedUsers.addAll(OneDev.getInstance(UserManager.class).query());+ else+ authorizedUsers.addAll(group.getMembers());}}+ for (UserAuthorization authorization: project.getUserAuthorizations()) {+ if (authorization.getRole().implies(permission))+ authorizedUsers.add(authorization.getUser());+ }+return authorizedUsers;}@@ -75,7 +77,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canDeleteBranch(Project project, String branchName) {- if (canWriteCode(project.getFacade())) {+ if (canWriteCode(project)) {BranchProtection protection = project.getBranchProtection(branchName, getUser());return protection == null || !protection.isNoDeletion();} else {@@ -83,9 +85,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}}- @Nullablepublic static boolean canCreateTag(Project project, String tagName) {- if (canWriteCode(project.getFacade())) {+ if (canWriteCode(project)) {TagProtection protection = project.getTagProtection(tagName, getUser());return protection == null || !protection.isNoCreation();} else {@@ -93,9 +94,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}}- @Nullablepublic static boolean canCreateBranch(Project project, String branchName) {- if (canWriteCode(project.getFacade())) {+ if (canWriteCode(project)) {BranchProtection protection = project.getBranchProtection(branchName, getUser());return protection == null || !protection.isNoCreation();} else {@@ -105,40 +105,99 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static boolean canModify(Project project, String branch, String file) {User user = getUser();- return canWriteCode(project.getFacade())+ return canWriteCode(project)&& !project.isReviewRequiredForModification(user, branch, file)&& !project.isBuildRequiredForModification(user, branch, file);}public static boolean canPush(Project project, String branch, ObjectId oldObjectId, ObjectId newObjectId) {User user = getUser();- return canWriteCode(project.getFacade())+ return canWriteCode(project)&& !project.isReviewRequiredForPush(user, branch, oldObjectId, newObjectId, null)&& !project.isBuildRequiredForPush(user, branch, oldObjectId, newObjectId, null);}- public static boolean canAdministrate(UserFacade user) {- return getSubject().isPermitted(new UserAdministration(user));+ public static boolean canEditIssueField(Project project, String fieldName) {+ return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(fieldName)));+ }++ public static boolean isAuthorizedWithRole(Project project, String roleName) {+ Role role = OneDev.getInstance(RoleManager.class).find(roleName);+ if (role != null) {+ User user = getUser();+ if (user != null) {+ for (UserAuthorization authorization: user.getAuthorizations()) {+ if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))+ return true;+ }+ for (Group group: user.getGroups()) {+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))+ return true;+ }+ }+ }+ Group group = OneDev.getInstance(GroupManager.class).findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))+ return true;+ }+ }+ return false;+ } else {+ logger.error("Undefined role: " + roleName);+ return false;+ }}public static boolean canCreateProjects() {return getSubject().isPermitted(new CreateProjects());}- public static boolean canReadIssues(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ISSUE_READ));+ public static boolean canAccess(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, new AccessProject()));+ }++ public static boolean canReadCode(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, new ReadCode()));+ }++ public static boolean canWriteCode(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, new WriteCode()));+ }++ public static boolean canManage(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, new ManageProject()));+ }++ public static boolean canManageIssues(Project project) {+ return getSubject().isPermitted(new ProjectPermission(project, new ManageIssues()));+ }++ public static boolean canManage(Build build) {+ return getSubject().isPermitted(new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new ManageJob())));+ }++ public static boolean canAccessLog(Build build) {+ return getSubject().isPermitted(new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new AccessBuildLog())));}- public static boolean canReadCode(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.CODE_READ));+ public static boolean canAccess(Build build) {+ return getSubject().isPermitted(new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new AccessBuild())));}- public static boolean canWriteCode(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.CODE_WRITE));+ public static boolean canAccessReport(Build build, String reportName) {+ return getSubject().isPermitted(new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new AccessBuildReports(reportName))));}- public static boolean canAdministrate(ProjectFacade project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMINISTRATION));+ public static boolean canRunJob(Project project, String jobName) {+ return getSubject().isPermitted(new ProjectPermission(project,+ new JobPermission(jobName, new RunJob())));}public static boolean isAdministrator() {@@ -148,49 +207,49 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static boolean canModifyOrDelete(CodeComment comment) {User user = SecurityUtils.getUser();return user != null && user.equals(comment.getUser())- || canWriteCode(comment.getProject().getFacade());+ || canWriteCode(comment.getProject());}public static boolean canModifyOrDelete(CodeCommentReply reply) {User user = SecurityUtils.getUser();return user != null && user.equals(reply.getUser())- || canWriteCode(reply.getComment().getProject().getFacade());+ || canWriteCode(reply.getComment().getProject());}public static boolean canModifyOrDelete(PullRequestComment comment) {User user = SecurityUtils.getUser();return user != null && user.equals(comment.getUser())- || canWriteCode(comment.getRequest().getTargetProject().getFacade());+ || canWriteCode(comment.getRequest().getTargetProject());}public static boolean canModifyOrDelete(IssueComment comment) {User user = SecurityUtils.getUser();return user != null && user.equals(comment.getUser())- || canWriteCode(comment.getIssue().getProject().getFacade());+ || canWriteCode(comment.getIssue().getProject());}public static boolean canModifyOrDelete(PullRequestChange change) {User user = SecurityUtils.getUser();return user != null && user.equals(change.getUser())- || canWriteCode(change.getRequest().getTargetProject().getFacade());+ || canWriteCode(change.getRequest().getTargetProject());}public static boolean canModifyOrDelete(IssueChange change) {User user = SecurityUtils.getUser();return user != null && user.equals(change.getUser())- || canWriteCode(change.getIssue().getProject().getFacade());+ || canWriteCode(change.getIssue().getProject());}public static boolean canModify(PullRequest request) {User user = SecurityUtils.getUser();return user != null && user.equals(request.getSubmitter())- || canWriteCode(request.getTargetProject().getFacade());+ || canWriteCode(request.getTargetProject());}public static boolean canModify(Issue issue) {User user = SecurityUtils.getUser();return user != null && user.equals(issue.getSubmitter())- || canWriteCode(issue.getProject().getFacade());+ || canWriteCode(issue.getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.javaindex 9665ffec15..d3217124ae 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java@@ -8,10 +8,13 @@ public class BuildFacade extends EntityFacade {private final String commitHash;- public BuildFacade(Long buildId, Long projectId, String commitHash) {+ private final String jobName;++ public BuildFacade(Long buildId, Long projectId, String commitHash, String jobName) {super(buildId);this.projectId = projectId;this.commitHash = commitHash;+ this.jobName = jobName;}public Long getProjectId() {@@ -22,4 +25,8 @@ public class BuildFacade extends EntityFacade {return commitHash;}+ public String getJobName() {+ return jobName;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.javadeleted file mode 100644index d8b3e21448..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.security.permission.ProjectPrivilege;--public class GroupAuthorizationFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long groupId;-- private final Long projectId;-- private final ProjectPrivilege privilege;-- public GroupAuthorizationFacade(GroupAuthorization groupAuthorization) {- super(groupAuthorization.getId());-- groupId = groupAuthorization.getGroup().getId();- projectId = groupAuthorization.getProject().getId();- privilege = groupAuthorization.getPrivilege();- }-- public Long getGroupId() {- return groupId;- }-- public Long getProjectId() {- return projectId;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.javadeleted file mode 100644index aa424c92a4..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.Group;--public class GroupFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final boolean administrator;-- private final boolean canCreateProjects;-- public GroupFacade(Group group) {- super(group.getId());- name = group.getName();- administrator = group.isAdministrator();- canCreateProjects = group.isCanCreateProjects();- }-- public String getName() {- return name;- }-- public boolean isAdministrator() {- return administrator;- }-- public boolean isCanCreateProjects() {- return canCreateProjects;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/MembershipFacade.javadeleted file mode 100644index ec3fd953f4..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java+++ /dev/null@@ -1,28 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.Membership;--public class MembershipFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long groupId;-- private final Long userId;-- public MembershipFacade(Membership membership) {- super(membership.getId());-- groupId = membership.getGroup().getId();- userId = membership.getUser().getId();- }-- public Long getGroupId() {- return groupId;- }-- public Long getUserId() {- return userId;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javadeleted file mode 100644index 0219f6eb63..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ /dev/null@@ -1,57 +0,0 @@-package io.onedev.server.util.facade;--import java.util.Date;--import io.onedev.server.OneDev;-import io.onedev.server.cache.UserInfoManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.DefaultPrivilege;-import io.onedev.server.util.SecurityUtils;--public class ProjectFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final DefaultPrivilege defaultPrivilege;-- public ProjectFacade(Project project) {- super(project.getId());- name = project.getName();- defaultPrivilege = project.getDefaultPrivilege();- }-- public String getName() {- return name;- }-- public DefaultPrivilege getDefaultPrivilege() {- return defaultPrivilege;- }-- public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {- User user = SecurityUtils.getUser();- if (user != null) {- UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);- UserFacade userFacade = user.getFacade();- Date date1 = userInfoManager.getVisitDate(userFacade, project1);- Date date2 = userInfoManager.getVisitDate(userFacade, project2);- if (date1 != null) {- if (date2 != null)- return date2.compareTo(date1);- else- return -1;- } else {- if (date2 != null)- return 1;- else- return project1.compareTo(project2);- }- } else {- return project1.compareTo(project2);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.javadeleted file mode 100644index ef2e295054..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.permission.ProjectPrivilege;--public class UserAuthorizationFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long userId;-- private final Long projectId;-- private final ProjectPrivilege privilege;-- public UserAuthorizationFacade(UserAuthorization userAuthorization) {- super(userAuthorization.getId());-- userId = userAuthorization.getUser().getId();- projectId = userAuthorization.getProject().getId();- privilege = userAuthorization.getPrivilege();- }-- public Long getUserId() {- return userId;- }-- public Long getProjectId() {- return projectId;- }-- public ProjectPrivilege getPrivilege() {- return privilege;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.javadeleted file mode 100644index 4c30410a8f..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java+++ /dev/null@@ -1,64 +0,0 @@-package io.onedev.server.util.facade;--import javax.annotation.Nullable;--import io.onedev.commons.utils.matchscore.MatchScoreUtils;-import io.onedev.server.model.User;--public class UserFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final String fullName;-- private final String email;-- public UserFacade(User user) {- super(user.getId());-- name = user.getName();- fullName = user.getFullName();- email = user.getEmail();- }-- public String getName() {- return name;- }-- public String getFullName() {- return fullName;- }-- public String getEmail() {- return email;- }-- public boolean isRoot() {- return getId().equals(User.ROOT_ID);- }-- public String getDisplayName() {- if (getFullName() != null)- return getFullName();- else- return getName();- }-- @Override- public String toString() {- return getDisplayName();- }-- public double getMatchScore(@Nullable String queryTerm) {- double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);- double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);- return Math.max(scoreOfName, scoreOfFullName);- }-- public static UserFacade of(@Nullable User user) {- return user!=null?new UserFacade(user):null;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.javaindex 549998c981..36271a5692 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java@@ -5,7 +5,7 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;public class BuildProcessor extends BuildParser implements MarkdownProcessor {@@ -17,7 +17,7 @@ public class BuildProcessor extends BuildParser implements MarkdownProcessor {@Overrideprotected String toHtml(Build build, String text) {CharSequence url = RequestCycle.get().urlFor(- BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));return String.format("<a href='%s' class='build reference' data-reference=%d>%s</a>", url, build.getId(), text);}diff --git a/server-core/src/main/java/io/onedev/server/util/userident/UserIdent.java b/server-core/src/main/java/io/onedev/server/util/userident/UserIdent.javaindex 18e52663e3..eeae91bb1a 100644--- a/server-core/src/main/java/io/onedev/server/util/userident/UserIdent.java+++ b/server-core/src/main/java/io/onedev/server/util/userident/UserIdent.java@@ -9,7 +9,7 @@ import org.eclipse.jgit.lib.PersonIdent;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;@JsonTypeInfo(property="@class", use = Id.CLASS)public abstract class UserIdent implements Serializable {@@ -18,14 +18,14 @@ public abstract class UserIdent implements Serializable {public abstract String getName();- public static UserIdent of(@Nullable UserFacade user) {+ public static UserIdent of(@Nullable User user) {if (user != null)return new OrdinaryUserIdent(user.getDisplayName(), user.getEmail());elsereturn new SystemUserIdent();}- public static UserIdent of(@Nullable UserFacade user, @Nullable String userName) {+ public static UserIdent of(@Nullable User user, @Nullable String userName) {if (user != null) {return new OrdinaryUserIdent(user.getDisplayName(), user.getEmail());} else if (userName != null) {diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeReaders.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeReaders.javadeleted file mode 100644index 66d2bd8a0b..0000000000--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeReaders.java+++ /dev/null@@ -1,22 +0,0 @@-package io.onedev.server.util.usermatcher;--import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;--public class CodeReaders implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.CODE_READ));- }-- @Override- public String toString() {- return "code readers";- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeWriters.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeWriters.javadeleted file mode 100644index 32cc7694e6..0000000000--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/CodeWriters.java+++ /dev/null@@ -1,22 +0,0 @@-package io.onedev.server.util.usermatcher;--import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;--public class CodeWriters implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.CODE_WRITE));- }-- @Override- public String toString() {- return "code writers";- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/IssueReaders.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/IssueReaders.javadeleted file mode 100644index 38ec0474b2..0000000000--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/IssueReaders.java+++ /dev/null@@ -1,22 +0,0 @@-package io.onedev.server.util.usermatcher;--import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;--public class IssueReaders implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ISSUE_READ));- }-- @Override- public String toString() {- return "issue readers";- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/ProjectAdministrators.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/ProjectAdministrators.javadeleted file mode 100644index 23a9a685aa..0000000000--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/ProjectAdministrators.java+++ /dev/null@@ -1,22 +0,0 @@-package io.onedev.server.util.usermatcher;--import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;--public class ProjectAdministrators implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(Project project, User user) {- return user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMINISTRATION));- }-- @Override- public String toString() {- return "project administrators";- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4 b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4index 71fcebbbae..68b4bf3176 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4@@ -6,10 +6,6 @@ userMatchercriteria: Anyone- | ProjectAdministrators- | CodeWriters- | CodeReaders- | IssueReaders| userCriteria| groupCriteria;@@ -22,22 +18,6 @@ Anyone: 'anyone';-ProjectAdministrators- : 'project' WS+ 'administrators'- ;--CodeWriters- : 'code' WS+ 'writers'- ;--CodeReaders- : 'code' WS+ 'readers'- ;--IssueReaders- : 'issue' WS+ 'readers'- ;-userCriteria: USER Value;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.javaindex ab6d3c6ab3..1a5391571a 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java@@ -61,14 +61,6 @@ public class UserMatcher implements Serializable {private static UserMatcherCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {if (criteriaContext.Anyone() != null) {return new Anyone();- } else if (criteriaContext.ProjectAdministrators() != null) {- return new ProjectAdministrators();- } else if (criteriaContext.CodeWriters() != null) {- return new CodeWriters();- } else if (criteriaContext.CodeReaders() != null) {- return new CodeReaders();- } else if (criteriaContext.IssueReaders() != null) {- return new IssueReaders();} else if (criteriaContext.userCriteria() != null) {String userName = getValue(criteriaContext.userCriteria().Value());SpecifiedUser specifiedUser = new SpecifiedUser();diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 95243d4e07..8c0896a730 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -33,6 +33,9 @@ import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.role.NewRolePage;+import io.onedev.server.web.page.admin.role.RoleDetailPage;+import io.onedev.server.web.page.admin.role.RoleListPage;import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;@@ -57,12 +60,14 @@ import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;@@ -145,8 +150,13 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));+ add(new OnePageMapper("administration/roles", RoleListPage.class));+ add(new OnePageMapper("administration/roles/new", NewRolePage.class));+ add(new OnePageMapper("administration/roles/${role}", RoleDetailPage.class));+add(new OnePageMapper("administration/groups", GroupListPage.class));add(new OnePageMapper("administration/groups/new", NewGroupPage.class));+ add(new OnePageMapper("administration/groups/${group}", GroupProfilePage.class));add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));@@ -190,7 +200,7 @@ public class OneUrlMapper extends CompoundRequestMapper {});add(new OnePageMapper("projects/new", NewProjectPage.class));- add(new OnePageMapper("projects/${project}", ProjectBlobPage.class));+ add(new OnePageMapper("projects/${project}", ProjectDashboardPage.class));add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {@@ -239,7 +249,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));add(new OnePageMapper("projects/${project}/builds", ProjectBuildsPage.class));- add(new OnePageMapper("projects/${project}/builds/${build}", BuildLogPage.class));+ add(new OnePageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));add(new OnePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));add(new OnePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));add(new OnePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.javaindex 01f512568d..a7da4aa3f1 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java@@ -4,25 +4,25 @@ import java.io.File;import javax.annotation.Nullable;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.util.userident.UserIdent;public interface AvatarManager {String getAvatarUrl(UserIdent userIdent);- String getAvatarUrl(ProjectFacade project);+ String getAvatarUrl(Project project);- void useAvatar(UserFacade user, @Nullable String avatarData);+ void useAvatar(User user, @Nullable String avatarData);- void useAvatar(ProjectFacade project, @Nullable String avatarData);+ void useAvatar(Project project, @Nullable String avatarData);- File getUploaded(UserFacade user);+ File getUploaded(User user);- File getUploaded(ProjectFacade project);+ File getUploaded(Project project);- void copyAvatar(ProjectFacade from, ProjectFacade to);+ void copyAvatar(Project from, Project to);}diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javaindex 1bd09f4961..1172c0fbe3 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java@@ -21,10 +21,9 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.EmailAwareIdent;import io.onedev.server.util.userident.RemovedUserIdent;import io.onedev.server.util.userident.SystemUserIdent;@@ -59,7 +58,7 @@ public class DefaultAvatarManager implements AvatarManager {EmailAwareIdent emailAwareIdent = (EmailAwareIdent) userIdent;User user = userManager.findByEmail(emailAwareIdent.getEmail());if (user != null) {- File uploadedFile = getUploaded(user.getFacade());+ File uploadedFile = getUploaded(user);if (uploadedFile.exists())return AVATARS_BASE_URL + "uploaded/users/" + user.getId() + ".jpg?version=" + uploadedFile.lastModified();}@@ -113,13 +112,13 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public File getUploaded(UserFacade user) {+ public File getUploaded(User user) {return new File(Bootstrap.getSiteDir(), "avatars/uploaded/users/" + user.getId() + ".jpg");}@Sessional@Override- public void useAvatar(UserFacade user, String avatarData) {+ public void useAvatar(User user, String avatarData) {Lock avatarLock = LockUtils.getLock("uploaded-user-avatar:" + user.getId());avatarLock.lock();try {@@ -132,7 +131,7 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public String getAvatarUrl(ProjectFacade project) {+ public String getAvatarUrl(Project project) {File avatarFile = getUploaded(project);if (avatarFile.exists())return AVATARS_BASE_URL + "uploaded/projects/" + project.getId() + ".jpg?version=" + avatarFile.lastModified();@@ -141,7 +140,7 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public void useAvatar(ProjectFacade project, String avatarData) {+ public void useAvatar(Project project, String avatarData) {Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + project.getId());avatarLock.lock();try {@@ -154,12 +153,12 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public File getUploaded(ProjectFacade project) {+ public File getUploaded(Project project) {return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + project.getId() + ".jpg");}@Override- public void copyAvatar(ProjectFacade from, ProjectFacade to) {+ public void copyAvatar(Project from, Project to) {Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + from.getId());avatarLock.lock();try {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex 7b20321848..243061733c 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -22,6 +22,7 @@ import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.action.condition.ActionCondition;import io.onedev.server.ci.job.action.condition.ActionConditionLexer;import io.onedev.server.ci.job.action.condition.ActionConditionParser;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;@@ -63,6 +64,15 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {for (RefInfo refInfo: Project.get().getBranches())branchNames.add(GitUtils.ref2branch(refInfo.getRef().getName()));return SuggestionUtils.suggest(branchNames, matchWith);+ } else if (operator == ActionConditionLexer.Is) {+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ Preconditions.checkState(fieldElements.size() == 1);+ String fieldName = ActionCondition.getValue(fieldElements.get(0).getMatchedText());+ JobAware jobAware = getComponent().findParent(JobAware.class);+ Job job = jobAware.getJob();+ ParamSpec paramSpec = job.getParamSpecMap().get(fieldName);+ if (paramSpec != null)+ return SuggestionUtils.suggest(paramSpec.getPossibleValues(), matchWith);}}return null;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 4ec33dcd28..d07c2f9716 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -19,7 +19,7 @@ import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.BuildQueryLexer;@@ -52,10 +52,6 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return projectModel.getObject();}- private CacheManager getCacheManager() {- return OneDev.getInstance(CacheManager.class);- }-@Overrideprotected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {@@ -68,7 +64,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {List<String> fields = new ArrayList<>(BuildConstants.QUERY_FIELDS);- List<String> paramNames = new ArrayList<>(getCacheManager().getBuildParamNames());+ BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);+ List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames());Collections.sort(paramNames);fields.addAll(paramNames);return SuggestionUtils.suggest(fields, matchWith);@@ -104,7 +101,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {return SuggestionUtils.suggestBuilds(project, matchWith);} else {- List<String> paramValues = new ArrayList<>(getCacheManager().getBuildParamValues(fieldName));+ BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);+ List<String> paramValues = new ArrayList<>(buildParamManager.getBuildParamValues(fieldName));Collections.sort(paramValues);List<InputSuggestion> suggestions = SuggestionUtils.suggest(paramValues, matchWith);return !suggestions.isEmpty()? suggestions: null;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.javaindex 9ddcc81eb2..24faf8eaa1 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/NotificationReceiverBehavior.java@@ -14,7 +14,6 @@ import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.ci.job.action.notificationreceiver.NotificationReceiverParser;import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -43,9 +42,8 @@ public class NotificationReceiverBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {- Project project = projectModel.getObject();- if (terminalExpect.findExpectByRule("userCriteria") != null)- return SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ, matchWith);+ if (terminalExpect.findExpectByRule("userCriteria") != null)+ return SuggestionUtils.suggestUsers(matchWith);elsereturn SuggestionUtils.suggestGroups(matchWith);}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.javaindex 9b78147f15..c1dad3d502 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java@@ -3,7 +3,10 @@ package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;+import org.apache.commons.lang3.StringUtils;+import com.google.common.base.Optional;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import io.onedev.commons.codeassist.AntlrUtils;@@ -16,6 +19,7 @@ import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneException;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobAware;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.ci.job.retrycondition.RetryCondition;import io.onedev.server.ci.job.retrycondition.RetryConditionLexer;import io.onedev.server.ci.job.retrycondition.RetryConditionParser;@@ -47,9 +51,23 @@ public class RetryConditionBehavior extends ANTLRAssistBehavior {Job job = jobAware.getJob();fields.addAll(job.getParamSpecMap().keySet());return SuggestionUtils.suggest(fields, matchWith);- } else {- return null;- }+ } else if ("criteriaValue".equals(spec.getLabel())) {+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ Preconditions.checkState(operatorElements.size() == 1);+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());+ int operator = AntlrUtils.getLexerRule(RetryConditionLexer.ruleNames, operatorName);+ if (operator == RetryConditionLexer.Is) {+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ Preconditions.checkState(fieldElements.size() == 1);+ String fieldName = RetryCondition.getValue(fieldElements.get(0).getMatchedText());+ JobAware jobAware = getComponent().findParent(JobAware.class);+ Job job = jobAware.getJob();+ ParamSpec paramSpec = job.getParamSpecMap().get(fieldName);+ if (paramSpec != null)+ return SuggestionUtils.suggest(paramSpec.getPossibleValues(), matchWith);+ }+ }+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex a50950e65c..d2c063f738 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -14,6 +14,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Response;@@ -58,7 +59,7 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {int count = (page+1) * WebConstants.PAGE_SIZE;Project project = projectModel.getObject();if (project != null) {- List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, term, count);+ List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), term, count);new ResponseFiller<>(response).fill(builds, page, WebConstants.PAGE_SIZE);} else {response.setHasMore(false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex ff69150fc2..1a4da265c9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -66,7 +66,7 @@ import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.model.EntityModel;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;@@ -304,8 +304,8 @@ public abstract class BuildListPanel extends Panel {Build build = rowModel.getObject();Long buildId = build.getId();- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildLogPage.class,- BuildLogPage.paramsOf(build, getQueryPosition(cellItem)));+ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,+ BuildDashboardPage.paramsOf(build, getQueryPosition(cellItem)));link.add(new Label("label", new AbstractReadOnlyModel<String>() {@Override@@ -361,8 +361,8 @@ public abstract class BuildListPanel extends Panel {});- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildLogPage.class,- BuildLogPage.paramsOf(build, getQueryPosition(cellItem)));+ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,+ BuildDashboardPage.paramsOf(build, getQueryPosition(cellItem)));link.add(new Label("label", new AbstractReadOnlyModel<String>() {@@ -405,7 +405,7 @@ public abstract class BuildListPanel extends Panel {}});- if (SecurityUtils.canReadCode(getProject().getFacade())) {+ if (SecurityUtils.canReadCode(getProject())) {columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_COMMIT)) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 64b351d029..567c8a6c6e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -38,7 +38,6 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.entity.nav.EntityNavPanel;@@ -115,10 +114,10 @@ public abstract class BuildSidePanel extends Panel {jobLink.add(new Label("label", getBuild().getJobName()));general.add(jobLink);- UserIdent submitter = UserIdent.of(UserFacade.of(getBuild().getSubmitter()), getBuild().getSubmitterName());+ UserIdent submitter = UserIdent.of(getBuild().getSubmitter(), getBuild().getSubmitterName());general.add(new UserIdentPanel("submitter", submitter, UserIdentPanel.Mode.AVATAR_AND_NAME));- UserIdent canceller = UserIdent.of(UserFacade.of(getBuild().getCanceller()), getBuild().getCancellerName());+ UserIdent canceller = UserIdent.of(getBuild().getCanceller(), getBuild().getCancellerName());general.add(new UserIdentPanel("canceller", canceller, UserIdentPanel.Mode.AVATAR_AND_NAME) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.javaindex 83f174e275..08d18e3830 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java@@ -20,7 +20,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.web.component.build.status.BuildStatusIcon;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;@SuppressWarnings("serial")public class SimpleBuildListPanel extends GenericPanel<List<Build>> {@@ -46,7 +46,7 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {Build build = item.getModelObject();Link<Void> buildLink = new BookmarkablePageLink<Void>("build",- BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));Long buildId = build.getId();buildLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 04e56a6705..ecb62617d2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -48,7 +48,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmListener;@@ -104,7 +103,7 @@ public abstract class CodeCommentPanel extends Panel {}));- UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());+ UserIdent userIdent = UserIdent.of(getComment().getUser(), getComment().getUserName());commentContainer.add(new UserIdentPanel("userAvatar", userIdent, Mode.AVATAR));commentContainer.add(new Label("userName", userIdent.getName()));commentContainer.add(new Label("action", "commented"));@@ -247,7 +246,7 @@ public abstract class CodeCommentPanel extends Panel {replyContainer.setMarkupId(reply.getAnchor());replyContainer.add(AttributeAppender.append("name", reply.getAnchor()));- UserIdent userIdent = UserIdent.of(UserFacade.of(reply.getUser()), reply.getUserName());+ UserIdent userIdent = UserIdent.of(reply.getUser(), reply.getUserName());replyContainer.add(new UserIdentPanel("userAvatar", userIdent, Mode.AVATAR));replyContainer.add(new Label("userName", userIdent.getName()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.javaindex e5f9b37b56..69758481ea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java@@ -42,7 +42,7 @@ public class InvalidCodeCommentPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getCodeComment().getProject().getFacade()));+ setVisible(SecurityUtils.canManage(getCodeComment().getProject()));}}.add(new ConfirmOnClick("Really want to delete this code comment?")));diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.javaindex 20aff0ac1b..6768e33a21 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java@@ -19,13 +19,12 @@ import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.component.user.list.UserListLink;import io.onedev.server.web.component.watchstatus.WatchStatusLink;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public abstract class EntityWatchesPanel extends Panel {@@ -81,7 +80,7 @@ public abstract class EntityWatchesPanel extends Panel {@Overrideprotected void populateItem(ListItem<EntityWatch> item) {User user = item.getModelObject().getUser();- item.add(new UserIdentPanel("watcher", UserIdent.of(UserFacade.of(user)), Mode.AVATAR));+ item.add(new UserIdentPanel("watcher", UserIdent.of(user), Mode.AVATAR));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.javaindex d0098215f4..28e3c3ac47 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java@@ -9,26 +9,26 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Group;import io.onedev.server.web.component.select2.ChoiceProvider;-public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<GroupFacade> {+public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<Group> {private static final long serialVersionUID = 1L;@Override- public void toJson(GroupFacade choice, JSONWriter writer) throws JSONException {+ public void toJson(Group choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(choice.getName());}@Override- public Collection<GroupFacade> toChoices(Collection<String> ids) {- List<GroupFacade> groups = Lists.newArrayList();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);+ public Collection<Group> toChoices(Collection<String> ids) {+ List<Group> groups = Lists.newArrayList();+ GroupManager groupManager = OneDev.getInstance(GroupManager.class);for (String each : ids) {Long id = Long.valueOf(each);- groups.add(cacheManager.getGroup(id));+ groups.add(groupManager.load(id));}return groups;diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.javaindex 449d6fe7ce..5b7abe7da2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java@@ -6,7 +6,7 @@ import java.util.List;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;@@ -15,25 +15,25 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {private static final long serialVersionUID = 1L;- private final List<GroupFacade> choices;+ private final List<Group> choices;- public GroupChoiceProvider(List<GroupFacade> choices) {+ public GroupChoiceProvider(List<Group> choices) {this.choices = new ArrayList<>(choices);- this.choices.sort(Comparator.comparing(GroupFacade::getName));+ this.choices.sort(Comparator.comparing(Group::getName));}@Override- public void query(String term, int page, Response<GroupFacade> response) {- List<GroupFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<GroupFacade>() {+ public void query(String term, int page, Response<Group> response) {+ List<Group> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<Group>() {@Override- public double getMatchScore(GroupFacade object) {+ public double getMatchScore(Group object) {return MatchScoreUtils.getMatchScore(object.getName(), term);}});- new ResponseFiller<GroupFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<Group>(response).fill(matched, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.javaindex 903039de89..3e7770c3e4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java@@ -6,13 +6,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.component.select2.Select2MultiChoice;@SuppressWarnings("serial")-public class GroupMultiChoice extends Select2MultiChoice<GroupFacade> {+public class GroupMultiChoice extends Select2MultiChoice<Group> {- public GroupMultiChoice(String id, IModel<Collection<GroupFacade>> groupsModel,+ public GroupMultiChoice(String id, IModel<Collection<Group>> groupsModel,AbstractGroupChoiceProvider choiceProvider) {super(id, groupsModel, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.javaindex c5cd875ee2..8199aeaf76 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java@@ -4,13 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.model.Group;import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class GroupSingleChoice extends Select2Choice<GroupFacade> {+public class GroupSingleChoice extends Select2Choice<Group> {- public GroupSingleChoice(String id, IModel<GroupFacade> groupModel,+ public GroupSingleChoice(String id, IModel<Group> groupModel,AbstractGroupChoiceProvider choiceProvider) {super(id, groupModel, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.javaindex 73367cfa43..9b18f05956 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java@@ -8,9 +8,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.IssueChange;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")public class IssueChangeActivity implements IssueActivity {@@ -49,7 +48,7 @@ public class IssueChangeActivity implements IssueActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getChange().getUser()), getChange().getUserName());+ return UserIdent.of(getChange().getUser(), getChange().getUserName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.javaindex aead258b01..784a037922 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java@@ -6,7 +6,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.IssueChange;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.SystemUserIdent;import io.onedev.server.util.userident.UserIdent;@@ -22,7 +21,7 @@ class IssueChangePanel extends GenericPanel<IssueChange> {super.onInitialize();IssueChange change = getModelObject();- UserIdent userIdent = UserIdent.of(UserFacade.of(change.getUser()), change.getUserName());+ UserIdent userIdent = UserIdent.of(change.getUser(), change.getUserName());add(new Label("user", userIdent.getName()).setVisible(!(userIdent instanceof SystemUserIdent)));add(new Label("description", change.getData().getDescription()));add(new Label("age", DateUtils.formatAge(change.getDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.javaindex d96780d827..efe26a8816 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java@@ -9,9 +9,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.model.IssueComment;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")public class IssueCommentedActivity implements IssueActivity {@@ -61,7 +60,7 @@ public class IssueCommentedActivity implements IssueActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());+ return UserIdent.of(getComment().getUser(), getComment().getUserName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex 2c409fe483..f0ce1cd9a0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -11,7 +11,6 @@ import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;@@ -33,7 +32,7 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {protected void onInitialize() {super.onInitialize();- UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());+ UserIdent userIdent = UserIdent.of(getComment().getUser(), getComment().getUserName());add(new Label("user", userIdent.getName()));add(new Label("age", DateUtils.formatAge(getComment().getDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.javaindex ba4a459aeb..f5939bd0f2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java@@ -8,9 +8,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")public class IssueOpenedActivity implements IssueActivity {@@ -49,7 +48,7 @@ public class IssueOpenedActivity implements IssueActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getIssue().getSubmitter()), getIssue().getSubmitterName());+ return UserIdent.of(getIssue().getSubmitter(), getIssue().getSubmitterName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex 22cbc80af2..50516dac3c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -11,7 +11,6 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;@@ -31,7 +30,7 @@ class IssueOpenedPanel extends GenericPanel<Issue> {super.onInitialize();Issue issue = getIssue();- add(new Label("user", UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName()).getName()));+ add(new Label("user", UserIdent.of(issue.getSubmitter(), issue.getSubmitterName()).getName()));add(new Label("age", DateUtils.formatAge(issue.getSubmitDate())));add(new ProjectCommentPanel("body") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javaindex cf746c4e7e..71997c19b5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -70,7 +70,7 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canReadCode(getIssue().getProject().getFacade())+ setVisible(SecurityUtils.canReadCode(getIssue().getProject())&& !getIssue().getCommits().isEmpty());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex bc54b31a8b..14472a8ca1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -34,13 +34,12 @@ import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -69,7 +68,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {protected void populateItem(ListItem<String> item) {String value = item.getModelObject();if (getField().getType().equals(FieldSpec.USER)) {- UserIdent userIdent = UserIdent.of(UserFacade.of(OneDev.getInstance(UserManager.class).findByName(value)), value);+ UserIdent userIdent = UserIdent.of(OneDev.getInstance(UserManager.class).findByName(value), value);item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));} else if (getField().getType().equals(FieldSpec.ISSUE)) {Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));@@ -86,7 +85,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));if (build != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));link.add(new Label("label", "#" + build.getNumber()));linkFrag.add(link);item.add(linkFrag);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex fcff1e7f5b..f06700188d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -44,7 +44,6 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;@@ -146,7 +145,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {List<String> customFieldNames = new ArrayList<>();for (FieldSpec field: getIssueSetting().getFieldSpecs()) {- if (UserMatcher.fromString(field.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))+ if (SecurityUtils.canEditIssueField(getProject(), field.getName()))customFieldNames.add(field.getName());}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.javaindex 85bbebd919..53edbf6822 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@@ -58,7 +58,6 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.IssueQueryBehavior;@@ -355,7 +354,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});@@ -463,7 +462,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWriteCode(getProject().getFacade()) && issuesTable.getItemCount() != 0);+ setVisible(SecurityUtils.canWriteCode(getProject()) && issuesTable.getItemCount() != 0);}});@@ -516,7 +515,7 @@ public abstract class IssueListPanel extends Panel {}});- if (SecurityUtils.canWriteCode(getProject().getFacade())) {+ if (SecurityUtils.canWriteCode(getProject())) {columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {@Override@@ -546,7 +545,7 @@ public abstract class IssueListPanel extends Panel {fragment.add(new IssueStateLabel("state", rowModel));- UserIdent submitterIdent = UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName());+ UserIdent submitterIdent = UserIdent.of(issue.getSubmitter(), issue.getSubmitterName());fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));fragment.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex c965f679bb..81cfe28dc2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -96,7 +96,7 @@ public abstract class IssueOperationsPanel extends Panel {for (TransitionSpec transition: transitions) {if (transition.canTransite(getIssue()) && transition.getTrigger() instanceof PressButtonTrigger) {PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();- if (trigger.isAuthorized()) {+ if (trigger.isAuthorized(getIssue().getProject())) {AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {private String comment;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.javaindex 04b1df510a..35d611c823 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java@@ -96,7 +96,7 @@ public class IssuePullRequestsPanel extends GenericPanel<Issue> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canReadCode(getIssue().getProject().getFacade())+ setVisible(SecurityUtils.canReadCode(getIssue().getProject())&& !requestsModel.getObject().isEmpty());}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.javaindex b5e7a55546..92fc1b0d55 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@@ -55,7 +55,6 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;import io.onedev.server.web.component.entity.nav.EntityNavPanel;@@ -199,7 +198,7 @@ public abstract class IssueSidePanel extends Panel {super.onConfigure();User user = SecurityUtils.getUser();String initialState = OneDev.getInstance(SettingManager.class).getIssueSetting().getInitialStateSpec().getName();- setVisible(SecurityUtils.canWriteCode(getIssue().getProject().getFacade())+ setVisible(SecurityUtils.canWriteCode(getIssue().getProject())|| user != null && user.equals(getIssue().getSubmitter()) && getIssue().getState().equals(initialState));}@@ -354,7 +353,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWriteCode(getIssue().getProject().getFacade()));+ setVisible(SecurityUtils.canWriteCode(getIssue().getProject()));}});@@ -403,7 +402,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected void populateItem(ListItem<IssueVote> item) {User user = item.getModelObject().getUser();- item.add(new UserIdentPanel("voter", UserIdent.of(UserFacade.of(user)), Mode.AVATAR));+ item.add(new UserIdentPanel("voter", UserIdent.of(user), Mode.AVATAR));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.javaindex cecc04620b..5a76b36e05 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java@@ -35,7 +35,7 @@ public class JobDefLink extends BookmarkablePageLink<Void> {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(SecurityUtils.canReadCode(projectModel.getObject().getFacade()));+ setEnabled(SecurityUtils.canReadCode(projectModel.getObject()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 1860eb351d..b135bcbf2c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -28,6 +28,7 @@ import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.model.EntityModel;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@SuppressWarnings("serial")@@ -72,7 +73,7 @@ public class RunJobLink extends AjaxLink<Void> {job, bean, job.getParamSpecMap().keySet());Build build = OneDev.getInstance(JobManager.class).submit(getProject(),commitId, job.getName(), paramMap, SecurityUtils.getUser());- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));}@Override@@ -101,7 +102,7 @@ public class RunJobLink extends AjaxLink<Void> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWriteCode(getProject().getFacade()));+ setVisible(SecurityUtils.canRunJob(getProject(), jobName));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 7f9a57cb07..72e92b2850 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -54,7 +54,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -277,7 +277,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);List<Map<String, String>> userList = new ArrayList<>();- for (UserFacade user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {+ for (User user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {Map<String, String> userMap = new HashMap<>();userMap.put("name", user.getName());if (user.getFullName() != null)diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 5c453b6cb4..75b641e1ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -181,7 +181,7 @@ public class MarkdownViewer extends GenericPanel<String> {case "user":User user = OneDev.getInstance(UserManager.class).get(Long.valueOf(referenceId));if (user != null) {- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(UserIdent.of(user.getFacade()));+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(UserIdent.of(user));String script = String.format("onedev.server.markdown.renderUserTooltip('%s', '%s', '%s')",JavaScriptEscape.escapeJavaScript(avatarUrl),JavaScriptEscape.escapeJavaScript(user.getDisplayName()),diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.javaindex bf404f4ab2..fcabbf511a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java@@ -2,10 +2,10 @@ package io.onedev.server.web.component.markdown;import java.util.List;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;public interface UserMentionSupport {- List<UserFacade> findUsers(String query, int count);+ List<User> findUsers(String query, int count);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.javadeleted file mode 100644index 9dddb2d450..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.component.project;--import org.apache.wicket.Page;--import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;--public class ProjectLink extends ViewStateAwarePageLink<Void> {-- private static final long serialVersionUID = 1L;-- public ProjectLink(String id, Project project) {- super(id, getPageClass(project), ProjectPage.paramsOf(project));- }-- private static Class<? extends Page> getPageClass(Project project) {- if (SecurityUtils.canReadCode(project.getFacade()))- return ProjectBlobPage.class;- else- return IssueListPage.class;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.javaindex 0235722272..20dfbcc3b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java@@ -17,7 +17,7 @@ public class ProjectAvatar extends WebComponent {public ProjectAvatar(String id, Project project) {super(id);- url = getAvatarManager().getAvatarUrl(project.getFacade());+ url = getAvatarManager().getAvatarUrl(project);}private AvatarManager getAvatarManager() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.javaindex 9d31ac0a54..44b55475cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java@@ -28,7 +28,7 @@ public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);params = ProjectPage.paramsOf(project);- url = avatarManager.getAvatarUrl(project.getFacade());+ url = avatarManager.getAvatarUrl(project);tooltip = project.getName();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.javaindex 3cc639825b..9e0518dd58 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java@@ -1,39 +1,32 @@package io.onedev.server.web.component.project.choice;import java.util.Collection;-import java.util.List;+import java.util.stream.Collectors;-import org.apache.commons.text.StringEscapeUtils;import org.json.JSONException;import org.json.JSONWriter;--import com.google.common.collect.Lists;+import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;import io.onedev.server.web.component.select2.ChoiceProvider;@SuppressWarnings("serial")-public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<ProjectFacade> {+public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Project> {@Override- public void toJson(ProjectFacade choice, JSONWriter writer) throws JSONException {+ public void toJson(Project choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId());writer.key("name");- writer.value(StringEscapeUtils.escapeHtml4(choice.getName()));+ writer.value(HtmlEscape.escapeHtml5(choice.getName()));}@Override- public Collection<ProjectFacade> toChoices(Collection<String> ids) {- List<ProjectFacade> list = Lists.newArrayList();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- for (String each : ids) {- Long id = Long.valueOf(each);- list.add(cacheManager.getProject(id));- }-- return list;+ public Collection<Project> toChoices(Collection<String> ids) {+ return ids.stream()+ .map(it->OneDev.getInstance(ProjectManager.class).load(Long.valueOf(it)))+ .collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.javanew file mode 100644index 0000000000..09610e1185--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java@@ -0,0 +1,39 @@+package io.onedev.server.web.component.project.choice;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;++import io.onedev.commons.utils.matchscore.MatchScoreProvider;+import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import io.onedev.server.model.Project;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.ResponseFiller;++public class ProjectChoiceProvider extends AbstractProjectChoiceProvider {++ private static final long serialVersionUID = 1L;++ private final List<Project> choices;++ public ProjectChoiceProvider(List<Project> choices) {+ this.choices = new ArrayList<>(choices);+ this.choices.sort(Comparator.comparing(Project::getName));+ }++ @Override+ public void query(String term, int page, Response<Project> response) {+ List<Project> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<Project>() {++ @Override+ public double getMatchScore(Project object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ });++ new ResponseFiller<Project>(response).fill(matched, page, WebConstants.PAGE_SIZE);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.javaindex 922219f17f..403a49f60f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java@@ -6,14 +6,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.model.Project;import io.onedev.server.web.component.select2.Select2MultiChoice;-public class ProjectMultiChoice extends Select2MultiChoice<ProjectFacade> {+public class ProjectMultiChoice extends Select2MultiChoice<Project> {private static final long serialVersionUID = 1L;- public ProjectMultiChoice(String id, IModel<Collection<ProjectFacade>> model, AbstractProjectChoiceProvider choiceProvider) {+ public ProjectMultiChoice(String id, IModel<Collection<Project>> model, AbstractProjectChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.javaindex 66cac5c764..dc31d94688 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java@@ -4,13 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.model.Project;import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class ProjectSingleChoice extends Select2Choice<ProjectFacade> {+public class ProjectSingleChoice extends Select2Choice<Project> {- public ProjectSingleChoice(String id, IModel<ProjectFacade> model, AbstractProjectChoiceProvider choiceProvider) {+ public ProjectSingleChoice(String id, IModel<Project> model, AbstractProjectChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex f06b316bbe..97b1bf9ad3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.project.comment;-import java.util.ArrayList;import java.util.Comparator;import java.util.List;@@ -12,13 +11,13 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.model.User;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.component.markdown.UserMentionSupport;@@ -35,15 +34,14 @@ public abstract class CommentInput extends MarkdownEditor {return new UserMentionSupport() {@Override- public List<UserFacade> findUsers(String query, int count) {- List<UserFacade> users = new ArrayList<>(- SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.ISSUE_READ));- users.sort(Comparator.comparing(UserFacade::getDisplayName));+ public List<User> findUsers(String query, int count) {+ List<User> users = OneDev.getInstance(UserManager.class).query();+ users.sort(Comparator.comparing(User::getDisplayName));- users = MatchScoreUtils.filterAndSort(users, new MatchScoreProvider<UserFacade>() {+ users = MatchScoreUtils.filterAndSort(users, new MatchScoreProvider<User>() {@Override- public double getMatchScore(UserFacade object) {+ public double getMatchScore(User object) {return object.getMatchScore(query);}@@ -80,7 +78,7 @@ public abstract class CommentInput extends MarkdownEditor {public List<Build> findBuilds(Project project, String query, int count) {if (project == null)project = getProject();- return OneDev.getInstance(BuildManager.class).query(project, query, count);+ return OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), query, count);}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex d50011f6a7..af65770002 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -3,7 +3,4 @@<wicket:fragment wicket:id="projectFrag"><a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a></wicket:fragment>- <wicket:fragment wicket:id="commitMessageFrag">- <a wicket:id="link"><span wicket:id="message"></span></a>- </wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 9af271c3e4..760b2c8e6c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -16,7 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvidimport org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;@@ -24,32 +23,30 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;-import io.onedev.server.web.component.project.ProjectLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectListPanel extends Panel {- private final IModel<List<ProjectFacade>> projectsModel;+ private final IModel<List<Project>> projectsModel;private final PagingHistorySupport pagingHistorySupport;- public ProjectListPanel(String id, IModel<List<ProjectFacade>> projectsModel,+ public ProjectListPanel(String id, IModel<List<Project>> projectsModel,@Nullable PagingHistorySupport pagingHistorySupport) {super(id);this.projectsModel = projectsModel;@@ -60,16 +57,17 @@ public class ProjectListPanel extends Panel {protected void onInitialize() {super.onInitialize();- List<IColumn<ProjectFacade, Void>> columns = new ArrayList<>();+ List<IColumn<Project, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Project")) {+ columns.add(new AbstractColumn<Project, Void>(Model.of("Project")) {@Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- Link<Void> link = new ProjectLink("link", project);+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(project));link.add(new ProjectAvatar("avatar", project));link.add(new Label("name", project.getName()));fragment.add(link);@@ -83,11 +81,11 @@ public class ProjectListPanel extends Panel {});- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Author")) {+ columns.add(new AbstractColumn<Project, Void>(Model.of("Last Author")) {@Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());RevCommit lastCommit = project.getLastCommit();if (lastCommit != null) {@@ -105,23 +103,17 @@ public class ProjectListPanel extends Panel {});- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Message")) {+ columns.add(new AbstractColumn<Project, Void>(Model.of("Last Commit Message")) {@Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());RevCommit lastCommit = project.getLastCommit();- if (lastCommit != null) {- Fragment fragment = new Fragment(componentId, "commitMessageFrag", ProjectListPanel.this);- PageParameters params = CommitDetailPage.paramsOf(project, lastCommit.name());- Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class, params);- link.add(new Label("message", lastCommit.getShortMessage()));- fragment.add(link);- cellItem.add(fragment);- } else {+ if (lastCommit != null)+ cellItem.add(new Label(componentId, lastCommit.getShortMessage()));+ elsecellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));- }}@Override@@ -131,11 +123,11 @@ public class ProjectListPanel extends Panel {});- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Date")) {+ columns.add(new AbstractColumn<Project, Void>(Model.of("Last Commit Date")) {@Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {+ public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,+ IModel<Project> rowModel) {Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId());RevCommit lastCommit = project.getLastCommit();if (lastCommit != null) {@@ -152,11 +144,11 @@ public class ProjectListPanel extends Panel {});- SortableDataProvider<ProjectFacade, Void> dataProvider = new LoadableDetachableDataProvider<ProjectFacade, Void>() {+ SortableDataProvider<Project, Void> dataProvider = new LoadableDetachableDataProvider<Project, Void>() {@Override- public Iterator<? extends ProjectFacade> iterator(long first, long count) {- List<ProjectFacade> projects;+ public Iterator<? extends Project> iterator(long first, long count) {+ List<Project> projects;projects = projectsModel.getObject();if (first + count <= projects.size())return projects.subList((int)first, (int)(first+count)).iterator();@@ -170,13 +162,13 @@ public class ProjectListPanel extends Panel {}@Override- public IModel<ProjectFacade> model(ProjectFacade object) {+ public IModel<Project> model(Project object) {return Model.of(object);}};- DataTable<ProjectFacade, Void> projectsTable =- new DataTable<ProjectFacade, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);+ DataTable<Project, Void> projectsTable =+ new DataTable<Project, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);if (pagingHistorySupport != null)projectsTable.setCurrentPage(pagingHistorySupport.getCurrentPage());diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.htmldeleted file mode 100644index d3f4557dc8..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.html+++ /dev/null@@ -1,20 +0,0 @@-<wicket:panel>- <div class="privilege selection">- <a wicket:id="issueRead">- <div class="title">Issue Read</div>- <div class="description">Able to read issues of the project</div>- </a>- <a wicket:id="codeRead">- <div class="title">Code Read</div>- <div class="description">Has issue read privilege, and can also pull/read code of the project</div>- </a>- <a wicket:id="codeWrite">- <div class="title">Code Write</div>- <div class="description">Has code write privilege, and can also push/write code of the project</div>- </a>- <a wicket:id="administration">- <div class="title">Administration</div>- <div class="description">Has code write privilege, and can also administrate the project</div>- </a>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.javadeleted file mode 100644index ccce19132e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/selection/PrivilegeSelectionPanel.java+++ /dev/null@@ -1,89 +0,0 @@-package io.onedev.server.web.component.project.privilege.selection;--import javax.annotation.Nullable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.security.permission.ProjectPrivilege;--@SuppressWarnings("serial")-public abstract class PrivilegeSelectionPanel extends Panel {-- private final ProjectPrivilege currentPrivilege;-- public PrivilegeSelectionPanel(String id, @Nullable ProjectPrivilege currentPrivilege) {- super(id);- this.currentPrivilege = currentPrivilege;- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new AjaxLink<Void>("issueRead") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.ISSUE_READ)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.ISSUE_READ);- }-- });- add(new AjaxLink<Void>("codeRead") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.CODE_READ)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.CODE_READ);- }-- });- add(new AjaxLink<Void>("codeWrite") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.CODE_WRITE)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.CODE_WRITE);- }-- });- add(new AjaxLink<Void>("administration") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (currentPrivilege == ProjectPrivilege.ADMINISTRATION)- add(AttributeAppender.append("class", "active"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, ProjectPrivilege.ADMINISTRATION);- }-- });- }-- protected abstract void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege);--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.javadeleted file mode 100644index 39d11dcc22..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourceCssResourceReference.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.component.project.privilege.source;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--@SuppressWarnings("serial")-public class PrivilegeSourceCssResourceReference extends BaseDependentCssResourceReference {-- public PrivilegeSourceCssResourceReference() {- super(PrivilegeSourceCssResourceReference.class, "privilege-source.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.htmldeleted file mode 100644index b958f3cec8..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="privilege-source">- <b wicket:id="user"></b> has permission <b wicket:id="privilege"></b> on project <b wicket:id="project"></b> as:- <ul>- <li wicket:id="userIsRoot" class="user-is-root">User is root</li>- <li wicket:id="projectHasDefaultPrivilege" class="project-has-default-privilege"></li>- <wicket:container wicket:id="groups">- <li class="user-is-member-of-group">The user is a member of group <b wicket:id="group"></b></li>- </wicket:container>- </ul>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.javadeleted file mode 100644index 61fbb7712f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java+++ /dev/null@@ -1,127 +0,0 @@-package io.onedev.server.web.component.project.privilege.source;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;--import io.onedev.commons.utils.WordUtils;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Membership;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.permission.DefaultPrivilege;-import io.onedev.server.security.permission.ProjectPrivilege;--@SuppressWarnings("serial")-public class PrivilegeSourcePanel extends Panel {-- private final IModel<User> userModel;-- private final IModel<Project> projectModel;-- private final ProjectPrivilege privilege;-- public PrivilegeSourcePanel(String id, User user, Project project, ProjectPrivilege privilege) {- super(id);-- Long userId = user.getId();- userModel = new LoadableDetachableModel<User>() {-- @Override- protected User load() {- return OneDev.getInstance(UserManager.class).load(userId);- }-- };-- Long projectId = project.getId();- projectModel = new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- return OneDev.getInstance(ProjectManager.class).load(projectId);- }-- };-- this.privilege = privilege;- }-- @Override- public void onInitialize() {- super.onInitialize();-- User user = userModel.getObject();- Project project = projectModel.getObject();- add(new Label("user", user.getDisplayName()));- add(new Label("project", project.getName()));- add(new Label("privilege", WordUtils.toWords(privilege.name())));-- add(new WebMarkupContainer("userIsRoot").setVisible(user.isRoot()));- DefaultPrivilege defaultPrivilege = project.getDefaultPrivilege();- if (defaultPrivilege != null && defaultPrivilege.getProjectPrivilege().implies(privilege)) {- add(new Label("projectHasDefaultPrivilege",- "Project has default permission \"" + WordUtils.toWords(defaultPrivilege.getProjectPrivilege().name()) + "\""));- } else {- add(new WebMarkupContainer("projectHasDefaultPrivilege").setVisible(false));- }- add(new ListView<Group>("groups", new LoadableDetachableModel<List<Group>>() {-- @Override- protected List<Group> load() {- List<Group> groups = new ArrayList<>();- for (Membership membership: user.getMemberships()) {- if (membership.getGroup().isAdministrator()) {- groups.add(membership.getGroup());- } else {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {- if (authorization.getProject().equals(project)- && authorization.getPrivilege() == privilege) {- groups.add(membership.getGroup());- break;- }- }- }- }- return groups;- }-- }) {-- @Override- protected void populateItem(ListItem<Group> item) {- item.add(new Label("group", item.getModelObject().getName()));- }-- });- }-- @Override- protected void onDetach() {- userModel.detach();- projectModel.detach();-- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new PrivilegeSourceCssResourceReference()));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/privilege-source.css b/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/privilege-source.cssdeleted file mode 100644index 4ad64569e0..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/privilege/source/privilege-source.css+++ /dev/null@@ -1,12 +0,0 @@-.privilege-source {- padding: 8px;-}-.privilege-source b {- color: #444;-}-.privilege-source a {- font-weight: bold;-}-.privilege-source ul {- margin-bottom: 0;-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.javaindex 2cf246aed7..44296c0f0d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java@@ -12,7 +12,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;import io.onedev.server.web.component.user.ident.UserIdentPanel;@@ -39,7 +38,7 @@ public class PullRequestSummaryPanel extends GenericPanel<PullRequest> {link.add(new Label("label", request.getTitle()));add(link);add(new RequestStatusLabel("status", getModel()));- UserIdent submitterIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());+ UserIdent submitterIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));add(new Label("comments", request.getCommentCount()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex c534f5b2fa..7b49b779f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -29,9 +29,9 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.ConfirmListener;@@ -114,7 +114,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {@Overrideprotected void populateItem(ListItem<PullRequestReview> item) {PullRequestReview review = item.getModelObject();- item.add(new UserIdentPanel("user", UserIdent.of(UserFacade.of(review.getUser())), Mode.AVATAR_AND_NAME));+ item.add(new UserIdentPanel("user", UserIdent.of(review.getUser()), Mode.AVATAR_AND_NAME));PullRequest request = getPullRequest();@@ -215,7 +215,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {}@Override- protected void onSelect(AjaxRequestTarget target, UserFacade user) {+ protected void onSelect(AjaxRequestTarget target, User user) {super.onSelect(target, user);send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.javaindex 3199516190..9f574e160e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java@@ -16,7 +16,6 @@ import io.onedev.commons.codeassist.grammar.RuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.model.Project;-import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.reviewrequirement.ReviewRequirementParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -46,9 +45,8 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {- Project project = projectModel.getObject();if (terminalExpect.findExpectByRule("userCriteria") != null)- return SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ, matchWith);+ return SuggestionUtils.suggestUsers(matchWith);elsereturn SuggestionUtils.suggestGroups(matchWith);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.javaindex d30c1c1b70..70ae28bf04 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java@@ -11,12 +11,11 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;@SuppressWarnings("serial")-public class ReviewerChoice extends SelectToAddChoice<UserFacade> {+public class ReviewerChoice extends SelectToAddChoice<User> {private final IModel<PullRequest> requestModel;@@ -51,7 +50,7 @@ public class ReviewerChoice extends SelectToAddChoice<UserFacade> {}@Override- protected void onSelect(AjaxRequestTarget target, UserFacade userFacade) {+ protected void onSelect(AjaxRequestTarget target, User userFacade) {PullRequest request = requestModel.getObject();User user = OneDev.getInstance(UserManager.class).load(userFacade.getId());PullRequestReview review = request.getReview(user);diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.javaindex 2a538e62e0..a09b7222c9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java@@ -9,11 +9,11 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;@@ -29,23 +29,22 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {}@Override- public void query(String term, int page, Response<UserFacade> response) {+ public void query(String term, int page, Response<User> response) {PullRequest request = requestModel.getObject();- Collection<UserFacade> users = SecurityUtils.getAuthorizedUsers(request.getTargetProject().getFacade(),- ProjectPrivilege.CODE_READ);+ Collection<User> users = OneDev.getInstance(UserManager.class).query();for (PullRequestReview review: request.getReviews()) {if (review.getExcludeDate() == null && review.getResult() == null)- users.remove(review.getUser().getFacade());+ users.remove(review.getUser());}- List<UserFacade> reviewers = new ArrayList<>(users);+ List<User> reviewers = new ArrayList<>(users);- reviewers.sort(Comparator.comparing(UserFacade::getDisplayName));+ reviewers.sort(Comparator.comparing(User::getDisplayName));- reviewers = MatchScoreUtils.filterAndSort(reviewers, new MatchScoreProvider<UserFacade>() {+ reviewers = MatchScoreUtils.filterAndSort(reviewers, new MatchScoreProvider<User>() {@Override- public double getMatchScore(UserFacade object) {+ public double getMatchScore(User object) {return object.getMatchScore(term);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.javaindex 16637ce5f5..843df22012 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java@@ -12,7 +12,6 @@ import org.apache.wicket.model.PropertyModel;import io.onedev.server.OneDev;import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.avatarupload.AvatarFileSelected;@@ -40,19 +39,19 @@ public class AvatarEditPanel extends GenericPanel<User> {protected void onInitialize() {super.onInitialize();- add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(getUser()))));+ add(new UserAvatar("avatar", UserIdent.of(getUser())));add(new Link<Void>("useDefault") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAvatarManager().getUploaded(getUser().getFacade()).exists());+ setVisible(getAvatarManager().getUploaded(getUser()).exists());}@Overridepublic void onClick() {- getAvatarManager().useAvatar(getUser().getFacade(), null);+ getAvatarManager().useAvatar(getUser(), null);setResponsePage(getPage().getClass(), getPage().getPageParameters());}@@ -67,7 +66,7 @@ public class AvatarEditPanel extends GenericPanel<User> {protected void onSubmit() {super.onSubmit();AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);- avatarManager.useAvatar(getUser().getFacade(), uploadedAvatarData);+ avatarManager.useAvatar(getUser(), uploadedAvatarData);setResponsePage(getPage().getClass(), getPage().getPageParameters());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.javaindex 6bcefaef9a..c41f07d982 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java@@ -10,30 +10,30 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.select2.ChoiceProvider;-public abstract class AbstractUserChoiceProvider extends ChoiceProvider<UserFacade> {+public abstract class AbstractUserChoiceProvider extends ChoiceProvider<User> {private static final long serialVersionUID = 1L;@Override- public void toJson(UserFacade choice, JSONWriter writer) throws JSONException {+ public void toJson(User choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getDisplayName()));String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(UserIdent.of(choice));writer.key("avatar").value(avatarUrl);}@Override- public Collection<UserFacade> toChoices(Collection<String> ids) {- List<UserFacade> users = Lists.newArrayList();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);+ public Collection<User> toChoices(Collection<String> ids) {+ List<User> users = Lists.newArrayList();+ UserManager userManager = OneDev.getInstance(UserManager.class);for (String each : ids) {Long id = Long.valueOf(each);- users.add(cacheManager.getUser(id));+ users.add(userManager.load(id));}return users;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.javaindex 2b175e7f25..c9da11453d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java@@ -6,7 +6,7 @@ import java.util.List;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;@@ -15,25 +15,25 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;- private final List<UserFacade> choices;+ private final List<User> choices;- public UserChoiceProvider(List<UserFacade> choices) {+ public UserChoiceProvider(List<User> choices) {this.choices = new ArrayList<>(choices);- this.choices.sort(Comparator.comparing(UserFacade::getDisplayName));+ this.choices.sort(Comparator.comparing(User::getDisplayName));}@Override- public void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<UserFacade>() {+ public void query(String term, int page, Response<User> response) {+ List<User> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<User>() {@Override- public double getMatchScore(UserFacade object) {+ public double getMatchScore(User object) {return object.getMatchScore(term);}});- new ResponseFiller<UserFacade>(response).fill(matched, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<User>(response).fill(matched, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.javaindex 756b5c6ef6..01caa4f2f8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java@@ -6,14 +6,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.component.select2.Select2MultiChoice;-public class UserMultiChoice extends Select2MultiChoice<UserFacade> {+public class UserMultiChoice extends Select2MultiChoice<User> {private static final long serialVersionUID = 1L;- public UserMultiChoice(String id, IModel<Collection<UserFacade>> model, AbstractUserChoiceProvider choiceProvider) {+ public UserMultiChoice(String id, IModel<Collection<User>> model, AbstractUserChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.javaindex ea543fc484..ff4e51f4dc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java@@ -4,13 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class UserSingleChoice extends Select2Choice<UserFacade> {+public class UserSingleChoice extends Select2Choice<User> {- public UserSingleChoice(String id, IModel<UserFacade> model, AbstractUserChoiceProvider choiceProvider) {+ public UserSingleChoice(String id, IModel<User> model, AbstractUserChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.javaindex 7bf3f3c51f..9b7cd64b4f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/UserListPanel.java@@ -9,10 +9,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.user.UserProfilePage;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")abstract class UserListPanel extends Panel {@@ -29,7 +28,7 @@ abstract class UserListPanel extends Panel {for (User user: getUsers()) {Link<Void> link = new BookmarkablePageLink<Void>(usersView.newChildId(),UserProfilePage.class, UserProfilePage.paramsOf(user));- link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));+ link.add(new UserAvatar("avatar", UserIdent.of(user)));link.add(new Label("name", user.getDisplayName()));usersView.add(link);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.javaindex 357b4e5ab7..875a21f802 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java@@ -60,7 +60,7 @@ public class ArchiveDownloadResource extends AbstractResource {throw new IllegalArgumentException("format parameter should be specified either zip or tar.gz");}- if (!SecurityUtils.canReadCode(project.getFacade()))+ if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();ResourceResponse response = new ResourceResponse();diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.javaindex acb79c8de3..1ec0ca8a27 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java@@ -54,9 +54,6 @@ public class ArtifactDownloadResource extends AbstractResource {if (project == null)throw new EntityNotFoundException("Unable to find project: " + projectName);- if (!SecurityUtils.canReadCode(project.getFacade()))- throw new UnauthorizedException();-Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();if (buildNumber == null)@@ -70,6 +67,9 @@ public class ArtifactDownloadResource extends AbstractResource {throw new EntityNotFoundException(message);}+ if (!SecurityUtils.canAccess(build))+ throw new UnauthorizedException();+List<String> pathSegments = new ArrayList<>();String pathSegment = params.get(PARAM_PATH).toString();if (pathSegment.length() != 0)diff --git a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.javaindex e0964f5e5c..6c3ed30cea 100644--- a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java@@ -19,7 +19,6 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.storage.AttachmentStorageManager;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.ProjectFacade;public class AttachmentDownloadResource extends AbstractResource {@@ -44,7 +43,7 @@ public class AttachmentDownloadResource extends AbstractResource {if (project == null)throw new EntityNotFoundException("Unable to find project: " + projectName);- if (!SecurityUtils.canReadCode(project.getFacade()))+ if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();String uuid = params.get(PARAM_UUID).toString();@@ -55,7 +54,7 @@ public class AttachmentDownloadResource extends AbstractResource {if (StringUtils.isBlank(attachment))throw new IllegalArgumentException("attachment parameter has to be specified");- File attachmentFile = new File(getAttachmentDir(project.getFacade(), uuid), attachment);+ File attachmentFile = new File(getAttachmentDir(project, uuid), attachment);if (!attachmentFile.exists())throw new RuntimeException("Attachment not found: " + attachment);@@ -83,11 +82,11 @@ public class AttachmentDownloadResource extends AbstractResource {return response;}- private static File getAttachmentDir(ProjectFacade project, String uuid) {+ private static File getAttachmentDir(Project project, String uuid) {return OneDev.getInstance(AttachmentStorageManager.class).getAttachmentStorage(project, uuid);}- public static PageParameters paramsOf(ProjectFacade project, String attachmentStorageUUID, String attachmentName) {+ public static PageParameters paramsOf(Project project, String attachmentStorageUUID, String attachmentName) {PageParameters params = new PageParameters();params.set(PARAM_PROJECT, project.getName());params.set(PARAM_UUID, attachmentStorageUUID);diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.javaindex 6865cbfe9d..3c15958de3 100644--- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java@@ -45,9 +45,6 @@ public class BuildLogDownloadResource extends AbstractResource {if (project == null)throw new EntityNotFoundException("Unable to find project: " + projectName);- if (!SecurityUtils.canReadCode(project.getFacade()))- throw new UnauthorizedException();-Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();if (buildNumber == null)@@ -61,6 +58,9 @@ public class BuildLogDownloadResource extends AbstractResource {throw new EntityNotFoundException(message);}+ if (!SecurityUtils.canAccessLog(build))+ throw new UnauthorizedException();+ResourceResponse response = new ResourceResponse();response.setContentType(MimeTypes.OCTET_STREAM);diff --git a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javaindex 252a22d75f..ab718bd082 100644--- a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java@@ -74,7 +74,7 @@ public class RawBlobDownloadResource extends AbstractResource {if (StringUtils.isBlank(path))throw new IllegalArgumentException("path parameter has to be specified");- if (!SecurityUtils.canReadCode(project.getFacade()))+ if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();final Blob blob = project.getBlob(new BlobIdent(revision, path, 0), true);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex a3abb79ed1..cb13d0ffb7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable;import java.io.Serializable;+import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;@@ -52,6 +53,8 @@ public class BeanEditor extends ValueEditor<Serializable> {private RepeatingView groupsView;+ private Map<String, ComponentContext> componentContexts = new HashMap<>();+public BeanEditor(String id, BeanDescriptor descriptor, IModel<Serializable> model) {super(id, model);@@ -115,8 +118,8 @@ public class BeanEditor extends ValueEditor<Serializable> {}}- private WebMarkupContainer newItem(String id, PropertyContext<Serializable> property) {- WebMarkupContainer item = new PropertyContainer(id, property) {+ private PropertyContainer newPropertyContainer(String id, PropertyContext<Serializable> property) {+ PropertyContainer propertyContainer = new PropertyContainer(id, property) {@Overrideprotected void onInitialize() {@@ -208,14 +211,14 @@ public class BeanEditor extends ValueEditor<Serializable> {protected void onConfigure() {super.onConfigure();setVisible(!property.getDescriptor().isPropertyExcluded()- && property.getDescriptor().isPropertyVisible(new ComponentContext(this), descriptor));+ && property.getDescriptor().isPropertyVisible(componentContexts, descriptor));}};- item.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));+ propertyContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));- return item;+ return propertyContainer;}public PropertyContext<Serializable> getPropertyContext(String propertyName) {@@ -253,8 +256,11 @@ public class BeanEditor extends ValueEditor<Serializable> {RepeatingView propertiesView = new RepeatingView("properties");contentFrag.add(propertiesView);- for (PropertyContext<Serializable> property: entry.getValue())- propertiesView.add(newItem(propertiesView.newChildId(), property));+ for (PropertyContext<Serializable> property: entry.getValue()) {+ PropertyContainer propertyContainer = newPropertyContainer(propertiesView.newChildId(), property);+ propertiesView.add(propertyContainer);+ componentContexts.put(property.getPropertyName(), new ComponentContext(propertyContainer));+ }groupContainer.add(contentFrag);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex df8c0406c3..b0b99b2f22 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -2,6 +2,7 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.lang.reflect.Method;+import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -45,6 +46,7 @@ public class BeanViewer extends Panel {protected void onInitialize() {super.onInitialize();+ Map<String, ComponentContext> componentContexts = new HashMap<>();RepeatingView groupsView = new RepeatingView("groups");for (Map.Entry<String, List<PropertyContext<Serializable>>> entry: properties.entrySet()) {WebMarkupContainer groupItem = new WebMarkupContainer(groupsView.newChildId());@@ -60,7 +62,7 @@ public class BeanViewer extends Panel {RepeatingView propertiesView = new RepeatingView("properties");for (PropertyContext<Serializable> property: entry.getValue()) {- WebMarkupContainer propertyItem = new PropertyContainer(propertiesView.newChildId()) {+ WebMarkupContainer propertyContainer = new PropertyContainer(propertiesView.newChildId()) {@Overridepublic Object getInputValue(String name) {@@ -78,18 +80,19 @@ public class BeanViewer extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(property.isPropertyVisible(new ComponentContext(this), descriptor) && !property.isPropertyExcluded());+ setVisible(property.isPropertyVisible(componentContexts, descriptor) && !property.isPropertyExcluded());}};- propertiesView.add(propertyItem);+ propertiesView.add(propertyContainer);+ componentContexts.put(property.getPropertyName(), new ComponentContext(propertyContainer));Method propertyGetter = property.getPropertyGetter();WebMarkupContainer nameTd = new WebMarkupContainer("name");- propertyItem.add(nameTd);+ propertyContainer.add(nameTd);WebMarkupContainer valueTd = new WebMarkupContainer("value");- propertyItem.add(valueTd);+ propertyContainer.add(valueTd);String displayName = property.getDisplayName();Component content = new Label("content", displayName);@@ -99,14 +102,14 @@ public class BeanViewer extends Panel {if (omitName != null && omitName.value() != OmitName.Place.EDITOR) {nameTd.setVisible(false);valueTd.add(AttributeAppender.replace("colspan", "2"));- propertyItem.add(AttributeAppender.append("class", "name-omitted"));+ propertyContainer.add(AttributeAppender.append("class", "name-omitted"));}Serializable bean = (Serializable) BeanViewer.this.getDefaultModelObject();Serializable propertyValue = (Serializable) property.getPropertyValue(bean);valueTd.add(property.renderForView("content", Model.of(propertyValue)));- propertyItem.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));+ propertyContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));}groupItem.add(propertiesView);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.javaindex 8fd8475c68..8b1a9c8efc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java@@ -34,7 +34,7 @@ public class DefaultEditSupportRegistry implements EditSupportRegistry {public PropertyContext<Serializable> getPropertyEditContext(PropertyDescriptor descriptor) {for (EditSupport each: editSupports) {PropertyContext<?> editContext = each.getEditContext(descriptor);- if (editContext != null)+ if (editContext != null)return (PropertyContext<Serializable>) editContext;}throw new RuntimeException(String.format(diff --git a/server-core/src/main/java/io/onedev/server/web/editable/Path.java b/server-core/src/main/java/io/onedev/server/web/editable/Path.javaindex e240a3fb27..09505e6109 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/Path.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/Path.java@@ -2,7 +2,6 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.util.ArrayList;-import java.util.Arrays;import java.util.List;import java.util.stream.Collectors;@@ -16,7 +15,8 @@ public class Path implements Serializable {private List<PathNode> nodes = new ArrayList<>();public Path(PathNode...nodes) {- this.nodes = Arrays.asList(nodes);+ for (PathNode node: nodes)+ this.nodes.add(node);}public Path(List<PathNode> nodes) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.javaindex 514071e50a..9bc48ab704 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java@@ -3,6 +3,7 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.lang.reflect.Method;import java.util.List;+import java.util.Map;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -146,8 +147,8 @@ public abstract class PropertyContext<T> implements Serializable {return descriptor.isPropertyRequired();}- public boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor) {- return descriptor.isPropertyVisible(componentContext, beanDescriptor);+ public boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor) {+ return descriptor.isPropertyVisible(componentContexts, beanDescriptor);}}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.javaindex e09079d32c..1b5fe23ff2 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@@ -4,6 +4,7 @@ import java.io.Serializable;import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;import java.util.HashSet;+import java.util.Map;import java.util.Set;import javax.annotation.Nullable;@@ -12,6 +13,7 @@ import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;+import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.commons.utils.BeanUtils;@@ -120,16 +122,16 @@ public class PropertyDescriptor implements Serializable {return null;}- public boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor) {- return isPropertyVisible(componentContext, beanDescriptor, Sets.newHashSet());+ public boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor) {+ return isPropertyVisible(componentContexts, beanDescriptor, Sets.newHashSet());}- private boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {+ private boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {if (!checkedPropertyNames.add(getPropertyName()))return false;Set<String> prevDependencyPropertyNames = new HashSet<>(getDependencyPropertyNames());- ComponentContext.push(componentContext);+ ComponentContext.push(Preconditions.checkNotNull(componentContexts.get(getPropertyName())));try {/** Sometimes, the dependency may include properties introduced while evaluating available choices@@ -142,7 +144,7 @@ public class PropertyDescriptor implements Serializable {return false;for (String dependencyPropertyName: getDependencyPropertyNames()) {Set<String> copyOfCheckedPropertyNames = new HashSet<>(checkedPropertyNames);- if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(componentContext, beanDescriptor, copyOfCheckedPropertyNames))+ if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(componentContexts, beanDescriptor, copyOfCheckedPropertyNames))return false;}return true;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectChoice.javanew file mode 100644index 0000000000..2e79600e6f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectChoice.java@@ -0,0 +1,12 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target(ElementType.METHOD)+@Retention(RetentionPolicy.RUNTIME)+public @interface ProjectChoice {+ String value() default "";+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/RoleChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RoleChoice.javanew file mode 100644index 0000000000..1f5c03a19c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RoleChoice.java@@ -0,0 +1,11 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target(ElementType.METHOD)+@Retention(RetentionPolicy.RUNTIME)+public @interface RoleChoice {+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.javaindex f8f079a275..1c68391f93 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchChoiceEditSupport.java@@ -19,7 +19,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.BranchChoice;@SuppressWarnings("serial")-public class BranchEditSupport implements EditSupport {+public class BranchChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex dc99c35238..52c4dddbc6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -58,6 +58,7 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {};input.setLabel(Model.of(getDescriptor().getDisplayName()));+input.setRequired(descriptor.isPropertyRequired());input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.javaindex 2169e649d8..4b5d98b4eb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.BuildChoice;@SuppressWarnings("serial")-public class BuildEditSupport implements EditSupport {+public class BuildChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex d50d41feab..8a383bd1f7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -91,8 +91,8 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {};input.setLabel(Model.of(getDescriptor().getDisplayName()));- input.setRequired(descriptor.isPropertyRequired());+ input.setRequired(descriptor.isPropertyRequired());input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.jsindex 4906036e04..55471aeed4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js@@ -1,19 +1,29 @@onedev.server.editable = {onBeanEditorDomReady: function(containerId) {var $container = $("#" + containerId);- var $group = $container.children(".group");- $group.children("a").click(function() {+ var $groups = $container.children(".group");+ $groups.children("a").click(function() {$(this).parent().toggleClass("expanded");});+ $groups.each(function() {+ var $group = $(this);+ if ($group.children("a").length != 0)+ onedev.server.editable.checkGroup($group);+ });$container.find(".feedbackPanelERROR").parents(".group.bean-properties").addClass("expanded");},onBeanViewerDomReady: function(containerId) {var $container = $("#" + containerId);- var $group = $container.children(".group");- $group.children("a").click(function() {+ var $groups = $container.children(".group");+ $groups.children("a").click(function() {$(this).parent().toggleClass("expanded");$(window).resize();});+ $groups.each(function() {+ var $group = $(this);+ if ($group.children("a").length != 0)+ onedev.server.editable.checkGroup($group);+ });},onBeanEditorPropertyContainerDomReady: function(containerId) {var $container = $("#" + containerId);@@ -23,5 +33,29 @@ onedev.server.editable = {$checkbox.children("label").append($label.children("span").text());$label.remove();});- }-}\ No newline at end of file+ },+ checkGroup: function($group) {+ var hasVisibleProperties = false;+ if ($group.children("table").length != 0) {+ $group.children("table").find(">tbody>tr").each(function() {+ if ($(this).css("display") != "none")+ hasVisibleProperties = true;+ });+ } else {+ $group.children("div").children("div").each(function() {+ if ($(this).css("display") != "none")+ hasVisibleProperties = true;+ });+ }+ if (hasVisibleProperties)+ $group.show();+ else+ $group.hide();+ },+};+$(document).on("elementReplaced", function(event, componentId) {+ var $component = $("#" + componentId);+ var $group = $component.closest(".bean-properties.group");+ if ($group.length != 0 && $group.children("a").length != 0)+ onedev.server.editable.checkGroup($group);+});\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 9209700c8c..563e6bd032 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -68,6 +68,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {}};+input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.javaindex ad27c298ac..525e6304c1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupChoiceEditSupport.java@@ -18,7 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.GroupChoice;@SuppressWarnings("serial")-public class GroupEditSupport implements EditSupport {+public class GroupChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex d4482aaa54..ba431e4b46 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -15,10 +15,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;@@ -28,7 +26,7 @@ import io.onedev.server.web.editable.annotation.GroupChoice;@SuppressWarnings("serial")public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {- private final List<GroupFacade> choices = new ArrayList<>();+ private final List<Group> choices = new ArrayList<>();private GroupMultiChoice input;@@ -41,14 +39,14 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {protected void onInitialize() {super.onInitialize();- List<GroupFacade> groups = new ArrayList<>();+ List<Group> groups = new ArrayList<>();GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);Preconditions.checkNotNull(groupChoice);if (groupChoice.value().length() != 0) {- choices.addAll((List<GroupFacade>)ReflectionUtils+ choices.addAll((List<Group>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));} else {- choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());+ choices.addAll(OneDev.getInstance(GroupManager.class).query());}groups = new ArrayList<>();@@ -56,8 +54,8 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {GroupManager groupManager = OneDev.getInstance(GroupManager.class);for (String groupName: getModelObject()) {Group group = groupManager.find(groupName);- if (group != null && choices.contains(group.getFacade()))- groups.add(group.getFacade());+ if (group != null && choices.contains(group))+ groups.add(group);}}@@ -71,6 +69,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {};input.setConvertEmptyInputStringToNull(true);+input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));@@ -89,9 +88,9 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> groupNames = new ArrayList<>();- Collection<GroupFacade> groups = input.getConvertedInput();+ Collection<Group> groups = input.getConvertedInput();if (groups != null) {- for (GroupFacade group: groups)+ for (Group group: groups)groupNames.add(group.getName());}return groupNames;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 810b7c1396..c6cfdbd874 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -13,10 +13,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;-import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;@@ -26,7 +24,7 @@ import io.onedev.server.web.editable.annotation.GroupChoice;@SuppressWarnings("serial")public class GroupSingleChoiceEditor extends PropertyEditor<String> {- private final List<GroupFacade> choices = new ArrayList<>();+ private final List<Group> choices = new ArrayList<>();private GroupSingleChoice input;@@ -39,15 +37,13 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- GroupFacade facade;-GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);Preconditions.checkNotNull(groupChoice);if (groupChoice.value().length() != 0) {- choices.addAll((List<GroupFacade>)ReflectionUtils+ choices.addAll((List<Group>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));} else {- choices.addAll(OneDev.getInstance(CacheManager.class).getGroups().values());+ choices.addAll(OneDev.getInstance(GroupManager.class).query());}Group group;@@ -56,12 +52,10 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {elsegroup = null;- if (group != null && choices.contains(group.getFacade()))- facade = group.getFacade();- else- facade = null;+ if (group != null && !choices.contains(group))+ group = null;- input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider(choices)) {+ input = new GroupSingleChoice("input", Model.of(group), new GroupChoiceProvider(choices)) {@Overrideprotected void onInitialize() {@@ -89,7 +83,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- GroupFacade group = input.getConvertedInput();+ Group group = input.getConvertedInput();if (group != null)return group.getName();elsediff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.javaindex 6b8d1cbc78..26bece2449 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.IssueChoice;@SuppressWarnings("serial")-public class IssueEditSupport implements EditSupport {+public class IssueChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.javanew file mode 100644index 0000000000..51f67d91f9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.privilege;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class PrivilegeCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public PrivilegeCssResourceReference() {+ super(PrivilegeCssResourceReference.class, "privilege.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.htmlnew file mode 100644index 0000000000..f967fb5645--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.html@@ -0,0 +1,18 @@+<wicket:panel>+ <form wicket:id="form" class="job-privilege-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Job Privilege+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.javanew file mode 100644index 0000000000..87cfd7e97d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeEditPanel.java@@ -0,0 +1,114 @@+package io.onedev.server.web.editable.job.privilege;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+abstract class PrivilegeEditPanel extends Panel {++ private final List<JobPrivilege> privileges;++ private final int privilegeIndex;++ public PrivilegeEditPanel(String id, List<JobPrivilege> privileges, int privilegeIndex) {+ super(id);++ this.privileges = privileges;+ this.privilegeIndex = privilegeIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ JobPrivilege privilege;+ if (privilegeIndex != -1)+ privilege = privileges.get(privilegeIndex);+ else+ privilege = new JobPrivilege();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new NotificationPanel("feedback", form));++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PrivilegeEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.edit("editor", privilege);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (editor.isValid()) {+ if (privilegeIndex != -1)+ privileges.set(privilegeIndex, privilege);+ else+ privileges.add(privilege);+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(PrivilegeEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.htmlnew file mode 100644index 0000000000..0f1421f2e6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html@@ -0,0 +1,12 @@+<wicket:panel>+ <div class="job-privilege-list list">+ <div class="head">+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ </div>+ <table wicket:id="privileges" class="table table-condensed table-hover"></table>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.javanew file mode 100644index 0000000000..eed6f772ff--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.java@@ -0,0 +1,202 @@+package io.onedev.server.web.editable.job.privilege;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;++@SuppressWarnings("serial")+class PrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<JobPrivilege> privileges;++ public PrivilegeListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ privileges = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ privileges.add((JobPrivilege) each);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new PrivilegeEditPanel(id, privileges, -1) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(PrivilegeListEditPanel.this);+ }++ };+ }++ });++ List<IColumn<JobPrivilege, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {+ cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "minimum actions";+ }++ });++ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Job Names")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getJobNames()));+ }+ });++ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", PrivilegeListEditPanel.this);+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new PrivilegeEditPanel(id, privileges, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(PrivilegeListEditPanel.this);+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ markFormDirty(target);+ privileges.remove(rowModel.getObject());+ onPropertyUpdating(target);+ target.add(PrivilegeListEditPanel.this);+ }++ });+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ IDataProvider<JobPrivilege> dataProvider = new ListDataProvider<JobPrivilege>() {++ @Override+ protected List<JobPrivilege> getData() {+ return privileges;+ }++ };++ DataTable<JobPrivilege, Void> dataTable;+ add(dataTable = new DataTable<JobPrivilege, Void>("privileges", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));++ dataTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(privileges, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(privileges, fromIndex-i, fromIndex-i-1);+ }+ onPropertyUpdating(target);+ target.add(PrivilegeListEditPanel.this);+ }++ }.sortable("tbody"));+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (JobPrivilege each: privileges)+ value.add(each);+ return value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.javasimilarity index 56%rename from server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.javaindex a9b6534110..f6a13d8193 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditSupport.java@@ -1,62 +1,59 @@-package io.onedev.server.web.editable.polymorphiclist;--import java.io.Serializable;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;--import io.onedev.commons.utils.ClassUtils;-import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.EmptyValueLabel;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.Editable;--@SuppressWarnings("serial")-public class PolymorphicListEditSupport implements EditSupport {-- @Override- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {- final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass != null && !ClassUtils.isConcrete(elementClass)- && elementClass.getAnnotation(Editable.class) != null) {- return new PropertyContext<List<Serializable>>(descriptor) {-- @Override- public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {- return new PropertyViewer(componentId, descriptor) {-- @Override- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null) {- return new PolymorphicListPropertyViewer(id, propertyDescriptor, model.getObject());- } else {- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());- }- }-- };- }-- @Override- public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new PolymorphicListPropertyEditor(componentId, descriptor, model);- }-- };- }- }- return null;- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}+package io.onedev.server.web.editable.job.privilege;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class PrivilegeListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == JobPrivilege.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String componentId, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null)+ return new PrivilegeListViewPanel(componentId, model.getObject());+ else+ return new EmptyValueLabel(componentId, propertyDescriptor.getPropertyGetter());+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new PrivilegeListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.htmlnew file mode 100644index 0000000000..299009ea51--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="def-list job-privilege-list">+ <div class="body">+ <table wicket:id="privileges" class="table table-condensed table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.javanew file mode 100644index 0000000000..b4c720a36b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListViewPanel.java@@ -0,0 +1,151 @@+package io.onedev.server.web.editable.job.privilege;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.server.web.page.layout.SideFloating.Placement;++@SuppressWarnings("serial")+class PrivilegeListViewPanel extends Panel {++ private final List<JobPrivilege> privileges = new ArrayList<>();++ public PrivilegeListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ privileges.add((JobPrivilege) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<JobPrivilege, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Job Names")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getJobNames());+ }++ });+ }+ });++ columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });++ IDataProvider<JobPrivilege> dataProvider = new ListDataProvider<JobPrivilege>() {++ @Override+ protected List<JobPrivilege> getData() {+ return privileges;+ }++ };++ add(new DataTable<JobPrivilege, Void>("privileges", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ addTopToolbar(new HeadersToolbar<Void>(this, null));+ addBottomToolbar(new NoRecordsToolbar(this));+ }++ });+ }++ private abstract class ColumnFragment extends Fragment {++ private final int index;++ public ColumnFragment(String id, int index) {+ super(id, "columnFrag", PrivilegeListViewPanel.this);+ this.index = index;+ }++ protected abstract Component newLabel(String componentId);++ @Override+ protected void onInitialize() {+ super.onInitialize();+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, Placement.RIGHT) {++ @Override+ protected String getTitle() {+ return "Job Privilege";+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "job-privilege def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ return BeanContext.view(id, privileges.get(index));+ }++ };+ }++ };+ link.add(newLabel("label"));+ add(link);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/privilege.css b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/privilege.cssnew file mode 100644index 0000000000..e69de29bb2diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.htmlindex 9d8a32af58..43e88f6818 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <form wicket:id="form" class="service-edit leave-confirm">+ <form wicket:id="form" class="job-service-edit leave-confirm"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button><h4 id="modal-title" class="modal-title">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.htmlindex 2d77d73c8e..baa9142e80 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="service-list list">+ <div class="job-service-list list"><div class="head"><a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.htmlindex b3b6b92097..82c78444ad 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="def-list service-list">+ <div class="def-list job-service-list"><div class="body"><table wicket:id="services" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.javaindex 65e954ee61..6bb7c726f7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java@@ -154,7 +154,7 @@ class ServiceListViewPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", "service def-detail"));+ add(AttributeAppender.append("class", "job-service def-detail"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css b/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.cssindex 11ace26c8e..6c98a6eb31 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css@@ -1,3 +1,3 @@-.def-detail.service .editable>.bean-properties>table>tbody>tr>td.name {+.def-detail.job-service .editable>.bean-properties>table>tbody>tr>td.name {min-width: 150px;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.htmldeleted file mode 100644index 2a8521b554..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html+++ /dev/null@@ -1,35 +0,0 @@-<wicket:panel>- <div class="polymorphic-list list">- <div class="head">- <a wicket:id="addElement" title="Add new" class="btn btn-default btn-xs add-element"><span class="fa fa-plus"></span></a>- </div>- <table class="table table-condensed">- <tbody>- <tr wicket:id="elements">- <td>- <div class="head clearfix">- <div class="actions pull-left">- <span class="drag-indicator fa fa-reorder"></span>- </div>- <div class="type-selector pull-left">- <select wicket:id="elementTypeSelector" class="form-control"></select>- </div>- <div class="actions pull-left">- <a wicket:id="deleteElement" title="Delete this"><i class="fa fa-trash"></i></a>- </div>- </div>- <div class="body">- <div wicket:id="elementEditor"></div>- <div wicket:id="feedback"></div>- </div>- </td>- </tr>- </tbody>- <tfoot wicket:id="noElements">- <tr>- <td class="no-elements">No elements defined</td>- </tr>- </tfoot>- </table>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javadeleted file mode 100644index 638adb1960..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ /dev/null@@ -1,327 +0,0 @@-package io.onedev.server.web.editable.polymorphiclist;--import static de.agilecoders.wicket.jquery.JQuery.$;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Application;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.util.convert.ConversionException;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.launcher.loader.ImplementationRegistry;-import io.onedev.commons.utils.ClassUtils;-import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.BeanUpdating;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.PathNode;-import io.onedev.server.web.editable.PathNode.Indexed;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.ValueEditor;-import io.onedev.server.web.editable.Path;-import io.onedev.server.web.editable.annotation.ExcludedProperties;--@SuppressWarnings("serial")-public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializable>> {-- private final Class<?> baseClass;-- private final List<Class<?>> implementations;-- private final Set<String> excludedProperties = new HashSet<>();-- private RepeatingView rows;-- private WebMarkupContainer noElements;-- public PolymorphicListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- implementations = new ArrayList<>();- baseClass = ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());- Preconditions.checkNotNull(baseClass);-- ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);- implementations.addAll(registry.getImplementations(baseClass));-- Preconditions.checkArgument(- !implementations.isEmpty(),- "Can not find implementations for '" + baseClass + "'.");-- EditableUtils.sortAnnotatedElements(implementations);-- ExcludedProperties excludedPropertiesAnnotation =- descriptor.getPropertyGetter().getAnnotation(ExcludedProperties.class);- if (excludedPropertiesAnnotation != null) {- for (String each: excludedPropertiesAnnotation.value())- excludedProperties.add(each);- }- }-- @SuppressWarnings("unchecked")- private List<Serializable> newList() {- if (ClassUtils.isConcrete(getDescriptor().getPropertyClass())) {- try {- return (List<Serializable>) getDescriptor().getPropertyClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- } else {- return new ArrayList<Serializable>();- }- }-- private String getDisplayName(Class<?> clazz) {- String displayName = EditableUtils.getDisplayName(clazz);- displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);- return displayName;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<Serializable> list = getModelObject();- if (list == null)- list = newList();-- rows = new RepeatingView("elements");- add(rows);-- for (Serializable element: list) {- addRow(element);- }-- add(new AjaxButton("addElement") {-- @SuppressWarnings("deprecation")- @Override- public void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- markFormDirty(target);-- Component lastRow;- if (rows.size() != 0)- lastRow = rows.get(rows.size() - 1);- else- lastRow = null;-- Serializable newElement;- try {- newElement = (Serializable) implementations.get(0).newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- Component newRow = addRow(newElement);-- String script = String.format("$('<tr id=\"%s\"></tr>')", newRow.getMarkupId());- if (lastRow != null)- script += ".insertAfter('#" + lastRow.getMarkupId() + "');";- else- script += ".appendTo('#" + PolymorphicListPropertyEditor.this.getMarkupId() + ">div>table>tbody');";-- target.prependJavaScript(script);- target.add(newRow);- target.add(noElements);-- onPropertyUpdating(target);- }-- }.setDefaultFormProcessing(false));-- add(noElements = new WebMarkupContainer("noElements") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(rows.size() == 0);- }-- });- noElements.setOutputMarkupPlaceholderTag(true);-- add(new SortBehavior() {-- @SuppressWarnings("deprecation")- @Override- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- /*- List<Component> children = new ArrayList<>();- for (Component child: rows)- children.add(child);-- Component fromChild = children.remove(from.getItemIndex());- children.add(to.getItemIndex(), fromChild);-- rows.removeAll();- for (Component child: children)- rows.add(child);- */-- // Do not use code above as removing components outside of a container and add again- // can cause the fenced feedback panel not functioning properly- markFormDirty(target);-- int fromIndex = from.getItemIndex();- int toIndex = to.getItemIndex();- if (fromIndex < toIndex) {- for (int i=0; i<toIndex-fromIndex; i++)- rows.swap(fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- rows.swap(fromIndex-i, fromIndex-i-1);- }- onPropertyUpdating(target);- }-- }.sortable("tbody"));-- setOutputMarkupId(true);- }-- private WebMarkupContainer addRow(Serializable element) {- WebMarkupContainer row = new WebMarkupContainer(rows.newChildId());- row.setOutputMarkupId(true);- rows.add(row);-- List<String> implementationNames = new ArrayList<String>();- for (Class<?> each: implementations)- implementationNames.add(getDisplayName(each));-- Component elementEditor = newElementEditor(element);- row.add(elementEditor);-- row.add(new DropDownChoice<String>("elementTypeSelector", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- Component elementEditor = row.get("elementEditor");- if (elementEditor.isVisible()) {- return EditableUtils.getDisplayName(((BeanEditor) elementEditor).getDescriptor().getBeanClass());- } else {- return null;- }- }-- @Override- public void setObject(String object) {- for (Class<?> each: implementations) {- if (getDisplayName(each).equals(object)) {- Serializable element;- try {- element = (Serializable) each.newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- row.replace(newElementEditor(element));- return;- }- }- throw new IllegalStateException("Unable to find implementation named " + object);- }-- }, implementationNames).setNullValid(false).add(new AjaxFormComponentUpdatingBehavior("change"){-- @Override- protected void onUpdate(AjaxRequestTarget target) {- target.add(row.get("elementEditor"));- onPropertyUpdating(target);- }-- }));-- row.add(new FencedFeedbackPanel("feedback", elementEditor));-- row.add(new AjaxButton("deleteElement") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- markFormDirty(target);-- target.appendJavaScript($(row).chain("remove").get());- rows.remove(row);- target.add(noElements);-- onPropertyUpdating(target);- }-- }.setDefaultFormProcessing(false));-- return row;- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof BeanUpdating) {- event.stop();- onPropertyUpdating(((BeanUpdating)event.getPayload()).getHandler());- }- }-- private Component newElementEditor(Serializable element) {- Component elementEditor;- if (element != null) {- elementEditor = BeanContext.edit("elementEditor", element, excludedProperties, true);- } else {- elementEditor = new WebMarkupContainer("elementEditor").setVisible(false);- }- elementEditor.setOutputMarkupId(true);- elementEditor.setOutputMarkupPlaceholderTag(true);- return elementEditor;- }-- @Override- public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {- int index = ((Indexed) propertyNode).getIndex();-- int currentIndex = 0;- Iterator<Component> it = rows.iterator();- Component row = it.next();- while (currentIndex++ < index) {- row = it.next();- }- ((ValueEditor<?>) row.get("elementEditor")).error(pathInProperty, errorMessage);- }-- @Override- protected List<Serializable> convertInputToValue() throws ConversionException {- List<Serializable> newList = newList();- for (Component row: rows) {- BeanEditor elementEditor = (BeanEditor) row.get("elementEditor");- newList.add(elementEditor.getConvertedInput());- }- return newList;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.htmldeleted file mode 100644index 3bb67e33bf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html+++ /dev/null@@ -1,19 +0,0 @@-<wicket:panel>- <table class="polymorphic-list table table-condensed">- <tbody>- <tr wicket:id="elements">- <td>- <div wicket:id="elementType" class="type-selector"></div>- <div wicket:id="element"></div>- </td>- </tr>- </tbody>- <wicket:enclosure child="noElements">- <tfoot>- <tr>- <td wicket:id="noElements" class="no-elements">No elements defined</td>- </tr>- </tfoot>- </wicket:enclosure>- </table>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.javadeleted file mode 100644index ad1bc2899b..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java+++ /dev/null@@ -1,57 +0,0 @@-package io.onedev.server.web.editable.polymorphiclist;--import java.io.Serializable;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Application;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.ExcludedProperties;--@SuppressWarnings("serial")-public class PolymorphicListPropertyViewer extends Panel {-- private final List<Serializable> elements;-- private final Set<String> excludedProperties = new HashSet<>();-- public PolymorphicListPropertyViewer(String id, PropertyDescriptor descriptor, List<Serializable> elements) {- super(id);- this.elements = elements;-- ExcludedProperties excludedPropertiesAnnotation =- descriptor.getPropertyGetter().getAnnotation(ExcludedProperties.class);- if (excludedPropertiesAnnotation != null) {- for (String each: excludedPropertiesAnnotation.value())- excludedProperties.add(each);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<Serializable>("elements", elements) {-- @Override- protected void populateItem(ListItem<Serializable> item) {- String displayName = EditableUtils.getDisplayName(item.getModelObject().getClass());- displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);- item.add(new Label("elementType", displayName));- item.add(BeanContext.view("element", item.getModelObject(), excludedProperties, true));- }-- });- add(new WebMarkupContainer("noElements").setVisible(elements.isEmpty()));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectChoiceEditSupport.javanew file mode 100644index 0000000000..93630f7d68--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectChoiceEditSupport.java@@ -0,0 +1,93 @@+package io.onedev.server.web.editable.projectchoice;++import java.lang.reflect.Method;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.eclipse.jgit.util.StringUtils;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.server.web.editable.annotation.ProjectChoice;++@SuppressWarnings("serial")+public class ProjectChoiceEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ ProjectChoice projectChoice = propertyGetter.getAnnotation(ProjectChoice.class);+ if (projectChoice != null) {+ if (List.class.isAssignableFrom(propertyGetter.getReturnType())+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {+ return new PropertyContext<List<String>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ List<String> projectNames = model.getObject();+ if (projectNames != null && !projectNames.isEmpty()) {+ return new Label(id, StringUtils.join(projectNames, ", " ));+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {+ return new ProjectMultiChoiceEditor(componentId, descriptor, model);+ }++ };+ } else if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new Label(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new ProjectSingleChoiceEditor(componentId, descriptor, model);+ }++ };+ } else {+ throw new RuntimeException("Annotation 'ProjectChoice' should be applied to property with type 'String' or 'List<String>'.");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.javanew file mode 100644index 0000000000..e22d0c04f2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectMultiChoiceEditor.java@@ -0,0 +1,87 @@+package io.onedev.server.web.editable.projectchoice;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+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.web.component.project.choice.ProjectChoiceProvider;+import io.onedev.server.web.component.project.choice.ProjectMultiChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {++ private final List<Project> choices = new ArrayList<>();++ private ProjectMultiChoice input;++ public ProjectMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<List<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ @Override+ protected void onInitialize() {+ super.onInitialize();++ choices.addAll(OneDev.getInstance(ProjectManager.class).query());++ List<Project> projects = new ArrayList<>();+ if (getModelObject() != null) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ for (String projectName: getModelObject()) {+ Project project = projectManager.find(projectName);+ if (project != null && choices.contains(project))+ projects.add(project);+ }+ }++ input = new ProjectMultiChoice("input", new Model((Serializable)projects), new ProjectChoiceProvider(choices)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ input.setConvertEmptyInputStringToNull(true);+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ List<String> projectNames = new ArrayList<>();+ Collection<Project> projects = input.getConvertedInput();+ if (projects != null) {+ for (Project project: projects)+ projectNames.add(project.getName());+ }+ return projectNames;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.javanew file mode 100644index 0000000000..9ebbde938e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/projectchoice/ProjectSingleChoiceEditor.java@@ -0,0 +1,85 @@+package io.onedev.server.web.editable.projectchoice;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+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.web.component.project.choice.ProjectChoiceProvider;+import io.onedev.server.web.component.project.choice.ProjectSingleChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class ProjectSingleChoiceEditor extends PropertyEditor<String> {++ private final List<Project> choices = new ArrayList<>();++ private ProjectSingleChoice input;++ public ProjectSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ choices.addAll(OneDev.getInstance(ProjectManager.class).query());++ Project project;+ if (getModelObject() != null)+ project = OneDev.getInstance(ProjectManager.class).find(getModelObject());+ else+ project = null;++ Project facade;+ if (project != null && choices.contains(project))+ facade = project;+ else+ facade = null;++ input = new ProjectSingleChoice("input", Model.of(facade), new ProjectChoiceProvider(choices)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ input.setConvertEmptyInputStringToNull(true);++ // add this to control allowClear flag of select2+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+ add(input);+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ Project project = input.getConvertedInput();+ if (project != null)+ return project.getName();+ else+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.javaindex 029f41a382..1fa0b97f73 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.PullRequestChoice;@SuppressWarnings("serial")-public class PullRequestEditSupport implements EditSupport {+public class PullRequestChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.javanew file mode 100644index 0000000000..718a853744--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleChoiceEditSupport.java@@ -0,0 +1,93 @@+package io.onedev.server.web.editable.rolechoice;++import java.lang.reflect.Method;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.eclipse.jgit.util.StringUtils;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.server.web.editable.annotation.RoleChoice;++@SuppressWarnings("serial")+public class RoleChoiceEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ RoleChoice roleChoice = propertyGetter.getAnnotation(RoleChoice.class);+ if (roleChoice != null) {+ if (List.class.isAssignableFrom(propertyGetter.getReturnType())+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {+ return new PropertyContext<List<String>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ List<String> roleNames = model.getObject();+ if (roleNames != null && !roleNames.isEmpty()) {+ return new Label(id, StringUtils.join(roleNames, ", " ));+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {+ return new RoleMultiChoiceEditor(componentId, descriptor, model);+ }++ };+ } else if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new Label(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new RoleSingleChoiceEditor(componentId, descriptor, model);+ }++ };+ } else {+ throw new RuntimeException("Annotation 'RoleChoice' should be applied to property with type 'String' or 'List<String>'.");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.javanew file mode 100644index 0000000000..26fa4bb50f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java@@ -0,0 +1,81 @@+package io.onedev.server.web.editable.rolechoice;++import java.util.ArrayList;+import java.util.Collection;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.component.stringchoice.StringMultiChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class RoleMultiChoiceEditor extends PropertyEditor<List<String>> {++ private StringMultiChoice input;++ public RoleMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<List<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Map<String, String> roleNames = new LinkedHashMap<>();+ for (Role role: OneDev.getInstance(RoleManager.class).query())+ roleNames.put(role.getName(), role.getName());++ Collection<String> selected = new ArrayList<>();+ if (getModelObject() != null)+ selected.addAll(getModelObject());++ selected.retainAll(roleNames.keySet());++ input = new StringMultiChoice("input", Model.of(selected), Model.ofMap(roleNames)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ input.setConvertEmptyInputStringToNull(true);++ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ Collection<String> roleNames = input.getConvertedInput();+ if (roleNames != null)+ return new ArrayList<>(roleNames);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.javanew file mode 100644index 0000000000..b0982ba437--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java@@ -0,0 +1,72 @@+package io.onedev.server.web.editable.rolechoice;++import java.util.LinkedHashMap;+import java.util.Map;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class RoleSingleChoiceEditor extends PropertyEditor<String> {++ private StringSingleChoice input;++ public RoleSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Map<String, String> roleNames = new LinkedHashMap<>();+ for (Role role: OneDev.getInstance(RoleManager.class).query())+ roleNames.put(role.getName(), role.getName());++ String selected = getModelObject();+ if (!roleNames.containsKey(selected))+ selected = null;++ input = new StringSingleChoice("input", Model.of(selected), Model.ofMap(roleNames)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ input.setConvertEmptyInputStringToNull(true);++ // add this to control allowClear flag of select2+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+ add(input);+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 5f35392fd2..21f82861fe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -15,7 +15,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.javaindex e1098d4a7e..83f17066da 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserChoiceEditSupport.java@@ -18,7 +18,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.UserChoice;@SuppressWarnings("serial")-public class UserEditSupport implements EditSupport {+public class UserChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex cfbc151ebe..db55e52320 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -15,11 +15,9 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;@@ -29,7 +27,7 @@ import io.onedev.server.web.editable.annotation.UserChoice;@SuppressWarnings("serial")public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {- private final List<UserFacade> choices = new ArrayList<>();+ private final List<User> choices = new ArrayList<>();private UserMultiChoice input;@@ -50,22 +48,22 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);Preconditions.checkNotNull(userChoice);if (userChoice.value().length() != 0) {- choices.addAll((List<UserFacade>)ReflectionUtils+ choices.addAll((List<User>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));} else {- choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());+ choices.addAll(OneDev.getInstance(UserManager.class).query());}} finally {ComponentContext.pop();}- List<UserFacade> users = new ArrayList<>();+ List<User> users = new ArrayList<>();if (getModelObject() != null) {UserManager userManager = OneDev.getInstance(UserManager.class);for (String userName: getModelObject()) {User user = userManager.findByName(userName);- if (user != null && choices.contains(user.getFacade()))- users.add(user.getFacade());+ if (user != null && choices.contains(user))+ users.add(user);}}@@ -79,6 +77,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {};input.setConvertEmptyInputStringToNull(true);+input.setRequired(descriptor.isPropertyRequired());input.setLabel(Model.of(getDescriptor().getDisplayName()));@@ -97,9 +96,9 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> userNames = new ArrayList<>();- Collection<UserFacade> users = input.getConvertedInput();+ Collection<User> users = input.getConvertedInput();if (users != null) {- for (UserFacade user: users)+ for (User user: users)userNames.add(user.getName());}return userNames;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 39c591c26b..285310df4e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -13,11 +13,9 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;@@ -27,7 +25,7 @@ import io.onedev.server.web.editable.annotation.UserChoice;@SuppressWarnings("serial")public class UserSingleChoiceEditor extends PropertyEditor<String> {- private final List<UserFacade> choices = new ArrayList<>();+ private final List<User> choices = new ArrayList<>();private UserSingleChoice input;@@ -48,10 +46,10 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);Preconditions.checkNotNull(userChoice);if (userChoice.value().length() != 0) {- choices.addAll((List<UserFacade>)ReflectionUtils+ choices.addAll((List<User>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));} else {- choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());+ choices.addAll(OneDev.getInstance(UserManager.class).query());}} finally {ComponentContext.pop();@@ -63,13 +61,10 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {elseuser = null;- UserFacade facade;- if (user != null && choices.contains(user.getFacade()))- facade = user.getFacade();- else- facade = null;+ if (user != null && !choices.contains(user))+ user = null;- input = new UserSingleChoice("input", Model.of(facade), new UserChoiceProvider(choices)) {+ input = new UserSingleChoice("input", Model.of(user), new UserChoiceProvider(choices)) {@Overrideprotected void onInitialize() {@@ -97,7 +92,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- UserFacade user = input.getConvertedInput();+ User user = input.getConvertedInput();if (user != null)return user.getName();elsediff --git a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java b/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.javaindex 03ebd4b3b0..72b27539d2 100644--- a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java+++ b/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java@@ -25,7 +25,7 @@ public class AffinalProjectsModel extends LoadableDetachableModel<Collection<ProProject project = OneDev.getInstance(Dao.class).load(Project.class, projectId);List<Project> affinals = project.getForkRoot().getForkDescendants();for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canReadIssues(it.next().getFacade()))+ if (!SecurityUtils.canAccess(it.next()))it.remove();}return affinals;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationBean.javanew file mode 100644index 0000000000..f9bdb0e7aa--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationBean.java@@ -0,0 +1,42 @@+package io.onedev.server.web.page.admin;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.ProjectChoice;+import io.onedev.server.web.editable.annotation.RoleChoice;++@Editable+public class AuthorizationBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String projectName;++ private String roleName;++ @Editable(order=100, name="Project")+ @ProjectChoice+ @NotEmpty+ public String getProjectName() {+ return projectName;+ }++ public void setProjectName(String projectName) {+ this.projectName = projectName;+ }++ @Editable(order=200, name="Role")+ @RoleChoice+ @NotEmpty+ public String getRoleName() {+ return roleName;+ }++ public void setRoleName(String roleName) {+ this.roleName = roleName;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationsBean.javanew file mode 100644index 0000000000..cb0d993d1d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AuthorizationsBean.java@@ -0,0 +1,25 @@+package io.onedev.server.web.page.admin;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class AuthorizationsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<AuthorizationBean> authorizations = new ArrayList<>();++ @Editable+ public List<AuthorizationBean> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizations(List<AuthorizationBean> authorizations) {+ this.authorizations = authorizations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.cssindex 933b9291ce..65075ed24a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/administration.css@@ -38,6 +38,7 @@margin-right: 16px;}-.job-executor .panel-heading .name {+.job-executor .panel-heading .name,+.role .panel-heading .name {margin-right: 8px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.javaindex b4d3ac19a3..bf83dede96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java@@ -13,7 +13,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex cf89b83c9e..e36604c515 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -33,7 +33,7 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -114,7 +114,7 @@ public class GroovyScriptListPage extends AdministrationPage {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, TextUtils.describe(script.getJobAuthorization() != null));+ return new Label(componentId, TextUtils.describe(script.isCanBeUsedByJobs()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.htmlindex dc0b24a667..2f84381897 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.html@@ -1,23 +1,10 @@<wicket:extend>- <div class="page-title">Group Authorizations</div>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name">- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control">- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>+ <div class="page-title">Project Authorizations</div>+ <form wicket:id="form" class="authorization list">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary" value="Update"></div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="projectFrag">- <a wicket:id="project"></a>- </wicket:fragment>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- </wicket:fragment>+ </form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.javaindex 93661cbcd4..587f77e9dc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java@@ -2,316 +2,72 @@ package io.onedev.server.web.page.admin.group;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;import java.util.HashSet;-import java.util.Iterator;-import java.util.List;+import java.util.Set;-import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import io.onedev.commons.utils.WordUtils;-import io.onedev.commons.utils.matchscore.MatchScoreProvider;-import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.project.choice.AbstractProjectChoiceProvider;-import io.onedev.server.web.component.project.choice.ProjectChoiceResourceReference;-import io.onedev.server.web.component.project.privilege.selection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.AuthorizationBean;+import io.onedev.server.web.page.admin.AuthorizationsBean;@SuppressWarnings("serial")public class GroupAuthorizationsPage extends GroupPage {- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private static final String PARAM_QUERY = "query";-- private String query;-- private DataTable<GroupAuthorization, Void> authorizationsTable;-- private SelectionColumn<GroupAuthorization, Void> selectionColumn;-public GroupAuthorizationsPage(PageParameters params) {super(params);- query = params.get(PARAM_QUERY).toString();}- private EntityCriteria<GroupAuthorization> getCriteria() {- EntityCriteria<GroupAuthorization> criteria = EntityCriteria.of(GroupAuthorization.class);- if (query != null)- criteria.createCriteria("project").add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));- criteria.add(Restrictions.eq("group", getGroup()));- return criteria;- }-@Overrideprotected void onInitialize() {super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterProjects", Model.of(query)));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- query = searchField.getInput();- if (StringUtils.isBlank(query))- query = null;- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {-- @Override- public void query(String term, int page, Response<ProjectFacade> response) {- List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Collection<Long> authorizedProjectIds = new HashSet<>();- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getGroupId().equals(getGroup().getId()))- authorizedProjectIds.add(authorization.getProjectId());- }- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (!authorizedProjectIds.contains(project.getId()))- notAuthorizedProjects.add(project);- }- Collections.sort(notAuthorizedProjects);- Collections.reverse(notAuthorizedProjects);-- MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {-- @Override- public double getMatchScore(ProjectFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- };- notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);-- new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Authorize project...");- getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {- GroupAuthorization authorization = new GroupAuthorization();- authorization.setGroup(getGroup());- authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId()));- OneDev.getInstance(GroupAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("Project added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<GroupAuthorization> authorizationsToDelete = new HashSet<>();- for (IModel<GroupAuthorization> model: selectionColumn.getSelections()) {- authorizationsToDelete.add(model.getObject());- }- OneDev.getInstance(GroupAuthorizationManager.class).delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!selectionColumn.getSelections().isEmpty());- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<GroupAuthorization, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<GroupAuthorization, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,- IModel<GroupAuthorization> rowModel) {- GroupAuthorization authorization = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "projectFrag", GroupAuthorizationsPage.this);- fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(authorization.getProject())) {-- @Override- public IModel<?> getBody() {- return Model.of(rowModel.getObject().getProject().getName());- }-- });- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<GroupAuthorization, Void>(Model.of("Permission")) {-- @Override- public void populateItem(Item<ICellPopulator<GroupAuthorization>> cellItem, String componentId,- IModel<GroupAuthorization> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", GroupAuthorizationsPage.this);- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new PrivilegeSelectionPanel(id, rowModel.getObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- GroupAuthorization authorization = rowModel.getObject();- authorization.setPrivilege(privilege);- OneDev.getInstance(GroupAuthorizationManager.class).save(authorization);- target.add(fragment);- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- return WordUtils.toWords(rowModel.getObject().getPrivilege().name());- }-- }));- fragment.add(dropdown);- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<GroupAuthorization, Void> dataProvider = new SortableDataProvider<GroupAuthorization, Void>() {-- @Override- public Iterator<? extends GroupAuthorization> iterator(long first, long count) {- EntityCriteria<GroupAuthorization> criteria = getCriteria();- criteria.addOrder(Order.desc("id"));- return OneDev.getInstance(GroupAuthorizationManager.class).query(criteria, (int)first,- (int)count).iterator();- }+ AuthorizationsBean authorizationsBean = new AuthorizationsBean();+ for (GroupAuthorization authorization: getGroup().getAuthorizations()) {+ AuthorizationBean authorizationBean = new AuthorizationBean();+ authorizationBean.setProjectName(authorization.getProject().getName());+ authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationsBean.getAuthorizations().add(authorizationBean);+ }- @Override- public long size() {- return OneDev.getInstance(GroupAuthorizationManager.class).count(getCriteria());- }+ Form<?> form = new Form<Void>("form") {@Override- public IModel<GroupAuthorization> model(GroupAuthorization object) {- Long id = object.getId();- return new LoadableDetachableModel<GroupAuthorization>() {-- @Override- protected GroupAuthorization load() {- return OneDev.getInstance(GroupAuthorizationManager.class).load(id);+ protected void onSubmit() {+ super.onSubmit();++ Set<String> projectNames = new HashSet<>();+ Collection<GroupAuthorization> authorizations = new ArrayList<>();+ for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (projectNames.contains(authorizationBean.getProjectName())) {+ error("Duplicate authorizations found: " + authorizationBean.getProjectName());+ return;+ } else {+ projectNames.add(authorizationBean.getProjectName());+ GroupAuthorization authorization = new GroupAuthorization();+ authorization.setGroup(getGroup());+ authorization.setProject(OneDev.getInstance(ProjectManager.class).find(authorizationBean.getProjectName()));+ authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));+ authorizations.add(authorization);}-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getGroup());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- if (query != null)- params.add(PARAM_QUERY, query);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ OneDev.getInstance(GroupAuthorizationManager.class).authorize(getGroup(), authorizations);+ Session.get().success("Project authorizations updated");}};-- add(authorizationsTable = new HistoryAwareDataTable<GroupAuthorization, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));+ form.add(new NotificationPanel("feedback", form));+ form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));+ add(form);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.htmlindex 402c4d6d95..1cfdb61554 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html@@ -18,7 +18,6 @@<a wicket:id="name"></a></wicket:fragment><wicket:fragment wicket:id="actionFrag">- <a wicket:id="profile" title="Profile of this group"><i class="fa fa-cog"></i></a><a wicket:id="delete" title="Delete this group"><i class="fa fa-trash"></i></a></wicket:fragment></wicket:extend>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.javaindex 98f24688bc..5919fd0a88 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@@ -134,12 +134,12 @@ public class GroupListPage extends AdministrationPage {@Overridepublic void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId,IModel<Group> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().isCanCreateProjects()));+ cellItem.add(new Label(componentId, rowModel.getObject().isCreateProjects()));}});- columns.add(new AbstractColumn<Group, Void>(Model.of("Actions")) {+ columns.add(new AbstractColumn<Group, Void>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<Group>> cellItem, String componentId, IModel<Group> rowModel) {@@ -147,14 +147,6 @@ public class GroupListPage extends AdministrationPage {Group group = rowModel.getObject();- fragment.add(new Link<Void>("profile") {-- @Override- public void onClick() {- setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(rowModel.getObject()));- }-- });fragment.add(new Link<Void>("delete") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.javaindex cf23af9c69..08c3a88fa3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java@@ -6,7 +6,6 @@ import java.util.Collections;import java.util.HashSet;import java.util.Iterator;import java.util.List;-import java.util.Set;import org.apache.commons.lang.StringUtils;import org.apache.wicket.Session;@@ -36,15 +35,13 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Membership;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;@@ -57,7 +54,6 @@ import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;import io.onedev.server.web.page.admin.user.UserProfilePage;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class GroupMembershipsPage extends GroupPage {@@ -104,28 +100,19 @@ public class GroupMembershipsPage extends GroupPage {});- add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {+ add(new SelectToAddChoice<User>("addNew", new AbstractUserChoiceProvider() {@Override- public void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> nonMembers = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> memberIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getGroupId().equals(getGroup().getId()))- memberIds.add(membership.getUserId());- }- for (UserFacade user: cacheManager.getUsers().values()) {- if (!memberIds.contains(user.getId()))- nonMembers.add(user);- }+ public void query(String term, int page, Response<User> response) {+ List<User> nonMembers = OneDev.getInstance(UserManager.class).query();+ nonMembers.removeAll(getGroup().getMembers());Collections.sort(nonMembers);Collections.reverse(nonMembers);- nonMembers = MatchScoreUtils.filterAndSort(nonMembers, new MatchScoreProvider<UserFacade>() {+ nonMembers = MatchScoreUtils.filterAndSort(nonMembers, new MatchScoreProvider<User>() {@Override- public double getMatchScore(UserFacade object) {+ public double getMatchScore(User object) {return object.getMatchScore(term);}@@ -147,7 +134,7 @@ public class GroupMembershipsPage extends GroupPage {}@Override- protected void onSelect(AjaxRequestTarget target, UserFacade selection) {+ protected void onSelect(AjaxRequestTarget target, User selection) {Membership membership = new Membership();membership.setGroup(getGroup());membership.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));@@ -217,7 +204,7 @@ public class GroupMembershipsPage extends GroupPage {Fragment fragment = new Fragment(componentId, "nameFrag", GroupMembershipsPage.this);Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class,UserProfilePage.paramsOf(user));- link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));+ link.add(new UserAvatar("avatar", UserIdent.of(user)));link.add(new Label("name", user.getDisplayName()));fragment.add(link);cellItem.add(fragment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex 3e9a4ab7b4..38d8e77142 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -112,6 +112,11 @@ public abstract class GroupPage extends AdministrationPage {return groupModel.getObject();}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.isAdministrator();+ }+public static PageParameters paramsOf(Group group) {PageParameters params = new PageParameters();params.add(PARAM_GROUP, group.getId());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.htmlindex e42454acf0..9ae0119070 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.html@@ -1,26 +1,13 @@<wicket:extend><div class="page-title">Group Profile</div>- <div wicket:id="content" class="profile"></div>- <wicket:fragment wicket:id="editFrag">+ <div class="profile"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>- <div class="checkbox">- <label>- <input wicket:id="administrator" type="checkbox"/> Is Administrator- <div class="help-block">Members of administrator group have administrative rights over the whole system</div>- </label>- </div>- <div class="checkbox">- <label>- <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects- <div class="help-block">Check this to make members of this group able to fork/create projects</div>- </label>- </div>- <div wicket:id="feedback"></div>+ <div wicket:id="feedback"></div><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"><a wicket:id="delete" class="btn btn-danger pull-right">Delete</a></div></form>- </wicket:fragment>+ </div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.javaindex f8a2308904..1ca7ec32ad 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java@@ -3,41 +3,28 @@ package io.onedev.server.web.page.admin.group;import java.io.Serializable;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.FeedbackPanel;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Sets;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class GroupProfilePage extends GroupPage {private BeanEditor editor;-- private CheckBox administratorInput;-- private CheckBox canCreateProjectsInput;-+private String oldName;public GroupProfilePage(PageParameters params) {@@ -48,112 +35,65 @@ public class GroupProfilePage extends GroupPage {protected void onInitialize() {super.onInitialize();- if (SecurityUtils.isAdministrator()) {- Fragment fragment = new Fragment("content", "editFrag", this);- editor = BeanContext.editModel("editor", new IModel<Serializable>() {+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {- @Override- public void detach() {- }+ @Override+ public void detach() {+ }- @Override- public Serializable getObject() {- return getGroup();- }-- @Override- public void setObject(Serializable object) {- // check contract of GroupManager.save on why we assign oldName here- oldName = getGroup().getName();- editor.getDescriptor().copyProperties(object, getGroup());- }-- }, Sets.newHashSet("administrator", "canCreateProjects"), true);-- Form<?> form = new Form<Void>("form") {+ @Override+ public Serializable getObject() {+ return getGroup();+ }- @Override- protected void onSubmit() {- super.onSubmit();-- Group group = getGroup();- group.setAdministrator(administratorInput.getModelObject());- if (group.isAdministrator())- group.setCanCreateProjects(true);- else- group.setCanCreateProjects(canCreateProjectsInput.getModelObject());- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group groupWithSameName = groupManager.find(group.getName());- if (groupWithSameName != null && !groupWithSameName.equals(group)) {- editor.error(new Path(new PathNode.Named("name")),- "This name has already been used by another group.");- }- if (editor.isValid()) {- groupManager.save(group, oldName);- setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));- Session.get().success("Profile updated");- }- }-- };- form.add(editor);+ @Override+ public void setObject(Serializable object) {+ // check contract of GroupManager.save on why we assign oldName here+ oldName = getGroup().getName();+ editor.getDescriptor().copyProperties(object, getGroup());+ }- administratorInput = new CheckBox("administrator", Model.of(getGroup().isAdministrator()));- administratorInput.add(new OnChangeAjaxBehavior() {+ });- @Override- protected void onUpdate(AjaxRequestTarget target) {- if (administratorInput.getModelObject())- canCreateProjectsInput.setModelObject(true);- target.add(canCreateProjectsInput);- }-- });- form.add(administratorInput);-- canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(getGroup().isCanCreateProjects())) {+ Form<?> form = new Form<Void>("form") {- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!administratorInput.getModelObject());- }+ @Override+ protected void onSubmit() {+ super.onSubmit();- };- canCreateProjectsInput.setOutputMarkupId(true);- form.add(canCreateProjectsInput);-- form.add(new Link<Void>("delete") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.isAdministrator());- }-- @Override- public void onClick() {- try {- OneDev.getInstance(GroupManager.class).delete(getGroup());- setResponsePage(GroupListPage.class);- } catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));- }+ Group group = getGroup();+ GroupManager groupManager = OneDev.getInstance(GroupManager.class);+ Group groupWithSameName = groupManager.find(group.getName());+ if (groupWithSameName != null && !groupWithSameName.equals(group)) {+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another group.");+ }+ if (editor.isValid()) {+ groupManager.save(group, oldName);+ setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));+ Session.get().success("Profile updated");}-- }.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));+ }- form.add(new FeedbackPanel("feedback").setEscapeModelStrings(false));+ };+ form.add(editor);+ form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));++ form.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ try {+ OneDev.getInstance(GroupManager.class).delete(getGroup());+ setResponsePage(GroupListPage.class);+ } catch (OneException e) {+ error(HtmlUtils.formatAsHtml(e.getMessage()));+ }+ }- fragment.add(form);- add(fragment);- } else {- Group group = new Group();- new BeanDescriptor(Group.class).copyProperties(getGroup(), group);- add(BeanContext.view("content", group));- }-+ }.add(new ConfirmOnClick("Do you really want to delete group '" + getGroup().getName() + "'?")));++ add(form);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.htmlindex a8db476ba4..67f78a4b9b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.html@@ -3,18 +3,6 @@<div class="new-group"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>- <div class="checkbox">- <label>- <input wicket:id="administrator" type="checkbox"/> Is Administrator- <div class="help-block">Members of administrator group have administrative rights over the whole system</div>- </label>- </div>- <div class="checkbox">- <label>- <input wicket:id="canCreateProjects" class="can-create-projects" type="checkbox"/> Can Create Projects- <div class="help-block">Check this to make members of this group able to fork/create projects</div>- </label>- </div><div class="actions clearfix"><input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.javaindex 16cdb7d12d..8ea5044dee 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java@@ -1,25 +1,19 @@package io.onedev.server.web.page.admin.group;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Sets;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -27,10 +21,6 @@ public class NewGroupPage extends AdministrationPage {private Group group = new Group();- private CheckBox administratorInput;-- private CheckBox canCreateProjectsInput;-public NewGroupPage(PageParameters params) {super(params);}@@ -39,8 +29,7 @@ public class NewGroupPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();- BeanEditor editor = BeanContext.edit("editor", group,- Sets.newHashSet("administrator", "canCreateProjects"), true);+ BeanEditor editor = BeanContext.edit("editor", group);Form<?> form = new Form<Void>("form") {@@ -55,8 +44,6 @@ public class NewGroupPage extends AdministrationPage {"This name has already been used by another group");}if (editor.isValid()) {- group.setAdministrator(administratorInput.getModelObject());- group.setCanCreateProjects(canCreateProjectsInput.getModelObject());groupManager.save(group, null);Session.get().success("Group created");setResponsePage(GroupMembershipsPage.class, GroupMembershipsPage.paramsOf(group));@@ -65,30 +52,6 @@ public class NewGroupPage extends AdministrationPage {};form.add(editor);- administratorInput = new CheckBox("administrator", Model.of(group.isAdministrator()));- administratorInput.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- if (administratorInput.getModelObject())- canCreateProjectsInput.setModelObject(true);- target.add(canCreateProjectsInput);- }-- });- form.add(administratorInput);-- canCreateProjectsInput = new CheckBox("canCreateProjects", Model.of(group.isCanCreateProjects())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(!administratorInput.getModelObject());- }-- };- canCreateProjectsInput.setOutputMarkupId(true);- form.add(canCreateProjectsInput);add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.cssindex 3a5679fa9e..1a32b51719 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css@@ -37,7 +37,10 @@left: 44px;}-#group .authorization.list .head .select2-container,+#group .authorization.list .select2-container,#group .membership.list .head .select2-container {width: 240px;}+#group .authorization.list .property-roleName .select2-container {+ width: 360px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.javaindex e34054d9c6..5388644eae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java@@ -76,7 +76,6 @@ public class JobExecutorPage extends AdministrationPage {@Overrideprotected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- List<JobExecutor> executors = getSettingManager().getJobExecutors();JobExecutor executor = executors.get(from.getItemIndex());executors.set(from.getItemIndex(), executors.set(to.getItemIndex(), executor));getSettingManager().saveJobExecutors(executors);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.htmlnew file mode 100644index 0000000000..07bf2e12c8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.html@@ -0,0 +1,11 @@+<wicket:extend>+ <div class="page-title">New Role</div>+ <div class="new-role">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">+ </div>+ </form>+ </div>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..a4f2f6294e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java@@ -0,0 +1,69 @@+package io.onedev.server.web.page.admin.role;++import org.apache.wicket.Session;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.page.admin.AdministrationPage;++@SuppressWarnings("serial")+public class NewRolePage extends AdministrationPage {++ private Role role = new Role();++ public NewRolePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BeanEditor editor = BeanContext.edit("editor", role);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ RoleManager roleManager = OneDev.getInstance(RoleManager.class);+ Role roleWithSameName = roleManager.find(role.getName());+ if (roleWithSameName != null) {+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another role");+ }+ if (editor.isValid()) {+ roleManager.save(role, null);+ Session.get().success("Role created");+ setResponsePage(RoleListPage.class);+ }+ }++ };+ form.add(editor);+ add(form);+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.isAdministrator();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.javanew file mode 100644index 0000000000..526ef4452b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.admin.role;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class RoleCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public RoleCssResourceReference() {+ super(RoleCssResourceReference.class, "role.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.htmlnew file mode 100644index 0000000000..348f9fffb0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div class="page-title">Role Detail</div>+ <div class="role">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <div wicket:id="feedback"></div>+ <div class="actions clearfix">+ <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">+ <a wicket:id="delete" class="btn btn-danger pull-right">Delete</a>+ </div>+ </form>+ </div>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..184e863f45--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -0,0 +1,138 @@+package io.onedev.server.web.page.admin.role;++import java.io.Serializable;++import org.apache.wicket.Session;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.IModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.commons.utils.HtmlUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.model.EntityModel;+import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.util.ConfirmOnClick;++@SuppressWarnings("serial")+public class RoleDetailPage extends AdministrationPage {++ private static final String PARAM_ROLE = "role";++ protected final IModel<Role> roleModel;++ private String oldName;++ private BeanEditor editor;++ public RoleDetailPage(PageParameters params) {+ super(params);++ Long roleId = params.get(PARAM_ROLE).toLong();++ roleModel = new EntityModel<Role>(Role.class, roleId);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ editor = BeanContext.editModel("editor", new IModel<Serializable>() {++ @Override+ public void detach() {+ }++ @Override+ public Serializable getObject() {+ return getRole();+ }++ @Override+ public void setObject(Serializable object) {+ oldName = getRole().getName();+ editor.getDescriptor().copyProperties(object, getRole());+ }++ });++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ Role role = getRole();+ RoleManager roleManager = OneDev.getInstance(RoleManager.class);+ Role roleWithSameName = roleManager.find(role.getName());+ if (roleWithSameName != null && !roleWithSameName.equals(role)) {+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another role.");+ }+ if (editor.isValid()) {+ roleManager.save(role, oldName);+ setResponsePage(RoleDetailPage.class, RoleDetailPage.paramsOf(role));+ Session.get().success("Role updated");+ }+ }++ };+ form.add(editor);+ form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));++ form.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ try {+ OneDev.getInstance(RoleManager.class).delete(getRole());+ setResponsePage(RoleListPage.class);+ } catch (OneException e) {+ error(HtmlUtils.formatAsHtml(e.getMessage()));+ }+ }++ }.add(new ConfirmOnClick("Do you really want to delete role '" + getRole().getName() + "'?")));++ add(form);+ }++ @Override+ protected void onDetach() {+ roleModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));+ }++ public Role getRole() {+ return roleModel.getObject();+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.isAdministrator();+ }++ public static PageParameters paramsOf(Role role) {+ PageParameters params = new PageParameters();+ params.add(PARAM_ROLE, role.getId());+ return params;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.htmlnew file mode 100644index 0000000000..7fa7e8820c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html@@ -0,0 +1,23 @@+<wicket:extend>+ <div class="page-title">Role Administration</div>+ <div class="role list">+ <div class="head clearfix">+ <div class="pull-left clearable-wrapper">+ <input wicket:id="filterRoles" class="form-control search" placeholder="Filter by name">+ </div>+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Role</a>+ </div>+ </div>+ <div class="body">+ <div wicket:id="feedback"></div>+ <table wicket:id="roles" class="roles table table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="name"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionFrag">+ <a wicket:id="delete" title="Delete this role"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javanew file mode 100644index 0000000000..1cbc91639a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -0,0 +1,220 @@+package io.onedev.server.web.page.admin.role;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.commons.lang.StringUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import io.onedev.commons.utils.HtmlUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.component.datatable.HistoryAwareDataTable;+import io.onedev.server.web.component.link.LabelLink;+import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.util.ConfirmOnClick;+import io.onedev.server.web.util.PagingHistorySupport;++@SuppressWarnings("serial")+public class RoleListPage extends AdministrationPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private static final String PARAM_QUERY = "query";++ private DataTable<Role, Void> rolesTable;++ private String query;++ public RoleListPage(PageParameters params) {+ super(params);+ query = params.get(PARAM_QUERY).toString();+ }++ private EntityCriteria<Role> getCriteria() {+ EntityCriteria<Role> criteria = EntityCriteria.of(Role.class);+ if (query != null)+ criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));+ return criteria;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("filterRoles", Model.of(query)));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ query = searchField.getInput();+ if (StringUtils.isBlank(query))+ query = null;+ target.add(rolesTable);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ public void onClick() {+ setResponsePage(NewRolePage.class);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ });++ add(new FencedFeedbackPanel("feedback", this).setEscapeModelStrings(false));++ List<IColumn<Role, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Role, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {+ Fragment fragment = new Fragment(componentId, "nameFrag", RoleListPage.this);+ fragment.add(new LabelLink<Void>("name", Model.of(rowModel.getObject().getName())) {++ @Override+ public void onClick() {+ setResponsePage(RoleDetailPage.class, RoleDetailPage.paramsOf(rowModel.getObject()));+ }++ });+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<Role, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionFrag", RoleListPage.this);++ Role role = rowModel.getObject();++ fragment.add(new Link<Void>("delete") {++ @Override+ public void onClick() {+ try {+ OneDev.getInstance(RoleManager.class).delete(rowModel.getObject());+ setResponsePage(RoleListPage.class);+ } catch (OneException e) {+ getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));+ }+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator());+ }++ }.add(new ConfirmOnClick("Do you really want to delete role '" + role.getName() + "'?")));++ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ SortableDataProvider<Role, Void> dataProvider = new SortableDataProvider<Role, Void>() {++ @Override+ public Iterator<? extends Role> iterator(long first, long count) {+ EntityCriteria<Role> criteria = getCriteria();+ criteria.addOrder(Order.asc("name"));+ return OneDev.getInstance(RoleManager.class).query(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ return OneDev.getInstance(RoleManager.class).count(getCriteria());+ }++ @Override+ public IModel<Role> model(Role object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Role>() {++ @Override+ protected Role load() {+ return OneDev.getInstance(RoleManager.class).load(id);+ }++ };+ }+ };++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(rolesTable = new HistoryAwareDataTable<>("roles", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.isAdministrator();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new RoleCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.cssnew file mode 100644index 0000000000..e69de29bb2diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.htmlindex ab5d5d9c17..2f84381897 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.html@@ -1,24 +1,10 @@<wicket:extend>- <div class="page-title">Authorized Projects</div>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterProjects" class="form-control search" placeholder="Filter by project name">- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control">- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>+ <div class="page-title">Project Authorizations</div>+ <form wicket:id="form" class="authorization list">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary" value="Update"></div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="projectFrag">- <a wicket:id="project"></a>- </wicket:fragment>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>- </wicket:fragment>+ </form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.javaindex b5b53c8cc6..584d3477cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java@@ -2,489 +2,72 @@ package io.onedev.server.web.page.admin.user;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.HashMap;import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;+import java.util.Set;-import org.apache.wicket.Component;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.WordUtils;-import io.onedev.commons.utils.matchscore.MatchScoreProvider;-import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserAuthorizationManager;-import io.onedev.server.model.Project;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.project.choice.AbstractProjectChoiceProvider;-import io.onedev.server.web.component.project.choice.ProjectChoiceResourceReference;-import io.onedev.server.web.component.project.privilege.selection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.project.privilege.source.PrivilegeSourcePanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.AuthorizationBean;+import io.onedev.server.web.page.admin.AuthorizationsBean;@SuppressWarnings("serial")public class UserAuthorizationsPage extends UserPage {- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private String searchInput;-- private DataTable<Long, Void> authorizationsTable;-- private SelectionColumn<Long, Void> selectionColumn;-- private IModel<Map<Long, UserAuthorizationFacade>> explicitProjectAuthorizationsModel =- new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {-- @Override- protected Map<Long, UserAuthorizationFacade> load() {- Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();- for (UserAuthorizationFacade authorization:- OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) {- if (authorization.getUserId().equals(getUser().getId()))- authorizations.put(authorization.getProjectId(), authorization);- }- return authorizations;- }-- };- private IModel<Map<Long, ProjectPrivilege>> projectAuthorizationsModel =- new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {-- @Override- protected Map<Long, ProjectPrivilege> load() {- Map<Long, ProjectPrivilege> projectAuthorizations = new HashMap<>();- Collection<Long> projectsAuthorizedFromOtherSources = new HashSet<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);-- if (getUser().asSubject().isPermitted(new SystemAdministration())) {- for (ProjectFacade project: cacheManager.getProjects().values()) {- projectAuthorizations.put(project.getId(), ProjectPrivilege.ADMINISTRATION);- projectsAuthorizedFromOtherSources.add(project.getId());- }- } else {- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(getUser().getId()))- projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());- }- Collection<Long> groupIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(getUser().getId()))- groupIds.add(membership.getGroupId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (groupIds.contains(authorization.getGroupId())) {- ProjectPrivilege privilege = projectAuthorizations.get(authorization.getProjectId());- if (privilege == null || authorization.getPrivilege().implies(privilege))- projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());- projectsAuthorizedFromOtherSources.add(authorization.getProjectId());- }- }- for (ProjectFacade project: cacheManager.getProjects().values()) {- ProjectPrivilege privilege = projectAuthorizations.get(project.getId());- if (project.getDefaultPrivilege() != null) {- if (privilege == null || project.getDefaultPrivilege().getProjectPrivilege().implies(privilege))- projectAuthorizations.put(project.getId(), project.getDefaultPrivilege().getProjectPrivilege());- projectsAuthorizedFromOtherSources.add(project.getId());- }- }- }-- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();- List<Long> projectIds = new ArrayList<>(projectAuthorizations.keySet());- Collections.sort(projectIds, new Comparator<Long>() {-- @Override- public int compare(Long o1, Long o2) {- if (projectsAuthorizedFromOtherSources.contains(o1)) {- if (projectsAuthorizedFromOtherSources.contains(o2)) {- return o1.compareTo(o2);- } else {- return 1;- }- } else {- if (projectsAuthorizedFromOtherSources.contains(o2)) {- return -1;- } else {- return explicitProjectAuthorizations.get(o2).getId()- .compareTo(explicitProjectAuthorizations.get(o1).getId());- }- }- }-- });-- Map<Long, ProjectPrivilege> sortedProjectAuthorizations = new LinkedHashMap<>();- for (Long projectId: projectIds)- sortedProjectAuthorizations.put(projectId, projectAuthorizations.get(projectId));-- return sortedProjectAuthorizations;- }-- };-public UserAuthorizationsPage(PageParameters params) {super(params);}- @Override- protected void onDetach() {- explicitProjectAuthorizationsModel.detach();- projectAuthorizationsModel.detach();- super.onDetach();- }-- private Map<Long, UserAuthorizationFacade> getExplicitProjectAuthorizations() {- return explicitProjectAuthorizationsModel.getObject();- }-- private Map<Long, ProjectPrivilege> getProjectAuthorizations() {- return projectAuthorizationsModel.getObject();- }-- private boolean isPrivilegeFromOtherSources(Long projectId) {- UserAuthorizationFacade authorization = getExplicitProjectAuthorizations().get(projectId);- ProjectPrivilege privilege = getProjectAuthorizations().get(projectId);- return authorization == null || !authorization.getPrivilege().implies(privilege);- }-@Overrideprotected void onInitialize() {super.onInitialize();- TextField<String> searchField;-- add(searchField = new TextField<String>("filterProjects", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- searchInput = searchField.getInput();- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {-- @Override- public void query(String term, int page, Response<ProjectFacade> response) {- List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();-- for (ProjectFacade project: OneDev.getInstance(CacheManager.class).getProjects().values()) {- if (!getProjectAuthorizations().containsKey(project.getId()))- notAuthorizedProjects.add(project);- }- Collections.sort(notAuthorizedProjects);- Collections.reverse(notAuthorizedProjects);-- MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {-- @Override- public double getMatchScore(ProjectFacade object) {- return MatchScoreUtils.getMatchScore(object.getName(), term);- }-- };-- notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);-- new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Authorize project...");- getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(getUser());- authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId()));- OneDev.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("Project added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {+ AuthorizationsBean authorizationsBean = new AuthorizationsBean();+ for (UserAuthorization authorization: getUser().getAuthorizations()) {+ AuthorizationBean authorizationBean = new AuthorizationBean();+ authorizationBean.setProjectName(authorization.getProject().getName());+ authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationsBean.getAuthorizations().add(authorizationBean);+ }- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();- UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class);- for (IModel<Long> model: selectionColumn.getSelections()) {- UserAuthorizationFacade authorization = explicitProjectAuthorizations.get(model.getObject());- if (authorization != null) {- authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));- explicitProjectAuthorizations.remove(model.getObject());- }- }- userAuthorizationManager.delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }+ Form<?> form = new Form<Void>("form") {@Override- protected void onConfigure() {- super.onConfigure();-- boolean hasLocalPrivileges = false;- for (IModel<Long> model: selectionColumn.getSelections()) {- if (!isPrivilegeFromOtherSources(model.getObject())) {- hasLocalPrivileges = true;- break;+ protected void onSubmit() {+ super.onSubmit();++ Set<String> projectNames = new HashSet<>();+ Collection<UserAuthorization> authorizations = new ArrayList<>();+ for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (projectNames.contains(authorizationBean.getProjectName())) {+ error("Duplicate authorizations found: " + authorizationBean.getProjectName());+ return;+ } else {+ projectNames.add(authorizationBean.getProjectName());+ UserAuthorization authorization = new UserAuthorization();+ authorization.setUser(getUser());+ authorization.setProject(OneDev.getInstance(ProjectManager.class).find(authorizationBean.getProjectName()));+ authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));+ authorizations.add(authorization);}}- setVisible(hasLocalPrivileges);- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);-- List<IColumn<Long, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Long, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Long, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,- IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "projectFrag", UserAuthorizationsPage.this);- Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject());- String projectName = project.getName();- fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(project)) {-- @Override- public IModel<?> getBody() {- return Model.of(projectName);- }-- });- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {-- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,- IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", UserAuthorizationsPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- String script = String.format(""- + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",- getMarkupId(), isPrivilegeFromOtherSources(rowModel.getObject()));-- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- ProjectPrivilege privilege = getProjectAuthorizations().get(rowModel.getObject());- return new PrivilegeSelectionPanel(id, privilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- Long projectId = rowModel.getObject();-- Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations =- getExplicitProjectAuthorizations();- UserAuthorizationFacade userAuthorizationFacade =- explicitProjectAuthorizations.get(projectId);- UserAuthorizationManager userAuthorizationManager =- OneDev.getInstance(UserAuthorizationManager.class);- UserAuthorization userAuthorization;- if (userAuthorizationFacade == null) {- userAuthorization = new UserAuthorization();- userAuthorization.setUser(getUser());- userAuthorization.setProject(- OneDev.getInstance(ProjectManager.class).load(projectId));- } else {- userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());- }- userAuthorization.setPrivilege(privilege);- userAuthorizationManager.save(userAuthorization);- explicitProjectAuthorizations.put(projectId, userAuthorization.getFacade());-- target.add(fragment);-- if (getProjectAuthorizations().get(projectId) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher "- + "permission is granted from other sources");- }- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return WordUtils.toWords(getProjectAuthorizations().get(rowModel.getObject()).name());- }-- }));- fragment.add(dropdown);-- fragment.add(new DropdownLink("otherSources") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject());- return new PrivilegeSourcePanel(id, getUser(), project,- getProjectAuthorizations().get(project.getId()));- }-- });-- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {-- private List<Long> getProjectIds() {- List<Long> projectIds = new ArrayList<>(getProjectAuthorizations().keySet());- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- return MatchScoreUtils.filterAndSort(projectIds, new MatchScoreProvider<Long>() {-- @Override- public double getMatchScore(Long object) {- return MatchScoreUtils.getMatchScore(cacheManager.getProject(object).getName(), searchInput);- }-- });+ OneDev.getInstance(UserAuthorizationManager.class).authorize(getUser(), authorizations);+ Session.get().success("Project authorizations updated");}- @Override- public Iterator<? extends Long> iterator(long first, long count) {- List<Long> projectIds = getProjectIds();- if (first + count <= projectIds.size())- return projectIds.subList((int)first, (int)(first+count)).iterator();- else- return projectIds.subList((int)first, projectIds.size()).iterator();- }-- @Override- public long size() {- return getProjectIds().size();- }-- @Override- public IModel<Long> model(Long object) {- return Model.of(object);- }};-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getUser());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));+ form.add(new NotificationPanel("feedback", form));+ form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));+ add(form);}+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex c874466c9a..6e62e51027 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -18,7 +18,6 @@<a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="name" class="name"></span></a></wicket:fragment><wicket:fragment wicket:id="actionFrag">- <a wicket:id="profile" title="Profile of this user"><i class="fa fa-cog"></i></a><a wicket:id="delete" title="Delete this user"><i class="fa fa-trash"></i></a></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 855967942c..39b801e93f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -35,7 +35,6 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;@@ -118,7 +117,7 @@ public class UserListPage extends AdministrationPage {User user = rowModel.getObject();Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);Link<Void> link = new BookmarkablePageLink<Void>("link", UserProfilePage.class, UserProfilePage.paramsOf(user));- link.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))));+ link.add(new UserAvatar("avatar", UserIdent.of(user)));link.add(new Label("name", user.getName()));fragment.add(link);cellItem.add(fragment);@@ -143,22 +142,12 @@ public class UserListPage extends AdministrationPage {}});- columns.add(new AbstractColumn<User, Void>(Model.of("Actions")) {+ columns.add(new AbstractColumn<User, Void>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);- fragment.add(new Link<Void>("profile") {-- @Override- public void onClick() {- PageParameters params = UserPage.paramsOf(rowModel.getObject());- setResponsePage(UserProfilePage.class, params);- }-- });-User user = rowModel.getObject();fragment.add(new Link<Void>("delete") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.javaindex bdc9cec44f..adf9ca0bbc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java@@ -6,7 +6,6 @@ import java.util.Collections;import java.util.HashSet;import java.util.Iterator;import java.util.List;-import java.util.Set;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Session;@@ -36,13 +35,11 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.model.Group;import io.onedev.server.model.Membership;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;@@ -100,28 +97,19 @@ public class UserMembershipsPage extends UserPage {});- add(new SelectToAddChoice<GroupFacade>("addNew", new AbstractGroupChoiceProvider() {+ add(new SelectToAddChoice<Group>("addNew", new AbstractGroupChoiceProvider() {@Override- public void query(String term, int page, Response<GroupFacade> response) {- List<GroupFacade> notMembersOf = new ArrayList<>();- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> groupIds = new HashSet<>();- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(getUser().getId()))- groupIds.add(membership.getGroupId());- }- for (GroupFacade group: cacheManager.getGroups().values()) {- if (!groupIds.contains(group.getId()))- notMembersOf.add(group);- }+ public void query(String term, int page, Response<Group> response) {+ List<Group> notMembersOf = OneDev.getInstance(GroupManager.class).query();+ notMembersOf.removeAll(getUser().getGroups());Collections.sort(notMembersOf);Collections.reverse(notMembersOf);- notMembersOf = MatchScoreUtils.filterAndSort(notMembersOf, new MatchScoreProvider<GroupFacade>() {+ notMembersOf = MatchScoreUtils.filterAndSort(notMembersOf, new MatchScoreProvider<Group>() {@Override- public double getMatchScore(GroupFacade object) {+ public double getMatchScore(Group object) {return MatchScoreUtils.getMatchScore(object.getName(), term);}@@ -143,7 +131,7 @@ public class UserMembershipsPage extends UserPage {}@Override- protected void onSelect(AjaxRequestTarget target, GroupFacade selection) {+ protected void onSelect(AjaxRequestTarget target, Group selection) {Membership membership = new Membership();membership.setUser(getUser());membership.setGroup(OneDev.getInstance(GroupManager.class).load(selection.getId()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 3c08d19ac2..a3cdeb5d10 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -13,7 +13,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;@@ -49,7 +48,7 @@ public abstract class UserPage extends AdministrationPage {protected Component newHead(String componentId) {Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", UserPage.this);User user = userModel.getObject();- fragment.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(user))).add(AttributeAppender.append("title", user.getDisplayName())));+ fragment.add(new UserAvatar("avatar", UserIdent.of(user)).add(AttributeAppender.append("title", user.getDisplayName())));fragment.add(new Label("name", user.getDisplayName()));return fragment;}@@ -102,7 +101,7 @@ public abstract class UserPage extends AdministrationPage {}};- link.add(new UserAvatar("avatar", UserIdent.of(getUser().getFacade())));+ link.add(new UserAvatar("avatar", UserIdent.of(getUser())));link.add(new Label("name", getUser().getDisplayName()));fragment.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex addca82fc1..a3a092d725 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -44,17 +44,13 @@left: 44px;}-#user .authorization.list a.other-sources {- margin-left: 4px;- color: #DCB508;- vertical-align: middle;-}--#user .membership.list .head .select2-container,--#user .authorization.list .head .select2-container {+#user .membership.list .head .select2-container,+#user .authorization.list .select2-container {width: 240px;}+#user .authorization.list .property-roleNames .select2-container {+ width: 360px;+}.new-user .actions .btn {margin-right: 20px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex c6643ddfe9..313a2a4ce4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -23,8 +23,9 @@<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a><ul class="dropdown-menu"><li wicket:id="userManagement"><a wicket:id="link"><i class="fa fa-fw fa-user"></i> User Management</a></li>- <li wicket:id="groupManagement"><a wicket:id="link"><i class="fa fa-fw fa-group"></i> Group Management</a></li><li role="separator" class="divider"></li>+ <li wicket:id="roleManagement"><a wicket:id="link"><i class="fa fa-fw fa-vcard-o"></i> Role Management</a></li>+ <li wicket:id="groupManagement"><a wicket:id="link"><i class="fa fa-fw fa-group"></i> Group Management</a></li><li wicket:id="securitySetting"><a wicket:id="link"><i class="fa fa-fw fa-lock"></i> Security Setting</a></li><li wicket:id="externelAuthentication"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Externel Authentication</a></li><li role="separator" class="divider"></li>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex ab9ffbdaea..df6d9792b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -23,7 +23,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.avatar.UserAvatar;@@ -38,6 +37,9 @@ import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.role.NewRolePage;+import io.onedev.server.web.page.admin.role.RoleDetailPage;+import io.onedev.server.web.page.admin.role.RoleListPage;import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;@@ -112,6 +114,11 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)item.add(AttributeAppender.append("class", "active"));+ administrationContainer.add(item = new WebMarkupContainer("roleManagement"));+ item.add(new ViewStateAwarePageLink<Void>("link", RoleListPage.class));+ if (getPage() instanceof RoleListPage || getPage() instanceof NewRolePage || getPage() instanceof RoleDetailPage)+ item.add(AttributeAppender.append("class", "active"));+administrationContainer.add(item = new WebMarkupContainer("groupManagement"));item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)@@ -192,7 +199,7 @@ public abstract class LayoutPage extends BasePage {add(notSignedInContainer);WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");- signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));+ signedInContainer.add(new UserAvatar("avatar", UserIdent.of(loginUser)));signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));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.javaindex 4e1c96c4ae..12ce024f84 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@@ -14,8 +14,8 @@ import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -33,7 +33,7 @@ public class NewProjectPage extends LayoutPage {Project project = new Project();BeanEditor editor = BeanContext.edit("editor", project,- Lists.newArrayList("name", "description", "defaultPrivilege"), false);+ Lists.newArrayList("name", "description", "defaultRoleName"), false);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.htmlindex fd2e061aa1..590d431bfa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html@@ -13,9 +13,9 @@</div></div><div class="body">- <div wicket:id="orphanProjectsNote" class="alert alert-warning">Orphan projects are those without explicit administrators. For instance,+ <div wicket:id="orphanProjectsNote" class="alert alert-warning">Orphan projects are those without owners. For instance,project forked/created by some user will become orphan if that user account is deleted. You may delete orphan projects- to save resource or add someone else into a team with administrative rights if it is still useful.</div>+ to save resource or make someone else to own the projects if they are still useful.</div><div wicket:id="projects"></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 1491f9fe3d..7cdb210a7c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -2,9 +2,8 @@ package io.onedev.server.web.page.project;import java.util.ArrayList;import java.util.Comparator;-import java.util.HashSet;import java.util.List;-import java.util.Set;+import java.util.stream.Collectors;import org.apache.commons.lang.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -24,13 +23,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.project.list.ProjectListPanel;import io.onedev.server.web.page.layout.LayoutPage;@@ -49,34 +44,20 @@ public class ProjectListPage extends LayoutPage {private String query;- private final IModel<List<ProjectFacade>> orphanProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {+ private final IModel<List<Project>> orphanProjectsModel = new LoadableDetachableModel<List<Project>>() {@Override- protected List<ProjectFacade> load() {- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- List<ProjectFacade> projects = new ArrayList<>();+ protected List<Project> load() {+ List<Project> projects = OneDev.getInstance(ProjectManager.class).query()+ .stream()+ .filter(it->it.getOwner() == null)+ .sorted(Comparator.comparing(Project::getName))+ .collect(Collectors.toList());- Set<Long> projectIdsWithExplicitAdministrators = new HashSet<>();- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getPrivilege() == ProjectPrivilege.ADMINISTRATION)- projectIdsWithExplicitAdministrators.add(authorization.getProjectId());- }- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getPrivilege() == ProjectPrivilege.ADMINISTRATION)- projectIdsWithExplicitAdministrators.add(authorization.getProjectId());- }-- for (ProjectFacade project: cacheManager.getProjects().values()) {- if (!projectIdsWithExplicitAdministrators.contains(project.getId())) {- projects.add(project);- }- }- projects.sort(Comparator.comparing(ProjectFacade::getName));-- return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<ProjectFacade>() {+ return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<Project>() {@Override- public double getMatchScore(ProjectFacade object) {+ public double getMatchScore(Project object) {return MatchScoreUtils.getMatchScore(object.getName(), query);}@@ -91,17 +72,17 @@ public class ProjectListPage extends LayoutPage {showOrphanProjects = params.get(PARAM_ORPHAN).toBoolean(false);}- private final IModel<List<ProjectFacade>> projectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {+ private final IModel<List<Project>> projectsModel = new LoadableDetachableModel<List<Project>>() {@Override- protected List<ProjectFacade> load() {- List<ProjectFacade> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)+ protected List<Project> load() {+ List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class).getAccessibleProjects(getLoginUser()));- projects.sort(ProjectFacade::compareLastVisit);- return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<ProjectFacade>() {+ projects.sort(Project::compareLastVisit);+ return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<Project>() {@Override- public double getMatchScore(ProjectFacade object) {+ public double getMatchScore(Project object) {return MatchScoreUtils.getMatchScore(object.getName(), query);}@@ -184,10 +165,10 @@ public class ProjectListPage extends LayoutPage {});- add(projectList = new ProjectListPanel("projects", new AbstractReadOnlyModel<List<ProjectFacade>>() {+ add(projectList = new ProjectListPanel("projects", new AbstractReadOnlyModel<List<Project>>() {@Override- public List<ProjectFacade> getObject() {+ public List<Project> getObject() {if (showOrphanProjects)return orphanProjectsModel.getObject();elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 377a5e7dea..8340af90a2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -144,7 +144,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected List<? extends Tab> newTabs() {List<ProjectTab> tabs = ProjectPage.this.newTabs();- if (SecurityUtils.canAdministrate(getProject().getFacade()))+ if (SecurityUtils.canManage(getProject()))tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));return tabs;}@@ -187,7 +187,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadIssues(getProject().getFacade());+ return SecurityUtils.canAccess(getProject());}@Override@@ -197,7 +197,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {private List<ProjectTab> newTabs() {List<ProjectTab> tabs = new ArrayList<>();- if (SecurityUtils.canReadCode(getProject().getFacade())) {+ if (SecurityUtils.canReadCode(getProject())) {tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,ProjectCommitsPage.class, CommitDetailPage.class) {@@ -271,7 +271,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});- if (SecurityUtils.canReadCode(getProject().getFacade())) {+ if (SecurityUtils.canReadCode(getProject())) {tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",0, ProjectCodeCommentsPage.class) {@@ -330,7 +330,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});WebMarkupContainer settingItem = new WebMarkupContainer("setting");- settingItem.setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ settingItem.setVisible(SecurityUtils.canManage(getProject()));settingItem.add(new Tabbable("menu", newSettingTabs()));if (getPage() instanceof ProjectSettingPage)settingItem.add(AttributeAppender.append("class", "active expanded"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 46ee700e24..b011cc0d6e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -455,7 +455,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SProject project = getProject();if ((state.mode == Mode.VIEW || state.mode == Mode.VIEW_PLAIN || state.mode == Mode.BLAME)&& isOnBranch() && state.blobIdent.isTree()- && SecurityUtils.canWriteCode(project.getFacade())) {+ && SecurityUtils.canWriteCode(project)) {setVisible(true);setEnabled(!reviewRequired.get() && !buildRequired.get());} else {@@ -1334,7 +1334,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex ded58b18b8..dcf88a06da 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -57,7 +57,7 @@ class LastCommitsResource extends AbstractResource {public void writeData(Attributes attributes) throws IOException {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- if (!SecurityUtils.canReadCode(project.getFacade()))+ if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();LastCommitsOfChildren lastCommits = project.getLastCommitsOfChildren(revision, path);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.javaindex 205ca2dfbe..cf0e3d1b1d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java@@ -40,7 +40,7 @@ public class NoCommitsPanel extends Panel {protected void onInitialize() {super.onInitialize();- if (SecurityUtils.canWriteCode(context.getProject().getFacade())) {+ if (SecurityUtils.canWriteCode(context.getProject())) {add(new MenuLink("addFiles") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 871815a3a4..dbebf54abf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -70,7 +70,7 @@ public abstract class BlobViewPanel extends Panel {WebMarkupContainer changeActions = new WebMarkupContainer("changeActions");Project project = context.getProject();- if (SecurityUtils.canWriteCode(project.getFacade()) && context.isOnBranch()) {+ if (SecurityUtils.canWriteCode(project) && context.isOnBranch()) {User user = OneDev.getInstance(UserManager.class).getCurrent();String revision = context.getBlobIdent().revision;String path = context.getBlobIdent().path;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 4c2b69e66c..5b4d4f975c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -476,7 +476,7 @@ public class ProjectBranchesPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade())+ setVisible(SecurityUtils.canManage(getProject())&& !branch.equals(getProject().getDefaultBranch()));}@@ -692,7 +692,7 @@ public class ProjectBranchesPage extends ProjectPage {super.onConfigure();Project project = getProject();- if (SecurityUtils.canWriteCode(project.getFacade())) {+ if (SecurityUtils.canWriteCode(project)) {if (project.getDefaultBranch().equals(branch)) {setEnabled(false);} else {@@ -809,7 +809,7 @@ public class ProjectBranchesPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}private static class State implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 741faa87b9..9a14db22be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -62,11 +62,6 @@ public class ProjectBuildsPage extends ProjectPage {}}- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());- }-private BuildQuerySettingManager getBuildQuerySettingManager() {return OneDev.getInstance(BuildQuerySettingManager.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex 552292f3fa..982646a005 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -14,6 +14,7 @@<a wicket:id="moreInfo" class="more-info pull-right" title="More info"><span class="fa fa-ellipsis-h"></span></a></div><pre wicket:id="statusMessage" class="status-message alert"></pre>+ <wicket:enclosure child="commitMessage"><div class="commit-info clearfix"><div class="pull-left"><i class="fa fa-ext fa-commit"></i> Commit: </div><div class="pull-left">@@ -25,6 +26,7 @@<span wicket:id="commitAvatars"></span> <span wicket:id="commitNames"></span></div></div>+ </wicket:enclosure><ul wicket:id="buildTabs" class="tabs nav nav-tabs"></ul><wicket:child></wicket:child></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 060e0b08a7..f6e585ea9c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -18,6 +18,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -71,6 +72,7 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -116,7 +118,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canAccess(getBuild());}private WebSocketObserver newBuildObserver(Long buildId) {@@ -200,7 +202,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexMap<String, List<String>> paramMap = JobParam.getParamMap(getBuild().getJob(), paramBean,getBuild().getJob().getParamSpecMap().keySet());OneDev.getInstance(JobManager.class).resubmit(getBuild(), paramMap, SecurityUtils.getUser());- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(getBuild(), position));+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(getBuild(), position));}@Override@@ -255,7 +257,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getBuild().isFinished());+ setVisible(getBuild().isFinished() && SecurityUtils.canRunJob(getProject(), getBuild().getJobName()));}});@@ -271,7 +273,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getBuild().isFinished());+ setVisible(!getBuild().isFinished() && SecurityUtils.canRunJob(getBuild().getProject(), getBuild().getJobName()));}}.add(new ConfirmOnClick("Do you really want to cancel this build?")));@@ -361,13 +363,31 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexreturn getProject().getRevCommit(getBuild().getCommitHash(), true);}- }));+ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canReadCode(getProject()));+ }++ });RevCommit commit = getProject().getRevCommit(getBuild().getCommitHash(), true);add(new ContributorAvatars("commitAvatars", commit.getAuthorIdent(), commit.getCommitterIdent()));add(new ContributorPanel("commitNames", commit.getAuthorIdent(), commit.getCommitterIdent()));- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commitHash", CommitDetailPage.class, params);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commitHash", CommitDetailPage.class, params) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!SecurityUtils.canReadCode(getProject()))+ tag.setName("span");+ }++ };+ hashLink.setEnabled(SecurityUtils.canReadCode(getProject()));hashLink.add(new Label("label", GitUtils.abbreviateSHA(commit.name())));add(hashLink);@@ -379,15 +399,17 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexprotected List<Tab> load() {List<Tab> tabs = new ArrayList<>();- tabs.add(new BuildTab("Log", BuildLogPage.class) {-- @Override- protected Component renderOptions(String componentId) {- BuildLogPage page = (BuildLogPage) getPage();- return page.renderOptions(componentId);- }-- });+ if (SecurityUtils.canAccessLog(getBuild())) {+ tabs.add(new BuildTab("Log", BuildLogPage.class) {++ @Override+ protected Component renderOptions(String componentId) {+ BuildLogPage page = (BuildLogPage) getPage();+ return page.renderOptions(componentId);+ }++ });+ }LockUtils.read(getBuild().getArtifactsLockKey(), new Callable<Void>() {@@ -401,7 +423,9 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex});tabs.add(new BuildTab("Fixed Issues", FixedIssuesPage.class));- tabs.add(new BuildTab("Changes", BuildChangesPage.class));++ if (SecurityUtils.canReadCode(getProject()))+ tabs.add(new BuildTab("Changes", BuildChangesPage.class));List<BuildTabContribution> contributions = new ArrayList<>(OneDev.getExtensions(BuildTabContribution.class));contributions.sort(Comparator.comparing(BuildTabContribution::getOrder));@@ -467,7 +491,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex};deleteLink.add(new ConfirmOnClick("Do you really want to delete this build?"));- deleteLink.setVisible(SecurityUtils.canAdministrate(getBuild().getProject().getFacade()));+ deleteLink.setVisible(SecurityUtils.canManage(getBuild()));return deleteLink;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex f5cedaf360..c7de0b7f84 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -36,7 +36,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.download.ArtifactDownloadResource;import io.onedev.server.web.download.ArtifactDownloadResourceReference;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;@@ -48,11 +47,6 @@ public class BuildArtifactsPage extends BuildDetailPage {super(params);}- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());- }-@Overridepublic void onInitialize() {super.onInitialize();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.htmlnew file mode 100644index 0000000000..89e2ed850a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.html@@ -0,0 +1,3 @@+<wicket:extend>+TBD+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.javanew file mode 100644index 0000000000..145a0fa5a7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.builds.detail.dashboard;++import org.apache.wicket.RestartResponseException;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;+import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;+import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;++@SuppressWarnings("serial")+public class BuildDashboardPage extends BuildDetailPage {++ public BuildDashboardPage(PageParameters params) {+ super(params);++ if (SecurityUtils.canAccessLog(getBuild()))+ throw new RestartResponseException(BuildLogPage.class, BuildLogPage.paramsOf(getBuild(), getPosition()));+ else if (getBuild().getArtifactsDir().exists())+ throw new RestartResponseException(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild(), getPosition()));+ else+ throw new RestartResponseException(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild(), getPosition()));++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.javaindex bc90582794..40cc1c2f3b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.build.log.BuildLogPanel;import io.onedev.server.web.download.BuildLogDownloadResource;import io.onedev.server.web.download.BuildLogDownloadResourceReference;@@ -32,6 +33,11 @@ public class BuildLogPage extends BuildDetailPage {response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onLogDomReady();"));}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccessLog(getBuild());+ }+public Component renderOptions(String componentId) {Fragment fragment = new Fragment(componentId, "optionsFrag", this);fragment.add(new ResourceLink<Void>("download", new BuildLogDownloadResourceReference(),diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.javaindex 246b58617a..9b0ab259b9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java@@ -211,7 +211,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}public static PageParameters paramsOf(Project project, @Nullable String query) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex a25fdbf743..953e904a35 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -705,7 +705,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex d9c222b444..7de7d0baeb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -209,7 +209,7 @@ public class ProjectCommitsPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 02dc18f941..55be57df7a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -661,7 +661,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}public static class State implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.htmlnew file mode 100644index 0000000000..89e2ed850a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.html@@ -0,0 +1,3 @@+<wicket:extend>+TBD+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.javanew file mode 100644index 0000000000..9661f97ad8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java@@ -0,0 +1,24 @@+package io.onedev.server.web.page.project.dashboard;++import org.apache.wicket.RestartResponseException;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.issues.list.IssueListPage;++@SuppressWarnings("serial")+public class ProjectDashboardPage extends ProjectPage {++ public ProjectDashboardPage(PageParameters params) {+ super(params);++ if (SecurityUtils.canReadCode(getProject()))+ throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));+ else+ throw new RestartResponseException(IssueListPage.class, IssueListPage.paramsOf(getProject(), "", 0));++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex 2f6a8a3bdd..d421077aef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -39,7 +39,7 @@ abstract class ForkOptionPanel extends Panel {project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());BeanEditor editor = BeanContext.edit("editor", project,- Lists.newArrayList("name", "description", "defaultPrivilege"), false);+ Lists.newArrayList("name", "description", "defaultRoles"), false);Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);@@ -58,7 +58,7 @@ abstract class ForkOptionPanel extends Panel {target.add(form);} else {projectManager.fork(getProject(), project);- Session.get().success("Repository forked");+ Session.get().success("Project forked");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.htmlindex 62f11551db..c092e31baa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html@@ -8,9 +8,9 @@<span>Id: <span wicket:id="id"></span></span></div><div class="metrics">- <a wicket:id="commitsLink"><span wicket:id="count"></span></a>- <a wicket:id="branchesLink"><span wicket:id="count"></span></a>- <a wicket:id="tagsLink"><span wicket:id="count"></span></a>+ <span wicket:id="commitCount"></span>+ <span wicket:id="branchCount"></span>+ <span wicket:id="tagCount"></span><a wicket:id="forks"><span wicket:id="label"></span></a><a wicket:id="forkNow">fork now</a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex c2c04cf36b..e7b68833a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -31,9 +31,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class ProjectInfoPanel extends Panel {@@ -51,7 +49,7 @@ public abstract class ProjectInfoPanel extends Panel {if (getProject().getForkedFrom() != null) {Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",- ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom())) {+ ProjectDashboardPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom())) {@Overrideprotected void onComponentTag(ComponentTag tag) {@@ -62,7 +60,7 @@ public abstract class ProjectInfoPanel extends Panel {};link.add(new Label("name", getProject().getForkedFrom().getName()));- link.setEnabled(SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade()));+ link.setEnabled(SecurityUtils.canAccess(getProject().getForkedFrom()));add(link);} else {WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");@@ -84,45 +82,10 @@ public abstract class ProjectInfoPanel extends Panel {add(new WebMarkupContainer("description").setVisible(false));}- add(new ViewStateAwarePageLink<Void>("commitsLink",- ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);- }-- @Override- protected void onInitialize() {- super.onInitialize();- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));- }-- });-- add(new ViewStateAwarePageLink<Void>("branchesLink",- ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));- }-- });-- add(new ViewStateAwarePageLink<Void>("tagsLink",- ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));- }-- });+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ add(new Label("commitCount", commitInfoManager.getCommitCount(getProject()) + " commits"));+ add(new Label("branchCount", getProject().getRefs(Constants.R_HEADS).size() + " branches"));+ add(new Label("tagCount", getProject().getRefs(Constants.R_TAGS).size() + " tags"));if (getProject().getForks().isEmpty()) {add(new WebMarkupContainer("forks") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 390e78a72e..2970441d63 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -138,7 +138,7 @@ abstract class BacklogColumnPanel extends Panel {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());- if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))+ if (!SecurityUtils.canWriteCode(issue.getProject()))throw new UnauthorizedException("Permission denied");OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, null, SecurityUtils.getUser());target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));@@ -159,7 +159,7 @@ abstract class BacklogColumnPanel extends Panel {if (event.getPayload() instanceof IssueDragging && getQuery() != null) {IssueDragging issueDragging = (IssueDragging) event.getPayload();Issue issue = issueDragging.getIssue();- if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {+ if (SecurityUtils.canWriteCode(issue.getProject())) {issue = SerializationUtils.clone(issue);issue.setMilestone(null);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex f93341d38c..bed970d01c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -26,10 +26,9 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.util.Input;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.Input;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateLabel;@@ -108,7 +107,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {.findByName(field.getValues().iterator().next());if (user != null) {String tooltip = field.getName() + ": " + user.getDisplayName();- UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), UserIdent.of(UserFacade.of(user)));+ UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), UserIdent.of(user));avatar.add(AttributeAppender.append("title", tooltip));avatarsView.add(avatar);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex b03f50aad3..5d5fdbefd3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -40,6 +40,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;@@ -47,7 +48,6 @@ import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;import io.onedev.server.search.entity.issue.FieldOperatorCriteria;@@ -56,13 +56,11 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.ComponentContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;-import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -159,21 +157,20 @@ abstract class BoardColumnPanel extends Panel implements EditContext {for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {if (transition.canTransite(issue)&& transition.getTrigger() instanceof PressButtonTrigger- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized(getProject())&& transition.getToState().equals(getColumn())) {issue.setState(getColumn());break;}}- } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {+ } else if (SecurityUtils.canWriteCode(issue.getProject())) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);- UserMatcher userMatcher = UserMatcher.fromString(fieldSpec.getCanBeChangedBy());- if (fieldSpec != null && userMatcher.matches(getProject(), SecurityUtils.getUser())) {+ if (fieldSpec != null && SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName())) {issue = SerializationUtils.clone(issue);issue.setFieldValue(identifyField, getColumn());}}- } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {+ } else if (SecurityUtils.canWriteCode(issue.getProject())) {// move issue between backlog column and board columnissue = SerializationUtils.clone(issue);issue.setMilestone(getMilestone());@@ -253,7 +250,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {WebMarkupContainer head = new WebMarkupContainer("head");if (user != null) {head.add(new WebMarkupContainer("title").setVisible(false));- head.add(new UserIdentPanel("userIdent", UserIdent.of(UserFacade.of(user)), Mode.AVATAR_AND_NAME));+ head.add(new UserIdentPanel("userIdent", UserIdent.of(user), Mode.AVATAR_AND_NAME));} else {head.add(new Label("title", title).setEscapeModelStrings(false));head.add(new WebMarkupContainer("userIdent").setVisible(false));@@ -337,7 +334,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String fieldName = getBoard().getIdentifyField();if (issue.getMilestone() == null && getMilestone() != null) {// move a backlog issue to board- if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))+ if (!SecurityUtils.canWriteCode(issue.getProject()))throw new UnauthorizedException("Permission denied");OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());@@ -348,7 +345,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {if (transition.canTransite(issue)&& transition.getTrigger() instanceof PressButtonTrigger- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized(getProject())&& transition.getToState().equals(getColumn())) {transitionRef.set(transition);break;@@ -361,7 +358,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {PressButtonTrigger trigger = (PressButtonTrigger) transitionRef.get().getTrigger();for (String promptField: trigger.getPromptFields()) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);- if (fieldSpec != null && UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser())) {+ if (fieldSpec != null && SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName())) {hasPromptFields = true;break;}@@ -405,14 +402,14 @@ abstract class BoardColumnPanel extends Panel implements EditContext {markAccepted(target, issue, true);}} else {- if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))+ if (!SecurityUtils.canWriteCode(issue.getProject()))throw new UnauthorizedException("Permission denied");FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null)throw new OneException("Undefined custom field: " + fieldName);- if (!UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))+ if (!SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName()))throw new UnauthorizedException("Permission denied");Map<String, Object> fieldValues = new HashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 6893a48c4f..7b65840627 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -110,7 +110,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});add(new IssuePullRequestsPanel("pullRequests", getModel()));-add(new IssueCommitsPanel("commits", getModel()));List<Tab> tabs = new ArrayList<>();@@ -189,7 +188,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte}};- deleteLink.setVisible(SecurityUtils.canAdministrate(getIssue().getProject().getFacade()));+ deleteLink.setVisible(SecurityUtils.canManageIssues(getIssue().getProject()));return deleteLink;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 781ba4cee4..884c6eb8ed 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -255,7 +255,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {Fragment boardFragment = new Fragment("content", "hasBoardsFrag", this);Form<?> form = new Form<Void>("query");- if (!SecurityUtils.canAdministrate(getProject().getFacade()))+ if (!SecurityUtils.canManageIssues(getProject()))form.add(AttributeAppender.append("style", "margin-right: 0;"));form.add(new DropdownLink("board") {@@ -268,7 +268,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {Fragment menuFragment = new Fragment(id, "boardMenuFrag", IssueBoardsPage.this);- if (SecurityUtils.canAdministrate(getProject().getFacade())) {+ if (SecurityUtils.canManageIssues(getProject())) {menuFragment.add(AttributeAppender.append("class", "administrative"));}menuFragment.add(new Link<Void>("useDefault") {@@ -283,7 +283,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade())+ setVisible(SecurityUtils.canManageIssues(getProject())&& getProject().getIssueSetting().getBoardSpecs(false) != null);}@@ -293,7 +293,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void populateItem(ListItem<BoardSpec> item) {- item.add(new WebMarkupContainer("dragIndicator").setVisible(SecurityUtils.canAdministrate(getProject().getFacade())));+ item.add(new WebMarkupContainer("dragIndicator").setVisible(SecurityUtils.canManageIssues(getProject())));PageParameters params = IssueBoardsPage.paramsOf(getProject(), item.getModelObject(), getMilestone(),@@ -307,7 +307,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}};@@ -346,7 +346,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {});- if (SecurityUtils.canAdministrate(getProject().getFacade())) {+ if (SecurityUtils.canManage(getProject())) {menuFragment.add(new SortBehavior() {@Override@@ -372,7 +372,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});@@ -434,7 +434,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {Fragment menuFragment = new Fragment(id, "milestoneMenuFrag", IssueBoardsPage.this);- if (SecurityUtils.canAdministrate(getProject().getFacade()))+ if (SecurityUtils.canManage(getProject()))menuFragment.add(AttributeAppender.append("class", "administrative"));menuFragment.add(new ListView<Milestone>("milestones", new LoadableDetachableModel<List<Milestone>>() {@@ -467,7 +467,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}};@@ -581,7 +581,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});@@ -591,7 +591,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {});form.add(milestoneFragment);- } else if (SecurityUtils.canAdministrate(getProject().getFacade())) {+ } else if (SecurityUtils.canManageIssues(getProject())) {form.add(new CreateMilestoneLink("milestone") {@Override@@ -699,7 +699,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});@@ -708,7 +708,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade())+ setVisible(SecurityUtils.canManageIssues(getProject())&& getProject().getIssueSetting().getBoardSpecs(false) != null);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 0a0fdd81b6..b3c9dbff3f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -146,7 +146,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexCollection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());// Do not calculate fix builds now as it might be slow- if (!fixCommits.isEmpty() && SecurityUtils.canReadCode(getProject().getFacade()))+ if (!fixCommits.isEmpty())tabs.add(new IssueTab("Fixing Builds", FixingBuildsPage.class));add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));@@ -196,7 +196,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex};deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));- deleteLink.setVisible(SecurityUtils.canAdministrate(getIssue().getProject().getFacade()));+ deleteLink.setVisible(SecurityUtils.canManageIssues(getIssue().getProject()));return deleteLink;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex ff95293a14..68bc8e789e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -83,7 +83,7 @@ public class MilestoneDetailPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 48a22fb29f..f17422fcc1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -91,7 +91,7 @@ public class MilestoneEditPage extends ProjectIssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAdministrate(getProject().getFacade());+ return SecurityUtils.canManageIssues(getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 2990679e76..a1acaf307e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -141,7 +141,7 @@ public class MilestoneListPage extends ProjectIssuesPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManageIssues(getProject()));}});@@ -187,7 +187,7 @@ public class MilestoneListPage extends ProjectIssuesPage {}});- if (SecurityUtils.canAdministrate(getProject().getFacade())) {+ if (SecurityUtils.canManage(getProject())) {columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 9c0a101181..43ab5906f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -70,7 +70,7 @@ public class NewMilestonePage extends ProjectIssuesPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAdministrate(getProject().getFacade());+ return SecurityUtils.canManageIssues(getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.javaindex d9a5b943e1..ec17e2907c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java@@ -57,7 +57,7 @@ public class InvalidPullRequestPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(requestModel.getObject().getTargetProject().getFacade()));+ setVisible(SecurityUtils.canManage(requestModel.getObject().getTargetProject()));}}.add(new ConfirmOnClick("Do you really want to delete pull request #" + requestModel.getObject().getNumber() + "?")));@@ -77,7 +77,7 @@ public class InvalidPullRequestPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex 25335f2101..e5c44f3013 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -331,7 +331,7 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canReadCode(getProject().getFacade()));+ setVisible(SecurityUtils.canReadCode(getProject()));}});@@ -492,7 +492,7 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}public static PageParameters paramsOf(Project project, @Nullable String query, int page) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex fd3b3d0288..77c9eb5e01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -151,7 +151,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {if (suggestedSourceBranch != null) {if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());- } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {+ } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom())) {target = new ProjectAndBranch(getProject().getForkedFrom(),getProject().getForkedFrom().getDefaultBranch());} else {@@ -211,7 +211,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {OneDev.getInstance(PullRequestManager.class).checkQuality(request);- if (SecurityUtils.canWriteCode(getProject().getFacade()) && request.getReviews().isEmpty()) {+ if (SecurityUtils.canWriteCode(getProject()) && request.getReviews().isEmpty()) {PullRequestReview review = new PullRequestReview();review.setRequest(request);review.setUser(SecurityUtils.getUser());@@ -829,7 +829,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 56d9dabbe6..dd2cdd69a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -101,7 +101,6 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.branch.BranchLink;@@ -624,7 +623,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {private WebMarkupContainer newManageContainer() {WebMarkupContainer container = new WebMarkupContainer("manage");- container.setVisible(SecurityUtils.canAdministrate(getPullRequest().getTargetProject().getFacade()));+ container.setVisible(SecurityUtils.canManage(getPullRequest().getTargetProject()));container.add(new Link<Void>("synchronize") {@Override@@ -781,7 +780,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {});- UserIdent userIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());+ UserIdent userIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());statusAndBranchesContainer.add(new UserIdentPanel("user", userIdent, Mode.NAME));statusAndBranchesContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));@@ -1283,7 +1282,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}private class RequestTab extends PageTab {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.javaindex 7fed651a60..82022ed7fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java@@ -129,7 +129,7 @@ public enum PullRequestOperation {return request.getSourceProject() != null&& request.getSource().getObjectName(false) == null&& SecurityUtils.canModify(request)- && SecurityUtils.canWriteCode(request.getSourceProject().getFacade());+ && SecurityUtils.canWriteCode(request.getSourceProject());}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.javaindex 8d00197f36..1678deb4b0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java@@ -8,10 +8,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;import io.onedev.server.web.util.DeleteCallback;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class PullRequestChangeActivity implements PullRequestActivity {@@ -50,7 +49,7 @@ public class PullRequestChangeActivity implements PullRequestActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getChange().getUser()), getChange().getUserName());+ return UserIdent.of(getChange().getUser(), getChange().getUserName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex a77b239e6b..d33d021d5b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -8,7 +8,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.SystemUserIdent;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;@@ -25,7 +24,7 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {super.onInitialize();PullRequestChange change = getModelObject();- UserIdent userIdent = UserIdent.of(UserFacade.of(change.getUser()), change.getUserName());+ UserIdent userIdent = UserIdent.of(change.getUser(), change.getUserName());add(new Label("user", userIdent.getName()).setVisible(!(userIdent instanceof SystemUserIdent)));add(new Label("description", change.getData().getDescription()));add(new Label("age", DateUtils.formatAge(change.getDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.javaindex 601176dab3..bb03c5caea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java@@ -9,10 +9,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.model.PullRequestComment;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;import io.onedev.server.web.util.DeleteCallback;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class PullRequestCommentedActivity implements PullRequestActivity {@@ -58,7 +57,7 @@ public class PullRequestCommentedActivity implements PullRequestActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());+ return UserIdent.of(getComment().getUser(), getComment().getUserName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.javaindex 1b97383ee5..3244c2ec8d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java@@ -13,7 +13,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;@@ -36,7 +35,7 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {protected void onInitialize() {super.onInitialize();- UserIdent userIdent = UserIdent.of(UserFacade.of(getComment().getUser()), getComment().getUserName());+ UserIdent userIdent = UserIdent.of(getComment().getUser(), getComment().getUserName());add(new Label("user", userIdent.getName()));add(new Label("age", DateUtils.formatAge(getComment().getDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.javaindex cd4fd909ce..51abeebeb6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java@@ -8,10 +8,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;import io.onedev.server.web.util.DeleteCallback;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class PullRequestOpenedActivity implements PullRequestActivity {@@ -50,7 +49,7 @@ public class PullRequestOpenedActivity implements PullRequestActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(getRequest().getSubmitter()), getRequest().getSubmitterName());+ return UserIdent.of(getRequest().getSubmitter(), getRequest().getSubmitterName());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.javaindex 521b1d631b..4b1022ba28 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java@@ -12,7 +12,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;@@ -33,7 +32,7 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {super.onInitialize();PullRequest request = getPullRequest();- UserIdent userIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());+ UserIdent userIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());add(new Label("user", userIdent.getName()));add(new Label("age", DateUtils.formatAge(request.getSubmitDate())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.javaindex 28a633c3ed..6f7b18455d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.model.User;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.util.userident.UserIdent;@@ -50,7 +50,7 @@ public class PullRequestUpdatedActivity implements PullRequestActivity {@Overridepublic UserIdent getUser() {- return UserIdent.of(UserFacade.of(null));+ return UserIdent.of((User)null);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.javaindex 0f8ad2ecb7..fffe4e997a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java@@ -61,7 +61,7 @@ public abstract class SaveQueryPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));+ setVisible(SecurityUtils.canManage(getProject()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex 9f57233472..a84bb308c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -239,7 +239,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));- if (SecurityUtils.canAdministrate(getProject().getFacade())) {+ if (SecurityUtils.canManage(getProject())) {tabs.add(new AjaxActionTab(Model.of("For All Users")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex e3f4603072..7b1788b554 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -21,7 +21,7 @@ public abstract class ProjectSettingPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAdministrate(getProject().getFacade());+ return SecurityUtils.canManage(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.javanew file mode 100644index 0000000000..25432d38d2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java@@ -0,0 +1,44 @@+package io.onedev.server.web.page.project.setting.authorization;++import java.io.Serializable;++import javax.validation.constraints.Size;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.RoleChoice;+import io.onedev.server.web.editable.annotation.UserChoice;++@Editable+public class AuthorizationBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String userName;++ private String roleName;++ @Editable(order=100, name="User")+ @UserChoice+ @NotEmpty+ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ @Editable(order=200, name="Role")+ @RoleChoice+ @Size(min=1, message="At least one role needs to be specified")+ public String getRoleName() {+ return roleName;+ }++ public void setRoleName(String roleName) {+ this.roleName = roleName;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.javanew file mode 100644index 0000000000..73075899d3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.java@@ -0,0 +1,25 @@+package io.onedev.server.web.page.project.setting.authorization;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class AuthorizationsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<AuthorizationBean> authorizations = new ArrayList<>();++ @Editable+ public List<AuthorizationBean> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizations(List<AuthorizationBean> authorizations) {+ this.authorizations = authorizations;+ }++}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.htmlindex c4a6421816..70105738a6 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,21 +1,10 @@<wicket:extend><div class="page-title">User Authorizations</div>- <div class="authorization list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name">- </div>- <div class="pull-left">- <input wicket:id="addNew" type="hidden" class="form-control">- </div>- <div class="pull-left">- <a wicket:id="deleteSelected" class="btn btn-default"><i class="fa fa-trash"></i> Delete Selected</a>- </div>+ <form wicket:id="form" class="authorization list">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" class="btn btn-primary" value="Update"></div>- <table wicket:id="authorizations" class="authorizations table table-hover table-condensed"></table>- </div>- <wicket:fragment wicket:id="privilegeFrag">- <a wicket:id="dropdown" class="btn btn-xs btn-default"><span wicket:id="label"></span> <i class="fa fa-caret-down"></i></a>- <a wicket:id="otherSources" class="other-sources" title="This permission is granted from other sources, click for details"><i class="fa fa-warning"></i></a>- </wicket:fragment>+ </form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 2e72d73cd6..4f22229795 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -2,508 +2,70 @@ package io.onedev.server.web.page.project.setting.authorization;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.HashMap;import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;import java.util.Set;-import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.WordUtils;-import io.onedev.commons.utils.matchscore.MatchScoreProvider;-import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.project.privilege.selection.PrivilegeSelectionPanel;-import io.onedev.server.web.component.project.privilege.source.PrivilegeSourcePanel;-import io.onedev.server.web.component.select2.Response;-import io.onedev.server.web.component.select2.ResponseFiller;-import io.onedev.server.web.component.select2.SelectToAddChoice;-import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;-import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;+import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.util.userident.UserIdent;@SuppressWarnings("serial")public class ProjectAuthorizationsPage extends ProjectSettingPage {- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private static final String PARAM_QUERY = "query";-- private String query;-- private DataTable<Long, Void> authorizationsTable;-- private SelectionColumn<Long, Void> selectionColumn;-- private IModel<Map<Long, UserAuthorizationFacade>> explicitUserAuthorizationsModel =- new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {-- @Override- protected Map<Long, UserAuthorizationFacade> load() {- Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();- for (UserAuthorizationFacade authorization:- OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId()))- authorizations.put(authorization.getUserId(), authorization);- }- return authorizations;- }-- };-- private IModel<Map<Long, ProjectPrivilege>> userAuthorizationsModel =- new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {-- @Override- protected Map<Long, ProjectPrivilege> load() {- Map<Long, ProjectPrivilege> userAuthorizations = new HashMap<>();- Collection<Long> usersAuthorizedFromOtherSources = new HashSet<>();- userAuthorizations.put(User.ROOT_ID, ProjectPrivilege.ADMINISTRATION);- usersAuthorizedFromOtherSources.add(User.ROOT_ID);-- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- Set<Long> adminGroupIds = new HashSet<>();- for (GroupFacade group: cacheManager.getGroups().values()) {- if (group.isAdministrator())- adminGroupIds.add(group.getId());- }- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (adminGroupIds.contains(membership.getGroupId())) {- userAuthorizations.put(membership.getUserId(), ProjectPrivilege.ADMINISTRATION);- usersAuthorizedFromOtherSources.add(membership.getUserId());- }- }-- Map<Long, ProjectPrivilege> groupAuthorizations = new HashMap<>();- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId()))- groupAuthorizations.put(authorization.getGroupId(), authorization.getPrivilege());- }- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- ProjectPrivilege groupPrivilege = groupAuthorizations.get(membership.getGroupId());- if (groupPrivilege != null) {- ProjectPrivilege userPrivilege = userAuthorizations.get(membership.getUserId());- if (userPrivilege == null || groupPrivilege.implies(userPrivilege))- userAuthorizations.put(membership.getUserId(), groupPrivilege);- usersAuthorizedFromOtherSources.add(membership.getUserId());- }- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getProjectId().equals(getProject().getId())) {- ProjectPrivilege userPrivilege = userAuthorizations.get(authorization.getUserId());- if (userPrivilege == null || authorization.getPrivilege().implies(userPrivilege))- userAuthorizations.put(authorization.getUserId(), authorization.getPrivilege());- }- }- if (getProject().getDefaultPrivilege() != null) {- for (UserFacade user: cacheManager.getUsers().values()) {- ProjectPrivilege userPrivilege = userAuthorizations.get(user.getId());- if (userPrivilege == null || getProject().getDefaultPrivilege().getProjectPrivilege().implies(userPrivilege))- userAuthorizations.put(user.getId(), getProject().getDefaultPrivilege().getProjectPrivilege());- usersAuthorizedFromOtherSources.add(user.getId());- }- }-- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();- List<Long> userIds = new ArrayList<>(userAuthorizations.keySet());- Collections.sort(userIds, new Comparator<Long>() {-- @Override- public int compare(Long o1, Long o2) {- if (usersAuthorizedFromOtherSources.contains(o1)) {- if (usersAuthorizedFromOtherSources.contains(o2)) {- return o1.compareTo(o2);- } else {- return 1;- }- } else {- if (usersAuthorizedFromOtherSources.contains(o2)) {- return -1;- } else {- return explicitUserAuthorizations.get(o2).getId()- .compareTo(explicitUserAuthorizations.get(o1).getId());- }- }- }-- });-- Map<Long, ProjectPrivilege> sortedUserAuthorizations = new LinkedHashMap<>();- for (Long userId: userIds) {- sortedUserAuthorizations.put(userId, userAuthorizations.get(userId));- }-- return sortedUserAuthorizations;- }-- };-public ProjectAuthorizationsPage(PageParameters params) {super(params);- query = params.get(PARAM_QUERY).toString();}- @Override- protected void onDetach() {- explicitUserAuthorizationsModel.detach();- userAuthorizationsModel.detach();- super.onDetach();- }-- private Map<Long, ProjectPrivilege> getUserAuthorizations() {- return userAuthorizationsModel.getObject();- }-- private Map<Long, UserAuthorizationFacade> getExplicitUserAuthorizations() {- return explicitUserAuthorizationsModel.getObject();- }-- private boolean isPrivilegeFromOtherSources(Long userId) {- UserAuthorizationFacade authorization = getExplicitUserAuthorizations().get(userId);- ProjectPrivilege privilege = getUserAuthorizations().get(userId);- return authorization == null || !authorization.getPrivilege().implies(privilege);- }-@Overrideprotected void onInitialize() {super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("filterUsers", Model.of(query)));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- query = searchField.getInput();- if (StringUtils.isBlank(query))- query = null;- target.add(authorizationsTable);- }-- });-- add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {-- @Override- public void query(String term, int page, Response<UserFacade> response) {- List<UserFacade> notAuthorized = new ArrayList<>();-- for (UserFacade user: OneDev.getInstance(CacheManager.class).getUsers().values()) {- if (!getUserAuthorizations().containsKey(user.getId()))- notAuthorized.add(user);- }- Collections.sort(notAuthorized);- Collections.reverse(notAuthorized);-- notAuthorized = MatchScoreUtils.filterAndSort(notAuthorized, new MatchScoreProvider<UserFacade>() {-- @Override- public double getMatchScore(UserFacade object) {- return object.getMatchScore(term);- }-- });- new ResponseFiller<UserFacade>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add user...");- getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");- getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, UserFacade selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setProject(getProject());- authorization.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));- OneDev.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(authorizationsTable);- Session.get().success("User added");- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));- }-- });-- AjaxLink<Void> deleteSelected = new AjaxLink<Void>("deleteSelected") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();- UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class);- for (IModel<Long> model: selectionColumn.getSelections()) {- UserAuthorizationFacade authorization = explicitUserAuthorizations.get(model.getObject());- if (authorization != null) {- authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));- explicitUserAuthorizations.remove(model.getObject());- }- }- userAuthorizationManager.delete(authorizationsToDelete);- target.add(authorizationsTable);- selectionColumn.getSelections().clear();- target.add(this);- }-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasLocalPrivileges = false;- for (IModel<Long> model: selectionColumn.getSelections()) {- Long userId = model.getObject();- if (!isPrivilegeFromOtherSources(userId)) {- hasLocalPrivileges = true;- break;- }- }- setVisible(hasLocalPrivileges);- }-- };- deleteSelected.setOutputMarkupPlaceholderTag(true);- add(deleteSelected);- List<IColumn<Long, Void>> columns = new ArrayList<>();-- selectionColumn = new SelectionColumn<Long, Void>() {-- @Override- protected void onSelectionChange(AjaxRequestTarget target) {- target.add(deleteSelected);- }-- };- columns.add(selectionColumn);-- columns.add(new AbstractColumn<Long, Void>(Model.of("User")) {+ AuthorizationsBean authorizationsBean = new AuthorizationsBean();+ for (UserAuthorization authorization: getProject().getUserAuthorizations()) {+ AuthorizationBean authorizationBean = new AuthorizationBean();+ authorizationBean.setUserName(authorization.getUser().getName());+ authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationsBean.getAuthorizations().add(authorizationBean);+ }- @Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {- UserIdent userIdent = UserIdent.of(UserFacade.of(OneDev.getInstance(UserManager.class).load(rowModel.getObject())));- cellItem.add(new UserIdentPanel(componentId, userIdent, Mode.AVATAR_AND_NAME));- }- });-- columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {+ Form<?> form = new Form<Void>("form") {@Override- public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {- Fragment fragment = new Fragment(componentId, "privilegeFrag", ProjectAuthorizationsPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- Long userId = rowModel.getObject();- boolean canNotDelete = isPrivilegeFromOtherSources(userId)- || userId.equals(SecurityUtils.getUser().getId());- String script = String.format(""- + "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",- getMarkupId(), canNotDelete);-- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- WebMarkupContainer dropdown = new DropdownLink("dropdown") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- ProjectPrivilege privilege = getUserAuthorizations().get(rowModel.getObject());- return new PrivilegeSelectionPanel(id, privilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {- dropdown.close();- Long userId = rowModel.getObject();-- Map<Long, UserAuthorizationFacade> explicitUserAuthorizations =- getExplicitUserAuthorizations();- UserAuthorizationFacade userAuthorizationFacade =- explicitUserAuthorizations.get(userId);- UserAuthorizationManager userAuthorizationManager =- OneDev.getInstance(UserAuthorizationManager.class);- UserAuthorization userAuthorization;- if (userAuthorizationFacade == null) {- userAuthorization = new UserAuthorization();- userAuthorization.setProject(getProject());- userAuthorization.setUser(OneDev.getInstance(UserManager.class).load(userId));- } else {- userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());- }- userAuthorization.setPrivilege(privilege);- userAuthorizationManager.save(userAuthorization);- explicitUserAuthorizations.put(userId, userAuthorization.getFacade());-- target.add(fragment);-- if (getUserAuthorizations().get(userId) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher "- + "permission is granted from other sources");- }- }-- };- }-- };- dropdown.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return WordUtils.toWords(getUserAuthorizations().get(rowModel.getObject()).name());+ protected void onSubmit() {+ super.onSubmit();++ Set<String> userNames = new HashSet<>();+ Collection<UserAuthorization> authorizations = new ArrayList<>();+ for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (userNames.contains(authorizationBean.getUserName())) {+ error("Duplicate authorizations found: " + authorizationBean.getUserName());+ return;+ } else {+ userNames.add(authorizationBean.getUserName());+ UserAuthorization authorization = new UserAuthorization();+ authorization.setProject(getProject());+ authorization.setUser(OneDev.getInstance(UserManager.class).findByName(authorizationBean.getUserName()));+ authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));+ authorizations.add(authorization);}-- }));-- Long userId = rowModel.getObject();- if (userId.equals(SecurityUtils.getUser().getId()) && !isPrivilegeFromOtherSources(userId)) {- dropdown.add(AttributeAppender.append("disabled", "true"));- dropdown.setEnabled(false);}- fragment.add(dropdown);-- fragment.add(new DropdownLink("otherSources") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isPrivilegeFromOtherSources(rowModel.getObject()));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Long userId = rowModel.getObject();- User user = OneDev.getInstance(UserManager.class).load(userId);- return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(userId));- }-- });- fragment.setOutputMarkupId(true);- cellItem.add(fragment);- }- });-- SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {-- private List<Long> getUserIds() {- List<Long> userIds = new ArrayList<>(getUserAuthorizations().keySet());- CacheManager cacheManager = OneDev.getInstance(CacheManager.class);- return MatchScoreUtils.filterAndSort(userIds, new MatchScoreProvider<Long>() {-- @Override- public double getMatchScore(Long object) {- return cacheManager.getUser(object).getMatchScore(query);- }-- });- }-- @Override- public Iterator<? extends Long> iterator(long first, long count) {- List<Long> userIds = getUserIds();- if (first + count <= userIds.size())- return userIds.subList((int)first, (int)(first+count)).iterator();- else- return userIds.subList((int)first, userIds.size()).iterator();- }-- @Override- public long size() {- return getUserIds().size();- }-- @Override- public IModel<Long> model(Long object) {- return Model.of(object);- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- if (query != null)- params.add(PARAM_QUERY, query);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ OneDev.getInstance(UserAuthorizationManager.class).authorize(getProject(), authorizations);+ Session.get().success("User authorizations updated");}};-- add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));+ form.add(new NotificationPanel("feedback", form));+ form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));+ add(form);}-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex 1521f0253a..8797ad768f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -38,12 +38,12 @@ public class AvatarEditPage extends ProjectSettingPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAvatarManager().getUploaded(getProject().getFacade()).exists());+ setVisible(getAvatarManager().getUploaded(getProject()).exists());}@Overridepublic void onClick() {- getAvatarManager().useAvatar(getProject().getFacade(), null);+ getAvatarManager().useAvatar(getProject(), null);setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getProject()));}@@ -58,7 +58,7 @@ public class AvatarEditPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);- avatarManager.useAvatar(getProject().getFacade(), uploadedAvatarData);+ avatarManager.useAvatar(getProject(), uploadedAvatarData);setResponsePage(AvatarEditPage.class, AvatarEditPage.paramsOf(getProject()));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.htmlindex fed0558abe..365bbc7eee 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html@@ -1,14 +1,14 @@<wicket:extend><div class="page-title">Commit Message Transform</div><form wicket:id="commitMessageTransforms" class="commit-message-transforms leave-confirm">- <div wicket:id="editor"></div><div class="help-block">- <i class="fa fa-info-circle"></i> Thi setting tells OneDev how to transform commit message for displaying.+ This setting tells OneDev how to transform commit message for displaying.<tt>Search For</tt> expects a <a href="https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html">Java pattern</a>to match in the commit message, for instance, you may match JIRA issue key with <tt>([A-Z]{2,}-\d+)</tt>, and specify<tt>Replace With</tt> as <tt><a href="http://track.example.com/browse/$1">$1</a></tt> to replace JIRA issuekeys with issue links. Here <tt>$n</tt> represents nth capturing group in the pattern</div>+ <div wicket:id="editor"></div><div class="actions"><input type="submit" class="btn btn-primary dirty-aware" value="Save setting"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex a6333264cf..61ed6e1d9a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -13,12 +13,13 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -37,6 +38,11 @@ public class GeneralSettingPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();+ if (getProject().getOwner() != null)+ getProject().setOwnerName(getProject().getOwner().getName());+ else+ getProject().setOwnerName(null);+editor = BeanContext.editModel("editor", new IModel<Serializable>() {@Override@@ -55,7 +61,7 @@ public class GeneralSettingPage extends ProjectSettingPage {editor.getDescriptor().copyProperties(object, getProject());}- }, Lists.newArrayList("name", "description", "defaultPrivilege"), false);+ }, Lists.newArrayList("name", "description", "defaultRoleName", "ownerName"), false);Form<?> form = new Form<Void>("form") {@@ -75,6 +81,10 @@ public class GeneralSettingPage extends ProjectSettingPage {String errorMessage = "This name has already been used by another project";editor.error(new Path(new PathNode.Named("name")), errorMessage);} else {+ if (project.getOwnerName() != null)+ project.setOwner(OneDev.getInstance(UserManager.class).findByName(project.getOwnerName()));+ else+ project.setOwner(null);projectManager.save(project, oldName);Session.get().success("General setting has been updated");setResponsePage(GeneralSettingPage.class, paramsOf(project));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 82ca8d5d67..309a7adc46 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -82,6 +82,10 @@ body.BranchProtectionPage, body.WebHooksPage {#project-setting .commit-message-transforms th {font-weight: normal;}+#project-setting .authorization.list .select2-container,+#project-setting .authorization.list .property-roleName .select2-container {+ width: 360px;+}body.SecretListPage .help-block {margin: 0 0 16px 0;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlindex 27ca68ab44..2988818d8d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html@@ -1,12 +1,12 @@<wicket:extend><div class="page-title">Web Hooks</div><div class="web-hook list">+ <div class="help-block">+ OneDev will post event data in JSON format to specified URLs when subscribed events happen+ </div><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>- <div class="help-block">- <i class="fa fa-info-circle"></i> OneDev will post event data in JSON format to specified URLs when subscribed events happen- </div><div class="actions"><input type="submit" value="Save" class="dirty-aware btn btn-primary"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex ea1bfbfa83..c15755a98d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -40,7 +40,7 @@ public class ProjectContribsPage extends ProjectStatsPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.javaindex 83f71e0603..00b27b5825 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java@@ -70,7 +70,7 @@ public abstract class ProjectStatsPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javaindex a369e3e021..6cbd89c987 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java@@ -54,7 +54,7 @@ class TopContributorsResource extends AbstractResource {public void writeData(Attributes attributes) throws IOException {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- if (!SecurityUtils.canReadCode(project.getFacade()))+ if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();List<Contributor> topContributors = OneDev.getInstance(CommitInfoManager.class).getTopContributors(project, TOP_CONTRIBUTORS, type, fromDay, toDay);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 8b1536bee0..399ce0e471 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -387,7 +387,7 @@ public class ProjectTagsPage extends ProjectPage {super.onConfigure();Project project = getProject();- if (SecurityUtils.canWriteCode(project.getFacade())) {+ if (SecurityUtils.canWriteCode(project)) {TagProtection protection = project.getTagProtection(tagName, getLoginUser());setEnabled(protection == null || !protection.isNoDeletion());} else {@@ -438,7 +438,7 @@ public class ProjectTagsPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canReadCode(getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex e52a2d491e..7b0fc1bbc0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -18,7 +18,6 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();-add(new Link<Void>("test") {@Override@@ -34,5 +33,5 @@ public class TestPage extends BasePage {response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.javaindex d283d12c63..e1eb86e75c 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java@@ -21,7 +21,6 @@ import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.storage.AttachmentStorageManager;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.download.AttachmentDownloadResource;import io.onedev.server.web.download.AttachmentDownloadResourceReference;@@ -75,11 +74,11 @@ public class ProjectAttachmentSupport implements AttachmentSupport {return MAX_FILE_SIZE;}- private ProjectFacade getProject() {+ private Project getProject() {SessionManager sessionManager = OneDev.getInstance(SessionManager.class);sessionManager.openSession();try {- return OneDev.getInstance(ProjectManager.class).load(projectId).getFacade();+ return OneDev.getInstance(ProjectManager.class).load(projectId);} finally {sessionManager.closeSession();}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 774ecd1ff2..efcfe8bc65 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -24,7 +24,6 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.match.PatternApplied;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobVariable;@@ -37,6 +36,7 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Build;@@ -46,11 +46,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.Secret;-import io.onedev.server.model.support.administration.groovyscript.GroovyScript;-import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -85,7 +82,7 @@ public class SuggestionUtils {int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();User user = SecurityUtils.getUser();- for (ProjectFacade project: OneDev.getInstance(ProjectManager.class).getAccessibleProjects(user)) {+ for (Project project: OneDev.getInstance(ProjectManager.class).getAccessibleProjects(user)) {int index = project.getName().toLowerCase().indexOf(matchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)suggestions.add(new InputSuggestion(project.getName(), new LinearRange(index, index+matchWith.length())));@@ -161,7 +158,7 @@ public class SuggestionUtils {public static List<InputSuggestion> suggestUsers(String matchWith) {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- for (UserFacade user: OneDev.getInstance(CacheManager.class).getUsers().values()) {+ for (User user: OneDev.getInstance(UserManager.class).query()) {LinearRange match = LinearRange.match(user.getName(), matchWith, true, false, true);if (match != null) {String description;@@ -196,7 +193,7 @@ public class SuggestionUtils {if (matchWith.startsWith("#"))matchWith = matchWith.substring(1);List<InputSuggestion> suggestions = new ArrayList<>();- for (Build build: OneDev.getInstance(BuildManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {+ for (Build build: OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {InputSuggestion suggestion;String description;@@ -212,21 +209,6 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestUsers(Project project, ProjectPrivilege privilege, String matchWith) {- matchWith = matchWith.toLowerCase();- int numSuggestions = 0;- List<InputSuggestion> suggestions = new ArrayList<>();- for (UserFacade user: SecurityUtils.getAuthorizedUsers(project.getFacade(), privilege)) {- String name = user.getName();- int index = name.toLowerCase().indexOf(matchWith);- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {- LinearRange match = new LinearRange(index, index+matchWith.length());- suggestions.add(new InputSuggestion(name, user.getDisplayName(), match));- }- }- return suggestions;- }-public static List<InputSuggestion> suggestGroups(String matchWith) {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.javaindex f15dab387a..d54ae1ec0c 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java@@ -40,6 +40,8 @@ public class HtmlReportDownloadResource extends AbstractResource {private static final String PARAM_BUILD = "build";+ private static final String PARAM_REPORT = "report";+private static final String PARAM_PATH = "path";@Override@@ -55,9 +57,6 @@ public class HtmlReportDownloadResource extends AbstractResource {if (project == null)throw new EntityNotFoundException("Unable to find project: " + projectName);- if (!SecurityUtils.canReadCode(project.getFacade()))- throw new UnauthorizedException();-Long buildNumber = params.get(PARAM_BUILD).toOptionalLong();if (buildNumber == null)@@ -71,12 +70,20 @@ public class HtmlReportDownloadResource extends AbstractResource {throw new EntityNotFoundException(message);}+ String reportName = params.get(PARAM_REPORT).toOptionalString();++ if (reportName == null)+ throw new IllegalArgumentException("Html report name has to be specified");++ if (!SecurityUtils.canAccessReport(build, reportName))+ throw new UnauthorizedException();+List<String> pathSegments = new ArrayList<>();String pathSegment = params.get(PARAM_PATH).toString();if (pathSegment.length() != 0)pathSegments.add(pathSegment);else- throw new OneException("Html report paah has to be specified");+ throw new OneException("Html report path has to be specified");for (int i = 0; i < params.getIndexedCount(); i++) {pathSegment = params.get(i).toString();@@ -87,8 +94,9 @@ public class HtmlReportDownloadResource extends AbstractResource {String htmlPath = Joiner.on("/").join(pathSegments);File buildDir = OneDev.getInstance(StorageManager.class).getBuildDir(project.getId(), build.getNumber());- File reportsDir = new File(buildDir, JobHtmlReport.DIR);- File htmlFile = new File(reportsDir, htmlPath);+ File reportDir = new File(buildDir, JobHtmlReport.DIR + "/" + reportName);++ File htmlFile = new File(reportDir, htmlPath);if (!htmlFile.exists() || htmlFile.isDirectory()) {String message = String.format("Specified html path does not exist or is a directory (project: %s, build number: %d, path: %s)",project.getName(), build.getNumber(), htmlPath);@@ -131,10 +139,11 @@ public class HtmlReportDownloadResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Project project, Long buildNumber, String path) {+ public static PageParameters paramsOf(Project project, Long buildNumber, String reportName, String path) {PageParameters params = new PageParameters();params.set(PARAM_PROJECT, project.getName());params.set(PARAM_BUILD, buildNumber);+ params.set(PARAM_REPORT, reportName);params.set(PARAM_PATH, path);return params;}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.javaindex a2d3e935e6..2bc01cc745 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java@@ -3,22 +3,19 @@ package io.onedev.server.plugin.report.html;import java.io.File;import java.util.ArrayList;import java.util.Collection;-import java.util.HashMap;import java.util.List;-import java.util.Map;import java.util.concurrent.Callable;-import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.protocol.http.WebApplication;import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;-import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.JobReport;import io.onedev.server.model.Build;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.mapper.OneResourceMapper;@@ -54,15 +51,11 @@ public class HtmlReportModule extends AbstractPluginModule {@Overridepublic Void call() throws Exception {- File startPagesFile = new File(build.getReportDir(JobHtmlReport.DIR), JobHtmlReport.START_PAGES);- if (startPagesFile.exists()) {- Map<String, String> startPages;- if (startPagesFile.exists())- startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(startPagesFile));- else- startPages = new HashMap<>();- for (String reportName: startPages.keySet())- tabs.add(new HtmlReportTab(reportName));+ if (build.getReportDir(JobHtmlReport.DIR).exists()) {+ for (File reportDir: build.getReportDir(JobHtmlReport.DIR).listFiles()) {+ if (SecurityUtils.canAccessReport(build, reportDir.getName()))+ tabs.add(new HtmlReportTab(reportDir.getName()));+ }}return null;}@@ -83,7 +76,7 @@ public class HtmlReportModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {application.mount(new OnePageMapper("projects/${project}/builds/${build}/html-reports/${report}", HtmlReportPage.class));- application.mount(new OneResourceMapper("downloads/projects/${project}/builds/${build}/html-reports/${path}",+ application.mount(new OneResourceMapper("downloads/projects/${project}/builds/${build}/html-reports/${report}/${path}",new HtmlReportDownloadResourceReference()));}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.javaindex 9677ac7805..c94893eeb9 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java@@ -1,13 +1,10 @@package io.onedev.server.plugin.report.html;import java.io.File;-import java.util.HashMap;-import java.util.Map;import java.util.concurrent.Callable;import javax.annotation.Nullable;-import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;@@ -47,19 +44,19 @@ public class HtmlReportPage extends BuildDetailPage {@Overridepublic String call() throws Exception {- Map<String, String> startPages;- File infoFile = new File(getBuild().getReportDir(JobHtmlReport.DIR), JobHtmlReport.START_PAGES);- if (infoFile.exists())- startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(infoFile));+ File startPageFile = new File(getBuild().getReportDir(JobHtmlReport.DIR),+ reportName + "/" + JobHtmlReport.START_PAGE);+ if (startPageFile.exists())+ return FileUtils.readFileToString(startPageFile);else- startPages = new HashMap<>();- return startPages.get(reportName);+ return null;}});if (startPage != null) {- PageParameters params = HtmlReportDownloadResource.paramsOf(getProject(), getBuild().getNumber(), startPage);+ PageParameters params = HtmlReportDownloadResource.paramsOf(getProject(), getBuild().getNumber(),+ reportName, startPage);CharSequence startPageUrl = RequestCycle.get().urlFor(new HtmlReportDownloadResourceReference(), params);add(new WebMarkupContainer("htmlReport") {@@ -87,7 +84,7 @@ public class HtmlReportPage extends BuildDetailPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());+ return SecurityUtils.canAccessReport(getBuild(), reportName);}public String getReportName() {diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex e680e2c86c..4a1b7533c6 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -2,12 +2,9 @@ package io.onedev.server.plugin.report.html;import java.io.File;import java.io.IOException;-import java.util.HashMap;-import java.util.LinkedHashMap;import java.util.List;import java.util.concurrent.Callable;-import org.apache.commons.lang3.SerializationUtils;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;@@ -17,6 +14,7 @@ import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobReport;import io.onedev.server.model.Build;import io.onedev.server.util.JobLogger;+import io.onedev.server.util.validation.annotation.PathSegment;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@@ -27,7 +25,7 @@ public class JobHtmlReport extends JobReport {public static final String DIR = "html-reports";- public static final String START_PAGES = "$onedev-htmlreport-startpages$";+ public static final String START_PAGE = "$onedev-htmlreport-startpage$";private String reportName;@@ -36,6 +34,7 @@ public class JobHtmlReport extends JobReport {@Editable(order=1000, description="Specify report name. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")+ @PathSegment@NotEmptypublic String getReportName() {return reportName;@@ -64,7 +63,7 @@ public class JobHtmlReport extends JobReport {@Overridepublic void process(Build build, File workspace, JobLogger logger) {- File reportDir = build.getReportDir(DIR);+ File reportDir = new File(build.getReportDir(DIR), getReportName());FileUtils.createDir(reportDir);LockUtils.write(build.getReportLockKey(DIR), new Callable<Void>() {@@ -73,14 +72,8 @@ public class JobHtmlReport extends JobReport {public Void call() throws Exception {File startPage = new File(workspace, getStartPage());if (startPage.exists()) {- HashMap<String, String> startPages;- File startPagesFile = new File(reportDir, START_PAGES);- if (startPagesFile.exists())- startPages = SerializationUtils.deserialize(FileUtils.readFileToByteArray(startPagesFile));- else- startPages = new LinkedHashMap<>();- startPages.put(getReportName(), getStartPage());- FileUtils.writeByteArrayToFile(startPagesFile, SerializationUtils.serialize(startPages));+ File startPageFile = new File(reportDir, START_PAGE);+ FileUtils.writeFile(startPageFile, getStartPage());int baseLen = workspace.getAbsolutePath().length() + 1;for (File file: getPatternSet().listFiles(workspace)) {