Build: Merge xpack checkstyle config into core (#33399)
Solves all of the xpack line length suppressions and then merges the remainder of the xpack checkstyle_suppressions.xml file into the core checkstyle_suppressions.xml file. At this point that just means the antlr generated files for sql. It also adds an exclusion to the line length tests for javadocs that are just a URL. We have one such javadoc and breaking up the line would make the link difficult to use.
This commit is contained in:
parent
913d5fd820
commit
74b87989d9
|
@ -23,6 +23,7 @@
|
||||||
unfair. -->
|
unfair. -->
|
||||||
<module name="LineLength">
|
<module name="LineLength">
|
||||||
<property name="max" value="140"/>
|
<property name="max" value="140"/>
|
||||||
|
<property name="ignorePattern" value="^ *\* *https?://[^ ]+$"/>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
<module name="AvoidStarImport" />
|
<module name="AvoidStarImport" />
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<!-- These files are generated by ANTLR so its silly to hold them to our rules. -->
|
<!-- These files are generated by ANTLR so its silly to hold them to our rules. -->
|
||||||
<suppress files="org[/\\]elasticsearch[/\\]painless[/\\]antlr[/\\]PainlessLexer\.java" checks="." />
|
<suppress files="org[/\\]elasticsearch[/\\]painless[/\\]antlr[/\\]PainlessLexer\.java" checks="." />
|
||||||
<suppress files="org[/\\]elasticsearch[/\\]painless[/\\]antlr[/\\]PainlessParser(|BaseVisitor|Visitor)\.java" checks="." />
|
<suppress files="org[/\\]elasticsearch[/\\]painless[/\\]antlr[/\\]PainlessParser(|BaseVisitor|Visitor)\.java" checks="." />
|
||||||
|
<suppress files="plugin[/\\]sql[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]sql[/\\]parser[/\\]SqlBase(Base(Listener|Visitor)|Lexer|Listener|Parser|Visitor).java" checks="." />
|
||||||
|
|
||||||
<!-- JNA requires the no-argument constructor on JNAKernel32Library.SizeT to be public-->
|
<!-- JNA requires the no-argument constructor on JNAKernel32Library.SizeT to be public-->
|
||||||
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]bootstrap[/\\]JNAKernel32Library.java" checks="RedundantModifier" />
|
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]bootstrap[/\\]JNAKernel32Library.java" checks="RedundantModifier" />
|
||||||
|
|
|
@ -31,16 +31,7 @@ subprojects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
File checkstyleSuppressions = file('dev-tools/checkstyle_suppressions.xml')
|
|
||||||
subprojects {
|
subprojects {
|
||||||
tasks.withType(Checkstyle) {
|
|
||||||
inputs.file(checkstyleSuppressions)
|
|
||||||
// Use x-pack-elasticsearch specific suppressions file rather than the open source one.
|
|
||||||
configProperties = [
|
|
||||||
suppressions: checkstyleSuppressions
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-ccr:${version}": xpackModule('ccr')]
|
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-ccr:${version}": xpackModule('ccr')]
|
||||||
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-core:${version}": xpackModule('core')]
|
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-core:${version}": xpackModule('core')]
|
||||||
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-deprecation:${version}": xpackModule('deprecation')]
|
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-deprecation:${version}": xpackModule('deprecation')]
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE suppressions PUBLIC
|
|
||||||
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
|
|
||||||
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
|
|
||||||
|
|
||||||
<suppressions>
|
|
||||||
<!-- On Windows, Checkstyle matches files using \ path separator -->
|
|
||||||
<!-- These files are generated by ANTLR so its silly to hold them to our rules. -->
|
|
||||||
<suppress files="plugin[/\\]sql[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]sql[/\\]parser[/\\]SqlBase(Base(Listener|Visitor)|Lexer|Listener|Parser|Visitor).java" checks="." />
|
|
||||||
|
|
||||||
<suppress files="plugin[/\\]core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]ml[/\\]action[/\\]StopDatafeedAction.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]ml[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]ml[/\\]utils[/\\]DomainSplitFunction.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]persistent[/\\]CompletionPersistentTaskAction.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]Security.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]Realms.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]ActiveDirectorySIDUtil.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]ml[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]ml[/\\]integration[/\\]TooManyJobsIT.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]persistent[/\\]TestPersistentTasksPlugin.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]action[/\\]user[/\\]TransportGetUsersActionTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]file[/\\]FileRealmTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]ActiveDirectoryRealmTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]ActiveDirectorySessionFactoryTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]LdapRealmTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]LdapSessionFactoryTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]LdapUserSearchSessionFactoryTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]ldap[/\\]support[/\\]SessionFactoryTests.java" checks="LineLength" />
|
|
||||||
<suppress files="plugin[/\\]security[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]xpack[/\\]security[/\\]authc[/\\]pki[/\\]PkiRealmTests.java" checks="LineLength" />
|
|
||||||
<suppress files="qa[/\\]security-example-extension[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]example[/\\]realm[/\\]CustomRealmTests.java" checks="LineLength" />
|
|
||||||
</suppressions>
|
|
|
@ -18,7 +18,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This code sourced from:http://svn.apache.org/repos/asf/directory/studio/tags/2.0.0.v20170904-M13/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
|
* This code sourced from:
|
||||||
|
* http://svn.apache.org/repos/asf/directory/studio/tags/2.0.0.v20170904-M13/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.elasticsearch.xpack.security.authc.ldap;
|
package org.elasticsearch.xpack.security.authc.ldap;
|
||||||
|
|
|
@ -169,8 +169,8 @@ public class TransportGetUsersActionTests extends ESTestCase {
|
||||||
final int size = randomIntBetween(1, allReservedUsers.size());
|
final int size = randomIntBetween(1, allReservedUsers.size());
|
||||||
final List<User> reservedUsers = randomSubsetOf(size, allReservedUsers);
|
final List<User> reservedUsers = randomSubsetOf(size, allReservedUsers);
|
||||||
final List<String> names = reservedUsers.stream().map(User::principal).collect(Collectors.toList());
|
final List<String> names = reservedUsers.stream().map(User::principal).collect(Collectors.toList());
|
||||||
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null, TransportService.NOOP_TRANSPORT_INTERCEPTOR,
|
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
|
||||||
x -> null, null, Collections.emptySet());
|
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
|
||||||
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
||||||
usersStore, transportService, reservedRealm);
|
usersStore, transportService, reservedRealm);
|
||||||
|
|
||||||
|
@ -209,8 +209,8 @@ public class TransportGetUsersActionTests extends ESTestCase {
|
||||||
ReservedRealmTests.mockGetAllReservedUserInfo(usersStore, Collections.emptyMap());
|
ReservedRealmTests.mockGetAllReservedUserInfo(usersStore, Collections.emptyMap());
|
||||||
ReservedRealm reservedRealm = new ReservedRealm(mock(Environment.class), settings, usersStore, new AnonymousUser(settings),
|
ReservedRealm reservedRealm = new ReservedRealm(mock(Environment.class), settings, usersStore, new AnonymousUser(settings),
|
||||||
securityIndex, threadPool);
|
securityIndex, threadPool);
|
||||||
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null, TransportService.NOOP_TRANSPORT_INTERCEPTOR,
|
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
|
||||||
x -> null, null, Collections.emptySet());
|
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
|
||||||
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
||||||
usersStore, transportService, reservedRealm);
|
usersStore, transportService, reservedRealm);
|
||||||
|
|
||||||
|
@ -256,8 +256,8 @@ public class TransportGetUsersActionTests extends ESTestCase {
|
||||||
randomFrom(Collections.singletonList(new User("joe")), Arrays.asList(new User("jane"), new User("fred")), randomUsers());
|
randomFrom(Collections.singletonList(new User("joe")), Arrays.asList(new User("jane"), new User("fred")), randomUsers());
|
||||||
final String[] storeUsernames = storeUsers.stream().map(User::principal).collect(Collectors.toList()).toArray(Strings.EMPTY_ARRAY);
|
final String[] storeUsernames = storeUsers.stream().map(User::principal).collect(Collectors.toList()).toArray(Strings.EMPTY_ARRAY);
|
||||||
NativeUsersStore usersStore = mock(NativeUsersStore.class);
|
NativeUsersStore usersStore = mock(NativeUsersStore.class);
|
||||||
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null, TransportService.NOOP_TRANSPORT_INTERCEPTOR,
|
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
|
||||||
x -> null, null, Collections.emptySet());
|
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
|
||||||
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
||||||
usersStore, transportService, mock(ReservedRealm.class));
|
usersStore, transportService, mock(ReservedRealm.class));
|
||||||
|
|
||||||
|
@ -304,8 +304,8 @@ public class TransportGetUsersActionTests extends ESTestCase {
|
||||||
randomFrom(Collections.singletonList(new User("joe")), Arrays.asList(new User("jane"), new User("fred")), randomUsers());
|
randomFrom(Collections.singletonList(new User("joe")), Arrays.asList(new User("jane"), new User("fred")), randomUsers());
|
||||||
final String[] storeUsernames = storeUsers.stream().map(User::principal).collect(Collectors.toList()).toArray(Strings.EMPTY_ARRAY);
|
final String[] storeUsernames = storeUsers.stream().map(User::principal).collect(Collectors.toList()).toArray(Strings.EMPTY_ARRAY);
|
||||||
NativeUsersStore usersStore = mock(NativeUsersStore.class);
|
NativeUsersStore usersStore = mock(NativeUsersStore.class);
|
||||||
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null, TransportService.NOOP_TRANSPORT_INTERCEPTOR,
|
TransportService transportService = new TransportService(Settings.EMPTY, mock(Transport.class), null,
|
||||||
x -> null, null, Collections.emptySet());
|
TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, Collections.emptySet());
|
||||||
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
TransportGetUsersAction action = new TransportGetUsersAction(Settings.EMPTY, mock(ActionFilters.class),
|
||||||
usersStore, transportService, mock(ReservedRealm.class));
|
usersStore, transportService, mock(ReservedRealm.class));
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,8 @@ public class FileRealmTests extends ESTestCase {
|
||||||
|
|
||||||
public void testAuthenticateCaching() throws Exception {
|
public void testAuthenticateCaching() throws Exception {
|
||||||
Settings settings = Settings.builder()
|
Settings settings = Settings.builder()
|
||||||
.put("cache.hash_algo", Hasher.values()[randomIntBetween(0, Hasher.values().length - 1)].name().toLowerCase(Locale.ROOT)).build();
|
.put("cache.hash_algo", Hasher.values()[randomIntBetween(0, Hasher.values().length - 1)].name().toLowerCase(Locale.ROOT))
|
||||||
|
.build();
|
||||||
RealmConfig config = new RealmConfig("file-test", settings, globalSettings, TestEnvironment.newEnvironment(globalSettings),
|
RealmConfig config = new RealmConfig("file-test", settings, globalSettings, TestEnvironment.newEnvironment(globalSettings),
|
||||||
threadContext);
|
threadContext);
|
||||||
when(userPasswdStore.verifyPassword(eq("user1"), eq(new SecureString("test123")), any(Supplier.class)))
|
when(userPasswdStore.verifyPassword(eq("user1"), eq(new SecureString("test123")), any(Supplier.class)))
|
||||||
|
|
|
@ -63,7 +63,8 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
.put("path.home", createTempDir())
|
.put("path.home", createTempDir())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", settings, globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
RealmConfig config = new RealmConfig("ldap_realm", settings, globalSettings,
|
||||||
|
TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
LdapSessionFactory sessionFactory = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory sessionFactory = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
String user = "Horatio Hornblower";
|
String user = "Horatio Hornblower";
|
||||||
SecureString userPass = new SecureString("pass");
|
SecureString userPass = new SecureString("pass");
|
||||||
|
@ -87,8 +88,9 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
"wrongname={0},ou=people,o=sevenSeas",
|
"wrongname={0},ou=people,o=sevenSeas",
|
||||||
"cn={0},ou=people,o=sevenSeas", //this last one should work
|
"cn={0},ou=people,o=sevenSeas", //this last one should work
|
||||||
};
|
};
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", buildLdapSettings(ldapUrls(), userTemplates, groupSearchBase,
|
RealmConfig config = new RealmConfig("ldap_realm",
|
||||||
LdapSearchScope.SUB_TREE), globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
buildLdapSettings(ldapUrls(), userTemplates, groupSearchBase, LdapSearchScope.SUB_TREE),
|
||||||
|
globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
|
|
||||||
LdapSessionFactory sessionFactory = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory sessionFactory = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
|
|
||||||
|
@ -110,8 +112,9 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
"wrongname={0},ou=people,o=sevenSeas",
|
"wrongname={0},ou=people,o=sevenSeas",
|
||||||
"asdf={0},ou=people,o=sevenSeas", //none of these should work
|
"asdf={0},ou=people,o=sevenSeas", //none of these should work
|
||||||
};
|
};
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", buildLdapSettings(ldapUrls(), userTemplates, groupSearchBase,
|
RealmConfig config = new RealmConfig("ldap_realm",
|
||||||
LdapSearchScope.SUB_TREE), globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
buildLdapSettings(ldapUrls(), userTemplates, groupSearchBase, LdapSearchScope.SUB_TREE),
|
||||||
|
globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
|
|
||||||
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
|
|
||||||
|
@ -128,8 +131,9 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
public void testGroupLookupSubtree() throws Exception {
|
public void testGroupLookupSubtree() throws Exception {
|
||||||
String groupSearchBase = "o=sevenSeas";
|
String groupSearchBase = "o=sevenSeas";
|
||||||
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase,
|
RealmConfig config = new RealmConfig("ldap_realm",
|
||||||
LdapSearchScope.SUB_TREE), globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase, LdapSearchScope.SUB_TREE),
|
||||||
|
globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
|
|
||||||
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
|
|
||||||
|
@ -147,8 +151,9 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
public void testGroupLookupOneLevel() throws Exception {
|
public void testGroupLookupOneLevel() throws Exception {
|
||||||
String groupSearchBase = "ou=crews,ou=groups,o=sevenSeas";
|
String groupSearchBase = "ou=crews,ou=groups,o=sevenSeas";
|
||||||
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase,
|
RealmConfig config = new RealmConfig("ldap_realm",
|
||||||
LdapSearchScope.ONE_LEVEL), globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase, LdapSearchScope.ONE_LEVEL),
|
||||||
|
globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
|
|
||||||
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
|
|
||||||
|
@ -165,8 +170,9 @@ public class LdapSessionFactoryTests extends LdapTestCase {
|
||||||
public void testGroupLookupBase() throws Exception {
|
public void testGroupLookupBase() throws Exception {
|
||||||
String groupSearchBase = "cn=HMS Lydia,ou=crews,ou=groups,o=sevenSeas";
|
String groupSearchBase = "cn=HMS Lydia,ou=crews,ou=groups,o=sevenSeas";
|
||||||
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
String userTemplate = "cn={0},ou=people,o=sevenSeas";
|
||||||
RealmConfig config = new RealmConfig("ldap_realm", buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase,
|
RealmConfig config = new RealmConfig("ldap_realm",
|
||||||
LdapSearchScope.BASE), globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
buildLdapSettings(ldapUrls(), userTemplate, groupSearchBase, LdapSearchScope.BASE),
|
||||||
|
globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
|
|
||||||
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
LdapSessionFactory ldapFac = new LdapSessionFactory(config, sslService, threadPool);
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,8 @@ public class PkiRealmTests extends ESTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testTokenSupport() {
|
public void testTokenSupport() {
|
||||||
RealmConfig config = new RealmConfig("", Settings.EMPTY, globalSettings, TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
RealmConfig config = new RealmConfig("", Settings.EMPTY, globalSettings,
|
||||||
|
TestEnvironment.newEnvironment(globalSettings), new ThreadContext(globalSettings));
|
||||||
PkiRealm realm = new PkiRealm(config, mock(UserRoleMapper.class));
|
PkiRealm realm = new PkiRealm(config, mock(UserRoleMapper.class));
|
||||||
|
|
||||||
assertThat(realm.supports(null), is(false));
|
assertThat(realm.supports(null), is(false));
|
||||||
|
|
Loading…
Reference in New Issue