Recompute active realms when license changes#76592
Merged
tvernum merged 3 commits intoelastic:masterfrom Aug 17, 2021
Merged
Conversation
This commit changes the implementation of the Realms class to listen for license changes, and recompute the set of actively licensed realms only when the license changes rather than each time the "asList" method is called. This is primarily a performance optimisation, but it also allows us to turn off the "in use" license tracking for realms when they are disabled by a change in license. Relates: elastic#76476
Collaborator
|
Pinging @elastic/es-security (Team:Security) |
Contributor
Author
|
|
Contributor
Author
|
@elasticmachine run elasticsearch-ci/docs |
ywangd
approved these changes
Aug 17, 2021
Member
ywangd
left a comment
There was a problem hiding this comment.
LGTM
This is probably paranoid: What if the call to license update listener fails or crashes? Is it worth to think about how Realms could correctly itself eventually in this edge case?
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
Outdated
Show resolved
Hide resolved
Comment on lines
+233
to
+240
| realms = spy(new TestRealms(Settings.EMPTY, TestEnvironment.newEnvironment(settings), | ||
| Map.of(FileRealmSettings.TYPE, config -> mock(FileRealm.class), NativeRealmSettings.TYPE, config -> mock(NativeRealm.class)), | ||
| licenseState, threadContext, reservedRealm, Arrays.asList(firstRealm, secondRealm), | ||
| Collections.singletonList(firstRealm))); | ||
| Arrays.asList(firstRealm))); | ||
|
|
||
| // Needed because this is calculated in the constructor, which means the override doesn't get called correctly | ||
| realms.recomputeActiveRealms(); | ||
| assertThat(realms.asList(), contains(firstRealm, secondRealm)); |
Member
There was a problem hiding this comment.
This subclass and spy are getting rather complicated than their worth. What prevents us from replacing them with a simple mock?
Contributor
Author
There was a problem hiding this comment.
Probably nothing, but it wasn't a task I had time to undertake in this round of changes.
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java
Outdated
Show resolved
Hide resolved
Comment on lines
+164
to
+166
| private static boolean isBasicLicensedRealm(String type) { | ||
| return ReservedRealm.TYPE.equals(type) || InternalRealms.isBuiltinRealm(type); | ||
| } |
Member
There was a problem hiding this comment.
This can be a separate PR: It would be great if we could consolidate these predicate methods, e.g. isBuiltinRealm, isStandardRealm and isBasicLicensedRealm, ReservedRealm.TYPE.equals(type). A consistent naming convention is also helpful.
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Aug 17, 2021
This commit changes the implementation of the Realms class to listen for license changes, and recompute the set of actively licensed realms only when the license changes rather than each time the "asList" method is called. This is primarily a performance optimisation, but it also allows us to turn off the "in use" license tracking for realms when they are disabled by a change in license. Backport of: elastic#76592
tvernum
added a commit
that referenced
this pull request
Aug 18, 2021
This commit changes the implementation of the Realms class to listen for license changes, and recompute the set of actively licensed realms only when the license changes rather than each time the "asList" method is called. This is primarily a performance optimisation, but it also allows us to turn off the "in use" license tracking for realms when they are disabled by a change in license. Backport of: #76592
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit changes the implementation of the Realms class to listen
for license changes, and recompute the set of actively licensed realms
only when the license changes rather than each time the "asList" method
is called.
This is primarily a performance optimisation, but it also allows us to
turn off the "in use" license tracking for realms when they are
disabled by a change in license.
Relates: #76476