Merge 6412dc7 into f948cc5

Pil0tXia · web-flow · commit 1dc06ac7c5e0 · 2023-10-27T08:05:11.000Z
diff --git a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
@@ -28,9 +28,6 @@
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 import org.apache.eventmesh.webhook.api.WebHookOperationConstant;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -193,19 +190,16 @@ public List<WebHookConfig> queryWebHookConfigByManufacturer(final WebHookConfig
     }
 
     /**
-     * @param webHookConfig
-     * @return
+     * Escape callback path to a valid dataId.
      */
     private String getWebHookConfigDataId(final WebHookConfig webHookConfig) {
-        try {
-            // use URLEncoder.encode before, because the path may contain some speacial char like '/', which is illegal as a data id.
-            return URLEncoder.encode(webHookConfig.getCallbackPath(), StandardCharsets.UTF_8.name()) + DATA_ID_EXTENSION;
-        } catch (UnsupportedEncodingException e) {
-            if (log.isErrorEnabled()) {
-                log.error("get webhookConfig dataId {} failed", webHookConfig.getCallbackPath(), e);
-            }
+        String dataId = webHookConfig.getCallbackPath();
+        if (dataId.startsWith("/")) {
+            // remove the first slash
+            dataId = dataId.substring(1);
         }
-        return webHookConfig.getCallbackPath() + DATA_ID_EXTENSION;
+        // then replace the subsequent invalid chars with dots
+        return dataId.replaceAll("[@#$%^&*,/\\\\]", ".") + DATA_ID_EXTENSION;
     }
 
     private String getManuGroupId(final WebHookConfig webHookConfig) {
