diff options
| author | Simon Rettberg | 2020-07-20 10:50:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-07-20 10:50:35 +0200 |
| commit | c4e620cc427106bdfa75fa2a36fbcd4c414932c1 (patch) | |
| tree | d5ad119a953360f47df2831ff7f88b70f7d9ad5e /src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java | |
| parent | Add translations to German and an info text regarding the resolution (diff) | |
| download | bwlp-guacamole-ext-c4e620cc427106bdfa75fa2a36fbcd4c414932c1.tar.gz bwlp-guacamole-ext-c4e620cc427106bdfa75fa2a36fbcd4c414932c1.tar.xz bwlp-guacamole-ext-c4e620cc427106bdfa75fa2a36fbcd4c414932c1.zip | |
Fix getUsername/getIdentifier in TunnelListener, make it thread safe
Diffstat (limited to 'src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java')
| -rw-r--r-- | src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java index 93fda8d..a0531d0 100644 --- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java +++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java @@ -45,12 +45,7 @@ public class BwlpUserContext extends AbstractUserContext { throws GuacamoleCredentialsException { authUser = authenticatedUser; originalContext = context; - Credentials cred = authenticatedUser.getCredentials(); - if (cred != null && cred.getUsername() != null) { - username = cred.getUsername(); - } else { - username = authenticatedUser.getIdentifier(); - } + username = Util.getUsername(authenticatedUser); this.groupid = groupid; this.resolution = resolution; // OK @@ -60,12 +55,7 @@ public class BwlpUserContext extends AbstractUserContext { public BwlpUserContext(AuthenticatedUser authenticatedUser, UserContext context, WrappedConnection exConn) { authUser = authenticatedUser; originalContext = context; - Credentials cred = authenticatedUser.getCredentials(); - if (cred != null && cred.getUsername() != null) { - username = cred.getUsername(); - } else { - username = authenticatedUser.getIdentifier(); - } + username = Util.getUsername(authenticatedUser); this.groupid = -1; this.resolution = ""; connectionDirectory = new SimpleDirectory<Connection>(exConn); |