fernet-rack 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eacbb3d07e516ac97e456e7a9a9b170ddbbb91e8
-  data.tar.gz: 84a8d8ff96c3dd85140962430cbe4dd616dc056a
+  metadata.gz: 6d94674236ae463e25ce7f52993f53513af1c408
+  data.tar.gz: a3956e36c88b4ad4c5adec6e196af1680a78ce40
 SHA512:
-  metadata.gz: efec4e6f790b1e5d3a898787e14508e6127433d30ed25d988cee1bc7108c6320859bc16817c52126ca82808d04db21571afc09a8560200bfd1ac61790d36ff70
-  data.tar.gz: a9ad5c0cafc55e8bebc9bc0c3854636949b1b38e3acfc3368779ae2e942b8d2eae987894f24867bf14360834724d9d603d0720739a5ad84095ad28fce99979fd
+  metadata.gz: 47667bcd4e1872c4fd662123f8b76cac30a57a571e408791ee356a82fc084cc919950a551979261228ee08571ba42dfef4b4b9277f738eaa682a9e1883f64e0f
+  data.tar.gz: 4a02f5d9d14d6c99625dd8b5d487f70f2850dadda1e52898e94c93b181bf2b9a80dee9dc275ee142d8c965725c70f7cdf88a53e5a387377698a69c226f52103f

data/fernet-rack.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fernet-rack"
   gem.require_paths = ["lib"]
-  gem.version       = '0.2'
+  gem.version       = '0.3'
 
   gem.add_runtime_dependency "fernet", '~> 1.6'
   gem.add_development_dependency "minitest", '~> 5.4'

data/lib/rack/fernet.rb

@@ -18,4 +18,34 @@ module Rack
       end
     end
   end
+
+  class Fernet
+    def initialize(app, secret, content_type="application/json")
+      @app = app
+      @secret = secret
+      @content_type = content_type
+    end
+
+    def call(env)
+      verifier = ::Fernet.verifier(@secret, env["rack.input"].read)
+      if verifier.valid? && env["CONTENT_TYPE"] != 'application/octect-stream'
+        env['CONTENT_TYPE'] = @content_type
+        env["rack.input"] = StringIO.new(verifier.message)
+        @app.call(env)
+      elsif env["rack.input"].size.zero?
+        @app.call(env)
+      else
+        bad_request
+      end
+    end
+
+    private
+    def bad_request
+      return [ 400,
+        { 'Content-Type' => 'text/plain',
+          'Content-Length' => '0' },
+        []
+      ]
+    end
+  end
 end

data/test/test_fernet.rb

@@ -7,47 +7,36 @@ require 'rack/mock'
 class FernetTest < Minitest::Test
   def setup
     unprotected_app = Rack::Lint.new(lambda do |env|
-      [ 200, {'Content-Type' => 'text/plain'}, ["Hello"] ]
+      [ 200, {'Content-Type' => env["CONTENT_TYPE"].to_s }, [env["rack.input"].read] ]
     end)
-    @realm = "Lillet"
     @secret = "SqD5Mz/qFnXPLVTvkQKRDyVpli3Q6/habc7i89IrBRA="
-    @app = Rack::Auth::Fernet.new(unprotected_app, @secret, @realm)
+    @app = Rack::Fernet.new(unprotected_app, @secret)
     @request = Rack::MockRequest.new(@app)
   end
 
-  def test_no_credentials
-    request do |response|
-      assert_basic_auth_challenge(response)
+  def test_invalid_signature
+    request("garbage") do |response|
+      assert_equal(response.status, 400)
     end
   end
 
-  def test_wrong_credentials
-    request_with_auth('token') do |response|
-      assert_basic_auth_challenge(response)
+  def test_valid_signature
+    data = Fernet.generate(@secret, '{}')
+    request(data) do |response|
+      assert_equal(response.status, 200)
+      assert_equal(response.body, '{}')
+      assert_equal(response.headers['Content-Type'], 'application/json')
     end
   end
 
-  def test_correct_credentials
-    token = Fernet.generate(@secret, 'Podensac')
-    request_with_auth(token) do |response|
+  def test_empty_payload
+    request do |response|
       assert_equal(response.status, 200)
-      assert_equal(response.body, "Hello")
     end
   end
 
   private
-  def request(headers={})
-    yield @request.get('/', headers)
-  end
-
-  def request_with_auth(token, &block)
-    request('HTTP_AUTHORIZATION' => 'Basic ' + [":#{token}"].pack("m*"), &block)
-  end
-
-  def assert_basic_auth_challenge(response)
-    assert_equal(response.status, 401)
-    assert_includes(response, 'WWW-Authenticate')
-    assert(response.headers['WWW-Authenticate'] =~ /Basic realm="#{Regexp.escape(@realm)}"/)
-    assert_empty(response.body)
+  def request(body=nil, headers={})
+    yield @request.get('/', input: body, CONTENT_TYPE: 'application/octet-stream')
   end
 end

data/test/test_fernet_auth.rb

@@ -0,0 +1,53 @@
+require 'minitest/autorun'
+require 'rack/fernet'
+require 'rack/lint'
+require 'rack/mock'
+
+
+class FernetAuthTest < Minitest::Test
+  def setup
+    unprotected_app = Rack::Lint.new(lambda do |env|
+      [ 200, {'Content-Type' => 'text/plain'}, ["Hello"] ]
+    end)
+    @realm = "Lillet"
+    @secret = "SqD5Mz/qFnXPLVTvkQKRDyVpli3Q6/habc7i89IrBRA="
+    @app = Rack::Auth::Fernet.new(unprotected_app, @secret, @realm)
+    @request = Rack::MockRequest.new(@app)
+  end
+
+  def test_no_credentials
+    request do |response|
+      assert_basic_auth_challenge(response)
+    end
+  end
+
+  def test_wrong_credentials
+    request_with_auth('token') do |response|
+      assert_basic_auth_challenge(response)
+    end
+  end
+
+  def test_correct_credentials
+    token = Fernet.generate(@secret, 'Podensac')
+    request_with_auth(token) do |response|
+      assert_equal(response.status, 200)
+      assert_equal(response.body, "Hello")
+    end
+  end
+
+  private
+  def request(headers={})
+    yield @request.get('/', headers)
+  end
+
+  def request_with_auth(token, &block)
+    request('HTTP_AUTHORIZATION' => 'Basic ' + [":#{token}"].pack("m*"), &block)
+  end
+
+  def assert_basic_auth_challenge(response)
+    assert_equal(response.status, 401)
+    assert_includes(response, 'WWW-Authenticate')
+    assert(response.headers['WWW-Authenticate'] =~ /Basic realm="#{Regexp.escape(@realm)}"/)
+    assert_empty(response.body)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fernet-rack
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fernet
@@ -51,6 +51,7 @@ files:
 - fernet-rack.gemspec
 - lib/rack/fernet.rb
 - test/test_fernet.rb
+- test/test_fernet_auth.rb
 homepage: http://rubygems.org/gems/fernet-rack
 licenses:
 - MIT
@@ -77,4 +78,5 @@ specification_version: 4
 summary: Easily authenticate
 test_files:
 - test/test_fernet.rb
+- test/test_fernet_auth.rb
 has_rdoc: