oauthenticator 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db80d67c9ca2a714efb0048d51559e1177f4189a
-  data.tar.gz: 9e4d2a061109d621b67aa147ebaf9d3aee6f4e81
+  metadata.gz: a17268e39c4fe588fc52170f7e978a4a32f29c46
+  data.tar.gz: 1a494d30f16afa681d0966f7d3371e55eb1891c5
 SHA512:
-  metadata.gz: 1e02a8108f52fc163c5c766121eecc78c120becff60cd42007b574cfc27912c225fd6a78e2e6af2a3673a253db233c2625709791509a4a91e4adc80d4ae1ffb9
-  data.tar.gz: fff84c1346c81617b391facb3de890bd223ee304170afdbc16dd71f852f4cbe224c163bd70af5ae25828928e2fa099fef4d58c7d2b5cd0d80ab2f9480344f750
+  metadata.gz: d804e22e7df42027f7080dffce83f3a8bcc6a785c31a54ac35f87f3668c456dd354c0f0245664f7db40a465270d020dde929a7defdbf3af57e2ad42c8f4a44bb
+  data.tar.gz: 2558fd383699e41c3915d0c8b4d1e9cb85d79f4d6ddc4e7155c17ab7abe29dff60db55a9b39da41ef1c95b10027744db09bab8e371be23118427aeb70eb4a581

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.3
+
+- env["oauth.signed_request"] contains the signed request. this makes any helper methods from the implemented 
+config methods module available and helps avoid code duplication (and sometimes duplicated db queries - 
+depending on implementation)
+- fix irrelevant warning with Hash#reject called on hash with a default proc
+
 # 1.3.2
 
 - loosen dependency to allow rack 2.0

data/README.md

@@ -75,13 +75,13 @@ See the documentation for {OAuthenticator::SignableRequest} for more detailed in
 
 ### OAuth Request Body Hash
 
