Release/v6.40

VERSION

@@ -1 +1 @@
-6.3.0
+6.4.0

client/all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>6.3.0</version>
+    <version>6.4.0</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>

client/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>6.3.0</version>
+    <version>6.4.0</version>
 
     <packaging>pom</packaging>
 

server/common/model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/common/model/src/main/java/com/alipay/sofa/registry/common/model/constants/ValueConstants.java

@@ -156,6 +156,9 @@ public class ValueConstants {
           "change_push_task.delay.config",
           SESSION_PROVIDE_DATA_INSTANCE_ID,
           SESSION_PROVIDE_DATA_GROUP);
+  public static final String ADMIN_API_TOKEN_DATA_ID =
+      DataInfo.toDataInfoId(
+          "admin.api.token", SESSION_PROVIDE_DATA_INSTANCE_ID, SESSION_PROVIDE_DATA_GROUP);
 
   public static final String DISABLE_DATA_ID_CASE_SENSITIVE_SWITCH =
       "disable.dataId.case.sensitive";

server/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/common/util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/distribution/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/distribution/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

server/remoting/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/remoting/bolt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/remoting/http/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/remoting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/data/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/integration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/meta/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/bootstrap/MetaServerConfiguration.java

@@ -64,6 +64,7 @@
 import com.alipay.sofa.registry.server.meta.resource.SlotSyncResource;
 import com.alipay.sofa.registry.server.meta.resource.SlotTableResource;
 import com.alipay.sofa.registry.server.meta.resource.StopPushDataResource;
+import com.alipay.sofa.registry.server.meta.resource.filter.AuthRestFilter;
 import com.alipay.sofa.registry.server.meta.resource.filter.LeaderAwareFilter;
 import com.alipay.sofa.registry.server.meta.slot.status.SlotTableStatusService;
 import com.alipay.sofa.registry.server.shared.config.CommonConfig;
@@ -335,6 +336,11 @@ public LeaderAwareFilter leaderAwareFilter() {
       return new LeaderAwareFilter();
     }
 
+    @Bean
+    public AuthRestFilter authRestFilter() {
+      return new AuthRestFilter();
+    }
+
     @Bean
     public ProvideDataResource provideDataResource() {
       return new ProvideDataResource();

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/resource/StopPushDataResource.java

@@ -27,6 +27,7 @@
 import com.alipay.sofa.registry.log.LoggerFactory;
 import com.alipay.sofa.registry.server.meta.provide.data.DefaultProvideDataNotifier;
 import com.alipay.sofa.registry.server.meta.provide.data.ProvideDataService;
+import com.alipay.sofa.registry.server.meta.resource.filter.AuthRestController;
 import com.alipay.sofa.registry.server.meta.resource.filter.LeaderAwareRestController;
 import com.alipay.sofa.registry.util.JsonUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -59,6 +60,7 @@ public class StopPushDataResource {
   @GET
   @Path("open")
   @Produces(MediaType.APPLICATION_JSON)
+  @AuthRestController
   public Result closePush() {
     boolean ret;
     Result result = new Result();
@@ -94,6 +96,7 @@ public Result closePush() {
   @GET
   @Path("close")
   @Produces(MediaType.APPLICATION_JSON)
+  @AuthRestController
   public Result openPush() {
     boolean ret;
     Result result = new Result();

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/resource/filter/AuthRestController.java

@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.alipay.sofa.registry.server.meta.resource.filter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.ws.rs.NameBinding;
+
+/**
+ * @author jiangcun.hlc
+ *     <p>Nov 17, 2023
+ */
+@NameBinding
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface AuthRestController {}

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/resource/filter/AuthRestFilter.java

@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.alipay.sofa.registry.server.meta.resource.filter;
+
+import static com.alipay.sofa.registry.common.model.constants.ValueConstants.ADMIN_API_TOKEN_DATA_ID;
+
+import com.alipay.sofa.registry.common.model.console.PersistenceData;
+import com.alipay.sofa.registry.log.Logger;
+import com.alipay.sofa.registry.log.LoggerFactory;
+import com.alipay.sofa.registry.server.meta.provide.data.ProvideDataService;
+import com.alipay.sofa.registry.store.api.DBResponse;
+import com.alipay.sofa.registry.store.api.OperationStatus;
+import java.io.IOException;
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author jiangcun.hlc
+ *     <p>Nov 17, 2023
+ */
+@Provider
+@AuthRestController
+@Priority(Priorities.USER)
+public class AuthRestFilter implements ContainerRequestFilter {
+  private static final Logger LOGGER = LoggerFactory.getLogger(AuthRestFilter.class);
+
+  @Autowired private ProvideDataService provideDataService;
+
+  @Override
+  public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+    boolean authAllow;
+    DBResponse<PersistenceData> queryResponse =
+        provideDataService.queryProvideData(ADMIN_API_TOKEN_DATA_ID);
+    if (queryResponse.getOperationStatus() == OperationStatus.SUCCESS) {
+      authAllow =
+          StringUtils.equals(
+              queryResponse.getEntity().getData(), getAuthToken(containerRequestContext));
+    } else {
+      authAllow = true;
+    }
+    if (!authAllow) {
+      Response response =
+          Response.status(Response.Status.BAD_REQUEST)
+              .header("reason", "auth check failed!")
+              .build();
+      LOGGER.error(
+          "[filter] url: %s, auth check fail!", containerRequestContext.getUriInfo().getPath());
+      containerRequestContext.abortWith(response);
+    }
+  }
+
+  public String getAuthToken(ContainerRequestContext context) {
+    String token = context.getHeaderString("x-apiauth-token");
+    if (StringUtils.isNotBlank(token)) {
+      return token;
+    }
+    return "unknown";
+  }
+}

server/server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/session/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.3.0</version>
+        <version>6.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

server/server/session/src/main/java/com/alipay/sofa/registry/server/session/metadata/MetadataCacheRegistry.java

@@ -83,6 +83,11 @@ public Set<String> getPushEnableDataCenters() {
 
   public void register(AppRevision appRevision) {
     registerTask.put(appRevision.getRevision(), appRevision);
+    registerWorker.wakeup();
+  }
+  // retry not wakeup
+  public void registerNotWake(AppRevision appRevision) {
+    registerTask.put(appRevision.getRevision(), appRevision);
   }
 
   private Tuple<Set<String>, Set<String>> getMetadataDataCenters() {
@@ -156,11 +161,11 @@ public void runUnthrowable() {
           if (success == null || !success) {
             String revision = entry.getKey();
             LOG.info("register fail, retry ro register revision:{}", revision);
-            register(registers.get(revision));
+            registerNotWake(registers.get(revision));
           }
         } catch (Throwable throwable) {
           String revision = entry.getKey();
-          register(registers.get(revision));
+          registerNotWake(registers.get(revision));
           LOG.error(
               "[AppRevision]do register error, retry next time. revision:{}", revision, throwable);
         }