Disable Look up Group for Amazon, Database and External with SAML #3881
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
ZitaNemeckova
force-pushed
the
fix_group_lookup
branch
from
594969f to
9b661c0
Compare
jvlcek
reviewed
May 2, 2018
| @@ -1,6 +1,9 @@ | |||
| - if @edit | |||
| - url = url_for_only_path(:action => 'rbac_group_field_changed', :id => (@edit[:group_id] || "new")) | |||
| - combo_url = "/ops/rbac_group_field_changed/#{@edit[:group_id] || 'new'}" | |||
| - amazon_authentication = ::Settings.authentication.mode.casecmp('amazon') == 0 | |||
| - database_authentication = ::Settings.authentication.mode.casecmp('database') == 0 | |||
| - ext_auth_with_saml = ::Settings.authentication.mode.casecmp("httpd") == 0 && ::Settings.authentication.saml_enabled | |||
There was a problem hiding this comment.
@ZitaNemeckova Thank you for putting this together.
I have a suggestion that might simplify the code.
Group lookup is only supported when:
- mode is either ldap or ldaps
- mode is httpd and saml is not enabled
So maybe something like this ruby-ish pseudo code would be better:
mode = ::Settings.authentication.mode
saml_enabled = ::Settings.authentication.saml_enabled
can_lookup_groups = false
can_lookup_groups = mode.downcase.start_with?('ldap')
can_lookup_groups = mode.downcase == "httpd" && ! saml_enabled unless can_lookup_groupsThen the check below changes from:
- if !amazon_authentication && !database_authentication && !ext_auth_with_saml
+ if can_lookup_groupsHope this helps! JoeV
There was a problem hiding this comment.
@jvlcek Thanks, looks way better 👍
ZitaNemeckova
force-pushed
the
fix_group_lookup
branch
from
9b661c0 to
355c99c
Compare
|
Checked commits ZitaNemeckova/manageiq-ui-classic@7f63e7b~...355c99c with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
|
👍 Nice @ZitaNemeckova Thank you. LGTM |
|
@mzazrivec please review/merge, thanks :) |
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.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1440209
Instructions from BZ:
How to reproduce:
Configuration -> Settings -> select Current Server -> Authentication -> Mode -> set to
Amazon/Database/ExternalwithSAMLenabledConfiguration -> Access Control -> Create a new Group
Before:
After:
@miq-bot add_label bug, gaprindashvili/yes, fine/yes, euwe/yes