apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-25 17:22:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

server: do not return extension path to non root admins (#11856)

Browse Source 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2025-10-17 15:06:28 +05:30 committed by GitHub
parent d8766418e0
commit 4cdcde2fe7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/com/cloud/server/ManagementServerImpl.java
View File

@ -4672,7 +4672,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
final Map<String, Object> capabilities = new HashMap<>(); final Map<String, Object> capabilities = new HashMap<>();
final Account caller = getCaller(); final Account caller = getCaller();
final boolean isCallerAdmin = _accountService.isAdmin(caller.getId()); final boolean isCallerRootAdmin = _accountService.isRootAdmin(caller.getId());
final boolean isCallerAdmin = isCallerRootAdmin || _accountService.isAdmin(caller.getId());
boolean securityGroupsEnabled = false; boolean securityGroupsEnabled = false;
boolean elasticLoadBalancerEnabled; boolean elasticLoadBalancerEnabled;
String supportELB = "false"; String supportELB = "false";
@ -4753,7 +4754,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
} }
capabilities.put(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT, fsVmMinCpu); capabilities.put(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT, fsVmMinCpu);
capabilities.put(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE, fsVmMinRam); capabilities.put(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE, fsVmMinRam);
if (isCallerAdmin) { if (isCallerRootAdmin) {
capabilities.put(ApiConstants.EXTENSIONS_PATH, extensionsManager.getExtensionsPath()); capabilities.put(ApiConstants.EXTENSIONS_PATH, extensionsManager.getExtensionsPath());
} }
capabilities.put(ApiConstants.ADDITONAL_CONFIG_ENABLED, UserVmManager.EnableAdditionalVmConfig.valueIn(caller.getId())); capabilities.put(ApiConstants.ADDITONAL_CONFIG_ENABLED, UserVmManager.EnableAdditionalVmConfig.valueIn(caller.getId()));