From 0e5a3cb74f275ba1477bd13f6b1af27d30426aa0 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 18 Aug 2022 12:26:55 -0700 Subject: [PATCH] GUACAMOLE-990: The UserContext passed to redecorate() should NOT be the internal DecoratedUserContext wrapper. --- .../org/apache/guacamole/rest/auth/DecoratedUserContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/DecoratedUserContext.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/DecoratedUserContext.java index d773068f3..9aa26fafc 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/DecoratedUserContext.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/DecoratedUserContext.java @@ -145,7 +145,7 @@ public class DecoratedUserContext extends DelegatingUserContext { if (authProvider != userContext.getAuthenticationProvider()) { // Apply next layer of wrapping around UserContext - UserContext redecorated = authProvider.redecorate(decorated, + UserContext redecorated = authProvider.redecorate(decorated.getDelegateUserContext(), userContext, authenticatedUser, credentials); // Do not allow misbehaving extensions to wipe out the