Add secure setting for watcher email password#31620
Merged
hub-cap merged 5 commits intoelastic:masterfrom Jul 13, 2018
Merged
Conversation
Other watcher actions already account for secure settings in their sensitive settings, whereas the email sending action did not. This adds the ability to optionally set a secure_password for email accounts.
Collaborator
|
Pinging @elastic/es-core-infra |
spinscale
requested changes
Jul 5, 2018
Contributor
spinscale
left a comment
spinscale
left a comment
There was a problem hiding this comment.
can you add a test as well?
| @@ -232,7 +254,10 @@ static Properties loadSmtpProperties(Settings settings) { | |||
| settings = builder.build(); | |||
| Properties props = new Properties(); | |||
| for (String key : settings.keySet()) { | |||
Contributor
There was a problem hiding this comment.
how about using settings.filter(s -> s.startsWith("_secure") == false).keySet()?
| * Finds a setting, and then a secure setting if the setting is null, or returns null if one does not exist. This differs | ||
| * from other getSetting calls in that it allows for null whereas the other methods throw an exception. | ||
| */ | ||
| private static String getNullableSetting(String settingName, Settings settings, Setting<SecureString> secureSetting) { |
Contributor
There was a problem hiding this comment.
the name is not too descriptive but I dont have a good alternative at the moment either
Contributor
Author
There was a problem hiding this comment.
yea was only cuz the other classes have a method like this called getSetting that throws up on null :)
| port = settings.getAsInt("port", settings.getAsInt("localport", settings.getAsInt("local_port", 25))); | ||
| user = settings.get("user", settings.get("from", null)); | ||
| String passStr = settings.get("password", null); | ||
| String passStr = getNullableSetting(SMTP_PASSWORD, settings, SECURE_PASSWORD_SETTING); |
Contributor
There was a problem hiding this comment.
how about storing the password as a SecureString and have getNullableSettings return SecureString as well?
Contributor
Author
|
test added @spinscale |
spinscale
approved these changes
Jul 11, 2018
Contributor
spinscale
left a comment
spinscale
left a comment
There was a problem hiding this comment.
LGTM. can you add the commit line to sth like Watcher: Allow email account passwords to be a secure setting
| public class Account { | ||
|
|
||
| static final String SMTP_PROTOCOL = "smtp"; | ||
| static final String SMTP_PASSWORD = "password"; |
hub-cap
added a commit
that referenced
this pull request
Jul 13, 2018
Other watcher actions already account for secure settings in their sensitive settings, whereas the email sending action did not. This adds the ability to optionally set a secure_password for email accounts.
dnhatn
added a commit
that referenced
this pull request
Jul 13, 2018
* 6.x: Watcher: Make settings reloadable (#31746) [Rollup] Histo group config should support scaled_floats (#32048) lazy snapshot repository initialization (#31606) Add secure setting for watcher email password (#31620) Watcher: cleanup ensureWatchExists use (#31926) Add second level of field collapsing (#31808) Added lenient flag for synonym token filter (#31484) (#31970) Test: Fix a second case of bad watch creation [Rollup] Use composite's missing_bucket (#31402) Docs: Restyled cloud link in getting started Docs: Change formatting of Cloud options Re-instate link in StringFunctionUtils javadocs Correct spelling of AnalysisPlugin#requriesAnalysisSettings (#32025) Fix problematic chars in javadoc [ML] Move open job failure explanation out of root cause (#31925) [ML] Switch ML native QA tests to use a 3 node cluster (#32011)
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.
Other watcher actions already account for secure settings in their
sensitive settings, whereas the email sending action did not. This adds
the ability to optionally set a secure_password for email accounts.