oauth 0.5.8 → 0.6.0

data/lib/oauth/consumer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "net/http"
 require "net/https"
 require "oauth/oauth"
@@ -16,8 +18,9 @@ module OAuth
       end
     end
 
-    if !defined?(CA_FILE)
-      CA_FILES = %W(/etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt /usr/share/curl/curl-ca-bundle.crt)
+    unless defined?(CA_FILE)
+      CA_FILES = %w[/etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt
+                    /usr/share/curl/curl-ca-bundle.crt].freeze
       CA_FILES.each do |ca_file|
         if File.exist?(ca_file)
           CA_FILE = ca_file
@@ -29,15 +32,15 @@ module OAuth
 
     @@default_options = {
       # Signature method used by server. Defaults to HMAC-SHA1
-      :signature_method   => "HMAC-SHA1",
+      signature_method: "HMAC-SHA1",
 
       # default paths on site. These are the same as the defaults set up by the generators
-      :request_token_path => "/oauth/request_token",
-      :authenticate_path  => "/oauth/authenticate",
-      :authorize_path     => "/oauth/authorize",
-      :access_token_path  => "/oauth/access_token",
+      request_token_path: "/oauth/request_token",
+      authenticate_path: "/oauth/authenticate",
+      authorize_path: "/oauth/authorize",
+      access_token_path: "/oauth/access_token",
 
-      :proxy              => nil,
+      proxy: nil,
       # How do we send the oauth values to the server see
       # https://oauth.net/core/1.0/#consumer_req_param for more info
       #
@@ -46,10 +49,10 @@ module OAuth
       #   :header - via the Authorize header (Default) ( option 1. in spec)
       #   :body - url form encoded in body of POST request ( option 2. in spec)
       #   :query_string - via the query part of the url ( option 3. in spec)
-      :scheme        => :header,
+      scheme: :header,
 
       # Default http method used for OAuth Token Requests (defaults to :post)
-      :http_method   => :post,
+      http_method: :post,
 
       # Add a custom ca_file for consumer
       # :ca_file       => '/etc/certs.pem'
@@ -59,9 +62,14 @@ module OAuth
       # nil, false - no debug output
       # true - uses $stdout
       # some_value - uses some_value
-      :debug_output => nil,
+      debug_output: nil,
+
+      # Defaults to producing a body_hash as part of the signature but
+      # can be disabled since it's not officially part of the OAuth 1.0
+      # spec. Possible values are true and false
+      body_hash_enabled: true,
 
-      :oauth_version => "1.0"
+      oauth_version: "1.0"
     }
 
     attr_accessor :options, :key, :secret
@@ -75,7 +83,8 @@ module OAuth
     #     :http_method        => :post,
     #     :request_token_path => "/oauth/example/request_token.php",
     #     :access_token_path  => "/oauth/example/access_token.php",
-    #     :authorize_path     => "/oauth/example/authorize.php"
+    #     :authorize_path     => "/oauth/example/authorize.php",
+    #     :body_hash_enabled  => false
     #    })
     #
     # Start the process by requesting a token
@@ -94,10 +103,7 @@ module OAuth
       @secret = consumer_secret
 
       # ensure that keys are symbols
-      @options = @@default_options.merge(options.inject({}) do |opts, (key, value)|
-        opts[key.to_sym] = value
-        opts
-      end)
+      @options = @@default_options.merge(options.transform_keys(&:to_sym))
     end
 
     # The default http method
@@ -106,15 +112,13 @@ module OAuth
     end
 
     def debug_output
-      @debug_output ||= begin
-        case @options[:debug_output]
-        when nil, false
-        when true
-          $stdout
-        else
-          @options[:debug_output]
-        end
-      end
+      @debug_output ||= case @options[:debug_output]
+                        when nil, false
+                        when true
+                          $stdout
+                        else
+                          @options[:debug_output]
+                        end
     end
 
     # The HTTP object for the site. The HTTP Object is what you get when you do Net::HTTP.new
@@ -127,13 +131,14 @@ module OAuth
       if custom_uri
         @uri  = custom_uri
         @http = create_http # yike, oh well. less intrusive this way
-      else  # if no custom passed, we use existing, which, if unset, is set to site uri
+      else # if no custom passed, we use existing, which, if unset, is set to site uri
         @uri ||= URI.parse(site)
       end
     end
 
     def get_access_token(request_token, request_options = {}, *arguments, &block)
