Skip to content

The Unified and Autonomous Development Platform

feat: Remove guest concept (OD-2154)

Robin Shen1c31597c115b
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index 24f7d1dde3..f7fca1b2f3 100644
--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -644,7 +644,7 @@ public class DefaultDataManager implements DataManager, Serializable {
if (validator.validate(bean).isEmpty()) {
createRoot(bean);
} else {
- manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_GUEST, PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS)) {
+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS)) {
@Override
public void complete() {
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 8c022fa2e9..7fce24cb97 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -7099,5 +7099,41 @@ public class DataMigrator {
}
}
}
-
+
+ private void migrate180(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Users.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements())
+ element.element("guest").detach();
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("UserInvitations.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements())
+ element.element("inviteAsGuest").detach();
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("SECURITY")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.element("selfRegisterAsGuest").detach();
+ } else if (key.equals("AUTHENTICATOR")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.element("createUserAsGuest").detach();
+ } else if (key.equals("SSO_CONNECTORS")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ for (Element connectorElement : valueElement.elements())
+ connectorElement.element("createUserAsGuest").detach();
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
index 8085c8be11..b8d0f387c0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
@@ -31,8 +31,6 @@ public interface UserManager extends EntityManager<User> {
void delete(User user);
void delete(Collection<User> users);
-
- void setAsGuest(Collection<User> users, boolean guest);
/**
* Find root user in the system.
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.java
index 861c99426d..d273f1ce8e 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
@@ -21,7 +21,6 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.usage.Usage;
@@ -249,44 +248,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
for (var user: users)
delete(user);
}
-
- @Transactional
- @Override
- public void setAsGuest(Collection<User> users, boolean guest) {
- for (var user: users) {
- user.setGuest(guest);
- if (guest) {
- var query = getSession().createQuery("update Build set submitter=:unknown where submitter=:submitter");
- query.setParameter("submitter", user);
- query.setParameter("unknown", getUnknown());
- query.executeUpdate();
-
- query = getSession().createQuery("update Build set canceller=:unknown where canceller=:canceller");
- query.setParameter("canceller", user);
- query.setParameter("unknown", getUnknown());
- query.executeUpdate();
-
- query = getSession().createQuery("update PullRequest set submitter=:unknown where submitter=:submitter");
- query.setParameter("submitter", user);
- query.setParameter("unknown", getUnknown());
- query.executeUpdate();
-
- query = getSession().createQuery("delete from PullRequestAssignment where user=:user");
- query.setParameter("user", user);
- query.executeUpdate();
-
- query = getSession().createQuery("delete from IssueWork where user=:user");
- query.setParameter("user", user);
- query.executeUpdate();
-
- query = getSession().createQuery("delete from Stopwatch where user=:user");
- query.setParameter("user", user);
- query.executeUpdate();
- }
- dao.persist(user);
- }
- }
-
+
@Sessional
@Override
public User findByName(String userName) {
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index 9c3675abe5..8636b4a723 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -735,7 +735,6 @@ public class DefaultMailManager implements MailManager, Serializable {
user.setName(UserNameValidator.suggestUserName(ParsedEmailAddress.parse(internetAddress.getAddress()).getName()));
user.setFullName(internetAddress.getPersonal());
user.setPassword("impossible password");
- user.setGuest(true);
userManager.create(user);
EmailAddress addressEntity = new EmailAddress();
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.java
index 2b00fba97b..aebfd8f28e 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
@@ -62,12 +62,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public static final String PROP_NAME = "name";
- public static final String PROP_PASSWORD = "password";
-
public static final String PROP_FULL_NAME = "fullName";
- public static final String PROP_GUEST = "guest";
-
public static final String PROP_DISABLE_WATCH_NOTIFICATIONS = "disableWatchNotifications";
public static final String PROP_NOTIFY_OWN_EVENTS = "notifyOwnEvents";
@@ -92,8 +88,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private String fullName;
- private boolean guest;
-
private boolean disableWatchNotifications;
private boolean notifyOwnEvents;
@@ -549,15 +543,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
this.fullName = fullName;
}
- @Editable(order=300, description = "Whether or not to create the user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")
- public boolean isGuest() {
- return guest;
- }
-
- public void setGuest(boolean guest) {
- this.guest = guest;
- }
-
@Editable(order=350, description = "Whether or not to disable email notifications for watched " +
"events. Note that forced notifications such as mention notification, review invitation, " +
"and build failure notification will still be sent")
@@ -578,10 +563,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
this.notifyOwnEvents = sendOwnEvents;
}
- public boolean isEffectiveGuest() {
- return guest && !isRoot() && !isSystem();
- }
-
public Collection<AccessToken> getAccessTokens() {
return accessTokens;
}
@@ -966,7 +947,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Override
public UserFacade getFacade() {
- return new UserFacade(getId(), getName(), getFullName(), isGuest());
+ return new UserFacade(getId(), getName(), getFullName());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/UserInvitation.java b/server-core/src/main/java/io/onedev/server/model/UserInvitation.java
index b67958f3ef..4aca633970 100644
--- a/server-core/src/main/java/io/onedev/server/model/UserInvitation.java
+++ b/server-core/src/main/java/io/onedev/server/model/UserInvitation.java
@@ -1,21 +1,18 @@
package io.onedev.server.model;
-import static io.onedev.server.model.UserInvitation.PROP_EMAIL_ADDRESS;
-import static io.onedev.server.model.UserInvitation.PROP_INVITATION_CODE;
-
-import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.onedev.server.annotation.Editable;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
+import java.util.UUID;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import io.onedev.server.annotation.Editable;
+import static io.onedev.server.model.UserInvitation.PROP_EMAIL_ADDRESS;
+import static io.onedev.server.model.UserInvitation.PROP_INVITATION_CODE;
@Entity
@Table(indexes={@Index(columnList=PROP_EMAIL_ADDRESS), @Index(columnList=PROP_INVITATION_CODE)})
@@ -36,8 +33,6 @@ public class UserInvitation extends AbstractEntity {
@JsonIgnore
private String invitationCode = UUID.randomUUID().toString();
- private boolean inviteAsGuest;
-
public String getEmailAddress() {
return emailAddress;
}
@@ -54,11 +49,4 @@ public class UserInvitation extends AbstractEntity {
this.invitationCode = invitationCode;
}
- public boolean isInviteAsGuest() {
- return inviteAsGuest;
- }
-
- public void setInviteAsGuest(boolean inviteAsGuest) {
- this.inviteAsGuest = inviteAsGuest;
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
index 6e4daae191..cc3372b1df 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
@@ -30,8 +30,6 @@ public class SecuritySetting implements Serializable {
private String allowedSelfRegisterEmailDomain;
- private boolean selfRegisterAsGuest = false;
-
private boolean enableSelfDeregister;
private String defaultLoginGroupName;
@@ -68,16 +66,6 @@ public class SecuritySetting implements Serializable {
public void setAllowedSelfRegisterEmailDomain(String allowedSelfRegisterEmailDomain) {
this.allowedSelfRegisterEmailDomain = allowedSelfRegisterEmailDomain;
}
-
- @Editable(order=250, name="Self Sign-Up as Guest", description = "Whether or not to create self sign-up user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")
- @ShowCondition("isEnableSelfRegisterEnabled")
- public boolean isSelfRegisterAsGuest() {
- return selfRegisterAsGuest;
- }
-
- public void setSelfRegisterAsGuest(boolean selfRegisterAsGuest) {
- this.selfRegisterAsGuest = selfRegisterAsGuest;
- }
private static boolean isEnableSelfRegisterEnabled() {
return (boolean) EditContext.get().getInputValue("enableSelfRegister");
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.java
index 18f4c80697..e39692ddd6 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,16 +1,14 @@
package io.onedev.server.model.support.administration.authenticator;
-import java.io.Serializable;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-
-import io.onedev.server.util.usage.Usage;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.GroupChoice;
+import io.onedev.server.util.usage.Usage;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UsernamePasswordToken;
+
+import java.io.Serializable;
@Editable
@JsonTypeInfo(use=Id.CLASS)
@@ -20,18 +18,7 @@ public abstract class Authenticator implements Serializable {
private String defaultGroup;
- private boolean createUserAsGuest;
-
private int timeout = 300;
-
- @Editable(order=10000, description = "Whether or not to create authenticated user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")
- public boolean isCreateUserAsGuest() {
- return createUserAsGuest;
- }
-
- public void setCreateUserAsGuest(boolean createUserAsGuest) {
- this.createUserAsGuest = createUserAsGuest;
- }
@Editable(order=15000, placeholder="No default group", description="Optionally add newly authenticated user to "
+ "specified group if membership information is not retrieved")
@@ -67,6 +54,4 @@ public abstract class Authenticator implements Serializable {
public abstract Authenticated authenticate(UsernamePasswordToken token) throws AuthenticationException;
- public abstract boolean isManagingMemberships();
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
index c369638463..c6da037449 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java
@@ -15,8 +15,6 @@ public abstract class SsoConnector implements Serializable {
private String name;
- private boolean createUserAsGuest;
-
private String defaultGroup;
@Editable(order=100, description="Name of the provider will be displayed on login button")
@@ -31,15 +29,6 @@ public abstract class SsoConnector implements Serializable {
public abstract String getButtonImageUrl();
- @Editable(order=10000, description = "Whether or not to create authenticated user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")
- public boolean isCreateUserAsGuest() {
- return createUserAsGuest;
- }
-
- public void setCreateUserAsGuest(boolean createUserAsGuest) {
- this.createUserAsGuest = createUserAsGuest;
- }
-
@Editable(order=20000, placeholder="No default group", description="Optionally add newly authenticated "
+ "user to specified group if membership information is not available")
@GroupChoice
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index b8a27c5c6b..0752675b93 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -9,9 +9,9 @@ import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.rest.InvalidParamException;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.annotation.EntityCreate;
-import io.onedev.server.rest.InvalidParamException;
import io.onedev.server.rest.resource.support.RestConstants;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
@@ -200,7 +200,7 @@ public class PullRequestResource {
ProjectAndBranch target = new ProjectAndBranch(data.getTargetProjectId(), data.getTargetBranch());
ProjectAndBranch source = new ProjectAndBranch(data.getSourceProjectId(), data.getSourceBranch());
- if (user.isEffectiveGuest() || !SecurityUtils.canReadCode(target.getProject()) || !SecurityUtils.canReadCode(source.getProject()))
+ if (!SecurityUtils.canReadCode(target.getProject()) || !SecurityUtils.canReadCode(source.getProject()))
throw new UnauthorizedException();
if (target.equals(source))
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java
index a7accc8f39..8cfaebf432 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java
@@ -1,6 +1,5 @@
package io.onedev.server.rest.resource;
-import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.annotation.UserName;
import io.onedev.server.entitymanager.EmailAddressManager;
@@ -265,7 +264,6 @@ public class UserResource {
user.setName(data.getName());
user.setFullName(data.getFullName());
user.setPassword(passwordService.encryptPassword(data.getPassword()));
- user.setGuest(data.isGuest());
userManager.create(user);
EmailAddress emailAddress = new EmailAddress();
@@ -339,23 +337,6 @@ public class UserResource {
}
}
- @Api(order=2050)
- @Path("/{userId}/guest")
- @POST
- public Response setGuest(@PathParam("userId") Long userId, boolean guest) {
- User user = userManager.load(userId);
- if (!SecurityUtils.isAdministrator()) {
- throw new UnauthorizedException();
- } else if (user.isRoot()) {
- throw new ExplicitException("Can not change guest status of root user");
- } else if (user.equals(SecurityUtils.getAuthUser())) {
- throw new ExplicitException("Can not change guest status of yourself");
- } else {
- userManager.setAsGuest(Sets.newHashSet(user), guest);
- return Response.ok().build();
- }
- }
-
@Api(order=2100)
@Path("/{userId}/queries-and-watches")
@POST
@@ -421,8 +402,6 @@ public class UserResource {
private String fullName;
private String emailAddress;
-
- private boolean guest;
@Api(order=100, description="Login name of the user")
@UserName
@@ -465,14 +444,6 @@ public class UserResource {
this.emailAddress = emailAddress;
}
- @Api(order=400)
- public boolean isGuest() {
- return guest;
- }
-
- public void setGuest(boolean guest) {
- this.guest = guest;
- }
}
public static class ProfileUpdateData implements Serializable {
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.java
index cadbd21ec0..f2d8e449e7 100644
--- 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.java
@@ -15,4 +15,5 @@ public class AccessBuild implements BasePermission {
public boolean isApplicable(@Nullable UserFacade user) {
return true;
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java b/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
index e9066b3a65..9d200b6f17 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/CreateChildren.java
@@ -13,6 +13,6 @@ public class CreateChildren implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/CreateRootProjects.java b/server-core/src/main/java/io/onedev/server/security/permission/CreateRootProjects.java
index 09a788d78e..61f2523cb0 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/CreateRootProjects.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/CreateRootProjects.java
@@ -13,6 +13,6 @@ public class CreateRootProjects implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
index f0c35a3b66..f5c16dc876 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
@@ -14,6 +14,6 @@ public class ManageBuilds implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
index b179e777bc..849e2474a9 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageCodeComments.java
@@ -13,6 +13,6 @@ public class ManageCodeComments implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
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.java
index 00dd36232a..56d64f6c0d 100644
--- 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.java
@@ -17,6 +17,6 @@ public class ManageIssues implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
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.java
index 9e6076cab5..589133da9d 100644
--- 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.java
@@ -13,6 +13,6 @@ public class ManageJob implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
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.java
index a69fbcfbc8..053c820cb5 100644
--- 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.java
@@ -13,6 +13,6 @@ public class ManageProject implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
index c77cbccb57..077c73672c 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManagePullRequests.java
@@ -13,6 +13,6 @@ public class ManagePullRequests implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
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.java
index 4ebba4d746..d9ccf36882 100644
--- 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.java
@@ -16,6 +16,6 @@ public class RunJob implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
index dedad0ffd6..ea54d7267f 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ScheduleIssues.java
@@ -13,6 +13,6 @@ public class ScheduleIssues implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java b/server-core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java
index 20f6482545..6903ec6958 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java
@@ -1,6 +1,5 @@
package io.onedev.server.security.permission;
-import io.onedev.server.model.User;
import io.onedev.server.util.facade.UserFacade;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
@@ -14,6 +13,6 @@ public class SystemAdministration implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java b/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
index 63cd42b8e7..0596cde247 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/UploadCache.java
@@ -13,7 +13,7 @@ public class UploadCache implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
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.java
index 87a51ac73a..156ad9429b 100644
--- 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.java
@@ -13,6 +13,6 @@ public class WriteCode implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java b/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
index db479c8d67..2880ebe2ae 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/WritePack.java
@@ -13,6 +13,6 @@ public class WritePack implements BasePermission {
@Override
public boolean isApplicable(@Nullable UserFacade user) {
- return user != null && !user.isEffectiveGuest();
+ return user != null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
index 66bd61bb70..d81fe83128 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
@@ -63,14 +63,12 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {
return token instanceof UsernamePasswordToken;
}
- private User newUser(String userNameOrEmailAddress, Authenticated authenticated,
- boolean createAsGuest, @Nullable String defaultGroup) {
+ private User newUser(String userNameOrEmailAddress, Authenticated authenticated, @Nullable String defaultGroup) {
User user = new User();
var userName = userNameOrEmailAddress;
if (userName.contains("@"))
userName = StringUtils.substringBefore(userName, "@");
user.setName(UserNameValidator.suggestUserName(userName));
- user.setGuest(createAsGuest);
if (authenticated.getFullName() != null)
user.setFullName(authenticated.getFullName());
userManager.create(user);
@@ -178,11 +176,11 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {
+ "' has already been used by another user");
} else {
return newUser(userNameOrEmailAddressValue, authenticated,
- authenticator.isCreateUserAsGuest(), authenticator.getDefaultGroup());
+ authenticator.getDefaultGroup());
}
} else {
return newUser(userNameOrEmailAddressValue, authenticated,
- authenticator.isCreateUserAsGuest(), authenticator.getDefaultGroup());
+ authenticator.getDefaultGroup());
}
} else {
throw new UnknownAccountException("Invalid credentials");
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java
index 47ba5bb1a5..72c40ba19a 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthenticatingRealm.java
@@ -47,7 +47,6 @@ public class SsoAuthenticatingRealm extends AuthenticatingRealm {
private User newUser(SsoAuthenticated authenticated) {
User user = new User();
user.setName(authenticated.getUserName());
- user.setGuest(authenticated.getConnector().isCreateUserAsGuest());
if (authenticated.getFullName() != null)
user.setFullName(authenticated.getFullName());
userManager.create(user);
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.java
index d89d326703..cb1e9ceeaf 100644
--- 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.java
@@ -12,13 +12,10 @@ public class UserFacade extends EntityFacade {
private final String fullName;
- private final boolean guest;
-
- public UserFacade(Long id, String name, @Nullable String fullName, boolean guest) {
+ public UserFacade(Long id, String name, @Nullable String fullName) {
super(id);
this.name = name;
this.fullName = fullName;
- this.guest = guest;
}
public String getName() {
@@ -29,10 +26,6 @@ public class UserFacade extends EntityFacade {
return fullName;
}
- public boolean isGuest() {
- return guest;
- }
-
public String getDisplayName() {
if (getFullName() != null)
return getFullName();
@@ -51,10 +44,6 @@ public class UserFacade extends EntityFacade {
public boolean isUnknown() {
return User.UNKNOWN_ID.equals(getId());
}
-
- public boolean isEffectiveGuest() {
- return guest && !isRoot() && !isSystem();
- }
public static UserFacade of(@Nullable User user) {
if (user != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
index f06d06c1e8..5b13ad1c34 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java
@@ -145,7 +145,7 @@ abstract class TimingDetailPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
var user = SecurityUtils.getAuthUser();
- setVisible(user != null && !user.isEffectiveGuest() && getStopWatchManager().find(user, getIssue()) == null);
+ setVisible(user != null && getStopWatchManager().find(user, getIssue()) == null);
}
};
}
@@ -163,7 +163,7 @@ abstract class TimingDetailPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
var user = SecurityUtils.getAuthUser();
- setVisible(user != null && !user.isEffectiveGuest() && getStopWatchManager().find(user, getIssue()) == null);
+ setVisible(user != null && getStopWatchManager().find(user, getIssue()) == null);
}
};
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 67d8dcf64e..8a03fb5500 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -820,9 +820,6 @@ public abstract class PullRequestListPanel extends Panel {
add(newPullRequestLink = new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,
NewPullRequestPage.paramsOf(getProject())));
}
- var user = SecurityUtils.getAuthUser();
- newPullRequestLink.setVisible(user == null || !user.isEffectiveGuest());
-
body = new WebMarkupContainer("body");
add(body.setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
index ec29283439..0416d34b12 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -57,7 +57,7 @@ public class ProfileEditPanel extends GenericPanel<User> {
editor.getDescriptor().copyProperties(object, getUser());
}
- }, Sets.newHashSet("password", "guest"), true);
+ }, Sets.newHashSet("password"), true);
Form<?> form = new Form<Void>("form") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
index f4c1a6282a..3ea2017970 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
@@ -1,10 +1,17 @@
package io.onedev.server.web.page.admin.usermanagement;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserInvitationManager;
+import io.onedev.server.model.UserInvitation;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.util.PagingHistorySupport;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -26,18 +33,10 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserInvitationManager;
-import io.onedev.server.model.UserInvitation;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.util.PagingHistorySupport;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
@SuppressWarnings("serial")
public class InvitationListPage extends AdministrationPage {
@@ -146,16 +145,6 @@ public class InvitationListPage extends AdministrationPage {
}
});
-
- columns.add(new AbstractColumn<>(Model.of("Invite as Guest")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<UserInvitation>> cellItem,
- String componentId, IModel<UserInvitation> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().isInviteAsGuest()));
- }
-
- });
columns.add(new AbstractColumn<>(Model.of("")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
index 48dfdb9be7..e6db1b3096 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
@@ -1,22 +1,19 @@
package io.onedev.server.web.page.admin.usermanagement;
-import java.io.Serializable;
-import java.util.List;
-
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotEmpty;
-
-import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
-
import com.google.common.base.Splitter;
-
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.EmailAddressManager;
-import io.onedev.server.entitymanager.UserInvitationManager;
-import io.onedev.server.validation.Validatable;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Multiline;
+import io.onedev.server.entitymanager.EmailAddressManager;
+import io.onedev.server.entitymanager.UserInvitationManager;
+import io.onedev.server.validation.Validatable;
+import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
+
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
@Editable
@ClassValidating
@@ -26,8 +23,6 @@ public class NewInvitationBean implements Serializable, Validatable {
private String emailAddresses;
- private boolean inviteAsGuest;
-
@Editable(order=100, description="Specify email addresses to send invitations, with one per line")
@Multiline
@NotEmpty
@@ -39,15 +34,6 @@ public class NewInvitationBean implements Serializable, Validatable {
this.emailAddresses = emailAddresses;
}
- @Editable(order=200, description = "Whether or not to invite the user as <a href='https://docs.onedev.io/concepts#guest-user' target='_blank'>guest</a>")
- public boolean isInviteAsGuest() {
- return inviteAsGuest;
- }
-
- public void setInviteAsGuest(boolean inviteAsGuest) {
- this.inviteAsGuest = inviteAsGuest;
- }
-
public List<String> getListOfEmailAddresses() {
return Splitter.on("\n").omitEmptyStrings().trimResults().splitToList(getEmailAddresses());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
index cd10b7b2ff..40ae241674 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
@@ -46,7 +46,6 @@ public class NewInvitationPage extends AdministrationPage {
logger.log("Sending invitation to '" + emailAddress + "'...");
UserInvitation invitation = new UserInvitation();
invitation.setEmailAddress(emailAddress);
- invitation.setInviteAsGuest(bean.isInviteAsGuest());
UserInvitationManager userInvitationManager = OneDev.getInstance(UserInvitationManager.class);
userInvitationManager.create(invitation);
userInvitationManager.sendInvitationEmail(invitation);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
index 84452f3f69..41e2a0346c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
@@ -66,7 +66,6 @@ public class NewUserPage extends AdministrationPage {
User user = new User();
user.setName(bean.getName());
user.setFullName(bean.getFullName());
- user.setGuest(bean.isGuest());
user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getPassword()));
EmailAddress emailAddress = new EmailAddress();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
index 8dc22c7b75..1d76cca62a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html
@@ -20,7 +20,6 @@
<a wicket:id="link">
<img wicket:id="avatar">
<span wicket:id="name" class="name"></span>
- <span wicket:id="guest" class="badge badge-sm badge-info ml-1">guest</span>
</a>
</wicket:fragment>
<wicket:fragment wicket:id="actionsFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
index c097fd4480..23eeb47a67 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java
@@ -191,119 +191,6 @@ public class UserListPage extends AdministrationPage {
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
-
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Set Selected Users as Guest";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- for (var model: selectionColumn.getSelections()) {
- var user = model.getObject();
- if (user.isRoot()) {
- Session.get().error("Can not set root as guest");
- return;
- } else if (user.equals(SecurityUtils.getAuthUser())) {
- Session.get().error("Can not set yourself as guest");
- return;
- }
- }
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- getUserManager().setAsGuest(selectionColumn.getSelections().stream().map(IModel::getObject).collect(Collectors.toSet()), true);
- target.add(usersTable);
- selectionColumn.getSelections().clear();
- Session.get().success("Set as guest successfully");
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Change records of these users will be removed as result of setting to guest. Type <code>yes</code> to confirm";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
-
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!selectionColumn.getSelections().isEmpty());
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "Please select users to set as guest");
- }
- }
-
- };
- }
-
- });
-
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Set Selected Users as non-Guest";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- getUserManager().setAsGuest(selectionColumn.getSelections().stream().map(IModel::getObject).collect(Collectors.toSet()), false);
- target.add(usersTable);
- selectionColumn.getSelections().clear();
- Session.get().success("Set as non-guest successfully");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!selectionColumn.getSelections().isEmpty());
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "Please select users to set as non-guest");
- }
- }
-
- };
- }
-
- });
menuItems.add(new MenuItem() {
@@ -376,126 +263,6 @@ public class UserListPage extends AdministrationPage {
});
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Set All Queried Users as Guest";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- for (var it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();) {
- var user = it.next();
- if (user.isRoot()) {
- Session.get().error("Can not set root as guest");
- return;
- } else if (user.equals(SecurityUtils.getAuthUser())) {
- Session.get().error("Can not set yourself as guest");
- return;
- }
- }
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- var users = new ArrayList<User>();
- for (var it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();)
- users.add(it.next());
- getUserManager().setAsGuest(users, true);
- target.add(usersTable);
- selectionColumn.getSelections().clear();
- Session.get().success("Set as guest successfully");
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Change records of these users will be removed as result of setting to guest. Type <code>yes</code> to confirm";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(usersTable.getItemCount() != 0);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "No users to set as guest");
- }
- }
-
- };
- }
-
- });
-
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Set All Queried Users as non-Guest";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxLink<Void>(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- dropdown.close();
-
- Collection<User> users = new ArrayList<>();
- for (var it = (Iterator<User>) dataProvider.iterator(0, usersTable.getItemCount()); it.hasNext();) {
- users.add(it.next());
- }
- getUserManager().setAsGuest(users, false);
- target.add(usersTable);
- selectionColumn.getSelections().clear();
-
- Session.get().success("Set as non-guest successfully");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(usersTable.getItemCount() != 0);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled()) {
- tag.put("disabled", "disabled");
- tag.put("title", "No users to set as non-guest");
- }
- }
-
- };
- }
-
- });
-
menuItems.add(new MenuItem() {
@Override
@@ -600,7 +367,6 @@ public class UserListPage extends AdministrationPage {
};
link.add(new UserAvatar("avatar", user));
link.add(new Label("name", user.getName()));
- link.add(new WebMarkupContainer("guest").setVisible(user.isEffectiveGuest()));
fragment.add(link);
cellItem.add(fragment);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.html
index 43b634f71e..c75e32c814 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.html
@@ -9,6 +9,5 @@
<a wicket:id="users" class="d-inline-block">Users</a>
<span class="dot d-inline-block"></span>
<span wicket:id="userName" class="d-inline-block"></span>
- <span wicket:id="guest" class="ml-2 badge badge-info badge-sm guest">guest</span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
index 2c04c12521..b8a2e7258d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
@@ -122,7 +122,6 @@ public abstract class UserPage extends AdministrationPage implements UserAware {
Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);
fragment.add(new BookmarkablePageLink<Void>("users", UserListPage.class));
fragment.add(new Label("userName", getUser().getDisplayName()));
- fragment.add(new WebMarkupContainer("guest").setVisible(getUser().isEffectiveGuest()));
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/user.css
index 71def19fa0..a5b215a68c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/user.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/user.css
@@ -4,6 +4,3 @@
.user-detail .authorization-list .select2-container {
width: 100%;
}
-.topbar-title .guest {
- margin-top: 2px;
-}
\ No newline at end of file
diff --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.java
index 179641dd80..9a08a784c2 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
@@ -404,7 +404,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati
if (mergeBase != null
&& getLoginUser() != null
- && !getLoginUser().isEffectiveGuest()
&& state.leftSide.getBranch()!=null
&& state.rightSide.getBranch()!=null) {
PullRequest request = requestModel.getObject();
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.java
index eb92c96cd7..1da1bd1777 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
@@ -239,7 +239,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
request.getAssignments().add(assignment);
} else {
for (UserAuthorization authorization: target.getProject().getUserAuthorizations()) {
- if (authorization.getRole().isOwner() && !authorization.getUser().isEffectiveGuest()) {
+ if (authorization.getRole().isOwner()) {
PullRequestAssignment assignment = new PullRequestAssignment();
assignment.setRequest(request);
assignment.setUser(authorization.getUser());
@@ -1024,8 +1024,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
@Override
protected boolean isPermitted() {
- return !SecurityUtils.getAuthUser().isEffectiveGuest()
- && SecurityUtils.canReadCode(target.getProject())
+ return SecurityUtils.canReadCode(target.getProject())
&& SecurityUtils.canReadCode(source.getProject());
}
diff --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.java
index 283be5070b..f25165f9af 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
@@ -1296,7 +1296,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
statusBarContainer.add(new BookmarkablePageLink<Void>(
"newPullRequest",
NewPullRequestPage.class,
- NewPullRequestPage.paramsOf(getProject())).setVisible(user == null || !user.isEffectiveGuest()));
+ NewPullRequestPage.paramsOf(getProject())));
return statusBarContainer;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
index 7265e4306f..93733eac91 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java
@@ -1,13 +1,5 @@
package io.onedev.server.web.page.simple.security;
-import com.google.common.collect.Sets;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -25,6 +17,12 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.simple.SimplePage;
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
@SuppressWarnings("serial")
public class CreateUserFromInvitationPage extends SimplePage {
@@ -58,7 +56,7 @@ public class CreateUserFromInvitationPage extends SimplePage {
super.onInitialize();
User newUser = new User();
- BeanEditor editor = BeanContext.edit("editor", newUser, Sets.newHashSet(User.PROP_GUEST), true);
+ BeanEditor editor = BeanContext.edit("editor", newUser);
Form<?> form = new Form<Void>("form") {
@@ -77,7 +75,6 @@ public class CreateUserFromInvitationPage extends SimplePage {
user.setName(newUser.getName());
user.setFullName(newUser.getFullName());
user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(newUser.getPassword()));
- user.setGuest(invitationModel.getObject().isInviteAsGuest());
EmailAddress emailAddress = new EmailAddress();
emailAddress.setValue(invitationModel.getObject().getEmailAddress());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
index 8f338a25b8..575fe0f541 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
@@ -53,7 +53,7 @@ public class SignUpPage extends SimplePage {
super.onInitialize();
SignUpBean bean = new SignUpBean();
- BeanEditor editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_GUEST, PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);
+ BeanEditor editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);
Form<?> form = new Form<Void>("form") {
@@ -86,7 +86,6 @@ public class SignUpPage extends SimplePage {
user.setName(bean.getName());
user.setFullName(bean.getFullName());
user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getPassword()));
- user.setGuest(getSecuritySetting().isSelfRegisterAsGuest());
EmailAddress emailAddress = new EmailAddress();
emailAddress.setValue(bean.getEmailAddress());
diff --git a/server-ee b/server-ee
index 0e62741772..b09b8e3e1b 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 0e6274177211fd85ddddffc4e88b990b30bb7c15
+Subproject commit b09b8e3e1b0c61c5b86803e068cea928de7074f5
diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
index 793085957a..ec7f03283a 100644
--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
@@ -431,11 +431,6 @@ public class LdapAuthenticator extends Authenticator {
return null;
}
}
-
- @Override
- public boolean isManagingMemberships() {
- return !(getGroupRetrieval() instanceof DoNotRetrieveGroups);
- }
/* Copied from Spring LdapEncoder.java */
private static String[] FILTER_ESCAPE_TABLE = new String['\\' + 1];