fix #1978

d762823b · nobodyiam · Jason Song · d1ae1477 · d762823b
Commit d762823b authored Feb 20, 2019 by nobodyiam Committed by Jason Song Feb 23, 2019
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.java ...work/apollo/openapi/auth/ConsumerPermissionValidator.java +8 -3

No files found.
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.java
@@ -21,15 +21,16 @@ public class 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 class ConsumerPermissionValidator {
      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));