[ISSUE nacos-group#124] Fix naming spas auth sign algorithm.

pixystone · Nov 28, 2022 · 311edf2 · 311edf2
1 parent 60dc0fb
commit 311edf2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/naming/NamingProxy.cpp b/src/naming/NamingProxy.cpp
@@ -150,14 +150,18 @@ NacosString NamingProxy::callServer
 }
 
 NacosString NamingProxy::getDataToSign(const std::list <NacosString> &paramValues, NacosString &nowTimeMs) {
+    const NacosString &groupName = ParamUtils::findByKey(paramValues, NamingConstant::GROUP_NAME);
     const NacosString &serviceName = ParamUtils::findByKey(paramValues, NamingConstant::SERVICE_NAME);
 
-    NacosString dataToSign = "";
+    NacosString dataToSign = "" + nowTimeMs;
     if (!ParamUtils::isBlank(serviceName)) {
-        dataToSign = serviceName + "@@";
+        if (ParamUtils::contains(serviceName, "@@") || ParamUtils::isBlank(groupName)) {
+            dataToSign += "@@" + serviceName;
+        } else {
+            dataToSign += "@@" + groupName + "@@" + serviceName;
+        }
     }
 
-    dataToSign += nowTimeMs;
     return dataToSign;
 }