omniauth-chef 0.1.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0bbedb2dab18096a3380d45c56397dbe02ede3db
-  data.tar.gz: 6e47f5491a174804b08a648adbc574570a4a4b33
+SHA256:
+  metadata.gz: 2598a4b153d54f1fe207a2ad9c9703a0e8e68558120d28d523cd8f2b9aa65017
+  data.tar.gz: 4eddfaf9edd36bad38ec5097f02c931f7add9acc96b9f97e0046f18c3d9263ee
 SHA512:
-  metadata.gz: b03505fa1200a3279e091ec2d2521fb5178f3c54cc31286523ee8f279c765f4afb1f27c2ca6a859c36edcd07c8476df61cf3f4fe2d4e56ae7218592d843bfbff
-  data.tar.gz: 518fc063878b8ef59403e201ba068a81926bc81d57772b56638262edc78ff1ba3d0547f25bb4a1a2ab3c81938f1b3004a845f57312b4d4575c0e4f912a544c89
+  metadata.gz: dfc95e35ae4a02ee6f6a46d91f2dabe13eff3dff423a2d35050f8b412781fd2d4933f05613b3264a06ae0808fc42dd861777ab3f0b43fa80795e125872d4af49
+  data.tar.gz: fb45ed24e9347dcc71eab6ad833a3258e138c5321ed856333c2ff66ac9edbace455b8d0fcf1513d628d91a43e3960132fd95fbfbebb635869a027ccd302b4b53

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/lib/omniauth-chef.rb

@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 require 'omniauth-chef/version'
-
 require 'omniauth/strategies/chef'

data/lib/omniauth-chef/version.rb

@@ -13,10 +13,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 module OmniAuth
   module Chef
-    VERSION = '0.1.0'
+    VERSION = "0.4.1"
   end
 end

data/lib/omniauth/strategies/chef.rb

@@ -13,9 +13,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 require 'chef'
+require 'chef/config'
 require 'omniauth'
 
 module OmniAuth
@@ -24,6 +24,7 @@ module OmniAuth
       include OmniAuth::Strategy
 
       option :endpoint,     'https://api.opscode.piab'
+      option :ssl_verify_mode, :verify_peer
       option :fields,       [:name, :password]
       option :headers,      { }
       option :organization, nil
@@ -31,6 +32,7 @@ module OmniAuth
       option :source,       'web'
       option :superuser,    'pivotal'
       option :key_path,     '../../../../config/webui_priv.pem'
+      option :key_data,     nil
       option :uid,          :name
 
       def callback_phase
@@ -60,7 +62,17 @@ module OmniAuth
 
       def authenticated_user
         begin
-          chef.post_rest(resource, username: username, password: password)['user']
+          uname = username
+          # Check if username is email
+          if (uname.include?('@'))
+            users = chef.get_rest(
+              "users?#{{ email: username }.to_query}"
+            )
+            if (users.length > 0)
+              uname = users.first[0]
+            end
+          end
+          chef.post_rest(resource, username: uname, password: password)['user']
         rescue Net::HTTPServerException
 
         end
@@ -71,7 +83,8 @@ module OmniAuth
       end
 
       def chef
-        ::Chef::REST.new endpoint, options.superuser, nil, parameters
+        ::Chef::Config.ssl_verify_mode options.ssl_verify_mode.to_sym
+        ::Chef::ServerAPI.new endpoint, parameters
       end
 
       def endpoint
@@ -83,7 +96,7 @@ module OmniAuth
       end
 
       def key
-        IO.read(File.expand_path(options.key_path, __FILE__)).strip
+        options.key_data || IO.read(File.expand_path(options.key_path, __FILE__)).strip
       end
 
       def organization
@@ -91,7 +104,10 @@ module OmniAuth
       end
 
       def parameters
-        { headers: headers, raw_key: key }
+        { headers: headers,
+          client_name: options.superuser,
+          client_key: nil,
+          raw_key: key }
       end
 
       def password

data/omniauth-chef.gemspec

@@ -9,8 +9,8 @@ require 'omniauth-chef/version'
 Gem::Specification.new do |spec|
   spec.name        = 'omniauth-chef'
   spec.version     = OmniAuth::Chef::VERSION
