Invert license security disabled helper method #54043
Merged
Conversation
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
Xpack license state contains a helper method to determine whether security is disabled due to license level defaults. Most code needs to know whether security is enabled, not disabled, but this method exists so that the security being explicitly disabled can be distinguished from licence level defaulting to disabled. However, in the case that security is explicitly disabled, the handlers in question are never registered, so security is implicitly not disabled explicitly, and thus we can share a single method to know whether licensing is enabled.
rjernst
added
>refactoring
:Security/License
Collaborator
|
Pinging @elastic/es-security (:Security/License) |
tvernum
approved these changes
Mar 25, 2020
Contributor
tvernum
left a comment
tvernum
left a comment
There was a problem hiding this comment.
LGTM, subject to the 2 comments below.
| } | ||
| } else if (SECURITY_ACTION_MATCHER.test(action)) { | ||
| if (licenseState.isSecurityDisabledByLicenseDefaults()) { | ||
| if (licenseState.isSecurityEnabled()) { |
Contributor
There was a problem hiding this comment.
This one looks to be backwards.
Suggested change
| if (licenseState.isSecurityEnabled()) { | |
| if (licenseState.isSecurityEnabled() == false) { |
| // FIPS 140 | ||
| assertThat(source.getValue("fips_140.enabled"), is(fips140Enabled)); | ||
| } else { | ||
| if (explicitlyDisabled) { |
Contributor
There was a problem hiding this comment.
I don't follow how this works. We don't seem to configure the value security.enabled based on explicitlyDisabled.
Member
Author
There was a problem hiding this comment.
Oops you're right, I need to explicitly set the settings as well since SecurityUsageTransportAction checks it as well.
rjernst
added a commit
that referenced
this pull request
Mar 26, 2020
This was a bug in #54043, where the logic for security being enabled needs to be combined with it not being explicitly disabled.
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Mar 26, 2020
Xpack license state contains a helper method to determine whether security is disabled due to license level defaults. Most code needs to know whether security is enabled, not disabled, but this method exists so that the security being explicitly disabled can be distinguished from licence level defaulting to disabled. However, in the case that security is explicitly disabled, the handlers in question are never registered, so security is implicitly not disabled explicitly, and thus we can share a single method to know whether licensing is enabled.
rjernst
added a commit
that referenced
this pull request
Mar 26, 2020
Xpack license state contains a helper method to determine whether security is disabled due to license level defaults. Most code needs to know whether security is enabled, not disabled, but this method exists so that the security being explicitly disabled can be distinguished from licence level defaulting to disabled. However, in the case that security is explicitly disabled, the handlers in question are never registered, so security is implicitly not disabled explicitly, and thus we can share a single method to know whether licensing is enabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Xpack license state contains a helper method to determine whether
security is disabled due to license level defaults. Most code needs to
know whether security is enabled, not disabled, but this method exists
so that the security being explicitly disabled can be distinguished from
licence level defaulting to disabled. However, in the case that security
is explicitly disabled, the handlers in question are never registered,
so security is implicitly not disabled explicitly, and thus we can share
a single method to know whether licensing is enabled.