fernet-rack 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c8aaf57239d1f082a25804b9ac2581cd463edb
-  data.tar.gz: b5b7e33dad82fd43db6c6e13106d072007aa7f58
+  metadata.gz: 6aa8111be46b666e1b3103cde898fa7af875ddb9
+  data.tar.gz: be4873a4df9f0c809c0a9be556c18e5e72ef7261
 SHA512:
-  metadata.gz: a1f21e59d62fc3fea4470628095f0efdce9c57f63af73e58f28baeee1261f09d454a3113febb3d86ede5caba2364a47a0d8e9c7e67a2705fa01a7b589e1228e7
-  data.tar.gz: 5cff741b336433dc07e21530ea668c56caa72a6ae8af361a310b2021f1e338b698f9892ead4cec2672b54c0e01946624fc2c124f80b929d54bdabcd332a7e9d0
+  metadata.gz: 568a2b5c57eb398519c690fb4113ad84908e984d020341a3243557ecba3b7af3006ae3812a554ca84fd6db6aac0d64c9386b36806fabf22dcfbc0564ff8093e5
+  data.tar.gz: febb00068b464b7000c6d7f23cb13bd16dd164cce50328ef4e891f4adb6aa6dc4a781216ae19d866471fa850f9effbf4230da746651b760a107a5f36315d37be

data/fernet-rack.gemspec

@@ -13,8 +13,8 @@ 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.6'
+  gem.version       = '0.7'
 
-  gem.add_runtime_dependency "fernet", '~> 2.0'
+  gem.add_runtime_dependency "fernet", '~> 2.1'
   gem.add_development_dependency "minitest", '~> 5.4'
-end
+end

data/lib/rack/fernet.rb

@@ -4,6 +4,8 @@ require 'rack'
 
 
 module Rack
+  class FernetError < StandardError; end
+
   module Auth
     class Fernet < Rack::Auth::Basic
       def initialize(app, secret, realm=nil)
@@ -28,25 +30,61 @@ module Rack
     end
 
     def call(env)
-      secret = if @secret.respond_to?(:call)
+      payload = env["rack.input"].read
+
+      unless payload.empty?
+        payload = decrypt_request(env, payload)
+        env["CONTENT_TYPE"] = @content_type
+        env["rack.input"] = StringIO.new(payload)
+      end
+
+      status, headers, body = @app.call(env)
+      str_body = read_body(body)
+      unless str_body.empty?
+        encoded = encrypt_response(env, str_body)
+        headers['Content-Type'] = 'application/octet-stream'
+        headers['Content-Length'] = encoded.length
+        body = [ encoded ]
+      end
+      [status, headers, body]
+    rescue ::Fernet::Error
+      bad_request
+    end
+
+    private
+
+    def read_body(body)
+      if body.respond_to? :join
+        body.join('')
+      else
+        result = []
+        body.each { |line| result << line }
+        result.join('')
+      end
+    end
+
+    def secret(env)
+      if @secret.respond_to?(:call)
         @secret.call(env)
       else
         @secret
       end
-      payload = env["rack.input"].read
-      verifier = ::Fernet.verifier(secret, payload)
+    end
+
+    def encrypt_response(env, payload)
+      ::Fernet.generate(secret(env), payload)
+    end
+
+    def decrypt_request(env, payload)
+      # read the payload
+      verifier = ::Fernet.verifier(secret(env), payload)
       if verifier.valid?
-        env["CONTENT_TYPE"] = @content_type
-        env["rack.input"] = StringIO.new(verifier.message)
-        @app.call(env)
-      elsif payload.size.zero?
-        @app.call(env)
+        verifier.message
       else
-        bad_request
+        raise ::Fernet::Error
       end
     end
 
-    private
     def bad_request
       return [ 400,
         { 'Content-Type' => 'text/plain',

data/test/test_fernet.rb

@@ -5,9 +5,6 @@ require 'rack/mock'
 
 class FernetTest < Minitest::Test
   def setup
-    unprotected_app = Rack::Lint.new(lambda do |env|
-      [ 200, {'Content-Type' => env["CONTENT_TYPE"].to_s }, [env["rack.input"].read] ]
-    end)
     @secret = "SqD5Mz/qFnXPLVTvkQKRDyVpli3Q6/habc7i89IrBRA="
     @app = Rack::Fernet.new(unprotected_app, @secret)
     @request = Rack::MockRequest.new(@app)
@@ -15,46 +12,69 @@ class FernetTest < Minitest::Test
 
   def test_invalid_signature
     request("garbage") do |response|
-      assert_equal(response.status, 400)
+      assert_equal(400, response.status)
     end
   end
 
   def test_valid_signature
-    request(data) do |response|
-      assert_equal(response.status, 200)
-      assert_equal(response.body, '{}')
-      assert_equal(response.headers['Content-Type'], 'application/json')
+    data = '{"hello"=>"world"}'
+    request(encrypt(data)) do |response|
+      assert_equal(200, response.status)
+      assert_equal(data, decrypt(response.body))
+      assert_equal('application/octet-stream', response.headers['Content-Type'])
     end
   end
 
   def test_empty_payload
     request do |response|
-      assert_equal(response.status, 200)
+      assert_equal(200, response.status)
     end
   end
 
   protected
-  def request(body=nil, headers={})
-    yield @request.get('/', input: body, CONTENT_TYPE: 'application/octet-stream')
+  def unprotected_app
+    Rack::Lint.new(lambda do |env|
+      request_body = env["rack.input"].read
+      content_type = env["CONTENT_TYPE"].to_s
+      unless request_body.empty?
+        assert_equal('application/json', content_type)
+      end
+      [ 200, {'Content-Type' => content_type }, [request_body] ]
+    end)
+  end
+
+  def request(body='', headers={})
+    yield @request.get('/', :input => body, 'CONTENT_TYPE' => 'application/octet-stream')
   end
 
-  def data
-    Fernet.generate(@secret, '{}')
+  def encrypt(data)
+    Fernet.generate(@secret, data)
+  end
+
+  def decrypt(data)
+    verifier = Fernet.verifier(@secret, data)
+    if verifier.valid?
+      verifier.message
+    end
   end
 end
 
 class DynamicFernetTest < FernetTest
   def setup
-    unprotected_app = Rack::Lint.new(lambda do |env|
-      [ 200, {'Content-Type' => env["CONTENT_TYPE"].to_s }, [env["rack.input"].read] ]
-    end)
     @secret = ->(env) { "SqD5Mz/qFnXPLVTvkQKRDyVpli3Q6/habc7i89IrBRA=" }
     @app = Rack::Fernet.new(unprotected_app, @secret)
     @request = Rack::MockRequest.new(@app)
   end
 
   protected
-  def data
-    Fernet.generate(@secret.call(nil), '{}')
+  def encrypt(data)
+    Fernet.generate(@secret.call(nil), data)
+  end
+
+  def decrypt(data)
+    verifier = Fernet.verifier(@secret.call(nil), data)
+    if verifier.valid?
+      verifier.message
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fernet-rack
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fernet
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement