-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
Fixes unauthorized error in es datasources #24624
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c7d5f38
Fixes check for security plugin
cqliu1 774e8e5
Merge branch 'master' into fix/esdocs-auth-error
cqliu1 86dad63
Cleaned up security check logic. Fixed tests for create_handlers. Add…
cqliu1 dea410c
Updated comment
cqliu1 8efc212
Added tests
cqliu1 c401739
Updated variable names
cqliu1 7c6d705
Merge branch 'master' into fix/esdocs-auth-error
cqliu1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
export const isSecurityEnabled = server => { | ||
const securityPlugin = server.plugins.security; | ||
const xpackInfo = server.plugins.xpack_main.info; | ||
|
||
return ( | ||
securityPlugin && | ||
xpackInfo.isAvailable() && | ||
xpackInfo.feature('security').isEnabled() && | ||
!xpackInfo.license.isOneOf('basic') | ||
); | ||
}; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious, is this really required? Won't
xpackInfo.feature('security').isEnabled()
be false if the license is wrong?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So if you run elasticsearch with a basic license and
xpack.security.enabled: true
,server.xpack_main.feature('security').isEnabled()
will be true, butserver.xpack_main.feature('security').isAvailable()
will be false. Instead of checking the license, I can checkisAvailable()
, but I do need both checks in case for the case I mentioned above and if you have a non-basic license but have security disabled.