-      response = token_request(http_method, (access_token_url? ? access_token_url : access_token_path), request_token, request_options, *arguments, &block)
+      response = token_request(http_method, (access_token_url? ? access_token_url : access_token_path), request_token,
+                               request_options, *arguments, &block)
       OAuth::AccessToken.from_hash(self, response)
     end
 
@@ -154,20 +159,23 @@ module OAuth
     def get_request_token(request_options = {}, *arguments, &block)
       # if oauth_callback wasn't provided, it is assumed that oauth_verifiers
       # will be exchanged out of band
-      request_options[:oauth_callback] ||= OAuth::OUT_OF_BAND unless request_options[:exclude_callback]
-
-      if block_given?
-        response = token_request(
-          http_method,
-          (request_token_url? ? request_token_url : request_token_path),
-          nil,
-          request_options,
-          *arguments,
-          &block
-        )
-      else
-        response = token_request(http_method, (request_token_url? ? request_token_url : request_token_path), nil, request_options, *arguments)
+      unless request_options[:exclude_callback]
+        request_options[:oauth_callback] ||= OAuth::OUT_OF_BAND
       end
+
+      response = if block
+                   token_request(
+                     http_method,
+                     (request_token_url? ? request_token_url : request_token_path),
+                     nil,
+                     request_options,
+                     *arguments,
+                     &block
+                   )
+                 else
+                   token_request(http_method, (request_token_url? ? request_token_url : request_token_path), nil,
+                                 request_options, *arguments)
+                 end
       OAuth::RequestToken.from_hash(self, response)
     end
 
@@ -182,7 +190,7 @@ module OAuth
     #   @consumer.request(:post, '/people', @token, {}, @person.to_xml, { 'Content-Type' => 'application/xml' })
     #
     def request(http_method, path, token = nil, request_options = {}, *arguments)
-      if path !~ /^\//
+      unless %r{^/}.match?(path)
         @http = create_http(path)
         _uri = URI.parse(path)
         path = "#{_uri.path}#{_uri.query ? "?#{_uri.query}" : ""}"
@@ -190,18 +198,19 @@ module OAuth
 
       # override the request with your own, this is useful for file uploads which Net::HTTP does not do
       req = create_signed_request(http_method, path, token, request_options, *arguments)
-      return nil if block_given? and yield(req) == :done
+      return nil if block_given? && (yield(req) == :done)
+
       rsp = http.request(req)
       # check for an error reported by the Problem Reporting extension
       # (https://wiki.oauth.net/ProblemReporting)
       # note: a 200 may actually be an error; check for an oauth_problem key to be sure
       if !(headers = rsp.to_hash["www-authenticate"]).nil? &&
-        (h = headers.select { |hdr| hdr =~ /^OAuth / }).any? &&
-        h.first =~ /oauth_problem/
+         (h = headers.grep(/^OAuth /)).any? &&
+         h.first.include?("oauth_problem")
 
         # puts "Header: #{h.first}"
 
-        # TODO doesn't handle broken responses from api.login.yahoo.com
+        # TODO: doesn't handle broken responses from api.login.yahoo.com
         # remove debug code when done
         params = OAuth::Helper.parse_header(h.first)
 
@@ -235,10 +244,9 @@ module OAuth
           # symbolize keys
           # TODO this could be considered unexpected behavior; symbols or not?
           # TODO this also drops subsequent values from multi-valued keys
-          CGI.parse(response.body).inject({}) do |h,(k,v)|
+          CGI.parse(response.body).each_with_object({}) do |(k, v), h|
             h[k.strip.to_sym] = v.first
             h[k.strip]        = v.first
-            h
           end
         end
       when (300..399)
@@ -250,11 +258,11 @@ module OAuth
         response.error! if uri.path == path && our_uri.host == uri.host
 
         if uri.path == path && our_uri.host != uri.host
-            options[:site] = "#{uri.scheme}://#{uri.host}"
-            @http = create_http
+          options[:site] = "#{uri.scheme}://#{uri.host}"
+          @http = create_http
         end
 
-        self.token_request(http_method, uri.path, token, request_options, arguments)
+        token_request(http_method, uri.path, token, request_options, arguments)
       when (400..499)
         raise OAuth::Unauthorized, response
       else
@@ -278,6 +286,7 @@ module OAuth
 
     def request_endpoint
       return nil if @options[:request_endpoint].nil?
+
       @options[:request_endpoint].to_s
     end
 
@@ -301,37 +310,37 @@ module OAuth
       @options[:access_token_path]
     end
 
-    # TODO this is ugly, rewrite
+    # TODO: this is ugly, rewrite
     def request_token_url
-      @options[:request_token_url] || site + request_token_path
+      @options[:request_token_url] || (site + request_token_path)
     end
 
     def request_token_url?
-      @options.has_key?(:request_token_url)
+      @options.key?(:request_token_url)
     end
 
     def authenticate_url
-      @options[:authenticate_url] || site + authenticate_path
+      @options[:authenticate_url] || (site + authenticate_path)
     end
 
     def authenticate_url?
-      @options.has_key?(:authenticate_url)
+      @options.key?(:authenticate_url)
     end
 
     def authorize_url
-      @options[:authorize_url] || site + authorize_path
+      @options[:authorize_url] || (site + authorize_path)
     end
 
     def authorize_url?
-      @options.has_key?(:authorize_url)
+      @options.key?(:authorize_url)
     end
 
     def access_token_url
-      @options[:access_token_url] || site + access_token_path
+      @options[:access_token_url] || (site + access_token_path)
     end
 
     def access_token_url?
-      @options.has_key?(:access_token_url)
+      @options.key?(:access_token_url)
     end
 
     def proxy
@@ -342,12 +351,9 @@ module OAuth
 
     # Instantiates the http object
     def create_http(_url = nil)
+      _url = request_endpoint unless request_endpoint.nil?
 
-      if !request_endpoint.nil?
-       _url = request_endpoint
-      end
-
-      our_uri = if _url.nil? || _url[0] =~ /^\//
+      our_uri = if _url.nil? || _url[0] =~ %r{^/}
                   URI.parse(site)
                 else
                   your_uri = URI.parse(_url)
@@ -364,7 +370,8 @@ module OAuth
         http_object = Net::HTTP.new(our_uri.host, our_uri.port)
       else
         proxy_uri = proxy.is_a?(URI) ? proxy : URI.parse(proxy)
