Skip to content

Commit 4cdcde2

Browse files
authored
server: do not return extension path to non root admins (#11856)
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent d876641 commit 4cdcde2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

server/src/main/java/com/cloud/server/ManagementServerImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4672,7 +4672,8 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
46724672
final Map<String, Object> capabilities = new HashMap<>();
46734673

46744674
final Account caller = getCaller();
4675-
final boolean isCallerAdmin = _accountService.isAdmin(caller.getId());
4675+
final boolean isCallerRootAdmin = _accountService.isRootAdmin(caller.getId());
4676+
final boolean isCallerAdmin = isCallerRootAdmin || _accountService.isAdmin(caller.getId());
46764677
boolean securityGroupsEnabled = false;
46774678
boolean elasticLoadBalancerEnabled;
46784679
String supportELB = "false";
@@ -4753,7 +4754,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
47534754
}
47544755
capabilities.put(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT, fsVmMinCpu);
47554756
capabilities.put(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE, fsVmMinRam);
4756-
if (isCallerAdmin) {
4757+
if (isCallerRootAdmin) {
47574758
capabilities.put(ApiConstants.EXTENSIONS_PATH, extensionsManager.getExtensionsPath());
47584759
}
47594760
capabilities.put(ApiConstants.ADDITONAL_CONFIG_ENABLED, UserVmManager.EnableAdditionalVmConfig.valueIn(caller.getId()));

0 commit comments

Comments
 (0)