-
Notifications
You must be signed in to change notification settings - Fork 24.3k
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
Validate monitoring username at parse time #47821
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
db0b648
validate AUTH_USERNAME at parse time
danhermann f748f8c
add comment to empty method
danhermann b785a26
Merge branch 'master' into 47711_auth_username
elasticmachine b3a369a
improve validation error message
danhermann 8ad9d62
Merge branch 'master' into 47711_auth_username
elasticmachine 3aca46d
fix unit test
danhermann 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -177,7 +177,46 @@ public Iterator<Setting<?>> settings() { | |
*/ | ||
public static final Setting.AffixSetting<String> AUTH_USERNAME_SETTING = | ||
Setting.affixKeySetting("xpack.monitoring.exporters.","auth.username", | ||
(key) -> Setting.simpleString(key, Property.Dynamic, Property.NodeScope, Property.Filtered)); | ||
(key) -> Setting.simpleString( | ||
key, | ||
new Setting.Validator<String>() { | ||
@Override | ||
public void validate(String password) { | ||
|
||
} | ||
|
||
@Override | ||
public void validate(String username, Map<Setting<?>, Object> settings) { | ||
final String namespace = | ||
HttpExporter.AUTH_USERNAME_SETTING.getNamespace( | ||
HttpExporter.AUTH_USERNAME_SETTING.getConcreteSetting(key)); | ||
final String password = | ||
(String) settings.get(AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(namespace)); | ||
|
||
// password must be specified along with username for any auth | ||
if (Strings.isNullOrEmpty(username) == false) { | ||
if (Strings.isNullOrEmpty(password)) { | ||
throw new SettingsException( | ||
"[" + AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(namespace).getKey() + "] without [" + | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we have a more explicit message? This is something a user sees that must be acted upon. Perhaps something for the form "XXX is set but YYY is missing" |
||
AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(namespace).getKey() + "]"); | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public Iterator<Setting<?>> settings() { | ||
final String namespace = | ||
HttpExporter.AUTH_USERNAME_SETTING.getNamespace( | ||
HttpExporter.AUTH_USERNAME_SETTING.getConcreteSetting(key)); | ||
final List<Setting<?>> settings = List.of( | ||
HttpExporter.AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(namespace)); | ||
return settings.iterator(); | ||
} | ||
|
||
}, | ||
Property.Dynamic, | ||
Property.NodeScope, | ||
Property.Filtered)); | ||
/** | ||
* Password for basic auth. | ||
*/ | ||
|
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
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.
nit: comment to why empty