[ISSUE-alibaba#4262] Fix public namespace permission problem (alibaba…

…#4273) * fix public namespace permission problem * move NamespaceUtilTest to common module
bobo365 · Nov 20, 2020 · ba9ed8e · ba9ed8e
1 parent 44641d9
commit ba9ed8e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...os/config/server/utils/NamespaceUtil.java → ...aba/nacos/common/utils/NamespaceUtil.java b/...os/config/server/utils/NamespaceUtil.java → ...aba/nacos/common/utils/NamespaceUtil.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.config.server.utils;
-
-import org.apache.commons.lang3.StringUtils;
+package com.alibaba.nacos.common.utils;
 
 /**
  * namespace(tenant) util.

diff --git a/...onfig/server/utils/NamespaceUtilTest.java → ...nacos/common/utils/NamespaceUtilTest.java b/...onfig/server/utils/NamespaceUtilTest.java → ...nacos/common/utils/NamespaceUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.config.server.utils;
+package com.alibaba.nacos.common.utils;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
@@ -20,6 +20,7 @@
 
 import com.alibaba.nacos.auth.model.Resource;
 import com.alibaba.nacos.auth.parser.ResourceParser;
+import com.alibaba.nacos.common.utils.NamespaceUtil;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -35,7 +36,7 @@ public class ConfigResourceParser implements ResourceParser {
     @Override
     public String parseName(Object request) {
         HttpServletRequest req = (HttpServletRequest) request;
-        String namespaceId = req.getParameter("tenant");
+        String namespaceId = NamespaceUtil.processNamespaceParameter(req.getParameter("tenant"));
         String groupName = req.getParameter("group");
         String dataId = req.getParameter("dataId");
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
@@ -44,7 +44,7 @@
 import com.alibaba.nacos.config.server.utils.MD5Util;
 import com.alibaba.nacos.config.server.utils.ParamUtils;
 import com.alibaba.nacos.config.server.utils.RequestUtil;
-import com.alibaba.nacos.config.server.utils.NamespaceUtil;
+import com.alibaba.nacos.common.utils.NamespaceUtil;
 import com.alibaba.nacos.config.server.utils.TimeUtils;
 import com.alibaba.nacos.config.server.utils.ZipUtils;
 import com.alibaba.nacos.sys.utils.InetUtils;

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java b/naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
@@ -20,6 +20,7 @@
 import com.alibaba.nacos.api.naming.utils.NamingUtils;
 import com.alibaba.nacos.auth.model.Resource;
 import com.alibaba.nacos.auth.parser.ResourceParser;
+import com.alibaba.nacos.common.utils.NamespaceUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
@@ -39,7 +40,7 @@ public String parseName(Object request) {
 
         HttpServletRequest req = (HttpServletRequest) request;
 
-        String namespaceId = req.getParameter(CommonParams.NAMESPACE_ID);
+        String namespaceId = NamespaceUtil.processNamespaceParameter(req.getParameter(CommonParams.NAMESPACE_ID));
         String serviceName = req.getParameter(CommonParams.SERVICE_NAME);
         String groupName = req.getParameter(CommonParams.GROUP_NAME);
         if (StringUtils.isBlank(groupName)) {