safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-580: Avert potential NullPointerException when looking for user attributes.

Browse Source
This commit is contained in:
Nick Couchman
2018-06-22 06:43:56 -04:00
parent a9637494ac
commit 50baf1c947
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
View File

@@ -26,6 +26,7 @@ import com.novell.ldap.LDAPAttributeSet;
import com.novell.ldap.LDAPConnection; import com.novell.ldap.LDAPConnection;
import com.novell.ldap.LDAPEntry; import com.novell.ldap.LDAPEntry;
import com.novell.ldap.LDAPException; import com.novell.ldap.LDAPException;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -283,7 +284,12 @@ public class AuthenticationProviderService {
try { try {
// Get LDAP attributes by querying LDAP // Get LDAP attributes by querying LDAP
LDAPEntry userEntry = ldapConnection.read(userDN, attrArray); LDAPEntry userEntry = ldapConnection.read(userDN, attrArray);
if (userEntry == null)
return null;
LDAPAttributeSet attrSet = userEntry.getAttributeSet(); LDAPAttributeSet attrSet = userEntry.getAttributeSet();
if (attrSet == null)
return null;
// Add each attribute into Map // Add each attribute into Map
for (Object attrObj : attrSet) { for (Object attrObj : attrSet) {