From 8cf718c39bed2de9527c7171263bad5112f7ed16 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 26 Jun 2020 17:00:07 +0200
Subject: Fallback to getIdentifier() if credential's username is null

---
 .../de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

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