killbill-cybersource 4.0.9 → 4.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f29b96955182c07ea9f8c6c0b2664828c9b385d
-  data.tar.gz: 43392e1684880a50f286cdaaae67b8c8666e2d91
+  metadata.gz: 58cb83423a65c33db773647d189febf28e53c799
+  data.tar.gz: 047b2949668e415baa08694d5adda58f28c78abe
 SHA512:
-  metadata.gz: 6ccc1ae57b5fef06cf6e45f2518704aaebaaf3f0b195a8356f4a9eae084cdb748e245e6e04d1f67d42580c5c8d981eec90276df47826c6bbdd50e2dfd190d292
-  data.tar.gz: 2da7bfe0ff896e517ea1ec8be1450cf850633274b629afad4cac5997947a2ac1fd16b62aa1560f3cec2c4f98f2aeef58bb879050432432835334f6a622ee1ba9
+  metadata.gz: 228be79b3eb1f98e22367db93ec779e54fe67c529e9b1cb827f1e94cd818a0933f3fa2c36c4a8d45ce89a14db9700005547863540fb986414d9daea9e7ef343d
+  data.tar.gz: 7febfe2b9798496d89af92ea4b5da908cedf79d516f72b740f06dd4890aa8ac92af21c386cc775c2bbd4be507c473b7b9e80eff997300af3aa98b4f50d2ad416

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (4.0.9)
+    killbill-cybersource (4.0.10)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)

data/NEWS

@@ -1,3 +1,8 @@
+4.0.10
+    Fix parsing of AVS and CVV responses
+    Specify User-Agent, X-Request-Id and Content-Type headers to CyberSource
+    Better handling of 5xx errors
+
 4.0.9
     Android Pay bugfix
     Cancel UNDEFINED payments after 24 hours by default

data/VERSION

@@ -1 +1 @@
-4.0.9
+4.0.10

data/lib/cybersource/cyber_source_on_demand.rb

@@ -26,8 +26,10 @@ module Killbill #:nodoc:
 
         headers = {
             # Don't use symbols or it will confuse Net/HTTP
-            'Authorization' => 'Basic ' + Base64.encode64("#{@config[:username]}:#{@config[:password]}").chomp
+            'Authorization' => 'Basic ' + Base64.encode64("#{@config[:username]}:#{@config[:password]}").chomp,
+            'User-Agent' => ActiveMerchant::Billing::CyberSourceGateway.ua
         }
+        headers['X-Request-Id'] = ActiveMerchant::Billing::CyberSourceGateway.x_request_id unless ActiveMerchant::Billing::CyberSourceGateway.x_request_id.blank?
 
         data = URI.encode_www_form(params)
 

data/lib/cybersource/ext/active_merchant/active_merchant.rb

@@ -5,6 +5,13 @@ module ActiveMerchant
 
     class CyberSourceGateway
 
+      cattr_reader :ua
+
+      def self.x_request_id
+        # See KillbillMDCInsertingServletFilter
+        org::slf4j::MDC::get('req.requestId') rescue nil
+      end
+
       def initialize(options = {})
         super
 
@@ -104,13 +111,18 @@ module ActiveMerchant
         end
       end
 
-      # See https://github.com/killbill/killbill-cybersource-plugin/issues/4
       def commit(request, options)
         request = build_request(request, options)
         begin
-          raw_response = ssl_post(test? ? self.test_url : self.live_url, request)
+          raw_response = ssl_post(test? ? self.test_url : self.live_url, request, build_headers(options))
         rescue ResponseError => e
-          raw_response = e.response.body
+          if !e.response.nil? && e.response.code.to_i == 500 && !e.response.body.blank?
+            # See https://github.com/killbill/killbill-cybersource-plugin/issues/4
+            raw_response = e.response.body
+          else
+            # Don't swallow other 5xx errors like proxy timeouts - these should most likely be UNKNOWN
+            raise e
+          end
         end
         response = parse(raw_response)
 
