Commit 8998fca
committed
GUACAMOLE-2219: Fix vault token resolution for BALANCING connection groups
When connecting through a BALANCING connection group, the JDBC layer
internally selects and connects a child connection, bypassing the
vault extension's TokenInjectingConnection wrapper. This means
addTokens(Connection) is never called for the selected child, and
vault-managed tokens (e.g. KEEPER_USER_PASSWORD) are not resolved,
causing authentication failures on the child connection.
This commit addresses two issues:
1. VaultUserContext.addTokens(ConnectionGroup) now detects BALANCING
groups and pre-resolves vault tokens for all child connections,
ensuring tokens are available when the JDBC layer applies them
to the selected child's configuration.
2. KsmSecretService.getTokens() now guards against null
GuacamoleConfiguration, which is always null for connection
groups since they have no protocol configuration. Previously
this caused a NullPointerException.1 parent 90a938c commit 8998fca
2 files changed
Lines changed: 72 additions & 0 deletions
File tree
- extensions/guacamole-vault/modules
- guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user
- guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret
Lines changed: 67 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
357 | 358 | | |
358 | 359 | | |
359 | 360 | | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
360 | 427 | | |
361 | 428 | | |
362 | 429 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
520 | 520 | | |
521 | 521 | | |
522 | 522 | | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
523 | 528 | | |
524 | 529 | | |
525 | 530 | | |
| |||
0 commit comments