The Unified and Autonomous Development Platform
Able to disable anonymous access from security setting
robin shencd40a9a823ba
diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.javaindex e23544a020..c13ea1e25e 100644--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java@@ -314,8 +314,11 @@ public class DatabaseMigrator {FileUtils.deleteDir(infoDir);}}+ } else if (element.elementText("key").equals("SECURITY")) {+ element.element("setting").addElement("enableAnonymousAccess").setText("false");}- }+ }+ dom.writeToFile(file, false);}}} catch (IOException e) {diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.javaindex 7b4c8f4ac2..8d5f72936e 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java@@ -51,7 +51,7 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ReviewStatus;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.util.editable.EditableUtils;-import com.gitplex.server.util.jackson.ExternalView;+import com.gitplex.server.util.jackson.RestView;import com.google.common.base.Preconditions;@Entity@@ -455,7 +455,7 @@ public class PullRequest extends AbstractEntity {* it will trigger a re-calculation, and client should call this method later* to get the calculated result*/- @JsonView(ExternalView.class)+ @JsonView(RestView.class)@Nullablepublic MergePreview getMergePreview() {if (mergePreviewOpt == null)@@ -486,24 +486,24 @@ public class PullRequest extends AbstractEntity {this.mergeStrategy = mergeStrategy;}- @JsonView(ExternalView.class)+ @JsonView(RestView.class)public PullRequestUpdate getLatestUpdate() {return getSortedUpdates().get(getSortedUpdates().size()-1);}- @JsonView(ExternalView.class)+ @JsonView(RestView.class)public String getBaseRef() {Preconditions.checkNotNull(getId());return REFS_PREFIX + getNumber() + "/base";}- @JsonView(ExternalView.class)+ @JsonView(RestView.class)public String getMergeRef() {Preconditions.checkNotNull(getId());return REFS_PREFIX + getNumber() + "/merge";}- @JsonView(ExternalView.class)+ @JsonView(RestView.class)public String getHeadRef() {Preconditions.checkNotNull(getId());return REFS_PREFIX + getNumber() + "/head";diff --git a/core/src/main/java/com/gitplex/server/model/User.java b/core/src/main/java/com/gitplex/server/model/User.javaindex df96058b64..f04ff64b89 100644--- a/core/src/main/java/com/gitplex/server/model/User.java+++ b/core/src/main/java/com/gitplex/server/model/User.java@@ -26,10 +26,12 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;+import com.fasterxml.jackson.annotation.JsonView;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Password;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.jackson.DefaultView;import com.gitplex.server.util.validation.annotation.UserName;import com.google.common.base.Objects;import com.google.common.base.Preconditions;@@ -132,6 +134,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Editable(order=150, autocomplete="new-password")@Password(confirmative=true)+ @JsonView(DefaultView.class)@NotEmptypublic String getPassword() {return password;diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.javaindex 6a46423f31..0ffc74fda0 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SecuritySetting.java@@ -9,9 +9,20 @@ public class SecuritySetting implements Serializable {private static final long serialVersionUID = 1L;+ private boolean enableAnonymousAccess = false;+private boolean enableSelfRegister = true;-- @Editable(description="User can self-register if this option is enabled")++ @Editable(order=100, description="Whether or not to allow anonymous users to access this server")+ public boolean isEnableAnonymousAccess() {+ return enableAnonymousAccess;+ }++ public void setEnableAnonymousAccess(boolean enableAnonymousAccess) {+ this.enableAnonymousAccess = enableAnonymousAccess;+ }++ @Editable(order=200, description="User can self-register if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/SecurityRealm.javaindex 6fdc4e54e5..1abd42bd9e 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java@@ -20,6 +20,7 @@ import org.apache.shiro.subject.PrincipalCollection;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.security.permission.CreateProjects;import com.gitplex.server.security.permission.ProjectPermission;@@ -39,14 +40,17 @@ public class SecurityRealm extends AuthorizingRealm {private final CacheManager cacheManager;+ private final ConfigManager configManager;+@Inject- public SecurityRealm(UserManager userManager, CacheManager cacheManager) {+ public SecurityRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);this.userManager = userManager;this.cacheManager = cacheManager;+ this.configManager = configManager;}@SuppressWarnings("serial")@@ -69,38 +73,41 @@ public class SecurityRealm extends AuthorizingRealm {@Overridepublic Collection<Permission> getObjectPermissions() {Collection<Permission> permissions = new ArrayList<>();- permissions.add(new PublicPermission());- if (userId != 0L) {- UserFacade user = cacheManager.getUser(userId);- if (user != null) {- 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()));++ UserFacade user = null;+ if (userId != 0L)+ user = cacheManager.getUser(userId);+ if (user != null) {+ permissions.add(new PublicPermission());+ 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()));+ }+ }+ } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {+ permissions.add(new PublicPermission());}return permissions;}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.javaindex 8db2fa5f9d..bf9232a9d5 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java@@ -24,6 +24,7 @@ import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.model.support.TagProtection;import com.gitplex.server.security.permission.CreateProjects;import com.gitplex.server.security.permission.ProjectPermission;+import com.gitplex.server.security.permission.PublicPermission;import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.security.permission.UserAdministration;import com.gitplex.server.util.facade.GroupAuthorizationFacade;@@ -183,6 +184,10 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return getSubject().isPermitted(new CreateProjects());}+ public static boolean canAccessPublic() {+ return getSubject().isPermitted(new PublicPermission());+ }+public static boolean canRead(Project project) {return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.READ));}diff --git a/core/src/main/java/com/gitplex/server/util/jackson/ExternalView.java b/core/src/main/java/com/gitplex/server/util/jackson/RestView.javasimilarity index 61%rename from core/src/main/java/com/gitplex/server/util/jackson/ExternalView.javarename to core/src/main/java/com/gitplex/server/util/jackson/RestView.javaindex 48db090cc4..f33b35c053 100644--- a/core/src/main/java/com/gitplex/server/util/jackson/ExternalView.java+++ b/core/src/main/java/com/gitplex/server/util/jackson/RestView.java@@ -1,5 +1,5 @@package com.gitplex.server.util.jackson;-public class ExternalView {+public class RestView {}diff --git a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.javaindex 38e0e78d0c..5a985d9bb3 100644--- a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java@@ -10,7 +10,6 @@ import javax.ws.rs.Produces;import javax.ws.rs.QueryParam;import javax.ws.rs.core.MediaType;-import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;import com.gitplex.server.manager.ProjectManager;@@ -41,7 +40,7 @@ public class ProjectResource {Project project = dao.load(Project.class, id);if (!SecurityUtils.canRead(project))- throw new UnauthenticatedException();+ throw new UnauthorizedException("Unauthorized access to project " + project.getName());elsereturn project;}diff --git a/rest/src/main/java/com/gitplex/server/rest/UserResource.java b/rest/src/main/java/com/gitplex/server/rest/UserResource.javaindex f7ecd3bc37..4965b5c4d7 100644--- a/rest/src/main/java/com/gitplex/server/rest/UserResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/UserResource.java@@ -12,6 +12,7 @@ import javax.ws.rs.Produces;import javax.ws.rs.QueryParam;import javax.ws.rs.core.MediaType;+import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.Email;@@ -19,6 +20,7 @@ import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.rest.jersey.ValidQueryParams;+import com.gitplex.server.security.SecurityUtils;@Path("/users")@Consumes(MediaType.WILDCARD)@@ -39,6 +41,8 @@ public class UserResource {@QueryParam("name") String name,@Email @QueryParam("email") String email,@QueryParam("fullName") String fullName) {+ if (!SecurityUtils.canAccessPublic())+ throw new UnauthorizedException("Unauthorized access to user profiles");EntityCriteria<User> criteria = EntityCriteria.of(User.class);if (name != null)criteria.add(Restrictions.eq("name", name));@@ -52,6 +56,8 @@ public class UserResource {@GET@Path("/{id}")public User get(@PathParam("id") Long id) {+ if (!SecurityUtils.canAccessPublic())+ throw new UnauthorizedException("Unauthorized access to user profile");return dao.load(User.class, id);}diff --git a/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.javaindex 5415bb014f..2f2d78a3a2 100644--- a/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java@@ -5,7 +5,7 @@ import javax.ws.rs.ext.ContextResolver;import javax.ws.rs.ext.Provider;import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.server.util.jackson.ExternalView;+import com.gitplex.server.util.jackson.RestView;@Providerpublic class JacksonContextResolver implements ContextResolver<ObjectMapper> {@@ -15,7 +15,7 @@ public class JacksonContextResolver implements ContextResolver<ObjectMapper> {@Injectpublic JacksonContextResolver(ObjectMapper objectMapper) {this.objectMapper = objectMapper.copy();- this.objectMapper.setConfig(this.objectMapper.getSerializationConfig().withView(ExternalView.class));+ this.objectMapper.setConfig(this.objectMapper.getSerializationConfig().withView(RestView.class));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.javaindex 34e5e22536..a2635e08aa 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java@@ -48,9 +48,9 @@ import com.gitplex.server.web.assets.Assets;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.page.init.ServerInitPage;import com.gitplex.server.web.page.security.LoginPage;+import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;-import com.gitplex.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public abstract class BasePage extends WebPage {diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javaindex 25833b4fbc..1c1d4fd270 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java@@ -177,18 +177,6 @@ public abstract class LayoutPage extends BasePage {return breadcrumbs;};- protected boolean isLoggedIn() {- return getLoginUser() != null;- }-- protected boolean isRemembered() {- return SecurityUtils.getSubject().isRemembered();- }-- protected boolean isAuthenticated() {- return SecurityUtils.getSubject().isAuthenticated();- }-protected boolean isFootVisible() {return true;}@@ -196,12 +184,17 @@ public abstract class LayoutPage extends BasePage {@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();- if (isLoggedIn()) {+ if (getLoginUser() != null) {regions.add(new TaskChangedRegion(getLoginUser().getId()));}return regions;}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccessPublic();+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.javaindex 19bd4618f2..a33fec0e90 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/compare/RevisionComparePage.java@@ -370,7 +370,10 @@ public class RevisionComparePage extends ProjectPage implements MarkSupport {protected void onConfigure() {super.onConfigure();- if (mergeBase != null && isLoggedIn() && state.leftSide.getBranch()!=null && state.rightSide.getBranch()!=null) {+ if (mergeBase != null+ && getLoginUser() != null+ && state.leftSide.getBranch()!=null+ && state.rightSide.getBranch()!=null) {PullRequest request = requestModel.getObject();setVisible(request == null && !mergeBase.equals(rightCommitId));} else {diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.java b/web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.javaindex 5a6d6af223..08340251b7 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/LogoutPage.java@@ -2,6 +2,7 @@ package com.gitplex.server.web.page.security;import org.apache.wicket.RestartResponseException;+import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebSession;import com.gitplex.server.web.page.base.BasePage;@@ -11,7 +12,8 @@ public class LogoutPage extends BasePage {public LogoutPage() {WebSession.get().logout();- getSession().warn("You've been logged out");+ if (SecurityUtils.canAccessPublic())+ getSession().warn("You've been logged out");throw new RestartResponseException(getApplication().getHomePage());}