Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring access token management

Robin Shenaf92fbfb5d1c
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 44904c6301..4db300aaa6 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -88,7 +88,6 @@ import io.onedev.server.commandhandler.Upgrade;
import io.onedev.server.data.DataManager;
import io.onedev.server.data.DefaultDataManager;
import io.onedev.server.entitymanager.AccessTokenAuthorizationManager;
-import io.onedev.server.entitymanager.AccessTokenManager;
import io.onedev.server.entitymanager.AgentAttributeManager;
import io.onedev.server.entitymanager.AgentLastUsedDateManager;
import io.onedev.server.entitymanager.AgentManager;
@@ -169,7 +168,6 @@ import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.entitymanager.UserInvitationManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entitymanager.impl.DefaultAccessTokenAuthorizationManager;
-import io.onedev.server.entitymanager.impl.DefaultAccessTokenManager;
import io.onedev.server.entitymanager.impl.DefaultAgentAttributeManager;
import io.onedev.server.entitymanager.impl.DefaultAgentLastUsedDateManager;
import io.onedev.server.entitymanager.impl.DefaultAgentManager;
@@ -540,7 +538,6 @@ public class CoreModule extends AbstractPluginModule {
bind(PackManager.class).to(DefaultPackManager.class);
bind(PackBlobManager.class).to(DefaultPackBlobManager.class);
bind(PackBlobReferenceManager.class).to(DefaultPackBlobReferenceManager.class);
- bind(AccessTokenManager.class).to(DefaultAccessTokenManager.class);
bind(AccessTokenAuthorizationManager.class).to(DefaultAccessTokenAuthorizationManager.class);
bind(ReviewedDiffManager.class).to(DefaultReviewedDiffManager.class);
bind(OAuthTokenManager.class).to(DefaultOAuthTokenManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java
deleted file mode 100644
index 0a78e1beb5..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAccessTokenManager.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.map.IMap;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.AccessTokenManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.entity.EntityPersisted;
-import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.system.SystemStarting;
-import io.onedev.server.exception.ServerNotReadyException;
-import io.onedev.server.model.AccessToken;
-import io.onedev.server.model.User;
-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.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.CryptoUtils;
-import io.onedev.server.util.facade.AccessTokenCache;
-import io.onedev.server.util.facade.AccessTokenFacade;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.concurrent.TimeUnit;
-
-@Singleton
-public class DefaultAccessTokenManager extends BaseEntityManager<AccessToken> implements AccessTokenManager {
-
- private final UserManager userManager;
-
- private final ClusterManager clusterManager;
-
- private final TransactionManager transactionManager;
-
- private volatile AccessTokenCache cache;
-
- private volatile IMap<String, Long> temporalAccessTokens;
-
- @Inject
- public DefaultAccessTokenManager(Dao dao, UserManager userManager, ClusterManager clusterManager,
- TransactionManager transactionManager) {
- super(dao);
- this.userManager = userManager;
- this.clusterManager = clusterManager;
- this.transactionManager = transactionManager;
- }
-
- @Transactional
- @Override
- public void createOrUpdate(AccessToken projectToken) {
- dao.persist(projectToken);
- }
-
- @Sessional
- @Override
- public AccessToken findByOwnerAndName(User owner, String name) {
- if (cache != null) {
- var facade = cache.findByOwnerAndName(owner.getId(), name);
- if (facade != null)
- return load(facade.getId());
- else
- return null;
- } else {
- throw new ServerNotReadyException();
- }
- }
-
- @Sessional
- @Override
- public AccessToken findByValue(String value) {
- if (cache != null) {
- var facade = cache.findByValue(value);
- if (facade != null) {
- return load(facade.getId());
- } else {
- Long userId = temporalAccessTokens.get(value);
- if (userId != null) {
- var accessToken = new AccessToken();
- accessToken.setOwner(userManager.load(userId));
- accessToken.setHasOwnerPermissions(true);
- accessToken.setValue(value);
- return accessToken;
- } else {
- return null;
- }
- }
- } else {
- throw new ServerNotReadyException();
- }
- }
-
- @Sessional
- @Listen
- public void on(SystemStarting event) {
- HazelcastInstance hazelcastInstance = clusterManager.getHazelcastInstance();
-
- temporalAccessTokens = hazelcastInstance.getMap("temporalAccessTokens");
-
- cache = new AccessTokenCache(hazelcastInstance.getReplicatedMap("accessTokenCache"));
- for (var token: query())
- cache.put(token.getId(), token.getFacade());
- }
-
- @Override
- public String createTemporal(Long userId, long secondsToExpire) {
- var value = CryptoUtils.generateSecret();
- temporalAccessTokens.put(value, userId, secondsToExpire, TimeUnit.SECONDS);
- return value;
- }
-
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.getEntity() instanceof AccessToken) {
- var facade = (AccessTokenFacade) event.getEntity().getFacade();
- transactionManager.runAfterCommit(() -> cache.put(facade.getId(), facade));
- }
- }
-
- @Transactional
- @Listen
- public void on(EntityRemoved event) {
- if (event.getEntity() instanceof AccessToken) {
- var id = event.getEntity().getId();
- transactionManager.runAfterCommit(() -> cache.remove(id));
- }
- }
-
-}
\ No newline at end of file
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 87d8107d10..acedbb4f58 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
@@ -128,7 +128,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
public void create(User user) {
Preconditions.checkState(user.isNew());
if (user.isServiceAccount() && !subscriptionManager.isSubscriptionActive())
- throw new NoSubscriptionException();
+ throw new NoSubscriptionException("Service account");
user.setName(user.getName().toLowerCase());
dao.persist(user);
}
diff --git a/server-core/src/main/java/io/onedev/server/exception/NoSubscriptionException.java b/server-core/src/main/java/io/onedev/server/exception/NoSubscriptionException.java
index ef2685aae1..df4cba5901 100644
--- a/server-core/src/main/java/io/onedev/server/exception/NoSubscriptionException.java
+++ b/server-core/src/main/java/io/onedev/server/exception/NoSubscriptionException.java
@@ -4,8 +4,8 @@ import io.onedev.commons.utils.ExplicitException;
public class NoSubscriptionException extends ExplicitException {
- public NoSubscriptionException() {
- super("This feature requires an active subscription");
+ public NoSubscriptionException(String feature) {
+ super(feature + " requires an active subscription");
}
}
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 f339806687..33e492242c 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,7 @@
<a wicket:id="link">
<img wicket:id="avatar">
<span wicket:id="name" class="name"></span>
- <span wicket:id="service" class="badge badge-warning badge-sm ml-1">service</span>
+ <span wicket:id="service" class="badge badge-info badge-sm ml-1">service</span>
<span wicket:id="invalid" class="badge badge-danger badge-sm ml-1">invalid</span>
</a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html
index d500b88757..0cf11aedae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/profile/UserProfilePage.html
@@ -15,6 +15,6 @@
<div class="alert alert-light-warning alert-notice">This is a service account for task automation purpose</div>
</wicket:fragment>
<wicket:fragment wicket:id="invalidServiceAccountFrag">
- <div class="alert alert-light-danger alert-notice">Service account is only valid with an active subscription, please delete this account</div>
+ <div class="alert alert-light-danger alert-notice">Service account is only valid with an active subscription</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
index ebf66d9d55..3587ce554f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html
@@ -11,6 +11,6 @@
<div class="alert alert-light-warning alert-notice">You are a service account for task automation purpose</div>
</wicket:fragment>
<wicket:fragment wicket:id="invalidServiceAccountFrag">
- <div class="alert alert-light-danger alert-notice">Service account is only valid with an active subscription, please delete this account</div>
+ <div class="alert alert-light-danger alert-notice">Service account is only valid with an active subscription</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-ee b/server-ee
index 8e376ac95e..30fa4f7149 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 8e376ac95e23e03cf5d5796265205aa44e0da942
+Subproject commit 30fa4f7149515f00b0544fee53d108d101cf55c2