mixlib-authentication 2.1.0 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5824d5178ca85fc7eb82bbd0699c21d0a3ddbbc97c9b41d78c24c6dd78af11
-  data.tar.gz: 522ee0cc91c67a8c824dc25d7d605cfd833f9c5c636435787cdfe8f0bc67d7b2
+  metadata.gz: f961b487a4404bf999dd791952f784401e7eaf4a36eecdac52874ba9d9997a1a
+  data.tar.gz: 6ee8efc92cc33d7b7f94895f551877d362c38901a065360ca451db372072f31d
 SHA512:
-  metadata.gz: c1843f8908adb974f06173dc2a9bfc97a5b18fe11be4bbf8769c9e2af716e0cc259e275b5b2b00aa41b9d442f9e2e1f2fc8e111d5f46645e8e7544a3e8b44933
-  data.tar.gz: c8b6d61be5b2e9c8db0d6527f94c8ef347fbcc8aa08735dc0f00b10f82a90687a71a4058f1489a805b19ce296c1ae8f9bd7b1981e24fbac1c4ef6e9fe04ea742
+  metadata.gz: 8719fbb1220d6df7d0ac0bef161eddcefa032333bad5f00221324658b8609b0e898912423d9a6a6c4cee937c63ecda581cd08e0fe932d3f113c2e0cf409bd439
+  data.tar.gz: 54371b49adc7c04b5511fd16066287d142e01ee9248aa7d30f8074b147b1d7cf4074639d9e007eff92b4e695cd70c8a4b25e3015fa35fdc1af8a4392ac10d105

data/lib/mixlib/authentication.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Christopher Brown (<cb@chef.io>)
+# Copyright:: Copyright (c) 2009-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 
 module Mixlib
   module Authentication
-    DEFAULT_SERVER_API_VERSION = "0"
+    DEFAULT_SERVER_API_VERSION = "0".freeze
 
     attr_accessor :logger
     module_function :logger, :logger=
@@ -36,7 +36,7 @@ module Mixlib
       require "mixlib/log"
       Mixlib::Authentication::Log.extend(Mixlib::Log)
     rescue LoadError
-      require "mixlib/authentication/null_logger"
+      require_relative "authentication/null_logger"
       Mixlib::Authentication::Log.extend(Mixlib::Authentication::NullLogger)
     end
 

data/lib/mixlib/authentication/digester.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Christopher Brown (<cb@chef.io>)
+# Copyright:: Copyright (c) 2009-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require "mixlib/authentication"
-require "openssl"
+require_relative "../authentication"
+require "openssl" unless defined?(OpenSSL)
 
 module Mixlib
   module Authentication

data/lib/mixlib/authentication/http_authentication_request.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright (c) 2010-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 
-require "mixlib/authentication"
+require_relative "../authentication"
 
 module Mixlib
   module Authentication
     class HTTPAuthenticationRequest
 
-      MANDATORY_HEADERS = [:x_ops_sign, :x_ops_userid, :x_ops_timestamp, :host, :x_ops_content_hash]
+      MANDATORY_HEADERS = %i{x_ops_sign x_ops_userid x_ops_timestamp host x_ops_content_hash}.freeze
 
       attr_reader :request
 

data/lib/mixlib/authentication/signatureverification.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
+# Author:: Christopher Brown (<cb@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Copyright:: Copyright (c) 2009-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-require "net/http"
-require "forwardable"
-require "mixlib/authentication"
-require "mixlib/authentication/http_authentication_request"
-require "mixlib/authentication/signedheaderauth"
+require "net/http" unless defined?(Net::HTTP)
+require "forwardable" unless defined?(Forwardable)
+require_relative "../authentication"
+require_relative "http_authentication_request"
+require_relative "signedheaderauth"
 
 module Mixlib
   module Authentication
@@ -203,7 +203,7 @@ module Mixlib
           # No file_param; we're running in Merb, or it's just not there..
           if file_param.nil?
             hash_param = request.params.values.find { |value| value.respond_to?(:has_key?) } # Hash responds to :has_key? .