-The [OAuth Request Body Hash](https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html)
+The [OAuth Request Body Hash](https://tools.ietf.org/html/draft-eaton-oauth-bodyhash-00)
 specification is supported. By default all signing of outgoing does include the body hash. This can be 
 disabled by setting the `:hash_body?` / `'hash_body?'` attribute to false when instantiating an 
 OAuthenticator::SignableRequest. 
 
 For info on when to include the body hash, see 
-[When to Include the Body Hash](https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html#when_to_include). 
+[When to Include the Body Hash](https://tools.ietf.org/html/draft-eaton-oauth-bodyhash-00#section-4.1.1). 
 
 ## Authenticating incoming requests
 
@@ -195,7 +195,7 @@ methods it needs to function.
 
 ### OAuth Request Body Hash
 
-The [OAuth Request Body Hash](https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html)
+The [OAuth Request Body Hash](https://tools.ietf.org/html/draft-eaton-oauth-bodyhash-00)
 specification is supported. Requests which include the oauth_body_hash parameter are authenticated according 
 to the spec. 
 

data/Rakefile.rb

@@ -4,7 +4,8 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end
-task 'default' => 'test'
+require 'wwtd/tasks'
+task 'default' => 'wwtd'
 
 require 'yard'
 YARD::Rake::YardocTask.new do |t|

data/lib/oauthenticator/faraday_signer.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'rack'
 
 if Faraday.respond_to?(:register_middleware)
   Faraday.register_middleware(:request, :oauthenticator_signer => proc { OAuthenticator::FaradaySigner })
@@ -53,10 +54,11 @@ module OAuthenticator
 
     # do the thing
     def call(request_env)
+      media_type = Rack::Request.new('CONTENT_TYPE' => request_env[:request_headers]['Content-Type']).media_type
       request_attributes = {
         :request_method => request_env[:method],
         :uri => request_env[:url],
-        :media_type => request_env[:request_headers]['Content-Type'],
+        :media_type => media_type,
         :body => request_env[:body]
       }
       # the adapter will set the media type to form-encoded when not otherwise specified on 

data/lib/oauthenticator/parse_authorization.rb

@@ -34,7 +34,7 @@ module OAuthenticator
       scanner = StringScanner.new(header)
       auth_parse_error = proc { |message| raise ParseError.new(message, {'Authorization' => [message]}) }
       scanner.scan(/OAuth\s*/i) || auth_parse_error.call("Authorization scheme is not OAuth - recieved: #{header}")
-      attributes = Hash.new { |h,k| h[k] = [] }
+      attributes = {}
       while scanner.scan(/(\w+)="([^"]*)"\s*(,?)\s*/)
         key = scanner[1]
         value = scanner[2]
@@ -42,7 +42,7 @@ module OAuthenticator
         if !comma_follows && !scanner.eos?
           auth_parse_error.call("Could not parse Authorization header: #{header}\naround or after character #{scanner.pos}: #{scanner.rest}")
         end
-        attributes[unescape(key)] << unescape(value)
+        (attributes[unescape(key)] ||= []) << unescape(value)
       end
       unless scanner.eos?
         auth_parse_error.call("Could not parse Authorization header: #{header}\naround or after character #{scanner.pos}: #{scanner.rest}")

data/lib/oauthenticator/rack_authenticator.rb

@@ -48,6 +48,7 @@ module OAuthenticator
           unauthenticated_response(oauth_request.errors)
         else
           log_success(env, oauth_request)
+          env["oauth.signed_request"] = oauth_request
           env["oauth.consumer_key"] = oauth_request.consumer_key
           env["oauth.token"] = oauth_request.token
           env["oauth.authenticated"] = true

data/lib/oauthenticator/version.rb

@@ -1,5 +1,5 @@
 # OAuthenticator 
 module OAuthenticator
   # OAuthenticator::VERSION
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/faraday_signer_test.rb

@@ -46,6 +46,23 @@ describe OAuthenticator::FaradaySigner do
     assert_response 200, '☺', response
   end
 
+  it 'succeeds with charset' do
+    signing_options = {
+      :signature_method => 'HMAC-SHA1',
+      :consumer_key => consumer_key,
+      :consumer_secret => consumer_secret,
+      :token => token,
+      :token_secret => token_secret,
+    }
+
+    connection = Faraday.new(:url => 'http://example.com', :headers => {'Content-Type' => 'application/x-www-form-urlencoded; charset=UTF-8'}) do |faraday|
+      faraday.request :oauthenticator_signer, signing_options
+      faraday.adapter :rack, oapp
+    end
+    response = connection.post('/', 'a=b')
+    assert_response 200, '☺', response
+  end
+
   it 'is unauthorized' do
     signing_options = {
       :signature_method => 'PLAINTEXT',

data/test/rack_authenticator_test.rb

@@ -592,14 +592,16 @@ describe OAuthenticator::RackAuthenticator do
       end
     end
 
-    it 'sets oauth.authenticated, oauth.token, oauth.consumer_key' do
+    it 'sets oauth.authenticated, oauth.token, oauth.consumer_key, oauth.signed_request' do
       oauth_authenticated = nil
       oauth_token = nil
       oauth_consumer_key = nil
+      oauth_signed_request = nil
       testapp = proc do |env|
         oauth_authenticated = env['oauth.authenticated']
         oauth_token = env['oauth.token']
         oauth_consumer_key = env['oauth.consumer_key']
+        oauth_signed_request = env['oauth.signed_request']
         [200, {}, ['☺']]
       end
       otestapp = OAuthenticator::RackAuthenticator.new(testapp, :config_methods => OAuthenticatorTestConfigMethods)
@@ -607,6 +609,7 @@ describe OAuthenticator::RackAuthenticator do
       assert_equal(token, oauth_token)
       assert_equal(consumer_key, oauth_consumer_key)
       assert_equal(true, oauth_authenticated)
+      assert_kind_of(OAuthenticator::SignedRequest, oauth_signed_request)
     end
   end
 end

metadata

@@ -1,187 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: oauthenticator
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: minitest
   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: minitest-reporters
   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: rack-test
   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: timecop
   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: simplecov
   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: api_hammer
   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: yard
   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'
 description: OAuthenticator signs and authenticates OAuth 1.0 requests
@@ -191,8 +191,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .simplecov
-- .yardopts
+- ".simplecov"
+- ".yardopts"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
@@ -225,17 +225,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OAuth 1.0 request signing and authentication
@@ -249,5 +249,4 @@ test_files:
 - test/signable_request_test.rb
 - test/signed_request_test.rb
 - test/test_config_methods.rb
-- .simplecov
-has_rdoc: 
+- ".simplecov"