fix: preventing access to login page after Halo setup

halo-dev · Oct 14, 2024 · 43ec05c · 43ec05c
1 parent dd5f02e
commit 43ec05c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/application/src/main/java/run/halo/app/security/AuthProviderServiceImpl.java b/application/src/main/java/run/halo/app/security/AuthProviderServiceImpl.java
@@ -13,6 +13,7 @@
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.lang.NonNull;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
@@ -29,6 +30,7 @@
 import run.halo.app.extension.MetadataUtil;
 import run.halo.app.extension.ReactiveExtensionClient;
 import run.halo.app.extension.index.query.QueryFactory;
+import run.halo.app.infra.SystemConfigurableEnvironmentFetcher;
 import run.halo.app.infra.SystemSetting;
 import run.halo.app.infra.utils.JsonUtils;
 
@@ -42,6 +44,7 @@
 @RequiredArgsConstructor
 public class AuthProviderServiceImpl implements AuthProviderService {
     private final ReactiveExtensionClient client;
+    private final ObjectProvider<SystemConfigurableEnvironmentFetcher> environmentFetcherProvider;
 
     @Override
     public Mono<AuthProvider> enable(String name) {
@@ -146,7 +149,7 @@ public int compareTo(@NonNull AuthProviderWithPriority o) {
     }
 
     private Mono<List<SystemSetting.AuthProviderState>> fetchProviderStates() {
-        return fetchSystemConfigMap()
+        return getSystemConfigMap()
             .map(AuthProviderServiceImpl::getAuthProviderConfig)
             .map(SystemSetting.AuthProvider::getStates)
             .defaultIfEmpty(List.of())
@@ -218,7 +221,7 @@ private static SystemSetting.AuthProvider getAuthProviderConfig(ConfigMap config
     }
 
     private Mono<ConfigMap> updateAuthProviderEnabled(String name, boolean enabled) {
-        return Mono.defer(() -> fetchSystemConfigMap()
+        return Mono.defer(() -> getSystemConfigMap()
                 .flatMap(configMap -> {
                     var providerConfig = getAuthProviderConfig(configMap);
                     var stateToFoundOpt = providerConfig.getStates()
@@ -244,7 +247,12 @@ private Mono<ConfigMap> updateAuthProviderEnabled(String name, boolean enabled)
                 .filter(OptimisticLockingFailureException.class::isInstance));
     }
 
-    Mono<ConfigMap> fetchSystemConfigMap() {
-        return client.fetch(ConfigMap.class, SystemSetting.SYSTEM_CONFIG);
+    private Mono<ConfigMap> getSystemConfigMap() {
+        var systemFetcher = environmentFetcherProvider.getIfUnique();
+        if (systemFetcher == null) {
+            return Mono.error(
+                new IllegalStateException("No SystemConfigurableEnvironmentFetcher found"));
+        }
+        return systemFetcher.getConfigMap();
     }
 }
diff --git a/application/src/main/resources/extensions/system-configurable-configmap.yaml b/application/src/main/resources/extensions/system-configurable-configmap.yaml
@@ -51,3 +51,11 @@ data:
     {
       "search-engine": ["search-engine-lucene"]
     }
+  authProvider: |
+    {
+      "states": [{
+          "name": "local",
+          "enabled": true,
+          "priority": 0
+      }]
+    }
diff --git a/application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java b/application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java
@@ -10,12 +10,14 @@
 
 import java.util.HashMap;
 import org.json.JSONException;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.skyscreamer.jsonassert.JSONAssert;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.data.domain.Sort;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -28,6 +30,7 @@
 import run.halo.app.extension.ListOptions;
 import run.halo.app.extension.Metadata;
 import run.halo.app.extension.ReactiveExtensionClient;
+import run.halo.app.infra.SystemConfigurableEnvironmentFetcher;
 import run.halo.app.infra.SystemSetting;
 import run.halo.app.infra.utils.JsonUtils;
 
@@ -43,9 +46,20 @@ class AuthProviderServiceImplTest {
     @Mock
     ReactiveExtensionClient client;
 
+    @Mock
+    ObjectProvider<SystemConfigurableEnvironmentFetcher> systemFetchProvider;
+
+    @Mock
+    SystemConfigurableEnvironmentFetcher systemConfigFetcher;
+
     @InjectMocks
     AuthProviderServiceImpl authProviderService;
 
+    @BeforeEach
+    void setUp() {
+        when(systemFetchProvider.getIfUnique()).thenReturn(systemConfigFetcher);
+    }
+
     @Test
     void testEnable() throws JSONException {
         // Create a test auth provider
@@ -199,7 +213,7 @@ AuthProvider createAuthProvider(String name) {
     void pileSystemConfigMap() {
         ConfigMap configMap = new ConfigMap();
         configMap.setData(new HashMap<>());
-        when(client.fetch(eq(ConfigMap.class), eq(SystemSetting.SYSTEM_CONFIG)))
+        when(systemConfigFetcher.getConfigMap())
             .thenReturn(Mono.just(configMap));
     }
 }