-            if !hash_param.nil?
+            unless hash_param.nil?
               file_param = hash_param.values.find { |value| value.respond_to?(:read) } # File/Tempfile responds to :read.
             end
           end

data/lib/mixlib/authentication/signedheaderauth.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Author:: Christopher Walters (<cw@opscode.com>)
-# Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
+# Author:: Christopher Brown (<cb@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Copyright:: Copyright (c) 2009-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-require "time"
-require "base64"
+require "time" unless defined?(Time)
+require "base64" unless defined?(Base64)
 require "openssl/digest"
-require "mixlib/authentication"
-require "mixlib/authentication/digester"
+require_relative "../authentication"
+require_relative "digester"
 
 module Mixlib
   module Authentication
@@ -34,7 +34,7 @@ module Mixlib
         "1.0" => "sha1",
         "1.1" => "sha1",
         "1.3" => "sha256",
-      }.freeze()
+      }.freeze
 
       # Use of SUPPORTED_ALGORITHMS and SUPPORTED_VERSIONS is deprecated. Use
       # ALGORITHM_FOR_VERSION instead
@@ -74,15 +74,14 @@ module Mixlib
       # * `:host`: The host part of the URI
       def self.signing_object(args = {})
         SigningObject.new(args[:http_method],
-                          args[:path],
-                          args[:body],
-                          args[:host],
-                          args[:timestamp],
-                          args[:user_id],
-                          args[:file],
-                          args[:proto_version],
-                          args[:headers]
-                         )
+          args[:path],
+          args[:body],
+          args[:host],
+          args[:timestamp],
+          args[:user_id],
+          args[:file],
+          args[:proto_version],
+          args[:headers])
       end
 
       def algorithm
@@ -109,7 +108,7 @@ module Mixlib
           opts[:sign_version] ||= sign_version
         else
           # Was called like sign(key, 'foo', '1.3', other: 'bar')
-          Mixlib::Authentication.logger.warn("Using deprecated positional arguments for sign(), please update to keyword arguments (from #{caller[1][/^(.*:\d+):in /, 1]})")
+          Mixlib::Authentication.logger.warn("Using deprecated positional arguments for sign(), please update to keyword arguments (from #{caller[1][/^(.*:\d+):in /, 1]})") unless sign_algorithm == algorithm
           opts[:sign_algorithm] ||= sign_algorithm
           opts[:sign_version] ||= sign_version
         end
@@ -175,7 +174,7 @@ module Mixlib
       # ====Parameters
       #
       def canonical_path
-        p = path.gsub(/\/+/, "/")
+        p = path.gsub(%r{/+}, "/")
         p.length > 1 ? p.chomp("/") : p
       end
 
@@ -191,6 +190,7 @@ module Mixlib
         else
           @hashed_body_digest = digest
         end
+
         # Hash the file object if it was passed in, otherwise hash based on
         # the body.
         # TODO: tim 2009-12-28: It'd be nice to just remove this special case,
@@ -283,11 +283,13 @@ module Mixlib
             do_sign_ssh_agent(rsa_key, string_to_sign)
           else
             raise AuthenticationError, "RSA private key is required to sign requests, but a public key was provided" unless rsa_key.private?
+
             rsa_key.sign(digest.new, string_to_sign)
           end
         else
           raise AuthenticationError, "Agent signing mode requires signing protocol version 1.3 or newer" if use_ssh_agent
           raise AuthenticationError, "RSA private key is required to sign requests, but a public key was provided" unless rsa_key.private?
+
           rsa_key.private_encrypt(string_to_sign)
         end
       end
@@ -304,7 +306,7 @@ module Mixlib
       def do_sign_ssh_agent(rsa_key, string_to_sign)
         # First try loading net-ssh as it is an optional dependency.
         begin
-          require "net/ssh"
+          require "net/ssh" unless defined?(Net::SSH)
         rescue LoadError => e
           # ???: Since agent mode is explicitly enabled, should we even catch
           # this in the first place? Might be cleaner to let the LoadError bubble.
