mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Simplify permission management.

Browse source
This commit is contained in:
Michael Lipp 2025-01-29 21:01:49 +01:00
parent 8d96307bb5
commit ebda41346a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
org.jdrupes.vmoperator.vmaccess/src/org/jdrupes/vmoperator/vmaccess/VmAccess.java
View file

@ -546,26 +546,26 @@ public class VmAccess extends FreeMarkerConlet<VmAccess.ResourceModel> {
.map(ConsoleUser::getName).orElse(null); .map(ConsoleUser::getName).orElse(null);
var roles = WebConsoleUtils.rolesFromSession(session) var roles = WebConsoleUtils.rolesFromSession(session)
.stream().map(ConsoleRole::getName).toList(); .stream().map(ConsoleRole::getName).toList();
Set<Permission> result = new HashSet<>();
if (model.mode() == ResourceModel.Mode.POOL) { if (model.mode() == ResourceModel.Mode.POOL) {
if (pool == null) { if (pool == null) {
pool = appPipeline.fire(new GetPools() pool = appPipeline.fire(new GetPools()
.withName(model.name())).get().stream().findFirst() .withName(model.name())).get().stream().findFirst()
.orElse(null); .orElse(null);
} }
if (pool != null) { if (pool == null) {
result.addAll(pool.permissionsFor(user, roles)); return Collections.emptySet();
} }
return pool.permissionsFor(user, roles);
} }
if (vmDef == null) { if (vmDef == null) {
vmDef = appPipeline.fire(new GetVms().assignedFrom(model.name()) vmDef = appPipeline.fire(new GetVms().assignedFrom(model.name())
.assignedTo(user)).get().stream().map(VmData::definition) .assignedTo(user)).get().stream().map(VmData::definition)
.findFirst().orElse(null); .findFirst().orElse(null);
} }
if (vmDef != null) { if (vmDef == null) {
result.addAll(vmDef.permissionsFor(user, roles)); return Collections.emptySet();
} }
return result; return vmDef.permissionsFor(user, roles);
} }
private void updatePreview(ConsoleConnection channel, ResourceModel model, private void updatePreview(ConsoleConnection channel, ResourceModel model,