intermediate work on #159 #172
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
From @bhunut-adobe: adding keyring and using it to get ldap passwords from the Windows credential manager.
* allow specifying private key data in UMAPI config, using `priv_key_data` config setting (requires the YAML `|` convention with indented PEM key data on following lines) * get LDAP password from keyring, using `secure_password_key` config setting * get UMAPI client secret from keyring, using `secure_client_secret_key` config setting * get UMAPI private key data from keyring, using `secure_priv_key_data_key` config setting * remove the credential manager * clean up conventions around if parens and None comparisons in config.py * get rid of all PEP8 style warnings in config.py and the directory modules.
phil-levy
approved these changes
May 1, 2017
Contributor
phil-levy
left a comment
phil-levy
left a comment
There was a problem hiding this comment.
I think api_key should be considered a secure value for umapi access also.
* Add get_credential accessor to DictConfig, and integrate all use of keyring there. * Refactor ldap and umapi connectors to use get_credential. * move to consistent naming of connector configs. * catch a duplicated function definition in umapi connector.
* added a counter to the excluded_stray case in rules.py * while I was there, cleaned up all PEP 8 style warnings (mostly redundant parentheses and better comparisons with None). * make the umapi api_key setting a credential (a 1-line change, thanks to the refactoring done in my last commit! :)
Contributor
Author
|
I've made api_key into a credential as per review. (Thanks to the refactoring, this was a 1-line change.) I also found and fixed a bug (#173) while I was testing the change. @phil-levy I would appreciate a second review of the later commits. |
phil-levy
approved these changes
May 2, 2017
Contributor
phil-levy
left a comment
phil-levy
left a comment
There was a problem hiding this comment.
Looks good. Refactor makes reading much easier.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The work on #159 will be in two pieces:
This PR is for the first bullet. It removes the notion of an external credential manager class and instead integrates the use of
keyringdirectly into the directory connectors. It also cleans up a lot of PEP8 style violations and puts a bunch of extra parens inifstatements and rewritesNonecomparisons into their correct form.I am submitting this PR to get some code review in advance of the second change, but in addition I wanted to let @phil-levy get started on the documentation. So I have emailed an encrypted ZIP file to all reviewers (as well as the password) that has configuration files with live (Adobe-internal) credentials in all the different ways you can specify them.