exact4r 1.1 → 1.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+== v1.2
+  Updated with new SSL certificates for https://api.e-xact.com
+
 == v1.1
   Removed debugger statement. Sorry!
 

data/VERSION

@@ -1 +1 @@
-1.1
+1.2

data/certs/e-xact.com.crt

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFVTCCBD2gAwIBAgIHBITApWVLMTANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
+BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
+aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
+IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
+ODcwHhcNMTAwMjE2MjMzNTQzWhcNMTUwMjE2MjMzNTQzWjBRMRUwEwYDVQQKDAwq
+LmUteGFjdC5jb20xITAfBgNVBAsMGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEV
+MBMGA1UEAwwMKi5lLXhhY3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApvqzJMP4vtbvyXwepZhj8uaKXONIo4H8aN51FOL1PDdGEfWktlWw38Xj
+dU0KJrGeTcBgsfg8NehFwasilW6IbojhMmnvWyYaTzklEjMDmgda3hGRJRqbg/dW
+v0nZRMO7Xy0NNMGHeN9Sxs8977LRV5Y1VjK1M3WhilP3oxe49Ov1K4FEZrxT0fbn
+sqClwAm059XM+qWkUY5tBs6KSZQf1/+Xlx5txB/IqDWLrN5oRuCa+mBi5mIFE7nA
+suFtI/26szCYVuK6r8spbsYeo13c/qTv4yaZbLW3uXgbgTuI4FAtOR9NpUYvLQHR
+9kYYPeusqj0DnLD6ELMXkujHW0V6MQIDAQABo4IBtjCCAbIwDwYDVR0TAQH/BAUw
+AwEBADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQD
+AgWgMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2Rz
+MS0xNC5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5MDcGCCsGAQUFBwIB
+FitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMIGA
+BggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdvZGFkZHku
+Y29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNv
+bS9yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYDVR0jBBgwFoAU/axh
+MpNsRdbi7oVfmrrndplozOcwIwYDVR0RBBwwGoIMKi5lLXhhY3QuY29tggplLXhh
+Y3QuY29tMB0GA1UdDgQWBBRmlEOazZNz8dfnnl7UimMDqciOOzANBgkqhkiG9w0B
+AQUFAAOCAQEArQNhlZ3ij3Yz1U2GHiNY4fpYtNCAhzlrnNZUHaDlhiWEvOcXSB4j
+ER77sgaHmZOm8PW0mXg3eK0+Km5ANWbNbPLe0yPpKRa1GbmgxQx/P4MWMiM+872l
+QmpZlgLw2cGvivALAt7S74QTiqjYX10nNyHlpnlvB9Am2WgzQHQDzyKuKGglFjlw
+ItZpTFFkSGEWK99cxE69GMwtZCsr4b+RB80sDA+ckd45GISg808GkWHfqJVa64k8
+dlXVgRNQwLfrWN+BQeUsfsKu5jiNI7H2a8zrRt4mCa9urh15O+d4pDhXhrYSkQpI
+ezmbzKzCEd1mpiT+sjCzByN3uX6n7eF/Eg==
+-----END CERTIFICATE-----

data/certs/valicert_class2_root.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----

data/lib/ews/transaction/validator.rb

@@ -64,9 +64,9 @@ module EWS  # :nodoc:
 
         # ensure our amounts are within range
         append_error(:amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.amount)
