rack-signature 0.0.5 → 0.0.6

data/lib/rack/signature.rb

@@ -5,8 +5,8 @@ require_relative 'signature/verify'
 
 module Rack
   module Signature
-    def self.new(app, key)
-      Verify.new(app, key)
+    def self.new(app, options)
+      Verify.new(app, options)
     end
   end
 end

data/lib/rack/signature/verify.rb

@@ -9,16 +9,17 @@ require_relative 'hmac_signature'
 module Rack
   module Signature
     class Verify
+      attr_reader :options
 
       # Initializes the Rack Middleware
       #
       # ==== Attributes
       #
       # * +app+     - A Rack app
-      # * +key+     - The shared key used as a salt.
+      # * +options+ - A hash of options
       #
-      def initialize(app, key)
-        @app, @key = app, key
+      def initialize(app, options)
+        @app, @options = app, options
       end
 
       def call(env)
@@ -48,7 +49,15 @@ module Rack
       # builds the request message and tells HmacSignature to sign the message
       def compute_signature(env)
         message = BuildMessage.new(env).build!
-        HmacSignature.new(@key, message).sign
+        HmacSignature.new(shared_key(env), message).sign
+      end
+
+      # FIXME: This is here for now for a quick implementation within another
+      # app. This will eventually need to be a rack app itself
+      def shared_key(env)
+        token = env["HTTP_#{options[:header_token]}"]
+        return '' if token.nil? || token == ''
+        options[:klass].send(options[:method].to_s, token)
       end
 
     end

data/lib/rack/signature/version.rb

@@ -2,7 +2,7 @@ module Rack
   module Signature
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
 
     def self.version
       [MAJOR, MINOR, PATCH].join('.')

data/test/verify_test.rb

@@ -5,12 +5,13 @@ describe "Verifying a signed request" do
   include Rack::Test::Methods
 
   def setup
+    @options    = get_app_options
     @shared_key = key
     @signature  = expected_signature
   end
 
   let(:app)             { lambda { |env| [200, {}, ['Hello World']] } }
-  let(:rack_signature)  { Rack::Signature.new(app, @shared_key) }
+  let(:rack_signature)  { Rack::Signature.new(app, @options) }
   let(:mock_request)    { Rack::MockRequest.new(rack_signature) }
 
   describe "when a request is made without a signature" do
@@ -36,6 +37,7 @@ describe "Verifying a signed request" do
         "Content-Type"    => "application/json",
         "REQUEST_METHOD"  => "POST",
         "HTTP_X_AUTH_SIG" => @signature,
+        "HTTP_API_TOKEN"  => '123',
         input: "password=123456&email=me@home.com&name=me&age=1")
     end
 
@@ -54,6 +56,7 @@ describe "Verifying a signed request" do
         "Content-Type"    => "application/json",
         "REQUEST_METHOD"  => "POST",
         "HTTP_X_AUTH_SIG" => @signature,
+        "HTTP_API_TOKEN"  => '123',
         input: "password=1234567&email=me@home.com&name=me&age=1")
     end
 
@@ -80,4 +83,14 @@ describe "Verifying a signed request" do
     "Z0qY8Hy4a/gJkGZI0gklzM6vZztsAVVDjA18vb1BvHg="
   end
 
+  class DemoClass
+    def self.get_shared_token(token = '')
+      ::Digest::SHA2.hexdigest("shared-key") if token == '123'
+    end
+  end
+
+  def get_app_options
+    { klass: DemoClass, method: :get_shared_token, header_token: 'API_TOKEN' }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-signature
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack