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

Fix accessing console without password.
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Michael Lipp 2024-06-12 20:53:18 +02:00
parent d5c9a0c302
commit 9c31f574b8
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
View file

@ -513,8 +513,8 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
case "openConsole": case "openConsole":
if (perms.contains(Permission.ACCESS_CONSOLE)) { if (perms.contains(Permission.ACCESS_CONSOLE)) {
var pwQuery = Event.onCompletion(new GetDisplayPassword(vmDef), var pwQuery = Event.onCompletion(new GetDisplayPassword(vmDef),
e -> e.password().ifPresent( e -> openConsole(vmName, channel, model,
pw -> openConsole(vmName, channel, model, pw))); e.password().orElse(null)));
fire(pwQuery, vmChannel); fire(pwQuery, vmChannel);
} }
break; break;
@ -555,7 +555,10 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
.append("[virt-viewer]\ntype=spice\nhost=") .append("[virt-viewer]\ntype=spice\nhost=")
.append(addr.get().getHostAddress()).append("\nport=") .append(addr.get().getHostAddress()).append("\nport=")
.append(Integer.toString(port.get().getAsInt())) .append(Integer.toString(port.get().getAsInt()))
.append("\npassword=").append(password).append('\n'); .append('\n');
if (password != null) {
data.append("password=").append(password).append('\n');
}
proxyUrl.map(JsonPrimitive::getAsString).ifPresent(u -> { proxyUrl.map(JsonPrimitive::getAsString).ifPresent(u -> {
if (!Strings.isNullOrEmpty(u)) { if (!Strings.isNullOrEmpty(u)) {
data.append("proxy=").append(u).append('\n'); data.append("proxy=").append(u).append('\n');