-        append_error(:surcharge_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.surcharge_amount)
-        append_error(:tax1_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax1_amount)
-        append_error(:tax2_amount, "amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax2_amount)
+        append_error(:surcharge_amount, "surcharge_amount must be between 0.00 and 99999.99") unless amount_in_range?(self.surcharge_amount)
+        append_error(:tax1_amount, "tax1_amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax1_amount)
+        append_error(:tax2_amount, "tax2_amount must be between 0.00 and 99999.99") unless amount_in_range?(self.tax2_amount)
         
         # ensure our credit card information is valid
         append_error(:cc_number, "invalid cc_number supplied") unless valid_card_number?

data/lib/ews/transporter.rb

@@ -31,8 +31,8 @@ module EWS # :nodoc:
       @url = URI.parse(url.gsub(/\/$/,''))
       @transport_type = options[:transport_type] || :rest
       
-      @@issuer_cert ||= File.dirname(__FILE__)+"/../../certs/equifax_ca.cer"
-      @@server_cert ||= File.new(File.dirname(__FILE__)+"/../../certs/exact.cer").read
+      @@issuer_cert ||= File.dirname(__FILE__)+"/../../certs/valicert_class2_root.crt"
+      @@server_cert ||= File.new(File.dirname(__FILE__)+"/../../certs/e-xact.com.crt").read
     end
 
     # Submit a transaction request to the server
@@ -52,7 +52,7 @@ module EWS # :nodoc:
       request = build_http_request(transaction, transport_type, transport_details[:suffix])
       request.basic_auth(transaction.gateway_id, transaction.password)
       request.add_field "Accept", transport_details[:content_type]
-      request.add_field "User-Agent", "exact4r v1.1"
+      request.add_field "User-Agent", "exact4r v1.2"
       request.add_field "Content-type", "#{transport_details[:content_type]}; charset=UTF-8"
 
       response = get_connection.request(request)
@@ -113,13 +113,47 @@ private
 
     def validate_certificate(is_ok, ctx)
       cert = ctx.current_cert
-
-      # Only check the server certificate, not the issuer.
-      unless (cert.subject.to_s == cert.issuer.to_s)
-        is_ok &&= (@@server_cert == cert.to_pem)
+      return false if cert.nil?
+
+      # preverify failed?
+      return false unless is_ok
+
+      self_signed = false
+      ca = false
+      pathlen = nil
+      server_auth = true
+      self_signed = (cert.subject.cmp(cert.issuer) == 0)
+
+      # Check extensions for the certificate purpose according to http://www.openssl.org/docs/apps/x509.html (Certificate Extensions) and
+      # http://www.ietf.org/rfc/rfc3280.txt.
+      cert.extensions.each do |ex|
+        case ex.oid
+        when 'basicConstraints'
+          /CA:(TRUE|FALSE)(?:, pathlen:)*(\d*)/  =~ ex.value
+          ca ||= ($1 == 'TRUE')
+          pathlen = $2.to_i
+        when 'keyUsage'
+          usage = ex.value.split(/\s*,\s*/)
+          # a CA must have
+          ca &&= !usage.grep(/Certificate Sign/i).empty?
+          # Server Cert Must have
+          server_auth &&= !usage.grep(/Key Encipherment/i).empty?
+        when 'extendedKeyUsage'
+          usage = ex.value.split(/\s*,\s*/)
+          # Server Cert Must have
+          server_auth &&= !usage.grep(/TLS Web Server Authentication/i).empty?
+        when 'nsCertType'
+          usage = ex.value.split(/\s*,\s*/)
+          ca ||= !usage.grep(/SSL CA/i).empty?
+          server_auth ||= !usage.grep(/SSL Server/i).empty?
+        end
       end
 
-      is_ok
+      # We're looking for the server cert, so accept all CAs (which have already passed pre-verification)
+      return true if self_signed || ca
+      
+      # ensure the server cert is the one we're expecting
+      return server_auth && @@server_cert == cert.to_pem
     end
 
     # what transport types we support, and their corresponding suffixes

data/lib/exact4r.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activesupport'
+require 'active_support'
 
 require 'ews/transaction/mapping'
 require 'ews/transaction/request'

data/test/general/request_test.rb

@@ -142,6 +142,17 @@ class RequestTest < Test::Unit::TestCase
     assert response.approved?
     assert_equal "Transaction Normal", response.exact_message
   end
+  
+  def test_wont_send_invalid_amounts
+    [-0.01, "-0.01", 100000, "100000"].each do |amt|
+      transporter = EWS::Transporter.new(@@credentials.config['location'])
+      
+      transporter.expects(:build_http_request).never
+      
+      original_resp = transporter.submit(basic_new_transaction(:amount => amt), :json)
+      assert !original_resp
+    end
+  end
 
 private
   def basic_find_transaction(options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exact4r
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - E-xact Transactions Ltd.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +11:00
+date: 2010-03-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,9 +44,10 @@ extra_rdoc_files:
 - README
 - VERSION
 files: 
-- ./after.log
+- ./certs/e-xact.com.crt
 - ./certs/equifax_ca.cer
 - ./certs/exact.cer
+- ./certs/valicert_class2_root.crt
 - ./CHANGELOG
 - ./lib/ews/transaction/fake_response.rb
 - ./lib/ews/transaction/mapping.rb

data/after.log

@@ -1,4 +0,0 @@
-(in /Volumes/Exact/WebService/exact4r)
-Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader
-Started
-.................................................................