Fix Chef 12 oc_id regression #1244
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
|
Depends on chef/omniauth-chef#16 |
The upgrade of oc_id to Chef 12 in commit 6824d90 introduced 2 issues: (1) Incorrect arguments to ServrAPI.new (2) A change in ssl verification behavior This commit - Fixes issue (1), - Make the ssl_verify_mode configurable - Updates omniauth-chef to a version that contains similar fixes. * SSL Verify Mode The ssl verify mode has been set to verify_none. This isn't a behavior change from previous versions since this was the default in the old version of Chef we were previously pinned to. Because we want to talk to oc_id via 'localhost' to avoid cross-node requests, changing this to verify_peer is problematic since, even if we did the work to add /var/opt/opscode/nginx/ca (or the user-provided cert location) to the trusted_cert_dir, the cert would likely still mismatch since in the common case such certs ar for the `api_fqdn` and not "localhost". Signed-off-by: Steven Danna <[email protected]>
stevendanna
force-pushed
the
ssd/POOL-581
branch
from
90afe6a to
dea47e8
Compare
marcparadise
previously requested changes
Apr 27, 2017
src/oc-id/Gemfile
Outdated
| gem 'sentry-raven' | ||
| gem 'responders', '~> 2.0' | ||
| gem 'newrelic_rpm' | ||
| gem 'doorkeeper', '~> 1.4.0' | ||
|
|
||
| gem 'veil', git: 'https://github.com/chef/chef_secrets' | ||
| gem 'omniauth-chef', git: 'https://github.com/chef/omniauth-chef' | ||
| gem 'omniauth-chef', git: 'https://github.com/chef/omniauth-chef', branch: 'ssd/POOL-581' |
stevendanna
commented
Apr 27, 2017
| context "GET /id/v1/status" do | ||
| it "retuns 200" do | ||
| get(request_url, platform.superuser).should look_like({:status => 200, | ||
| :body => {}}) |
There was a problem hiding this comment.
I think we meant for this to be checking against good_status
Signed-off-by: Steven Danna <[email protected]>
stevendanna
force-pushed
the
ssd/POOL-581
branch
from
dea47e8 to
868b002
Compare
|
@chef/chef-server-maintainers Ready for review. |
Signed-off-by: Steven Danna <[email protected]>
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 upgrade of oc_id to Chef 12 in commit
6824d90
introduced 2 issues:
(1) Incorrect arguments to ServrAPI.new
(2) A change in ssl verification behavior
This commit
The ssl verify mode has been set to verify_none. This isn't a behavior
change from previous versions since this was the default in the old
version of Chef we were previously pinned to.
Because we want to talk to oc_id via 'localhost' to avoid cross-node
requests, changing this to verify_peer is problematic since, even if
we did the work to add /var/opt/opscode/nginx/ca (or the user-provided
cert location) to the trusted_cert_dir, the cert would likely still
mismatch since in the common case such certs ar for the
api_fqdnandnot "localhost".