Skip to content

A
apollo
Commit d762823b authored by nobodyiam's avatar nobodyiam Committed by Jason Song
Browse files
Options

fix #1978

parent d1ae1477
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
View file @ d762823b
...@@ -21,15 +21,16 @@ public class ConsumerPermissionValidator { ...@@ -21,15 +21,16 @@ public class ConsumerPermissionValidator {
this.consumerAuthUtil = consumerAuthUtil; this.consumerAuthUtil = consumerAuthUtil;
} }
public boolean hasModifyNamespacePermission(HttpServletRequest request, String appId, String namespaceName, public boolean hasModifyNamespacePermission(HttpServletRequest request, String appId, String namespaceName,
String env) { String env) {
if (hasCreateNamespacePermission(request, appId)) { if (hasCreateNamespacePermission(request, appId)) {
return true; return true;
} }
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request), return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE, PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env)); ||
permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
} }
...@@ -39,6 +40,10 @@ public class ConsumerPermissionValidator { ...@@ -39,6 +40,10 @@ public class ConsumerPermissionValidator {
return true; return true;
} }
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request), return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName))
||
permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE, PermissionType.RELEASE_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env)); RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment