rack-oauth_proxy 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ed93602b7c511210f8a959e0ff4460bb27bc30
-  data.tar.gz: 0fa3909de26d926aed9852cac86e0edd73443e54
+  metadata.gz: 6c33bd03642050ec16695d9edd4eb0d128c1b26d
+  data.tar.gz: 18abbeca292daa9d059f18cfa3b13d86d86b04f8
 SHA512:
-  metadata.gz: c51c3a74817b05ca080bb42657da82bc217580f1fe6b7c2f03eb7ea4ffcfac2965708033ce1663c84e712064debcfe8338ade1039e0bdc5b6da6a9a984683475
-  data.tar.gz: 4f1a0d043ebc144ae09c83f7cee454c8c24e480cabfee93ccbe4c066cf206ccccf51c562301d11dff4024af00c35fabecbeed4171345f7b39ebfddd585f42c8d
+  metadata.gz: 2834913040a3706d41932e707744bbddec7bc2d522364fe0f8656c8c0c5ef93d12cce00adf69523b3495dc83700dde5d80e6a17125cba5a1a1232872563be432
+  data.tar.gz: b037d89e8c295df21a9c4cc88ccf02dd9807f01442c979d13c2f69784a65735d0fb81ccc3dcfff72b61ca8e06f5a7fb9a628e2b65c62b15884838ccd36eccd06

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+* Add `:propagated_header_fields` option
+* Use fadaday
+
 ## 0.0.3
 * Fix :bug: of `?access_token=...` handling
 

data/lib/rack/oauth_proxy.rb

@@ -3,7 +3,6 @@ require "rack/oauth_proxy/access_tokens/invalid"
 require "rack/oauth_proxy/access_tokens/valid"
 require "rack/oauth_proxy/client"
 require "rack/oauth_proxy/client/request"
-require "rack/oauth_proxy/client/response"
 require "rack/oauth_proxy/version"
 
 module Rack

data/lib/rack/oauth_proxy/client.rb

@@ -1,60 +1,45 @@
-require "net/http"
+require "faraday"
+require "faraday_middleware"
 
 module Rack
   class OauthProxy
     class Client
-      READ_TIMEOUT = 1
-      OPEN_TIMEOUT = 1
+      attr_reader :options
 
       def initialize(options = {})
         @options = options
       end
 
       def fetch(env)
-        request = Request.new(env)
-        if request.has_any_valid_credentials?
-          path = "#{uri.path}"
-          path << "?#{request.to_query}" if request.to_query.present?
-          header = {
-            "Authorization" => request.authorization,
-            "Host" => host,
-            "Resource-Owner-Id" => request.resource_owner_id,
-            "Scopes" => request.scopes,
-          }.reject {|key, value| value.nil? }
-          raw_response = http_client.get(path, header)
-          response = Response.new(raw_response)
-          if response.valid_as_access_token?
-            AccessTokens::Valid.new(response.to_hash)
-          else
-            AccessTokens::Invalid.new
-          end
-        else
-          AccessTokens::Invalid.new
-        end
-      rescue Timeout::Error
+        request = Request.new(env, options)
+        response = connection.get(url, request.params, request.header)
+        AccessTokens::Valid.new(response.body)
+      rescue
         AccessTokens::Invalid.new
       end
 
       private
 
-      def uri
-        @uri ||= URI.parse(url)
-      end
-
-      def http_client
-        client = Net::HTTP.new(uri.host, uri.port)
-        client.read_timeout = READ_TIMEOUT
-        client.open_timeout = OPEN_TIMEOUT
-        client.use_ssl = true if uri.scheme == 'https'
-        client
+      def connection
+        @connection ||= Faraday.new(headers: header) do |connection|
+          connection.adapter :net_http
+          connection.response :raise_error
+          connection.response :json
+        end
       end
 
       def url
-        @options[:url] or raise NoUrlError
+        options[:url] or raise NoUrlError
       end
 
       def host
-        @options[:host]
+        options[:host]
+      end
+
+      def header
+        {
+          "Host" => host,
+        }.reject {|key, value| value.nil? }
       end
 
       class NoUrlError < StandardError

data/lib/rack/oauth_proxy/client/request.rb

@@ -1,40 +1,42 @@
 require "active_support/core_ext/hash/slice"
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/object/to_query"
+require "json"
 require "rack"
 
 module Rack
   class OauthProxy
     class Client
       class Request
-        def initialize(env)
+        DEFAULT_PROPAGATED_HEADER_FIELDS = ["Authorization"]
+
+        attr_reader :env, :options
+
+        def initialize(env, options = {})
           @env = env
+          @options = options
         end
 
-        def has_any_valid_credentials?
-          authorization.present? ||
-            rack_request.params["access_token"].present? ||
-            rack_request.params["bearer_token"].present?
+        def header
+          header_with_nil_value.reject {|key, value| value.nil? }
         end
 
-        def rack_request
-          @rack_request ||= Rack::Request.new(@env)
+        def header_with_nil_value
+          propagated_header_fields.inject({}) do |result, field|
+            result.merge(field => env["HTTP_" + field.gsub("-", "_").upcase])
+          end
         end
 
-        def to_query
-          rack_request.params.slice("access_token", "bearer_token").to_query
+        def params
+          rack_request.params.slice("access_token", "bearer_token")
         end
 
-        def authorization
-          @env["HTTP_AUTHORIZATION"]
-        end
+        private
 
-        def resource_owner_id
-          @env["HTTP_RESOURCE_OWNER_ID"]
+        def rack_request
+          @rack_request ||= Rack::Request.new(@env)
         end
 
-        def scopes
-          @env["HTTP_SCOPES"]
+        def propagated_header_fields
+          options[:propagated_header_fields] || DEFAULT_PROPAGATED_HEADER_FIELDS
         end
       end
     end

data/lib/rack/oauth_proxy/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class OauthProxy
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/rack-oauth_proxy.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rack/oauth_proxy/version"
@@ -18,8 +17,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "faraday_middleware"
   spec.add_dependency "rack"
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "2.14.1"
   spec.add_development_dependency "webmock"

data/spec/rack/oauth_proxy/client_spec.rb

@@ -1,9 +1,19 @@
 require "spec_helper"
+require "securerandom"
 require "stringio"
 
 describe Rack::OauthProxy::Client do
+  before do
+    stub_request(:get, url).to_return(status: 401, body: {}.to_json)
+    stub_request(:get, url).with(headers: { "Authorization" => "Bearer #{token}" }).to_return(response)
+  end
+
   let(:client) do
-    described_class.new(url: url)
+    described_class.new(options)
+  end
+
+  let(:options) do
+    { url: url }
   end
 
   let(:url) do
@@ -13,6 +23,7 @@ describe Rack::OauthProxy::Client do
   let(:env) do
     {
       "HTTP_AUTHORIZATION" => "Bearer #{token}",
+      "HTTP_DUMMY" => "dummy",
       "rack.input" => StringIO.new,
     }
   end
@@ -21,34 +32,48 @@ describe Rack::OauthProxy::Client do
     SecureRandom.hex(32)
   end
 
+  let(:response) do
+    {
+      status: status,
+      body: body,
+    }
+  end
+
+  let(:status) do
+    200
+  end
+
+  let(:body) do
+    {}.to_json
+  end
+
   context "#fetch" do
     context "when authentication succeeded" do
-      before do
-        stub_request(:get, url).to_return(status: 200, body: {}.to_json)
-      end
-
       it "returns valid access token" do
         client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Valid
+        a_request(:get, url).with(headers: { "Authorization" => "Bearer #{token}" }).should have_been_made
       end
     end
 
-    context "without no credentials in request" do
+    context "when authentication failed" do
       before do
         env.delete("HTTP_AUTHORIZATION")
       end
 
       it "returns invalid access token" do
         client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Invalid
+        a_request(:get, url).should have_been_made
       end
     end
 
-    context "when authentication failed" do
+    context "with propagated header fields option" do
       before do
-        stub_request(:get, url).to_return(status: 401, body: {}.to_json)
+        options[:propagated_header_fields] = ["Dummy"]
       end
 
-      it "returns invalid access token" do
+      it "propagates specified fields" do
         client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Invalid
+        a_request(:get, url).with(headers: { "DUMMY" => "dummy" }).should have_been_made
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -114,7 +142,6 @@ files:
 - lib/rack/oauth_proxy/access_tokens/valid.rb
 - lib/rack/oauth_proxy/client.rb
 - lib/rack/oauth_proxy/client/request.rb
-- lib/rack/oauth_proxy/client/response.rb
 - lib/rack/oauth_proxy/version.rb
 - rack-oauth_proxy.gemspec
 - spec/rack/oauth_proxy/client_spec.rb

data/lib/rack/oauth_proxy/client/response.rb

@@ -1,42 +0,0 @@
-require "json"
-
-module Rack
-  class OauthProxy
-    class Client
-      class Response
-        def initialize(raw)
-          @raw = raw
-        end
-
-        def valid_as_access_token?
-          ok? && json? && hash?
-        end
-
-        def to_hash
-          parsed_body
-        end
-
-        private
-
-        def ok?
-          @raw.code == "200"
-        end
-
-        def json?
-          parsed_body
-          true
-        rescue JSON::ParserError
-          false
-        end
-
-        def hash?
-          parsed_body.is_a?(Hash)
-        end
-
-        def parsed_body
-          @parsed_body ||= JSON.parse(@raw.body)
-        end
-      end
-    end
-  end
-end