ey_api_hmac 0.0.15 → 0.0.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ey_api_hmac (0.0.15.pre)
+    ey_api_hmac (0.0.15)
       json
       rack-client
 

data/lib/ey_api_hmac/sso.rb

@@ -9,7 +9,7 @@ module EY
           verify_params!(url, extra_params, parameters)
           parameters.merge!(extra_params)
         end
-        uri.query = parameters.sort_by(&:to_s).map {|e| e.map{|str| CGI.escape(str.to_s)}.join '='}.join '&'
+        uri.query = params_to_string(parameters)
         signature = CGI.escape(signature_param(uri.to_s, auth_id, auth_key))
         uri.query += "&signature=#{signature}"
         uri.to_s
@@ -17,9 +17,10 @@ module EY
 
       def self.authenticated?(url, auth_id, auth_key)
         uri = URI.parse(url)
-        signature = CGI.unescape(uri.query.match(/&signature=(.*)$/)[1])
-        signed_string = uri.to_s.gsub(/&signature=(.*)$/,"")
-        signature_param(signed_string.to_s, auth_id, auth_key) == signature
+        query_params = CGI::parse(uri.query)
+        signature = query_params.delete("signature").to_s
+        uri.query = params_to_string(query_params)
+        signature == signature_param(uri.to_s, auth_id, auth_key)
       end
 
       def self.signature_param(signed_string, auth_id, auth_key)
@@ -28,6 +29,10 @@ module EY
 
       private
 
+      def self.params_to_string(parameters)
+        parameters.sort_by(&:to_s).map {|e| e.map{|str| CGI.escape(str.to_s)}.join '='}.join '&'
+      end
+
       def self.verify_params!(url, extra_params, parameters)
         illegal_query_params = parameters.keys.map(&:to_s) + ["signature"]
         extra_params.keys.each do |k|

data/lib/ey_api_hmac/version.rb

@@ -1,5 +1,5 @@
 module EY
   module ApiHMAC
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_api_hmac
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - "Jacob Burkhart & Thorben Schr\xC3\xB6der & David Calavera & others"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack-client