diff options
author | Simon Rettberg | 2020-06-26 17:00:07 +0200 |
---|---|---|
committer | Simon Rettberg | 2020-06-26 17:00:07 +0200 |
commit | 8cf718c39bed2de9527c7171263bad5112f7ed16 (patch) | |
tree | 999a96099114e31aaa1260a8afd8412ea39efbe5 /src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java | |
parent | Fix resolution detection JS (diff) | |
download | bwlp-guacamole-ext-8cf718c39bed2de9527c7171263bad5112f7ed16.tar.gz bwlp-guacamole-ext-8cf718c39bed2de9527c7171263bad5112f7ed16.tar.xz bwlp-guacamole-ext-8cf718c39bed2de9527c7171263bad5112f7ed16.zip |
Fallback to getIdentifier() if credential's username is null
Diffstat (limited to 'src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java')
-rw-r--r-- | src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java index a75d585..088be7f 100644 --- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java +++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java @@ -58,7 +58,17 @@ public class BwlpAuthenticationProvider implements AuthenticationProvider { public UserContext redecorate(UserContext decorated, UserContext context, AuthenticatedUser authenticatedUser, Credentials credentials) throws GuacamoleException { - String username = authenticatedUser.getCredentials().getUsername(); + Credentials creds = authenticatedUser.getCredentials(); + if (creds == null) + return context; + String username = creds.getUsername(); + if (username == null) { + username = authenticatedUser.getIdentifier(); + } + if (username == null) { + LOGGER.warn("redecorate: Ignoring user without name"); + return context; + } LOGGER.warn("REdecorate called for " + username); BwlpUserContext user = oldMappings.get(username); |