Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure NamingException.resolvedObj is Serializable

Browse Source 
Fixes: gh-5378
This commit is contained in:
Rob Winch
2018-08-22 10:07:27 -05:00
parent 5888a3f6b7
commit 31650d7eaa
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
View File

@@ -42,6 +42,7 @@ import javax.naming.OperationNotSupportedException;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import javax.naming.ldap.InitialLdapContext;
import java.io.Serializable;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -219,6 +220,8 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends
logger.debug("Authentication for " + bindPrincipal + " failed:" + exception);
}
handleResolveObj(exception);
int subErrorCode = parseSubErrorCode(exception.getMessage());
if (subErrorCode <= 0) {
@@ -234,6 +237,14 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends
}
}
private void handleResolveObj(NamingException exception) {
Object resolvedObj = exception.getResolvedObj();
boolean serializable = resolvedObj instanceof Serializable;
if (resolvedObj != null && !serializable) {
exception.setResolvedObj(null);
}
}
private int parseSubErrorCode(String message) {
Matcher m = SUB_ERROR_CODE.matcher(message);