paypal_adaptive 0.3.1 → 0.3.2

data/README.markdown

@@ -91,6 +91,9 @@ for each environment, e.g.:
 The ssl_cert_file should point to your cert_key_pem.txt that is downloaded through the paypal developer interface. It will contain a section that specifies the RSA private key and another section that specifies a certificate. If this is left empty, paypal_adaptive will attempt to use the signature method of validation with PayPal, so your signature config must not be nil.
 
 ## Changelog
+0.3.2
+Added support to api certificate since ssl_cert_file config is now used to set CA Authority. thanks jimbocortes
+
 0.3.1
 Update json dependency to use ~>1.0 so any version 1.X will work.
 

data/lib/paypal_adaptive/config.rb

@@ -15,7 +15,7 @@ module PaypalAdaptive
       :beta_sandbox => "https://svcs.beta-sandbox.paypal.com"
     } unless defined? API_BASE_URL_MAPPING
 
-    attr_accessor :paypal_base_url, :api_base_url, :headers, :ssl_cert_path, :ssl_cert_file
+    attr_accessor :paypal_base_url, :api_base_url, :headers, :ssl_cert_path, :ssl_cert_file, :api_cert_file
 
     def initialize(env=nil, config_override={})
       config = YAML.load(ERB.new(File.new(config_filepath).read).result)[env]
@@ -29,6 +29,7 @@ module PaypalAdaptive
 
         @ssl_cert_path = nil
         @ssl_cert_file = nil
+        @api_cert_file = nil
         @paypal_base_url = PAYPAL_BASE_URL_MAPPING[pp_env]
         @api_base_url = API_BASE_URL_MAPPING[pp_env]
 
@@ -42,8 +43,9 @@ module PaypalAdaptive
           "X-PAYPAL-RESPONSE-DATA-FORMAT" => "JSON"
         }
         @headers.merge!({"X-PAYPAL-SECURITY-SIGNATURE" => config['signature']}) if config['signature']
-
+        @ssl_cert_path = config['ssl_cert_path'] unless config['ssl_cert_path'].blank?
         @ssl_cert_file = config['ssl_cert_file'] unless config['ssl_cert_file'].blank?
+        @api_cert_file = config['api_cert_file'] unless config['api_cert_file'].blank?
       end
     end
 

data/lib/paypal_adaptive/ipn_notification.rb

@@ -10,6 +10,7 @@ module PaypalAdaptive
       @paypal_base_url = config.paypal_base_url
       @ssl_cert_path = config.ssl_cert_path
       @ssl_cert_file = config.ssl_cert_file
+      @api_cert_file = config.api_cert_file
     end
 
     def send_back(data)
@@ -20,12 +21,13 @@ module PaypalAdaptive
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       http.ca_path = @ssl_cert_path unless @ssl_cert_path.nil?
 
-      if @ssl_cert_file
-        # cert = File.read(@ssl_cert_file)
-        # http.cert = OpenSSL::X509::Certificate.new(cert)
-        # http.key = OpenSSL::PKey::RSA.new(cert)
-        http.ca_file = @ssl_cert_file
+      if @api_cert_file
+        cert = File.read(@api_cert_file)
+        http.cert = OpenSSL::X509::Certificate.new(cert)
+        http.key = OpenSSL::PKey::RSA.new(cert)
       end
+      http.ca_path = @ssl_cert_path unless @ssl_cert_path.blank?
+      http.ca_file = @ssl_cert_file unless @ssl_cert_file.blank?
 
       path = "#{@paypal_base_url}/cgi-bin/webscr"
       response_data = http.post(path, data).body

data/lib/paypal_adaptive/request.rb

@@ -14,6 +14,7 @@ module PaypalAdaptive
       @headers = config.headers
       @ssl_cert_path = config.ssl_cert_path
       @ssl_cert_file = config.ssl_cert_file
+      @api_cert_file = config.api_cert_file
     end
 
     def validate
@@ -91,13 +92,13 @@ module PaypalAdaptive
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
-      if @ssl_cert_file
-        #cert = File.read(@ssl_cert_file)
-        #http.cert = OpenSSL::X509::Certificate.new(cert)
-        #http.key = OpenSSL::PKey::RSA.new(cert)
-        http.ca_file = @ssl_cert_file
+      if @api_cert_file
+        cert = File.read(@api_cert_file)
+        http.cert = OpenSSL::X509::Certificate.new(cert)
+        http.key = OpenSSL::PKey::RSA.new(cert)
       end
-      http.ca_path = @ssl_cert_path unless @ssl_cert_path.nil?
+      http.ca_path = @ssl_cert_path unless @ssl_cert_path.blank?
+      http.ca_file = @ssl_cert_file unless @ssl_cert_file.blank?
 
       begin
         response_data = http.post(path, api_request_data, @headers)

data/lib/paypal_adaptive/version.rb

@@ -1,4 +1,4 @@
 module PaypalAdaptive
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_adaptive
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70345696753460 !ruby/object:Gem::Requirement
+  requirement: &70212142494100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345696753460
+  version_requirements: *70212142494100
 - !ruby/object:Gem::Dependency
   name: jsonschema
-  requirement: &70345696752780 !ruby/object:Gem::Requirement
+  requirement: &70212142493220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345696752780
+  version_requirements: *70212142493220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70345696752060 !ruby/object:Gem::Requirement
+  requirement: &70212142492480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70345696752060
+  version_requirements: *70212142492480
 description: Lightweight wrapper for Paypal's Adaptive Payments API
 email:
 - tommy.chheng@gmail.com