Refactor ConfigCache and related pathways ,uniformly use UTF-8 encoding for md5 fields

client/src/main/java/com/alibaba/nacos/client/config/impl/ConfigTransportClient.java

@@ -79,7 +79,7 @@ public ConfigTransportClient(NacosClientProperties properties, ConfigServerListM
         this.tenant = properties.getProperty(PropertyKeyConst.NAMESPACE);
         this.serverListManager = serverListManager;
         this.properties = properties.asProperties();
-        this.securityProxy = new SecurityProxy(serverListManager.getServerList(),
+        this.securityProxy = new SecurityProxy(serverListManager,
                 ConfigHttpClientManager.getInstance().getNacosRestTemplate());
     }
 

client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java

@@ -81,7 +81,7 @@ private void init(Properties properties) throws NacosException {
         InitUtils.initWebRootContext(nacosClientProperties);
         serverListManager = new NamingServerListManager(nacosClientProperties, namespace);
         serverListManager.start();
-        securityProxy = new SecurityProxy(serverListManager.getServerList(),
+        securityProxy = new SecurityProxy(serverListManager,
                 NamingHttpClientManager.getInstance().getNacosRestTemplate());
         initSecurityProxy(properties);
         serverProxy = new NamingHttpClientProxy(namespace, securityProxy, serverListManager, nacosClientProperties);

client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java

@@ -74,7 +74,7 @@ public NamingClientProxyDelegate(String namespace, ServiceInfoHolder serviceInfo
         this.serverListManager = new NamingServerListManager(properties, namespace);
         this.serverListManager.start();
         this.serviceInfoHolder = serviceInfoHolder;
-        this.securityProxy = new SecurityProxy(this.serverListManager.getServerList(),
+        this.securityProxy = new SecurityProxy(this.serverListManager,
                 NamingHttpClientManager.getInstance().getNacosRestTemplate());
         initSecurityProxy(properties);
         this.httpClientProxy = new NamingHttpClientProxy(namespace, securityProxy, serverListManager, properties);

client/src/main/java/com/alibaba/nacos/client/security/SecurityProxy.java

@@ -17,18 +17,22 @@
 package com.alibaba.nacos.client.security;
 
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.client.address.AbstractServerListManager;
+import com.alibaba.nacos.client.address.ServerListChangeEvent;
 import com.alibaba.nacos.client.auth.impl.NacosAuthLoginConstant;
-import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthPluginManager;
-import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
-import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthService;
-import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.lifecycle.Closeable;
+import com.alibaba.nacos.common.notify.Event;
+import com.alibaba.nacos.common.notify.NotifyCenter;
+import com.alibaba.nacos.common.notify.listener.Subscriber;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
+import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthPluginManager;
+import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -45,15 +49,25 @@ public class SecurityProxy implements Closeable {
     private ClientAuthPluginManager clientAuthPluginManager;
 
     /**
-     * Construct from serverList, nacosRestTemplate, init client auth plugin.
-     * // TODO change server list to serverListManager after serverListManager refactor and unite.
+     * Construct from serverListManager, nacosRestTemplate, init client auth plugin.
      *
-     * @param serverList a server list that client request to.
+     * @param serverListManager a server list manager that client request to.
      * @Param nacosRestTemplate http request template.
      */
-    public SecurityProxy(List<String> serverList, NacosRestTemplate nacosRestTemplate) {
+    public SecurityProxy(AbstractServerListManager serverListManager, NacosRestTemplate nacosRestTemplate) {
         clientAuthPluginManager = new ClientAuthPluginManager();
-        clientAuthPluginManager.init(serverList, nacosRestTemplate);
+        clientAuthPluginManager.init(serverListManager.getServerList(), nacosRestTemplate);
+        NotifyCenter.registerSubscriber(new Subscriber<ServerListChangeEvent>() {
+            @Override
+            public void onEvent(ServerListChangeEvent event) {
+                clientAuthPluginManager.refreshServerList(serverListManager.getServerList());
+            }
+
+            @Override
+            public Class<? extends Event> subscribeType() {
+                return ServerListChangeEvent.class;
+            }
+        });
     }
 
     /**

client/src/test/java/com/alibaba/nacos/client/naming/selector/NamingSelectorFactoryTest.java

@@ -24,7 +24,7 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -92,6 +92,7 @@ public void testNewIpSelector() {
     @Test
     public void testNewMetadataSelector() {
         Instance ins1 = new Instance();
+        ins1.setMetadata(new LinkedHashMap<>()); 
         ins1.addMetadata("a", "1");
         ins1.addMetadata("b", "2");
         Instance ins2 = new Instance();
@@ -102,7 +103,7 @@ public void testNewMetadataSelector() {
         NamingContext namingContext = mock(NamingContext.class);
         when(namingContext.getInstances()).thenReturn(Arrays.asList(ins1, ins2, ins3));
 
-        NamingSelector metadataSelector = NamingSelectorFactory.newMetadataSelector(new HashMap() {
+        NamingSelector metadataSelector = NamingSelectorFactory.newMetadataSelector(new LinkedHashMap() {
             {
                 put("a", "1");
                 put("b", "2");
@@ -117,6 +118,7 @@ public void testNewMetadataSelector() {
     @Test
     public void testNewMetadataSelector2() {
         Instance ins1 = new Instance();
+        ins1.setMetadata(new LinkedHashMap<>()); 
         ins1.addMetadata("a", "1");
         ins1.addMetadata("c", "3");
         Instance ins2 = new Instance();
@@ -127,7 +129,7 @@ public void testNewMetadataSelector2() {
         NamingContext namingContext = mock(NamingContext.class);
         when(namingContext.getInstances()).thenReturn(Arrays.asList(ins1, ins2, ins3));
 
-        NamingSelector metadataSelector = NamingSelectorFactory.newMetadataSelector(new HashMap() {
+        NamingSelector metadataSelector = NamingSelectorFactory.newMetadataSelector(new LinkedHashMap() {
             {
                 put("a", "1");
                 put("b", "2");

client/src/test/java/com/alibaba/nacos/client/security/SecurityProxyTest.java

@@ -18,7 +18,9 @@
 
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.client.address.AbstractServerListManager;
 import com.alibaba.nacos.client.auth.impl.NacosAuthLoginConstant;
+import com.alibaba.nacos.client.env.NacosClientProperties;
 import com.alibaba.nacos.common.http.HttpRestResult;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.http.param.Header;
@@ -68,7 +70,34 @@ void setUp() throws Exception {
 
         List<String> serverList = new ArrayList<>();
         serverList.add("localhost");
-        securityProxy = new SecurityProxy(serverList, nacosRestTemplate);
+        NacosClientProperties properties = NacosClientProperties.PROTOTYPE.derive(new Properties());
+        AbstractServerListManager serverListManager = new AbstractServerListManager(properties) {
+            @Override
+            protected String getModuleName() {
+                return "Test";
+            }
+
+            @Override
+            protected NacosRestTemplate getNacosRestTemplate() {
+                return nacosRestTemplate;
+            }
+
+            @Override
+            public String genNextServer() {
+                return serverList.get(0);
+            }
+
+            @Override
+            public String getCurrentServer() {
+                return serverList.get(0);
+            }
+
+            @Override
+            public List<String> getServerList() {
+                return serverList;
+            }
+        };
+        securityProxy = new SecurityProxy(serverListManager, nacosRestTemplate);
     }
 
     @Test

common/src/test/java/com/alibaba/nacos/common/notify/DefaultSharePublisherTest.java

@@ -106,7 +106,7 @@ void testIgnoreExpiredEvent() throws InterruptedException {
         defaultSharePublisher.addSubscriber(smartSubscriber2, MockSlowEvent2.class);
         defaultSharePublisher.publish(mockSlowEvent1);
         defaultSharePublisher.publish(mockSlowEvent2);
-        TimeUnit.MILLISECONDS.sleep(1100);
+        TimeUnit.MILLISECONDS.sleep(1500);
         verify(smartSubscriber1).onEvent(mockSlowEvent1);
         verify(smartSubscriber2).onEvent(mockSlowEvent2);
         reset(smartSubscriber1);

config/src/main/java/com/alibaba/nacos/config/server/configuration/NacosConfigConfiguration.java

@@ -19,6 +19,7 @@
 import com.alibaba.nacos.config.server.filter.CircuitFilter;
 import com.alibaba.nacos.config.server.filter.NacosWebFilter;
 import com.alibaba.nacos.persistence.configuration.condition.ConditionDistributedEmbedStorage;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -34,6 +35,7 @@
 public class NacosConfigConfiguration {
 
     @Bean
+    @ConditionalOnProperty(name = "nacos.web.charset.filter", havingValue = "nacos", matchIfMissing = true)
     public FilterRegistrationBean<NacosWebFilter> nacosWebFilterRegistration() {
         FilterRegistrationBean<NacosWebFilter> registration = new FilterRegistrationBean<>();
         registration.setFilter(nacosWebFilter());

config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java

@@ -28,6 +28,7 @@
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.constant.ParametersField;
 import com.alibaba.nacos.config.server.controller.parameters.SameNamespaceCloneConfigBean;
+import com.alibaba.nacos.config.server.enums.ApiVersionEnum;
 import com.alibaba.nacos.config.server.model.ConfigAdvanceInfo;
 import com.alibaba.nacos.config.server.model.ConfigAllInfo;
 import com.alibaba.nacos.config.server.model.ConfigInfo;
@@ -244,7 +245,7 @@ public void getConfig(HttpServletRequest request, HttpServletResponse response,
 
         final String clientIp = RequestUtil.getRemoteIp(request);
         String isNotify = request.getHeader("notify");
-        inner.doGetConfig(request, response, dataId, group, tenant, tag, isNotify, clientIp);
+        inner.doGetConfig(request, response, dataId, group, tenant, tag, isNotify, clientIp, ApiVersionEnum.V1);
     }
 
     /**

config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java

@@ -55,7 +55,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.alibaba.nacos.config.server.constant.Constants.ENCODE_UTF8;
 import static com.alibaba.nacos.config.server.utils.LogUtil.PULL_LOG;
 
 /**
@@ -135,8 +134,6 @@ public String doGetConfig(HttpServletRequest request, HttpServletResponse respon
 
         boolean notify = StringUtils.isNotBlank(isNotify) && Boolean.parseBoolean(isNotify);
 
-        String acceptCharset = ENCODE_UTF8;
-
         if (isV2) {
             response.setHeader(HttpHeaderConsts.CONTENT_TYPE, MediaType.APPLICATION_JSON);
         }
@@ -187,7 +184,7 @@ public String doGetConfig(HttpServletRequest request, HttpServletResponse respon
                 String encryptedDataKey;
 
                 if (matchedGray != null) {
-                    md5 = matchedGray.getMd5(acceptCharset);
+                    md5 = matchedGray.getMd5();
                     lastModified = matchedGray.getLastModifiedTs();
                     encryptedDataKey = matchedGray.getEncryptedDataKey();
                     content = ConfigDiskServiceFactory.getInstance()
@@ -211,7 +208,7 @@ public String doGetConfig(HttpServletRequest request, HttpServletResponse respon
                     response.setHeader(com.alibaba.nacos.api.common.Constants.VIPSERVER_TAG,
                             URLEncoder.encode(tag, StandardCharsets.UTF_8.displayName()));
                 } else {
-                    md5 = cacheItem.getConfigCache().getMd5(acceptCharset);
+                    md5 = cacheItem.getConfigCache().getMd5();
                     lastModified = cacheItem.getConfigCache().getLastModifiedTs();
                     encryptedDataKey = cacheItem.getConfigCache().getEncryptedDataKey();
                     content = ConfigDiskServiceFactory.getInstance().getContent(dataId, group, tenant);

config/src/main/java/com/alibaba/nacos/config/server/controller/v2/ConfigControllerV2.java

@@ -27,6 +27,7 @@
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.controller.ConfigServletInner;
+import com.alibaba.nacos.config.server.enums.ApiVersionEnum;
 import com.alibaba.nacos.config.server.model.ConfigInfo;
 import com.alibaba.nacos.config.server.model.ConfigRequestInfo;
 import com.alibaba.nacos.config.server.paramcheck.ConfigBlurSearchHttpParamExtractor;
@@ -105,7 +106,7 @@ public void getConfig(HttpServletRequest request, HttpServletResponse response,
         ParamUtils.checkParamV2(tag);
         final String clientIp = RequestUtil.getRemoteIp(request);
         String isNotify = request.getHeader("notify");
-        inner.doGetConfig(request, response, dataId, group, namespaceId, tag, isNotify, clientIp, true);
+        inner.doGetConfig(request, response, dataId, group, namespaceId, tag, isNotify, clientIp, ApiVersionEnum.V2);
     }
 
     /**

config/src/main/java/com/alibaba/nacos/config/server/enums/ApiVersionEnum.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-$toady.year Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.config.server.enums;
+
+/**
+ * Config Api Version enum.
+ * @author Nacos
+ */
+public enum ApiVersionEnum {
+
+    /**
+     * API version v1.
+     */
+    V1("v1"),
+
+    /**
+     * API version v2.
+     */
+    V2("v2");
+
+    private final String version;
+
+    ApiVersionEnum(String version) {
+        this.version = version;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+}

config/src/main/java/com/alibaba/nacos/config/server/model/CacheItem.java

@@ -35,7 +35,7 @@ public class CacheItem {
 
     public String type;
 
-    ConfigCache configCache = new ConfigCache();
+    ConfigCache configCache = ConfigCacheFactoryDelegate.getInstance().createConfigCache();
 
     /**
      * Use for gray.
@@ -92,7 +92,7 @@ public void initConfigGrayIfEmpty() {
     public void initConfigGrayIfEmpty(String grayName) {
         initConfigGrayIfEmpty();
         if (!this.configCacheGray.containsKey(grayName)) {
-            this.configCacheGray.put(grayName, new ConfigCacheGray(grayName));
+            this.configCacheGray.put(grayName, ConfigCacheFactoryDelegate.getInstance().createConfigCacheGray(grayName));
         }
     }