Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure NamingException.resolvedObj is Serializable 

Fixes: gh-5378
This commit is contained in:
Rob Winch 2018-08-22 10:07:27 -05:00
parent 8510e9a285
commit 5dd55d4936
1 changed files with 11 additions and 0 deletions
Show Stats 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.DirContext;
import javax.naming.directory.SearchControls; import javax.naming.directory.SearchControls;
import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.InitialLdapContext;
import java.io.Serializable;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -221,6 +222,8 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends
logger.debug("Authentication for " + bindPrincipal + " failed:" + exception); logger.debug("Authentication for " + bindPrincipal + " failed:" + exception);
} }
handleResolveObj(exception);
int subErrorCode = parseSubErrorCode(exception.getMessage()); int subErrorCode = parseSubErrorCode(exception.getMessage());
if (subErrorCode <= 0) { if (subErrorCode <= 0) {
@ -236,6 +239,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) { private int parseSubErrorCode(String message) {
Matcher m = SUB_ERROR_CODE.matcher(message); Matcher m = SUB_ERROR_CODE.matcher(message);