Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken short-circuit in getUnlicensedRealms #44399

Merged
merged 1 commit into from
Jul 17, 2019
Merged

Fix broken short-circuit in getUnlicensedRealms #44399

merged 1 commit into from
Jul 17, 2019

Conversation

tvernum
Copy link
Contributor

@tvernum tvernum commented Jul 16, 2019

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.

@tvernum
Fix broken short-circuit in getUnlicensedRealms
4fab4d4 
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.
@tvernum tvernum added >bug :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) v8.0.0 v7.4.0 labels Jul 16, 2019
@tvernum tvernum requested a review from bizybot July 16, 2019 05:24
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-security

@tvernum
Copy link
Contributor Author

tvernum commented Jul 16, 2019

@elasticmachine run elasticsearch-ci/2

Failure cleaning up an integTest. Doesn't reproduce.

at __randomizedtesting.SeedInfo.seed([4F235DF844DA8EE0:6CC2D5FCC656D32C]:0)
at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
at org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked(ElasticsearchAssertions.java:110)
at org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked(ElasticsearchAssertions.java:114)
at org.elasticsearch.test.TestCluster.wipeIndices(TestCluster.java:137)
at org.elasticsearch.test.TestCluster.wipe(TestCluster.java:74)
at org.elasticsearch.test.ESIntegTestCase.afterInternal(ESIntegTestCase.java:543)
at org.elasticsearch.test.ESIntegTestCase.cleanUpCluster(ESIntegTestCase.java:1960)

@tvernum tvernum added the v7.3.1 label Jul 16, 2019
@tvernum
Copy link
Contributor Author

tvernum commented Jul 16, 2019

Jenkins is in a grumpy mood :(
@elasticmachine run elasticsearch-ci/2

bizybot
bizybot approved these changes Jul 17, 2019
View reviewed changes
Copy link
Contributor

@bizybot bizybot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thank you.

@tvernum tvernum merged commit 2b65489 into elastic:master Jul 17, 2019
@jpountz jpountz added v7.3.0 and removed v7.3.1 labels Jul 26, 2019
@tvernum tvernum added v7.3.1 and removed v7.3.0 labels Jul 29, 2019
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Jul 29, 2019
@tvernum
Fix broken short-circuit in getUnlicensedRealms
a42d224 
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: elastic#44399
@tvernum tvernum mentioned this pull request Jul 29, 2019
Merged
tvernum added a commit that referenced this pull request Jul 30, 2019
@tvernum
Fix broken short-circuit in getUnlicensedRealms (#44937)
f575370 
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
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Jul 30, 2019
@tvernum
Fix broken short-circuit in getUnlicensedRealms
827a9f8 
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: elastic#44399
@tvernum tvernum mentioned this pull request Jul 30, 2019
Merged
tvernum added a commit that referenced this pull request Jul 31, 2019
@tvernum
Fix broken short-circuit in getUnlicensedRealms (#44993)
ae03812 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bizybot bizybot bizybot approved these changes

Assignees
No one assigned
Labels
>bug :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) v7.3.1 v7.4.0 v8.0.0-alpha1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tvernum @elasticmachine @bizybot @jpountz @jakelandis