From c4e620cc427106bdfa75fa2a36fbcd4c414932c1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 20 Jul 2020 10:50:35 +0200
Subject: Fix getUsername/getIdentifier in TunnelListener, make it thread safe

---
 src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/main/java/de/bwlehrpool/bwlp_guac/BwlpUserContext.java')

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);
-- 
cgit v1.2.3-55-g7522