so_paid 0.0.7 → 0.0.8

data/lib/so_paid/cybersource.rb

@@ -31,6 +31,10 @@ module SoPaid
 
       :signed_field_names =>
         [
+          # used for determining if live, or test mode was used
+          # AFTER the response form cybersource has been made
+          # and we are verifying the request signature
+          :merchant_defined_data100,
           :profile_id, 
           :access_key, 
           :transaction_uuid, 
@@ -74,6 +78,20 @@ module SoPaid
     end
 
 
+    def self.verify_transaction_signature(message)
+      if message[:req_merchant_defined_data100].present? and message[:req_merchant_defined_data] == "test"
+        secret_key = get_secret_key_for(:test)
+      else
+        secret_key = get_secret_key_for(:live)
+      end
+
+      verify_signature(message[:signed_field_names], message[:signature], secret_key)
+    end
+
+    def self.get_secret_key_for(targ_env)
+      (@@pv_defaults[targ_env] and @@pv_defaults[targ_env][:secret_key]) || @@pv_defaults[:secret_key]
+    end
+
     private
 
     def set_pv_fields
@@ -90,6 +108,7 @@ module SoPaid
       # merge pv_order_params on top of pv_options which is
       # the combination of the class defaults and the configuration file defaults
       @merged_pv_opts = merge_defaults(pv_opts, @pv_options)
+      @merged_pv_opts[:merchant_defined_data100] = live? ? "live" : "test"
       order_keys = @merged_pv_opts[:signed_field_names] + @merged_pv_opts[:unsigned_field_names]
       
       order_keys.each do |o_key|
@@ -138,5 +157,6 @@ module SoPaid
     def live?
       !test?
     end
+
   end
 end

data/lib/so_paid/hop.rb

@@ -40,17 +40,15 @@ module SoPaid
       Base64.encode64(mac.digest).gsub "\n", ''
     end
 
-    def self.verify_signature(data,signature)
+    def self.verify_signature(data, signature, secret_key)
        pub_digest = encode_hop(data, secret_key)
        pub_digest.eql?(signature)
     end
     
     def self.verify_transaction_signature(message)
-      verify_signature(message[:signed_field_names], message[:signature])
+      raise "verify_transaction_signature needs to be defined in child class"
     end
 
-    
-
 
     def initialize(order, pv_options={}, config_options={})
       @pv_order_params = {}.with_indifferent_access

data/lib/so_paid/version.rb

@@ -1,3 +1,3 @@
 module SoPaid
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: so_paid
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: