fix apolloconfig#1978

taiyangzhige · Feb 23, 2019 · d762823 · d762823
1 parent d1ae147
commit d762823
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...al/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.java b/...al/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.java
@@ -21,15 +21,16 @@ public ConsumerPermissionValidator(
     this.consumerAuthUtil = consumerAuthUtil;
   }
 
-
   public boolean hasModifyNamespacePermission(HttpServletRequest request, String appId, String namespaceName,
       String env) {
     if (hasCreateNamespacePermission(request, appId)) {
       return true;
     }
     return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
-        PermissionType.MODIFY_NAMESPACE,
-        RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
+        PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
+        ||
+        permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
+        PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
 
   }
 
@@ -39,6 +40,10 @@ public boolean hasReleaseNamespacePermission(HttpServletRequest request, String
       return true;
     }
     return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
+        PermissionType.RELEASE_NAMESPACE,
+        RoleUtils.buildNamespaceTargetId(appId, namespaceName))
+        ||
+        permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
         PermissionType.RELEASE_NAMESPACE,
         RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));