@@ -135,9 +147,29 @@ module ActiveMerchant
         Response.new(success, message, response,
                      :test => test?,
                      :authorization => authorization,
-                     :avs_result => {:code => response[:avsCode]},
-                     :cvv_result => response[:cvCode]
-        )
+                     :avs_result => {:code => response['avsCode']},
+                     :cvv_result => response['cvCode'])
+      end
+
+      def user_agent
+        @@ua ||= JSON.dump({
+                               :bindings_version => KB_PLUGIN_VERSION,
+                               :lang => 'ruby',
+                               :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+                               :platform => RUBY_PLATFORM,
+                               :publisher => 'killbill'
+                           })
+      end
+
+      def build_headers(options)
+        options[:x_request_id] ||= self.class.x_request_id
+        options[:content_type] ||= 'text/xml'
+
+        headers = {}
+        headers['Content-Type'] = options[:content_type]
+        headers['User-Agent'] = user_agent
+        headers['X-Request-Id'] = options[:x_request_id] unless options[:x_request_id].blank?
+        headers
       end
 
       def add_merchant_data(xml, options)

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.9</version>
+    <version>4.0.10</version>
     <name>cybersource-plugin</name>
     <url>http://github.com/killbill/killbill-cybersource-plugin</url>
     <description>Plugin for accessing Cybersource as a payment gateway</description>

data/spec/cybersource/base_plugin_spec.rb

@@ -147,6 +147,27 @@ describe Killbill::Cybersource::PaymentPlugin do
 
   context 'Errors handling' do
 
+    it 'handles proxy errors as UNDEFINED transactions' do
+      ::ActiveMerchant::Billing::CyberSourceGateway.any_instance.stub(:ssl_post) do |_, _|
+        raise ::ActiveMerchant::ResponseError.new(OpenStruct.new(:body => 'Oops', :code => 502))
+      end
+      purchase_with_token(:UNDEFINED).gateway_error.should == 'Failed with 502 '
+    end
+
+    it 'handles generic 500 errors as UNDEFINED transactions' do
+      ::ActiveMerchant::Billing::CyberSourceGateway.any_instance.stub(:ssl_post) do |_, _|
+        raise ::ActiveMerchant::ResponseError.new(OpenStruct.new(:body => nil, :code => 500))
+      end
+      purchase_with_token(:UNDEFINED).gateway_error.should == 'Failed with 500 '
+    end
+
+    it 'handles CyberSource errors as CANCELED transactions' do
+      ::ActiveMerchant::Billing::CyberSourceGateway.any_instance.stub(:ssl_post) do |_, _|
+        raise ::ActiveMerchant::ResponseError.new(OpenStruct.new(:body => one_or_more_fields_contains_invalid_data, :code => 500))
+      end
+      purchase_with_token(:CANCELED).gateway_error.should == 'One or more fields contains invalid data'
+    end
+
     it 'handles expired passwords as CANCELED transactions' do
       ::ActiveMerchant::Billing::CyberSourceGateway.any_instance.stub(:ssl_post).and_return(password_expired_response)
       purchase_with_token(:CANCELED).gateway_error.should == 'wsse:FailedCheck: Security Data : Merchant password has expired.'
@@ -425,4 +446,12 @@ describe Killbill::Cybersource::PaymentPlugin do
 <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsu:Timestamp xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="Timestamp-28121162"><wsu:Created>2008-01-15T21:50:41.580Z</wsu:Created></wsu:Timestamp></wsse:Security></soap:Header><soap:Body><c:replyMessage xmlns:c="urn:schemas-cybersource-com:transaction-data-1.26"><c:merchantReferenceCode>a1efca956703a2a5037178a8a28f7357</c:merchantReferenceCode><c:requestID>2004338415330008402434</c:requestID><c:decision>REJECT</c:decision><c:reasonCode>102</c:reasonCode><c:requestToken>Afvvj7KfIgU12gooCFE2/DanQIApt+G1OgTSA+R9PTnyhFTb0KRjgFY+ynyIFNdoKKAghwgx</c:requestToken><c:ccAuthReversalReply><c:reasonCode>102</c:reasonCode></c:ccAuthReversalReply><c:originalTransaction><c:amount>0.00</c:amount><c:reasonCode>100</c:reasonCode></c:originalTransaction></c:replyMessage></soap:Body></soap:Envelope>
     XML
   end
+
+  def one_or_more_fields_contains_invalid_data
+    <<-XML
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsu:Timestamp xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="Timestamp-28121162"><wsu:Created>2008-01-15T21:50:41.580Z</wsu:Created></wsu:Timestamp></wsse:Security></soap:Header><soap:Body><c:replyMessage xmlns:c="urn:schemas-cybersource-com:transaction-data-1.26"><c:requestID>12345</c:requestID><c:decision>REJECT</c:decision><c:reasonCode>102</c:reasonCode><c:invalidField>c:billTo/c:state</c:invalidField><c:requestToken>Afvvj7KfIgU12gooCFE2/DanQIApt+G1OgTSA+R9PTnyhFTb0KRjgFY+ynyIFNdoKKAghwgx</c:requestToken></c:replyMessage></soap:Body></soap:Envelope>
+    XML
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.10
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill