honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken short-circuit in getUnlicensedRealms (#44937)

Browse Source 
The existing equals check was broken, and would always be false.

The correct behaviour is to return "Collections.emptyList()" whenever
the the active(licensed)-realms equals the configured-realms.

Backport of: #44399
This commit is contained in:
Tim Vernum 2019-07-30 16:32:04 +10:00 committed by GitHub
parent 598c4e72f9
commit f575370e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
View File

@ -135,7 +135,7 @@ public class Realms implements Iterable<Realm> {
final List<Realm> allowedRealms = this.asList();
// Shortcut for the typical case, all the configured realms are allowed
if (allowedRealms.equals(this.realms.size())) {
if (allowedRealms.equals(this.realms)) {
return Collections.emptyList();
}

6
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java
View File

@ -48,6 +48,7 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.iterableWithSize;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -110,6 +111,7 @@ public class RealmsTests extends ESTestCase {
}
assertThat(realms.getUnlicensedRealms(), empty());
assertThat(realms.getUnlicensedRealms(), sameInstance(realms.getUnlicensedRealms()));
}
public void testWithSettingsWhereDifferentRealmsHaveSameOrder() throws Exception {
@ -150,6 +152,7 @@ public class RealmsTests extends ESTestCase {
}
assertThat(realms.getUnlicensedRealms(), empty());
assertThat(realms.getUnlicensedRealms(), sameInstance(realms.getUnlicensedRealms()));
}
public void testWithSettingsWithMultipleInternalRealmsOfSameType() throws Exception {
@ -185,6 +188,7 @@ public class RealmsTests extends ESTestCase {
assertThat(iter.hasNext(), is(false));
assertThat(realms.getUnlicensedRealms(), empty());
assertThat(realms.getUnlicensedRealms(), sameInstance(realms.getUnlicensedRealms()));
}
public void testUnlicensedWithOnlyCustomRealms() throws Exception {
@ -220,6 +224,7 @@ public class RealmsTests extends ESTestCase {
}
assertThat(realms.getUnlicensedRealms(), empty());
assertThat(realms.getUnlicensedRealms(), sameInstance(realms.getUnlicensedRealms()));
when(licenseState.allowedRealmType()).thenReturn(AllowedRealmType.DEFAULT);
@ -303,6 +308,7 @@ public class RealmsTests extends ESTestCase {
}
assertThat(types, contains("ldap", "type_0"));
assertThat(realms.getUnlicensedRealms(), empty());
assertThat(realms.getUnlicensedRealms(), sameInstance(realms.getUnlicensedRealms()));
when(licenseState.allowedRealmType()).thenReturn(AllowedRealmType.DEFAULT);
iter = realms.iterator();