-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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 password at parse time #47740
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
18c075d
Validate AUTH_PASSWORD_SETTING at parse time
danhermann 659f754
add settings iterator, fix unit tests
danhermann 8307e2b
add comment for empty validation method
danhermann a65a823
change exception class
danhermann be39fbd
Merge branch 'master' into 47711_auth_password
elasticmachine 4577ab7
remove unused import
danhermann 0470b37
Merge branch '47711_auth_password' of https://github.com/danhermann/e…
danhermann bf95a3e
Merge branch 'master' into 47711_auth_password
elasticmachine 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 |
---|---|---|
|
@@ -183,7 +183,45 @@ public Iterator<Setting<?>> settings() { | |
*/ | ||
public static final Setting.AffixSetting<String> AUTH_PASSWORD_SETTING = | ||
Setting.affixKeySetting("xpack.monitoring.exporters.","auth.password", | ||
(key) -> Setting.simpleString(key, Property.Dynamic, Property.NodeScope, Property.Filtered)); | ||
(key) -> Setting.simpleString(key, | ||
new Setting.Validator<String>() { | ||
@Override | ||
public void validate(String password) { | ||
// no password validation that is independent of other settings | ||
} | ||
|
||
@Override | ||
public void validate(String password, Map<Setting<?>, Object> settings) { | ||
final String namespace = | ||
HttpExporter.AUTH_PASSWORD_SETTING.getNamespace( | ||
HttpExporter.AUTH_PASSWORD_SETTING.getConcreteSetting(key)); | ||
final String username = | ||
(String) settings.get(AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(namespace)); | ||
|
||
// username is required for any auth | ||
if (Strings.isNullOrEmpty(username)) { | ||
if (Strings.isNullOrEmpty(password) == false) { | ||
throw new IllegalArgumentException( | ||
"[" + AUTH_PASSWORD_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. should the test assert this message is in the error too ? 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. NMVD I see it now .. it already did. sorry for the noise. |
||
AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(namespace).getKey() + "]"); | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public Iterator<Setting<?>> settings() { | ||
final String namespace = | ||
HttpExporter.AUTH_PASSWORD_SETTING.getNamespace( | ||
HttpExporter.AUTH_PASSWORD_SETTING.getConcreteSetting(key)); | ||
final List<Setting<?>> settings = List.of( | ||
HttpExporter.AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(namespace)); | ||
return settings.iterator(); | ||
} | ||
|
||
}, | ||
Property.Dynamic, | ||
Property.NodeScope, | ||
Property.Filtered)); | ||
/** | ||
* The SSL settings. | ||
* | ||
|
@@ -574,17 +612,6 @@ private static CredentialsProvider createCredentialsProvider(final Config config | |
final String username = AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings()); | ||
final String password = AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings()); | ||
|
||
// username is required for any auth | ||
if (Strings.isNullOrEmpty(username)) { | ||
if (Strings.isNullOrEmpty(password) == false) { | ||
throw new SettingsException( | ||
"[" + AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(config.name()).getKey() + "] without [" + | ||
AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(config.name()).getKey() + "]"); | ||
} | ||
// nothing to configure; default situation for most users | ||
return null; | ||
} | ||
|
||
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); | ||
credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password)); | ||
|
||
|
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.
Don't we need similar validation in AUTH_USERNAME_SETTING? Otherwise we could have username exist but no password?
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.
@rjernst, that validation was added in #47821.
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.
Ah ok, thanks. i guess this PR is out of date with master?