fix_auth now handles recursive settings #18631
Merged
Conversation
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
|
carbonin
reviewed
Apr 5, 2019
| @@ -20,13 +20,14 @@ def walk(settings, path = [], &block) | |||
| key_path = path.dup << key | |||
|
|
|||
| yield key, value, key_path, settings | |||
| next if key == settings || value == settings | |||
There was a problem hiding this comment.
How would the key equal the settings object? And would that even lead to this recursion behavior?
There was a problem hiding this comment.
ok. you win. I got in examples on all 3 of these cases.
|
|
||
| case value | ||
| when settings.class | ||
| walk(value, key_path, &block) | ||
| when Array | ||
| value.each_with_index do |v, i| | ||
| walk(v, key_path.dup << i, &block) if v.kind_of?(settings.class) | ||
| walk(v, key_path.dup << i, &block) if v.kind_of?(settings.class) && v != settings |
There was a problem hiding this comment.
Can you add a test for this case? I don't think the one below covers it.
situation: 1. For one customer, miq_request_tasks has an options hash with recursive values. 2. fix_auth recurses all the options looking for passwords to convert before: it recurses forever after: it now detects the recursion and does not go forever NOTE: this only detects very simple recursive cases. https://bugzilla.redhat.com/show_bug.cgi?id=1696237
kbrock
force-pushed
the
recursive_passwords
branch
from
a77c17c to
2eabc44
Compare
|
Checked commit kbrock@2eabc44 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 spec/lib/vmdb/settings_spec.rb
|
carbonin
approved these changes
Apr 5, 2019
simaishi
pushed a commit
that referenced
this pull request
Apr 22, 2019
fix_auth now handles recursive settings (cherry picked from commit 365c1a0) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1702072
|
Hammer backport details: |
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.
situation:
miq_request_taskshas anoptionshash with recursive values.fix_authrecurses all theoptionslooking for passwords to convert.before
it recurses forever
after
it now detects the recursion and does not go forever
NOTE: this only detects very simple recursive cases.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1696237
(Review spec with ignore whitespace may be easier to view)