GUACAMOLE-580: Avert potential NullPointerException when looking for user attributes.
This commit is contained in:
1 parent
a9637494ac
commit
50baf1c947
1 file changed
+6
+6
@@ -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) {
|
||||||
|
|||||||
Reference in new issue
Block a user