signauth 0.0.1 → 0.0.2

data/lib/signauth/request.rb

@@ -6,8 +6,8 @@ module Signauth
     attr_accessor :path
     attr_accessor :params
     
-    def initialize(signature_version = Signauth::Signature::Version1)
-      extend(signature_version)
+    def initialize(signature_version = 1)
+      extend(Signature.const_get("Version#{signature_version}"))
       @method = "GET"
       @host   = ""
       @path   = "/"

data/lib/signauth/signature/version_1.rb

@@ -4,17 +4,18 @@ module Signauth
 
       def add_authorization!(credentials)
         params['access_key_id']     = credentials.access_key_id
-        params['signature_version'] = '1'
-        params['signature_method']  = 'HmacSHA256'
+        params['signature_version'] = version
+        params['signature_method']  = 'HMAC-SHA-256'
 
         params.delete('signature')
         params['signature'] = signature(credentials)
+        params
       end
 
       def authenticate(credentials)
         given    = params.delete('signature')
         computed = signature(credentials)
-        unless given == computed
+        unless slow_string_comparison(given, computed)
           raise Errors::SignatureDoesNotMatch,
             "Invalid signature: should have sent Base64(HmacSHA256(secret, #{string_to_sign.inspect}))"\
             ", but given #{given}"
@@ -26,8 +27,12 @@ module Signauth
 
       protected
 
+      def version
+        "1"
+      end
+
       def signature(credentials)
-        Signer.sign(credentials.secret_access_key, string_to_sign)
+        Signer.sign(credentials.secret_access_key, string_to_sign, params['signature_method'])
       end
       
       def string_to_sign
@@ -43,6 +48,13 @@ module Signauth
         "#{URI.escape(name)}=#{URI.escape(value)}"
       end
 
+      def slow_string_comparison(given, computed)
+        return false if given.nil? || computed.nil? || given.length != computed.length
+        match = true
+        computed.chars.each_with_index{|c, i| match &= c == given[i] }
+        match
+      end
+
     end
   end
 end

data/lib/signauth/signature/version_2.rb

@@ -19,7 +19,11 @@ module Signauth
       end
 
       protected
-      
+
+      def version
+        "2"
+      end
+
       def validate_timestamp(skew)
         begin
           timestamp = Time.iso8601(params['timestamp'])

data/lib/signauth/signature.rb

@@ -1,6 +1,7 @@
+require "signauth/signature/version_1"
+require "signauth/signature/version_2"
+
 module Signauth
   module Signature
-    autoload :Version1, "signauth/signature/version_1"
-    autoload :Version2, "signauth/signature/version_2"
   end
 end

data/lib/signauth/signer.rb

@@ -5,13 +5,28 @@ module Signauth
   module Signer
     extend self
 
-    def sign(secret, string_to_sign, digest_method = 'sha256')
-      Base64.encode64(hmac(secret, string_to_sign, digest_method)).strip
+    def sign(secret, string_to_sign, algorithm = 'HMAC-SHA-256')
+      Base64.encode64(hmac(secret, string_to_sign, algorithm)).strip
     end
 
-    def hmac(key, value, digest = 'sha256')
+    def hmac(key, value, algorithm = 'HMAC-SHA-256')
+      digest = digest_name(algorithm)
       OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new(digest), key, value)
     end
 
+    private
+
+    def digest_name(algorithm)
+      ALGORITHM_DIGEST_MAPPING[algorithm]
+    end
+
+    ALGORITHM_DIGEST_MAPPING = {
+      "HMAC-MD5"     => "md5",
+      "HMAC-SHA-1"   => "sha1",
+      "HMAC-SHA-224" => "sha224",
+      "HMAC-SHA-256" => "sha256",
+      "HMAC-SHA-384" => "sha384",
+      "HMAC-SHA-512" => "sha512",
+    }
   end
 end

data/lib/signauth/version.rb

@@ -1,3 +1,3 @@
 module Signauth
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signauth
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 566629137
+      hash: -585195729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 566629137
+      hash: -585195729
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24