-        http_object = Net::HTTP.new(our_uri.host, our_uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+        http_object = Net::HTTP.new(our_uri.host, our_uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user,
+                                    proxy_uri.password)
       end
 
       http_object.use_ssl = (our_uri.scheme == "https")
@@ -372,19 +379,21 @@ module OAuth
       if @options[:no_verify]
         http_object.verify_mode = OpenSSL::SSL::VERIFY_NONE
       else
-        ca_file =  @options[:ca_file] || CA_FILE
-        if ca_file
-          http_object.ca_file = ca_file
-        end
+        ca_file = @options[:ca_file] || CA_FILE
+        http_object.ca_file = ca_file if ca_file
         http_object.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http_object.verify_depth = 5
       end
 
       http_object.read_timeout = http_object.open_timeout = @options[:timeout] || 60
-      http_object.open_timeout = @options[:open_timeout] if @options[:open_timeout]
+      if @options[:open_timeout]
+        http_object.open_timeout = @options[:open_timeout]
+      end
       http_object.ssl_version = @options[:ssl_version] if @options[:ssl_version]
-      http_object.cert = @options[:ssl_client_cert] if @options[:ssl_client_cert]
-      http_object.key  = @options[:ssl_client_key] if @options[:ssl_client_key]
+      if @options[:ssl_client_cert]
+        http_object.cert = @options[:ssl_client_cert]
+      end
+      http_object.key = @options[:ssl_client_key] if @options[:ssl_client_key]
       http_object.set_debug_output(debug_output) if debug_output
 
       http_object
@@ -394,36 +403,36 @@ module OAuth
     def create_http_request(http_method, path, *arguments)
       http_method = http_method.to_sym
 
-      if [:post, :put, :patch].include?(http_method)
-        data = arguments.shift
-      end
+      data = arguments.shift if %i[post put patch].include?(http_method)
 
       # if the base site contains a path, add it now
       # only add if the site host matches the current http object's host
       # (in case we've specified a full url for token requests)
-      uri  = URI.parse(site)
-      path = uri.path + path if uri.path && uri.path != "/" && uri.host == http.address
+      uri = URI.parse(site)
+      if uri.path && uri.path != "/" && uri.host == http.address
+        path = uri.path + path
+      end
 
       headers = arguments.first.is_a?(Hash) ? arguments.shift : {}
 
       case http_method
       when :post
-        request = Net::HTTP::Post.new(path,headers)
+        request = Net::HTTP::Post.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :put
-        request = Net::HTTP::Put.new(path,headers)
+        request = Net::HTTP::Put.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :patch
-        request = Net::HTTP::Patch.new(path,headers)
+        request = Net::HTTP::Patch.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :get
-        request = Net::HTTP::Get.new(path,headers)
+        request = Net::HTTP::Get.new(path, headers)
       when :delete
-        request =  Net::HTTP::Delete.new(path,headers)
+        request = Net::HTTP::Delete.new(path, headers)
       when :head
-        request = Net::HTTP::Head.new(path,headers)
+        request = Net::HTTP::Head.new(path, headers)
       else
-        raise ArgumentError, "Don't know how to handle http_method: :#{http_method.to_s}"
+        raise ArgumentError, "Don't know how to handle http_method: :#{http_method}"
       end
 
       if data.is_a?(Hash)
@@ -448,13 +457,12 @@ module OAuth
       request
     end
 
-    def marshal_dump(*args)
-      {:key => @key, :secret => @secret, :options => @options}
+    def marshal_dump(*_args)
+      { key: @key, secret: @secret, options: @options }
     end
 
     def marshal_load(data)
       initialize(data[:key], data[:secret], data[:options])
     end
-
   end
 end

data/lib/oauth/errors/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OAuth
   class Error < StandardError
   end

data/lib/oauth/errors/problem.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module OAuth
   class Problem < OAuth::Unauthorized
     attr_reader :problem, :params
+
     def initialize(problem, request = nil, params = {})
       super(request)
       @problem = problem

data/lib/oauth/errors/unauthorized.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module OAuth
   class Unauthorized < OAuth::Error
     attr_reader :request
+
     def initialize(request = nil)
+      super()
       @request = request
     end
 

data/lib/oauth/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "oauth/errors/error"
 require "oauth/errors/unauthorized"
 require "oauth/errors/problem"

data/lib/oauth/helper.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
+require "time"
 require "openssl"
 require "base64"
 
 module OAuth
   module Helper
-    extend self
+    module_function
 
     # Escape +value+ by URL encoding all non-reserved character.
     #
@@ -24,13 +27,13 @@ module OAuth
 
     # Generate a random key of up to +size+ bytes. The value returned is Base64 encoded with non-word
     # characters removed.
-    def generate_key(size=32)
+    def generate_key(size = 32)
       Base64.encode64(OpenSSL::Random.random_bytes(size)).gsub(/\W/, "")
     end
 
-    alias_method :generate_nonce, :generate_key
+    alias generate_nonce generate_key
 
-    def generate_timestamp #:nodoc:
+    def generate_timestamp # :nodoc:
       Time.now.to_i.to_s
     end
 
@@ -43,7 +46,8 @@ module OAuth
     # See Also: {OAuth core spec version 1.0, section 9.1.1}[http://oauth.net/core/1.0#rfc.section.9.1.1]
     def normalize(params)
       params.sort.map do |k, values|
-        if values.is_a?(Array)
+        case values
+        when Array
           # make sure the array has an element so we don't lose the key
           values << nil if values.empty?
           # multiple values were provided for a single key
@@ -51,13 +55,13 @@ module OAuth
             normalize_nested_query(values, k)
           else
             values.sort.collect do |v|
-              [escape(k),escape(v)] * "="
+              [escape(k), escape(v)].join("=")
             end
           end
-        elsif values.is_a?(Hash)
+        when Hash
           normalize_nested_query(values, k)
         else
-          [escape(k),escape(values)] * "="
+          [escape(k), escape(values)].join("=")
         end
       end * "&"
     end
@@ -76,7 +80,7 @@ module OAuth
           normalize_nested_query(v, prefix ? "#{prefix}[#{k}]" : k)
         end.flatten.sort
       else
-        [escape(prefix), escape(value)] * "="
+        [escape(prefix), escape(value)].join("=")
       end
     end
 
@@ -90,16 +94,16 @@ module OAuth
     #
     def parse_header(header)
       # decompose
-      params = header[6,header.length].split(/[,=&]/)
+      params = header[6, header.length].split(/[,=&]/)
 
       # odd number of arguments - must be a malformed header.
-      raise OAuth::Problem.new("Invalid authorization header") if params.size % 2 != 0
+      raise OAuth::Problem, "Invalid authorization header" if params.size.odd?
 
       params.map! do |v|
         # strip and unescape
         val = unescape(v.strip)
         # strip quotes
-        val.sub(/^\"(.*)\"$/, '\1')
+        val.sub(/^"(.*)"$/, '\1')
       end
 
       # convert into a Hash

data/lib/oauth/oauth.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module OAuth
   # request tokens are passed between the consumer and the provider out of
   # band (i.e. callbacks cannot be used), per section 6.1.1
   OUT_OF_BAND = "oob"
 
   # required parameters, per sections 6.1.1, 6.3.1, and 7
-  PARAMETERS = %w(oauth_callback oauth_consumer_key oauth_token
-    oauth_signature_method oauth_timestamp oauth_nonce oauth_verifier
-    oauth_version oauth_signature oauth_body_hash)
+  PARAMETERS = %w[oauth_callback oauth_consumer_key oauth_token
+                  oauth_signature_method oauth_timestamp oauth_nonce oauth_verifier
+                  oauth_version oauth_signature oauth_body_hash].freeze
 
   # reserved character regexp, per section 5.1
-  RESERVED_CHARACTERS = /[^a-zA-Z0-9\-\.\_\~]/
+  RESERVED_CHARACTERS = /[^a-zA-Z0-9\-._~]/.freeze
 end

data/lib/oauth/oauth_test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "action_controller"
 require "action_controller/test_process"
 

data/lib/oauth/request_proxy/base.rb

@@ -83,7 +83,7 @@ module OAuth
       end
 
       def oauth_parameters
-        parameters.select { |k, _v| OAuth::PARAMETERS.include?(k) }.select { |_k, v| v != "" }
+        parameters.select { |k, v| OAuth::PARAMETERS.include?(k) && !v.nil? && v != "" }
       end
 
       def non_oauth_parameters
@@ -127,7 +127,7 @@ module OAuth
       end
 
       # URI, including OAuth parameters
-      def signed_uri(with_oauth = true)
+      def signed_uri(with_oauth: true)
         if signed?
           params = if with_oauth
                      parameters

data/lib/oauth/request_proxy/mock_request.rb

@@ -32,7 +32,7 @@ module OAuth
 
       def normalized_uri
         super
-      rescue
+      rescue StandardError
         # if this is a non-standard URI, it may not parse properly
         # in that case, assume that it's already been normalized
         uri

data/lib/oauth/request_proxy/net_http.rb

@@ -38,13 +38,11 @@ module OAuth
             request_params = CGI.parse(query_string)
             # request_params.each{|k,v| request_params[k] = [nil] if v == []}
 
-            if options[:parameters]
-              options[:parameters].each do |k,v|
-                if request_params.has_key?(k) && v
-                  request_params[k] << v
-                else
-                  request_params[k] = [v]
-                end
+            options[:parameters]&.each do |k, v|
+              if request_params.key?(k) && v
+                request_params[k] << v
+              else
+                request_params[k] = [v]
               end
             end
             request_params
@@ -71,7 +69,9 @@ module OAuth
           end
 
           def auth_header_params
-            return nil unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
+            unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
+              return nil
+            end
 
             request["Authorization"]
           end

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -38,7 +38,8 @@ module OAuth
 
         def post_parameters
           # Post params are only used if posting form data
-          if method == "POST" || method == "PUT"
+          is_form_data = request.payload && request.payload.headers["Content-Type"] == "application/x-www-form-urlencoded"
+          if is_form_data && (method == "POST" || method == "PUT")
             OAuth::Helper.stringify_keys(query_string_to_hash(request.payload.to_s) || {})
           else
             {}

data/lib/oauth/request_proxy.rb

@@ -1,24 +1,27 @@
+# frozen_string_literal: true
+
 module OAuth
   module RequestProxy
-    def self.available_proxies #:nodoc:
+    def self.available_proxies # :nodoc:
       @available_proxies ||= {}
     end
 
     def self.proxy(request, options = {})
-      return request if request.kind_of?(OAuth::RequestProxy::Base)
+      return request if request.is_a?(OAuth::RequestProxy::Base)
 
       klass = available_proxies[request.class]
 
       # Search for possible superclass matches.
       if klass.nil?
-        request_parent = available_proxies.keys.find { |rc| request.kind_of?(rc) }
+        request_parent = available_proxies.keys.find { |rc| request.is_a?(rc) }
         klass = available_proxies[request_parent]
       end
 
       raise UnknownRequestType, request.class.to_s unless klass
+
       klass.new(request, options)
     end
 
-    class UnknownRequestType < Exception; end
+    class UnknownRequestType < RuntimeError; end
   end
 end