Fix Guacamole graphics login cache and session repair
This commit is contained in:
1 parent
98a474696b
commit
4f1ed41f9f
4 files changed
+43
-15
No files matched your search
@@ -43,8 +43,14 @@ test/rdp-access/rdp-access up --bind 0.0.0.0 --public-host x1.xcel.me --graphics
|
||||
|
||||
The choice is saved per gateway profile and reused when omitted. `status`
|
||||
prints the saved `graphics` mode. A change rewrites the connection mapping
|
||||
while retaining the gateway and tunnels; disconnect/reconnect the desktop to
|
||||
apply it. Existing sessions continue with their original display settings.
|
||||
while retaining the gateway and tunnels; **log out of Guacamole and sign in
|
||||
again** to apply it. Disconnecting/reconnecting the desktop or refreshing the
|
||||
page alone is insufficient: file-based authentication keeps a copy of the
|
||||
connection settings in each authenticated user's context. Existing logins
|
||||
continue with their original display settings even when they create another
|
||||
desktop connection. This follows the [Guacamole 1.6 authentication implementation](https://github.com/apache/guacamole-client/blob/1.6.0/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java).
|
||||
To clear cached logins and workers without rebooting the VM or replacing the
|
||||
gateway/tunnels, run `test/rdp-access/rdp-access repair`, then sign in again.
|
||||
If an old browser connection holds the single VRDE slot, close it or use the
|
||||
documented `repair` action before reconnecting.
|
||||
|
||||
@@ -286,8 +292,12 @@ disabled, run:
|
||||
test/rdp-access/rdp-access repair
|
||||
```
|
||||
|
||||
`repair` restarts only guacd, retains the VM, SSH tunnel, gateway, and IPv6
|
||||
forward, and does not alter the Windows guest. Close old browser tabs and sign
|
||||
`repair` restarts guacd **and the Guacamole web application**, clearing stale
|
||||
workers and cached login connection settings. It retains the VM, SSH tunnel,
|
||||
HTTPS gateway, and IPv6
|
||||
forward, and does not alter the Windows guest. It restarts those services
|
||||
sequentially and reloads nginx's upstream DNS address so Docker service IP
|
||||
reassignment cannot leave a `502 Bad Gateway` behind. Close old browser tabs and sign
|
||||
in again after it completes.
|
||||
|
||||
For quick recovery, use this decision table:
|
||||
@@ -296,7 +306,7 @@ For quick recovery, use this decision table:
|
||||
| --- | --- | --- |
|
||||
| Inspect everything | `test/rdp-access/rdp-access status` | Read-only VM, Compose, tunnel, and IPv6-forward state |
|
||||
| Start or reconnect access | `test/rdp-access/rdp-access up --bind 0.0.0.0 --public-host x1.xcel.me` | Reuses healthy services; recreates only missing tunnel/forward |
|
||||
| Browser says “Waiting for response” | `test/rdp-access/rdp-access status`; `test/rdp-access/rdp-access logs --tail=100`; if guacd is stale, `test/rdp-access/rdp-access repair` | Diagnoses tunnel/dual-stack issues; restarts only guacd |
|
||||
| Browser says “Waiting for response”, or resolution remains from an old preset | `test/rdp-access/rdp-access status`; `test/rdp-access/rdp-access logs --tail=100`; `test/rdp-access/rdp-access repair`, then sign in again | Diagnoses tunnel/dual-stack issues; clears cached web logins and stale guacd workers without restarting the VM |
|
||||
| Partial stack or changed endpoint | `test/rdp-access/rdp-access down`, then `test/rdp-access/rdp-access up --bind 0.0.0.0 --public-host x1.xcel.me` | Recreates the exact project with the new settings |
|
||||
| Print the current URL | `test/rdp-access/rdp-access url` | Read-only URL from the saved session |
|
||||
| Stop temporary access | `test/rdp-access/rdp-access down` | Stops gateway, IPv6 forward, SSH watchdog/tunnel; retains verifier/cert |
|
||||
|
||||
@@ -30,7 +30,7 @@ usage: test/rdp-access/rdp-access ACTION [OPTIONS]
|
||||
Actions:
|
||||
up start a private VRDE SSH tunnel and self-signed HTTPS Guacamole
|
||||
status show gateway, tunnel, and fixture status without changing anything
|
||||
repair restart only guacd to release a stale single-VRDE-slot worker
|
||||
repair restart guacd and Guacamole; release stale workers and cached logins
|
||||
url print the current browser URL
|
||||
logs follow or print Compose logs (pass Docker Compose log options)
|
||||
down stop containers and the private SSH watchdog/tunnel; retain generated state
|
||||
@@ -60,8 +60,9 @@ RDP_ACCESS_IPV6_FORWARD (auto, always, or never) control the reversible
|
||||
IPv6-to-IPv4 listener for dual-stack hostnames. Set
|
||||
RDP_ACCESS_GUACD_LOG_LEVEL=debug for temporary protocol diagnostics.
|
||||
RDP_ACCESS_GRAPHICS is equivalent to --graphics; omitted values reuse the
|
||||
saved profile setting (normal for a first start). Reconnect the desktop after
|
||||
changing graphics; existing connections retain their original settings.
|
||||
saved profile setting (normal for a first start). Log OUT of Guacamole and sign
|
||||
in again after changing graphics; reconnecting a desktop alone retains the
|
||||
login's cached settings. repair clears both cached logins and stale workers.
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -533,7 +534,7 @@ case $action in
|
||||
session_matches_current || fail "gateway already exists with a different configuration; run down first, then run up with the desired options"
|
||||
if [ "$saved_graphics" != "$RDP_ACCESS_GRAPHICS" ]; then
|
||||
render_mapping
|
||||
printf 'Graphics changed to %s. Disconnect/reconnect the desktop to apply.\n' "$RDP_ACCESS_GRAPHICS"
|
||||
printf 'Graphics changed to %s. Log out of Guacamole and sign in again to apply (desktop reconnect alone is insufficient).\n' "$RDP_ACCESS_GRAPHICS"
|
||||
fi
|
||||
if tunnel_active; then
|
||||
printf 'Guacamole stack and private VRDE tunnel are already active.\n'
|
||||
@@ -600,9 +601,17 @@ case $action in
|
||||
docker compose version >/dev/null
|
||||
assert_fixture_running
|
||||
[ -n "$(compose ps -q guacd 2>/dev/null || true)" ] || fail "Guacamole stack is not running; run up first"
|
||||
# File authentication retains connection configurations in each
|
||||
# authenticated UserContext. Restart the webapp as well as guacd so
|
||||
# a reconnect cannot silently reuse a login's old graphics preset.
|
||||
# Restart sequentially: simultaneous restarts can swap Docker-assigned
|
||||
# service IPs. Reload nginx's statically resolved upstream afterward,
|
||||
# even if Docker preserves the IPs on this particular restart.
|
||||
compose restart guacd >/dev/null
|
||||
wait_for_gateway || fail "Guacamole gateway did not become ready after guacd repair"
|
||||
printf 'guacd restarted; stale VRDE workers released. Close any old browser tab and sign in again.\n'
|
||||
compose restart guacamole >/dev/null
|
||||
compose exec -T gateway nginx -s reload >/dev/null
|
||||
wait_for_gateway || fail "Guacamole gateway did not become ready after session repair"
|
||||
printf 'Guacamole and guacd restarted; cached logins and stale VRDE workers cleared. Sign in again. VM and forwarding are unchanged.\n'
|
||||
;;
|
||||
url)
|
||||
[ "$#" -eq 0 ] || { usage >&2; fail "url accepts no options"; }
|
||||
|
||||
Reference in new issue
Block a user