add namespaces check in synchronization configuration feature

apolloconfig · Aug 3, 2024 · 621c151 · 621c151
1 parent 8f716ac
commit 621c151
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
@@ -195,7 +195,7 @@ public List<ItemDiffs> diff(@RequestBody NamespaceSyncModel model) {
   @PutMapping(value = "/apps/{appId}/namespaces/{namespaceName}/items", consumes = {"application/json"})
   public ResponseEntity<Void> update(@PathVariable String appId, @PathVariable String namespaceName,
                                      @RequestBody NamespaceSyncModel model) {
-    checkModel(!model.isInvalid());
+    checkModel(!model.isInvalid() && model.syncToNamespacesValid(appId, namespaceName));
     boolean hasPermission = permissionValidator.hasModifyNamespacePermission(appId, namespaceName);
     Env envNoPermission = null;
     // if uses has ModifyNamespace permission then he has permission

diff --git a/...rtal/src/main/java/com/ctrip/framework/apollo/portal/entity/model/NamespaceSyncModel.java b/...rtal/src/main/java/com/ctrip/framework/apollo/portal/entity/model/NamespaceSyncModel.java
@@ -41,6 +41,17 @@ public boolean isInvalid() {
     return false;
   }
 
+  public boolean syncToNamespacesValid(String appId, String namespaceName) {
+    for (NamespaceIdentifier namespaceIdentifier : syncToNamespaces) {
+      if (appId.equals(namespaceIdentifier.getAppId()) && namespaceName.equals(
+          namespaceIdentifier.getNamespaceName())) {
+        continue;
+      }
+      return false;
+    }
+    return true;
+  }
+
   public List<NamespaceIdentifier> getSyncToNamespaces() {
     return syncToNamespaces;
   }