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

Rework Context.INITIAL_CONTEXT_FACTORY Default

Browse Source 
With this approach in place, one will be able to specify a different
implementation using the setContextFactory method should
`com.sun.jndi.ldap.LdapCtxFactory` get removed one day (since this
class is not exported by the `java.naming` modules in JDK 9+ and is an
implementation detail).

Closes gh-579
This commit is contained in:
Ihor Herasymenko
2021-04-16 17:10:02 -04:00
committed by Josh Cummings
parent cef377b050
commit 0f30b05d2f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2005-2020 the original author or authors.
* Copyright 2005-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,6 +123,14 @@ public abstract class AbstractContextSource implements BaseLdapPathContextSource
private DirContextAuthenticationStrategy authenticationStrategy = new SimpleDirContextAuthenticationStrategy();
public AbstractContextSource() {
try {
contextFactory = Class.forName(DEFAULT_CONTEXT_FACTORY);
} catch (ClassNotFoundException e) {
LOG.trace("The default for contextFactory cannot be resolved", e);
}
}
public DirContext getContext(String principal, String credentials) {
// This method is typically called for authentication purposes, which means that we
// should explicitly disable pooling in case passwords are changed (LDAP-183).
@@ -407,7 +415,9 @@ public abstract class AbstractContextSource implements BaseLdapPathContextSource
if (ObjectUtils.isEmpty(urls)) {
throw new IllegalArgumentException("At least one server url must be set");
}
if (contextFactory == null) {
throw new IllegalArgumentException("contextFactory must be set");
}
if (authenticationSource == null) {
LOG.debug("AuthenticationSource not set - " + "using default implementation");
if (!StringUtils.hasText(userDn)) {
@@ -438,7 +448,7 @@ public abstract class AbstractContextSource implements BaseLdapPathContextSource
Hashtable<String, Object> env = new Hashtable<String, Object>(baseEnv);
env.put(Context.INITIAL_CONTEXT_FACTORY, contextFactory != null ? contextFactory.getName() : DEFAULT_CONTEXT_FACTORY);
env.put(Context.INITIAL_CONTEXT_FACTORY, contextFactory.getName());
env.put(Context.PROVIDER_URL, assembleProviderUrlString(urls));
if (dirObjectFactory != null) {