From 1c333106c03a188418679e7e248a3e848dd604b7 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sat, 19 Aug 2017 14:06:05 -0400 Subject: [PATCH] GUACAMOLE-362: Fix case where credential object is null. --- .../auth/cas/AuthenticationProviderService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java index 0422d30e3..6a13a83ad 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java @@ -109,9 +109,12 @@ public class AuthenticationProviderService { AttributePrincipal principal = ticketService.validateTicket(ticket); String username = principal.getName(); credentials.setUsername(username); - String clearPass = decryptPassword(principal.getAttributes().get("credential").toString()); - if (clearPass != null && !clearPass.isEmpty()) - credentials.setPassword(clearPass); + Object credObj = principal.getAttributes().get("credential"); + if (credObj != null) { + String clearPass = decryptPassword(credObj.toString()); + if (clearPass != null && !clearPass.isEmpty()) + credentials.setPassword(clearPass); + } authenticatedUser.init(username, credentials); return authenticatedUser; }