The Unified and Autonomous Development Platform
Cache shiro authorization info in request cycle
Robin Shen116c3512e3d3
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 6d2ef92d12..d6ca1c01a0 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@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.Iterator;+import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;@@ -56,4 +57,14 @@ public class DefaultGroupAuthorizationManager extends AbstractEntityManager<Grou}}+ @Override+ public List<GroupAuthorization> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }+}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 1e637a7c36..e29e403c09 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@@ -71,11 +71,6 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsdao.persist(group);}- @Override- public List<Group> query() {- return query(true);- }-@Transactional@Overridepublic void delete(Group group) {@@ -110,11 +105,21 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsreturn find(criteria);}+ @Override+ public List<Group> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }+@Overridepublic Group findAnonymous() {SecuritySetting securitySetting = OneDev.getInstance(SettingManager.class).getSecuritySetting();if (securitySetting.isEnableAnonymousAccess()) {- Group group = OneDev.getInstance(GroupManager.class).find(securitySetting.getAnonymousGroup());+ Group group = find(securitySetting.getAnonymousGroup());if (group != null)return group;elsediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.javaindex 39a990e869..4b8b0d3d95 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java@@ -1,6 +1,7 @@package io.onedev.server.entitymanager.impl;import java.util.Collection;+import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;@@ -26,4 +27,14 @@ public class DefaultMembershipManager extends AbstractEntityManager<Membership>dao.remove(membership);}+ @Override+ public List<Membership> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }+}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 592e921816..d136d275e8 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@@ -214,4 +214,14 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im}}+ @Override+ public List<Milestone> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }+}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 205abc772b..d78c519251 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@@ -408,6 +408,11 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn query(true);}+ @Override+ public int count() {+ return count(true);+ }+@Overridepublic Collection<Project> getPermittedProjects(@Nullable User user, Permission permission) {Collection<Project> projects = new HashSet<>();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.javaindex aa3ebb5743..c563741dd3 100644--- 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.java@@ -65,6 +65,11 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rreturn query(true);}+ @Override+ public int count() {+ return count(true);+ }+@Sessional@Overridepublic Role find(String name) {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 092f0b7fb3..d4c5b17b53 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@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.Iterator;+import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;@@ -57,6 +58,16 @@ public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserA}}+ @Override+ public List<UserAuthorization> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }+@Transactional@Overridepublic void authorize(Project project, Collection<UserAuthorization> authorizations) {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 96b43b5260..027545b853 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@@ -188,6 +188,11 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Upublic List<User> query() {return query(true);}++ @Override+ public int count() {+ return count(true);+ }@Sessional@Overridediff --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 fc6ba7ee36..867007ef64 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,11 +8,15 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_group_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_group_id"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Membership extends AbstractEntity {private static final long serialVersionUID = 1L;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 9cfc53a4b0..64ace7503c 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@@ -20,7 +20,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.role.CodePrivilege;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.security.permission.AccessBuild;@@ -217,8 +216,6 @@ public class Role extends AbstractEntity implements Permission {} else {if (manageProject) {permissions.add(new ReadCode());- for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())- permissions.add(new EditIssueField(field.getName()));permissions.add(new JobPermission("*", new AccessBuildLog()));} else {if (codePrivilege != CodePrivilege.NONE)diff --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 a304a09284..0be76b08cd 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@@ -107,6 +107,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();@OneToMany(mappedBy="owner")+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Project> projects = new ArrayList<>();@Lobdiff --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 20aff0dee7..113f8170db 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@@ -8,11 +8,15 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_project_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_project_id"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class UserAuthorization extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javaindex 91a5db904a..759df76b19 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -164,11 +164,6 @@ public class DefaultTransactionManager implements TransactionManager {});}- @Override- public SessionManager getSessionManager() {- return sessionManager;- }-@Overridepublic Transaction getTransaction() {return getSession().getTransaction();diff --git a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.javaindex bc1f18e513..8dba0e85e6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java@@ -28,8 +28,6 @@ public interface TransactionManager {Transaction getTransaction();- SessionManager getSessionManager();-Session getSession();<T> T call(Callable<T> callable);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 3feff47ce7..a001b079d1 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@@ -106,6 +106,16 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implementsreturn query(false);}+ @Override+ public int count(boolean cacheable) {+ return dao.count(entityClass, cacheable);+ }++ @Override+ public int count() {+ return count(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 2050f62350..35824e6569 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@@ -79,6 +79,10 @@ public interface Dao {<T extends AbstractEntity> List<T> query(Class<T> entityClass, boolean cacheable);+ <T extends AbstractEntity> int count(Class<T> entityClass);++ <T extends AbstractEntity> int count(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 4628576fe7..07924d652d 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@@ -111,6 +111,20 @@ public class DefaultDao implements Dao, Serializable {return query(criteria, 0, Integer.MAX_VALUE);}+ @Sessional+ @Override+ public <T extends AbstractEntity> int count(Class<T> entityClass) {+ return count(entityClass, false);+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> int count(Class<T> entityClass, boolean cacheable) {+ EntityCriteria<T> criteria = EntityCriteria.of(entityClass);+ criteria.setCacheable(cacheable);+ return count(criteria);+ }+@Overridepublic SessionManager getSessionManager() {return sessionManager;diff --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 0c6704dec7..995ce69775 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@@ -75,6 +75,10 @@ public interface EntityManager<T extends AbstractEntity> {List<T> query();+ int count(boolean cacheable);++ int count();+EntityCriteria<T> newCriteria();/**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 001b06467b..8e2906076d 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@@ -2,8 +2,10 @@ package io.onedev.server.security;import java.util.ArrayList;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;+import java.util.Map;import java.util.concurrent.Callable;import javax.annotation.Nullable;@@ -20,6 +22,8 @@ import org.apache.shiro.authz.AuthorizationInfo;import org.apache.shiro.authz.Permission;import org.apache.shiro.realm.AuthorizingRealm;import org.apache.shiro.subject.PrincipalCollection;+import org.apache.wicket.MetaDataKey;+import org.apache.wicket.request.cycle.RequestCycle;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -41,6 +45,7 @@ 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.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.CreateProjects;@@ -67,12 +72,19 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final ProjectManager projectManager;+ private final SessionManager sessionManager;+private final TransactionManager transactionManager;+ @SuppressWarnings("serial")+ private final MetaDataKey<Map<Long, AuthorizationInfo>> authorizationInfosKey =+ new MetaDataKey<Map<Long, AuthorizationInfo>>() {};+@Injectpublic OneAuthorizingRealm(UserManager userManager, SettingManager configManager,MembershipManager membershipManager, GroupManager groupManager,- ProjectManager projectManager, TransactionManager transactionManager) {+ ProjectManager projectManager, SessionManager sessionManager,+ TransactionManager transactionManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);@@ -82,11 +94,59 @@ public class OneAuthorizingRealm extends AuthorizingRealm {this.membershipManager = membershipManager;this.groupManager = groupManager;this.projectManager = projectManager;+ this.sessionManager = sessionManager;this.transactionManager = transactionManager;}- @Override- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {+ private Collection<Permission> getGroupPermissions(Group group, @Nullable User user) {+ Collection<Permission> permissions = new ArrayList<>();+ if (group.isAdministrator()) {+ if (user != null) {+ permissions.add(new SystemAdministration());+ } else {+ for (Project project: projectManager.query()) {+ permissions.add(new ProjectPermission(project, new ReadCode()));+ for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())+ permissions.add(new ProjectPermission(project, new EditIssueField(field.getName())));+ permissions.add(new ProjectPermission(project, new JobPermission("*", new AccessBuildLog())));+ }+ }+ }+ if (user != null && group.isCreateProjects())+ permissions.add(new CreateProjects());+ for (GroupAuthorization authorization: group.getProjectAuthorizations())+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));+ return permissions;+ }++ private AuthorizationInfo newAuthorizationInfo(Long userId) {+ Collection<Permission> permissions = sessionManager.call(new Callable<Collection<Permission>>() {++ @Override+ public Collection<Permission> call() throws Exception {+ Collection<Permission> permissions = new ArrayList<>();++ User user = null;+ if (userId != 0L) {+ user = userManager.load(userId);+ if (user.isRoot())+ permissions.add(new SystemAdministration());+ permissions.add(new UserAdministration(user));+ for (Group group: user.getGroups())+ permissions.addAll(getGroupPermissions(group, user));+ for (UserAuthorization authorization: user.getProjectAuthorizations())+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));+ for (Project project: user.getProjects())+ permissions.add(new ProjectPermission(project, new ManageProject()));+ }+ Group group = groupManager.findAnonymous();+ if (group != null)+ permissions.addAll(getGroupPermissions(group, user));+ return permissions;+ }++ });+return new AuthorizationInfo() {private static final long serialVersionUID = 1L;@@ -101,58 +161,32 @@ public class OneAuthorizingRealm extends AuthorizingRealm {return new HashSet<>();}- private Collection<Permission> getGroupPermissions(Group group, @Nullable User user) {- Collection<Permission> permissions = new ArrayList<>();- if (group.isAdministrator()) {- if (user != null) {- permissions.add(new SystemAdministration());- } else {- for (Project project: projectManager.query()) {- permissions.add(new ProjectPermission(project, new ReadCode()));- for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())- permissions.add(new ProjectPermission(project, new EditIssueField(field.getName())));- permissions.add(new ProjectPermission(project, new JobPermission("*", new AccessBuildLog())));- }- }- }- if (user != null && group.isCreateProjects())- permissions.add(new CreateProjects());- for (GroupAuthorization authorization: group.getProjectAuthorizations())- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- return permissions;- }-@Overridepublic Collection<Permission> getObjectPermissions() {- return transactionManager.getSessionManager().call(new Callable<Collection<Permission>>() {-- @Override- public Collection<Permission> call() throws Exception {- Long userId = (Long) principals.getPrimaryPrincipal();- Collection<Permission> permissions = new ArrayList<>();-- User user = null;- if (userId != 0L) {- user = userManager.load(userId);- if (user.isRoot())- permissions.add(new SystemAdministration());- permissions.add(new UserAdministration(user));- for (Group group: user.getGroups())- permissions.addAll(getGroupPermissions(group, user));- for (UserAuthorization authorization: user.getProjectAuthorizations())- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- for (Project project: user.getProjects())- permissions.add(new ProjectPermission(project, new ManageProject()));- }- Group group = groupManager.findAnonymous();- if (group != null)- permissions.addAll(getGroupPermissions(group, user));- return permissions;- }-- });+ return permissions;+ }+ };+ }++ @Override+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {+ Long userId = (Long) principals.getPrimaryPrincipal();+ RequestCycle requestCycle = RequestCycle.get();+ if (requestCycle != null) {+ Map<Long, AuthorizationInfo> authorizationInfos = requestCycle.getMetaData(authorizationInfosKey);+ if (authorizationInfos == null) {+ authorizationInfos = new HashMap<>();+ requestCycle.setMetaData(authorizationInfosKey, authorizationInfos);+ }+ AuthorizationInfo authorizationInfo = authorizationInfos.get(userId);+ if (authorizationInfo == null) {+ authorizationInfo = newAuthorizationInfo(userId);+ authorizationInfos.put(userId, authorizationInfo);}- };+ return authorizationInfo;+ } else {+ return newAuthorizationInfo(userId);+ }}@Overridediff --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.javaindex 4673ca74f9..9974cdd3a6 100644--- 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.java@@ -9,15 +9,22 @@ public class AccessBuildReports implements Permission {private final String reportNames;+ private transient PatternSet reportNamesPatternSet;+public AccessBuildReports(String reportNames) {this.reportNames = reportNames;}+ private PatternSet getReportNamesPatternSet() {+ if (reportNamesPatternSet == null)+ reportNamesPatternSet = PatternSet.fromString(reportNames);+ return reportNamesPatternSet;+ }@Overridepublic boolean implies(Permission p) {if (p instanceof AccessBuildReports) {AccessBuildReports accessBuildReports = (AccessBuildReports) p;- return PatternSet.fromString(reportNames).matches(new StringMatcher(), accessBuildReports.reportNames);+ return getReportNamesPatternSet().matches(new StringMatcher(), accessBuildReports.reportNames);} else {return new AccessBuild().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.javaindex 5d6711e7b5..4b0b65e7d9 100644--- 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.java@@ -11,16 +11,23 @@ public class JobPermission implements Permission {private final Permission privilege;+ private transient PatternSet jobNamesPatternSet;+public JobPermission(String jobNames, Permission privilege) {this.jobNames = jobNames;this.privilege = privilege;}+ private PatternSet getJobNamesPatternSet() {+ if (jobNamesPatternSet == null)+ jobNamesPatternSet = PatternSet.fromString(jobNames);+ return jobNamesPatternSet;+ }@Overridepublic boolean implies(Permission p) {if (p instanceof JobPermission) {JobPermission jobPermission = (JobPermission) p;- return PatternSet.fromString(jobNames).matches(new StringMatcher(), jobPermission.jobNames)+ return getJobNamesPatternSet().matches(new StringMatcher(), jobPermission.jobNames)&& privilege.implies(jobPermission.privilege);}return false;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 f18b7b93a6..c60571c8a1 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,6 +24,7 @@ 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.persistence.dao.EntityCriteria;@Singletonpublic class DefaultAttachmentStorageManager implements AttachmentStorageManager, SchedulableTask {@@ -96,7 +97,9 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager@Overridepublic void execute() {try {- for (Project project: dao.query(Project.class)) {+ EntityCriteria<Project> criteria = EntityCriteria.of(Project.class);+ criteria.setCacheable(true);+ for (Project project: dao.query(criteria)) {File tempAttachmentBase = new File(storageManager.getProjectAttachmentDir(project.getId()), TEMP);if (tempAttachmentBase.exists()) {for (File file: tempAttachmentBase.listFiles()) {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 5919fd0a88..8c7e59b474 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@@ -62,6 +62,8 @@ public class GroupListPage extends AdministrationPage {EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);if (query != null)criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);return criteria;}diff --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 08c3a88fa3..67baf02c58 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@@ -77,6 +77,8 @@ public class GroupMembershipsPage extends GroupPage {EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);if (query != null)criteria.createCriteria("user").add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);criteria.add(Restrictions.eq("group", getGroup()));return criteria;}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.javaindex 1cbc91639a..26c072ff50 100644--- 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.java@@ -61,6 +61,8 @@ public class RoleListPage extends AdministrationPage {EntityCriteria<Role> criteria = EntityCriteria.of(Role.class);if (query != null)criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);return criteria;}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 39b801e93f..32cf004f78 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@@ -68,6 +68,8 @@ public class UserListPage extends AdministrationPage {criteria.add(Restrictions.or(Restrictions.ilike("name", query, MatchMode.ANYWHERE),Restrictions.ilike("fullName", query, MatchMode.ANYWHERE)));+ } else {+ criteria.setCacheable(true);}return criteria;}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 adf9ca0bbc..221d736370 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@@ -74,6 +74,8 @@ public class UserMembershipsPage extends UserPage {EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);if (query != null)criteria.createCriteria("group").add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);criteria.add(Restrictions.eq("user", getUser()));return criteria;}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 7b0fc1bbc0..1ca3b55bbb 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@@ -6,6 +6,10 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -22,6 +26,9 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {+ Project test = OneDev.getInstance(ProjectManager.class).load(1L);+ SecurityUtils.canAccess(test);+ SecurityUtils.canAccess(test);}});