-  spec.authors     = ['Allen Goodman']
-  spec.email       = %q(a@getchef.com)
+  spec.authors     = ['James Casey', 'Allen Goodman']
+  spec.email       = %q(james@getchef.com a@getchef.com)
   spec.description = %q{OmniAuth strategy for Chef}
   spec.summary     = %q{OmniAuth strategy for Chef}
   spec.homepage    = 'https://github.com/opscode/oc_actionlog'
@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
 
   spec.test_files = Dir.glob 'spec/**/*.rb'
 
-  spec.require_paths = Dir.glob 'lib/**/*.rb'
+  spec.require_paths = %w(lib)
 
-  spec.add_development_dependency 'bundler',   '~>  1.5'
-  spec.add_development_dependency 'rack-test', '~>  0'
-  spec.add_development_dependency 'rake',      '~> 10'
-  spec.add_development_dependency 'rspec',     '~>  2'
+  spec.add_development_dependency 'guard-rspec', '~>  4.2'
+  spec.add_development_dependency 'rack-test',   '~> 1'
+  spec.add_development_dependency 'rake',        '~> 13'
+  spec.add_development_dependency 'rspec',       '~> 3'
 
-  spec.add_runtime_dependency 'chef',     '~> 11'
-  spec.add_runtime_dependency 'omniauth', '~>  1.2'
+  spec.add_runtime_dependency 'chef',     '~> 17'
+  spec.add_runtime_dependency 'omniauth', '~> 2.0', '>= 2.0.4' # required for CVE-2015-9284
 end

data/spec/omniauth/strategies/chef_spec.rb

@@ -14,10 +14,82 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Chef do
+  subject do
+    OmniAuth::Strategies::Chef.new({})
+  end
+
+  context 'options' do
+    describe 'option :endpoint' do
+      context 'default: https://api.opscode.piab' do
+        it do
+          expect(subject.options.endpoint).to eq('https://api.opscode.piab')
+        end
+      end
+    end
+
+    describe 'option :fields' do
+      context 'default: [:name, :password]' do
+        it { expect(subject.options.fields).to eq([:name, :password]) }
+      end
+    end
+
+    describe 'option :headers' do
+      context 'default: { }' do
+        it { expect(subject.options.headers).to eq({ }) }
+      end
+    end
+
+    describe 'option :organization' do
+      context 'default: nil' do
+        it { expect(subject.options.organization).to eq(nil) }
+      end
+    end
+
+    describe 'option :resource' do
+      context 'default: authenticate_user' do
+        it { expect(subject.options.resource).to eq('authenticate_user') }
+      end
+    end
+
+    describe 'option :source' do
+      context 'default: web' do
+        it { expect(subject.options.source).to eq('web') }
+      end
+    end
+
+    describe 'option :superuser' do
+      context 'default: pivotal' do
+        it { expect(subject.options.superuser).to eq('pivotal') }
+      end
+    end
+
+    describe 'option :key_path' do
+      context 'default: ../../../../config/webui_priv.pem' do
+        it do
+          default_key_path = '../../../../config/webui_priv.pem'
+
+          expect(subject.options.key_path).to eq(default_key_path)
+        end
+      end
+    end
+
+    describe 'option :key_data' do
+      context 'default: nil' do
+        it do
+          expect(subject.options.key_data).to eq(nil)
+        end
+      end
+    end
+
 
+    describe 'option :uid' do
+      context ':name' do
+        it { expect(subject.options.uid).to eq(:name) }
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 $:.unshift File.expand_path '..', __FILE__
 

metadata

@@ -1,101 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-chef
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.1
 platform: ruby
 authors:
+- James Casey
 - Allen Goodman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '17'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 description: OmniAuth strategy for Chef
-email: a@getchef.com
+email: james@getchef.com a@getchef.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,9 +123,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib/omniauth/strategies/chef.rb
-- lib/omniauth-chef/version.rb
-- lib/omniauth-chef.rb
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,11 +135,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Chef
 test_files:
-- spec/omniauth/strategies/chef_spec.rb
 - spec/spec_helper.rb
+- spec/omniauth/strategies/chef_spec.rb