oauth 1.1.0 → 1.1.1

data/lib/oauth/request_proxy/jabber_request.rb

@@ -18,8 +18,15 @@ module OAuth
         oauth = @request.get_elements("//oauth").first
         return @params unless oauth
 
-        %w[ oauth_token oauth_consumer_key oauth_signature_method oauth_signature
-            oauth_timestamp oauth_nonce oauth_version ].each do |param|
+        %w[
+          oauth_token
+          oauth_consumer_key
+          oauth_signature_method
+          oauth_signature
+          oauth_timestamp
+          oauth_nonce
+          oauth_version
+        ].each do |param|
           next unless (element = oauth.first_element(param))
 
           @params[param] = element.text

data/lib/oauth/request_proxy/net_http.rb

@@ -69,7 +69,7 @@ module OAuth
           end
 
           def auth_header_params
-            return nil unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
+            return unless request["Authorization"] && request["Authorization"][0, 5] == "OAuth"
 
             request["Authorization"]
           end

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -34,7 +34,8 @@ module OAuth
           query ? CGI.parse(query) : {}
         end
 
-        def request_params; end
+        def request_params
+        end
 
         def post_parameters
           # Post params are only used if posting form data
@@ -52,9 +53,9 @@ module OAuth
           query.split("&").inject({}) do |result, q|
             k, v = q.split("=")
             if !v.nil?
-              result.merge({ k => v })
+              result.merge({k => v})
             elsif !result.key?(k)
-              result.merge({ k => true })
+              result.merge({k => true})
             else
               result
             end

data/lib/oauth/server.rb

@@ -7,12 +7,13 @@ module OAuth
   # This is mainly used to create consumer credentials and can pretty much be ignored if you want to create your own
   class Server
     include OAuth::Helper
+
     attr_accessor :base_url
 
     @@server_paths = {
       request_token_path: "/oauth/request_token",
       authorize_path: "/oauth/authorize",
-      access_token_path: "/oauth/access_token"
+      access_token_path: "/oauth/access_token",
     }
 
     # Create a new server instance
@@ -32,13 +33,16 @@ module OAuth
     # mainly for testing purposes
     def create_consumer
       creds = generate_credentials
-      Consumer.new(creds[0], creds[1],
-                   {
-                     site: base_url,
-                     request_token_path: request_token_path,
-                     authorize_path: authorize_path,
-                     access_token_path: access_token_path
-                   })
+      Consumer.new(
+        creds[0],
+        creds[1],
+        {
+          site: base_url,
+          request_token_path: request_token_path,
+          authorize_path: authorize_path,
+          access_token_path: access_token_path,
+        },
+      )
     end
 
     def request_token_path

data/lib/oauth/signature/base.rb

@@ -43,7 +43,7 @@ module OAuth
         # override secrets based on the values returned from the block (if any)
         if block
           # consumer secret and token secret need to be looked up based on pieces of the request
-          secrets = yield block.arity == 1 ? request : [token, consumer_key, nonce, request.timestamp]
+          secrets = yield (block.arity == 1) ? request : [token, consumer_key, nonce, request.timestamp]
           if secrets.is_a?(Array) && secrets.size == 2
             @token_secret = secrets[0]
             @consumer_secret = secrets[1]

data/lib/oauth/signature/rsa/sha1.rb

@@ -9,8 +9,8 @@ module OAuth
         implements "rsa-sha1"
 
         def ==(other)
-          public_key.verify(OpenSSL::Digest.new("SHA1"),
-                            Base64.decode64(other.is_a?(Array) ? other.first : other), signature_base_string)
+          decoded = Base64.decode64(other.is_a?(Array) ? other.first : other)
+          public_key.verify(OpenSSL::Digest.new("SHA1"), decoded, signature_base_string)
         end
 
         def public_key
@@ -25,7 +25,14 @@ module OAuth
         end
 
         def body_hash
-          Base64.encode64(OpenSSL::Digest.digest("SHA1", request.body || "")).chomp.delete("\n")
+          # Use SHA1 body hash with compatibility across OpenSSL versions
+          data = request.body || ""
+          begin
+            digest_bytes = OpenSSL::Digest.digest("SHA1", data)
+          rescue StandardError
+            digest_bytes = ::Digest::SHA1.digest(data)
+          end
+          Base64.encode64(digest_bytes).chomp.delete("\n")
         end
 
         private
@@ -47,7 +54,7 @@ module OAuth
               options[:private_key]
             else
               consumer_secret
-            end
+            end,
           )
 
           private_key.sign(OpenSSL::Digest.new("SHA1"), signature_base_string)

data/lib/oauth/tokens/access_token.rb

@@ -8,7 +8,7 @@ module OAuth
     def request(http_method, path, *arguments)
       request_uri = URI.parse(path)
       site_uri = consumer.uri
-      is_service_uri_different = (request_uri.absolute? && request_uri != site_uri)
+      is_service_uri_different = request_uri.absolute? && request_uri != site_uri
       begin
         consumer.uri(request_uri) if is_service_uri_different
         @response = super(http_method, path, *arguments)

data/lib/oauth/tokens/consumer_token.rb

@@ -4,7 +4,7 @@ module OAuth
   # Superclass for tokens used by OAuth Clients
   class ConsumerToken < Token
     attr_accessor :consumer, :params
-    attr_reader   :response
+    attr_reader :response
 
     def self.from_hash(consumer, hash)
       token = new(consumer, hash[:oauth_token], hash[:oauth_token_secret])
@@ -15,7 +15,7 @@ module OAuth
     def initialize(consumer, token = "", secret = "")
       super(token, secret)
       @consumer = consumer
-      @params   = {}
+      @params = {}
     end
 
     # Make a signed request using given http_method to the path

data/lib/oauth/tokens/request_token.rb

@@ -6,14 +6,14 @@ module OAuth
   class RequestToken < ConsumerToken
     # Generate an authorization URL for user authorization
     def authorize_url(params = nil)
-      return nil if token.nil?
+      return if token.nil?
 
       params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authorize_url, params)
     end
 
     def authenticate_url(params = nil)
-      return nil if token.nil?
+      return if token.nil?
 
       params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authenticate_url, params)
@@ -25,8 +25,13 @@ module OAuth
 
     # exchange for AccessToken on server
     def get_access_token(options = {}, *arguments)
-      response = consumer.token_request(consumer.http_method,
-                                        (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path), self, options, *arguments)
+      response = consumer.token_request(
+        consumer.http_method,
+        (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path),
+        self,
+        options,
+        *arguments,
+      )
       OAuth::AccessToken.from_hash(consumer, response)
     end
 

data/lib/oauth/version.rb

@@ -2,6 +2,6 @@
 
 module OAuth
   module Version
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end