@@ -339,25 +341,25 @@ module Mixlib
     # generate a request signature. `SignedHeaderAuth.signing_object()`
     # provides a more convenient interface to the constructor.
     SigningObject = Struct.new(:http_method, :path, :body, :host,
-                                     :timestamp, :user_id, :file, :proto_version,
-                                     :headers) do
+      :timestamp, :user_id, :file, :proto_version,
+      :headers) do
 
-      include SignedHeaderAuth
+        include SignedHeaderAuth
 
-      def proto_version
-        (self[:proto_version] || SignedHeaderAuth::DEFAULT_PROTO_VERSION).to_s
-      end
+        def proto_version
+          (self[:proto_version] || SignedHeaderAuth::DEFAULT_PROTO_VERSION).to_s
+        end
 
-      def server_api_version
-        key = (self[:headers] || {}).keys.select do |k|
-          k.casecmp("x-ops-server-api-version") == 0
-        end.first
-        if key
-          self[:headers][key]
-        else
-          DEFAULT_SERVER_API_VERSION
+        def server_api_version
+          key = (self[:headers] || {}).keys.select do |k|
+            k.casecmp("x-ops-server-api-version") == 0
+          end.first
+          if key
+            self[:headers][key]
+          else
+            DEFAULT_SERVER_API_VERSION
+          end
         end
       end
-    end
   end
 end

data/lib/mixlib/authentication/version.rb

@@ -1,4 +1,5 @@
-# Copyright:: Copyright (c) 2010-2015 Chef Software, Inc.
+#
+# Copyright:: Copyright (c) 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +16,6 @@
 
 module Mixlib
   module Authentication
-    VERSION = "2.1.0"
+    VERSION = "3.0.7".freeze
   end
 end

metadata

@@ -1,96 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-authentication
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.7
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
+date: 2020-08-21 00:00:00.000000000 Z
+dependencies: []
 description: Mixes in simple per-request authentication
 email: info@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE
-- NOTICE
-- README.md
-- Rakefile
 - lib/mixlib/authentication.rb
 - lib/mixlib/authentication/digester.rb
 - lib/mixlib/authentication/http_authentication_request.rb
@@ -98,13 +24,7 @@ files:
 - lib/mixlib/authentication/signatureverification.rb
 - lib/mixlib/authentication/signedheaderauth.rb
 - lib/mixlib/authentication/version.rb
-- mixlib-authentication.gemspec
-- spec/mixlib/authentication/digester_spec.rb
-- spec/mixlib/authentication/http_authentication_request_spec.rb
-- spec/mixlib/authentication/mixlib_authentication_spec.rb
-- spec/mixlib/authentication/mixlib_log_missing_spec.rb
-- spec/spec_helper.rb
-homepage: https://www.chef.io
+homepage: https://github.com/chef/mixlib-authentication
 licenses:
 - Apache-2.0
 metadata: {}
@@ -116,15 +36,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mixes in simple per-request authentication

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-gemspec
-
-group(:development) do
-  gem "pry"
-  gem "mixlib-log", "~> 2"
-  gem "net-ssh"
-end

data/NOTICE

@@ -1,7 +0,0 @@
-Mixlib::Authentication NOTICE
-=================
-
-Developed at Chef (https://www.chef.io/).
-
- * Copyright 2009-2016, Chef Software, Inc. <legal@chef.io>
-

data/README.md

@@ -1,23 +0,0 @@
-# Mixlib::Authentication
-[![Build Status Master](https://travis-ci.org/chef/mixlib-authentication.svg?branch=master)](https://travis-ci.org/chef/mixlib-authentication) [![Gem Version](https://badge.fury.io/rb/mixlib-authentication.svg)](https://badge.fury.io/rb/mixlib-authentication)
-
-Mixlib::Authentication provides a class-based header signing authentication object, like the one used in Chef.
-
-## License
-- Author:: Christopher Brown ([cb@chef.io](mailto:cb@chef.io))
-- Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
-- License:: Apache License, Version 2.0
-
-```text
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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.
-```