ipizza 0.5.4 → 0.5.5

data/README.markdown

@@ -45,7 +45,9 @@ Configuration parameters
       # relatively to YAML file
       file_cert: ./certificates/bank_public.crt
       snd_id: dealer
-      encoding: UTF-8
+      encoding: ISO-8859-4
+
+Please note that currently only ISO-8859-4 encoding is supported with Swedbank. UTF-8 works well with other payment providers.
 
 Payment requests
 ----------------

data/lib/ipizza/provider/swedbank.rb

@@ -33,7 +33,7 @@ module Ipizza::Provider
 
     def payment_response(params)
       response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert, self.class.encoding)
+      response.verify(self.class.file_cert)
       return response
     end
 

data/lib/ipizza/response.rb

@@ -17,7 +17,7 @@ class Ipizza::Response
   def verify(certificate_path, charset = 'UTF-8')
     param_order = @@response_param_order[@params['VK_SERVICE']]
     verify_params = param_order.inject(Hash.new) { |h, p| h[p] = @params[p]; h }
-    mac_string = Ipizza::Util.mac_data_string(verify_params, param_order, 'UTF-8', charset)
+    mac_string = Ipizza::Util.mac_data_string(verify_params, param_order)
 
     @valid = Ipizza::Util.verify_signature(certificate_path, @params['VK_MAC'], mac_string)
   end

data/lib/ipizza/util.rb

@@ -49,10 +49,9 @@ module Ipizza
       # Where || is string concatenation, p(x) is length of the field x represented by three digits.
       #
       # Parameters val1, val2, value3 would be turned into "003val1003val2006value3".
-      def mac_data_string(params, sign_param_order, to_charset = 'UTF-8', from_charset = 'UTF-8')
+      def mac_data_string(params, sign_param_order)
         sign_param_order.inject('') do |memo, param|
           val = params[param].to_s
-          val = Iconv.conv(to_charset, from_charset, val)
           memo << func_p(val) << val
           memo
         end

data/lib/ipizza/version.rb

@@ -1,3 +1,3 @@
 module Ipizza
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/spec/certificates/swedbank_production.pem

@@ -0,0 +1,48 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 125 (0x7d)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=EE, ST=Estonia, L=Tallinn, O=Hansabank, OU=0025200, CN=Hansabank Server Certification Authority/emailAddress=certmaster@hansa.ee
+        Validity
+            Not Before: Oct 31 09:26:45 2007 GMT
+            Not After : Dec 25 09:26:45 2008 GMT
+        Subject: C=EE, O=Hansabank, CN=Virtual POS
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b1:4a:b1:cf:a6:1c:bc:7d:1f:6b:ca:a9:c9:a9:
+                    7b:e4:f1:c9:61:4c:c7:14:33:57:1e:d3:79:9e:73:
+                    ff:25:f1:55:ba:67:c2:34:9f:97:5c:ca:d0:1f:26:
+                    88:09:d3:76:9a:35:c8:31:22:47:ed:f1:2d:73:f1:
+                    c6:13:0e:19:0c:18:a2:93:1a:97:8c:9e:d6:13:43:
+                    d7:95:5b:5c:a3:59:60:96:44:ce:81:d9:4d:14:d1:
+                    ec:d0:e3:80:32:b2:5d:fd:de:de:01:0a:87:e6:4b:
+                    33:94:25:94:1d:ba:29:e8:8e:48:88:3e:0a:b0:a2:
+                    4a:6e:39:f8:ba:d4:4f:aa:8f
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: md5WithRSAEncryption
+        23:dc:bb:5b:a9:b7:70:c6:93:39:75:74:ad:ee:69:81:0b:b7:
+        9e:73:24:28:00:97:2c:57:a8:8b:76:d9:cc:87:7f:74:1f:35:
+        8b:ea:a2:25:5c:a6:af:3c:15:06:25:8e:89:ac:05:e8:d4:b4:
+        d2:0a:04:ca:81:36:dc:8c:72:24:06:b1:f6:e5:79:a9:f7:68:
+        3a:1b:15:7c:9c:99:4b:38:c8:c7:f9:bf:db:52:60:74:c4:03:
+        65:8b:11:e6:cc:e1:d5:d0:c0:07:fd:cb:5a:c8:2d:ef:01:e8:
+        16:87:51:d0:b2:59:51:d3:d1:93:a8:7b:30:74:85:46:5c:0f:
+        22:c0
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcOgAwIBAgIBfTANBgkqhkiG9w0BAQQFADCBrjELMAkGA1UEBhMCRUUx
+EDAOBgNVBAgTB0VzdG9uaWExEDAOBgNVBAcTB1RhbGxpbm4xEjAQBgNVBAoTCUhh
+bnNhYmFuazEQMA4GA1UECxMHMDAyNTIwMDExMC8GA1UEAxMoSGFuc2FiYW5rIFNl
+cnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAGCSqGSIb3DQEJARYTY2Vy
+dG1hc3RlckBoYW5zYS5lZTAeFw0wNzEwMzEwOTI2NDVaFw0wODEyMjUwOTI2NDVa
+MDcxCzAJBgNVBAYTAkVFMRIwEAYDVQQKEwlIYW5zYWJhbmsxFDASBgNVBAMTC1Zp
+cnR1YWwgUE9TMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxSrHPphy8fR9r
+yqnJqXvk8clhTMcUM1ce03mec/8l8VW6Z8I0n5dcytAfJogJ03aaNcgxIkft8S1z
+8cYTDhkMGKKTGpeMntYTQ9eVW1yjWWCWRM6B2U0U0ezQ44Aysl393t4BCofmSzOU
+JZQduinojkiIPgqwokpuOfi61E+qjwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACPc
+u1upt3DGkzl1dK3uaYELt55zJCgAlyxXqIt22cyHf3QfNYvqoiVcpq88FQYljoms
+BejUtNIKBMqBNtyMciQGsfblean3aDobFXycmUs4yMf5v9tSYHTEA2WLEebM4dXQ
+wAf9y1rILe8B6BaHUdCyWVHT0ZOoezB0hUZcDyLA
+-----END CERTIFICATE-----

data/spec/config/config.yml

@@ -6,7 +6,7 @@ swedbank:
   file_cert: ../certificates/bank.crt
   file_key: ../certificates/dealer.key
   key_secret: foobar
-  encoding: UTF-8
+  encoding: ISO-8859-4
   snd_id: sender
 
 seb:
@@ -14,7 +14,7 @@ seb:
   return_url: http://test.local/seb
   cancel_url: http://test.local/seb
   login: dealer
-  file_cert: ../certificates/seb_test_pub.crt
+  file_cert: ../certificates/seb_test_pub.pem
   file_key: ../certificates/dealer.key
   key_secret: foobar
   encoding: UTF-8

data/spec/ipizza/provider/seb_spec.rb

@@ -14,7 +14,20 @@ describe Ipizza::Provider::Seb do
   end
 
   describe '#payment_response' do
-    it 'should parse and verify the payment response from bank'
+    before(:each) do
+      @params = {
+        'VK_T_NO' => '1143', 'VK_REF' => '201107010000048', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_REC_ID' => 'testvpos',
+        'appname' => 'UN3MIN', 'keel' => 'EST', 'VK_T_DATE' => '01.07.2011', 'VK_SND_ACC' => '10010046155012', 'VK_STAMP' => '20110701000004',
+        'VK_CHARSET' => 'UTF-8', 'VK_RETURN' => 'https://store.kraftal.com/return/seb', 'VK_LANG' => '', 'VK_REC_NAME' => 'ALLAS ALLAR',
+        'VK_AMOUNT' => '.17', 'VK_SERVICE' => '1101', 'VK_AUTO' => 'N', 'VK_MSG' => 'Edicy invoice #20110701000004', 'act' => 'UPOSTEST2',
+        'VK_SND_ID' => 'EYP', 'VK_VERSION' => '008', 'VK_REC_ACC' => '10002050618003', 'VK_CURR' => 'EUR',
+        'VK_MAC' => 'fj7moIwqMbvhmftFs5/5muOD1Dj5sRIlTUUcXGbzNKGFCrRz/N2ZpprFlO+8el7BNnGAoqCc2b4V2BrJ5XRsyYtLy1Gi4W8eSqwxbjBefDo21PFXpTmXYYJVy98fIWmWhOIBPMnEq6BlVf100GlV1C3OL+2mBU/ZjtPQG+B7OHo='
+      }
+    end
+    
+    it 'should parse and verify the payment response from bank' do
+      Ipizza::Provider::Seb.new.payment_response(@params).should be_valid
+    end
   end
 
   describe '#authentication_request' do

data/spec/ipizza/provider/swedbank_spec.rb

@@ -14,7 +14,22 @@ describe Ipizza::Provider::Swedbank do
   end
 
   describe '#payment_response' do
-    it 'parses and verifies the payment response from bank'
+    before(:each) do
+      @params = {
+        'VK_T_NO' => '587', 'encoding' => 'UTF-8', 'VK_REC_ID' => 'fraktal', 'VK_REF' => '201107010000080',
+        'VK_SND_NAME' => Iconv.conv('ISO-8859-4', 'UTF-8', 'TÕNU RUNNEL'), 'VK_T_DATE' => '01.07.2011', 'VK_STAMP' => '20110701000008', 'VK_SND_ACC' => '1108126403',
+        'VK_LANG' => 'EST', 'VK_SERVICE' => '1101', 'VK_REC_NAME' => Iconv.conv('ISO-8859-4', 'UTF-8', 'FRAKTAL OÜ'), 'VK_AMOUNT' => '0.17',
+        'VK_MSG' => 'Edicy invoice #20110701000008', 'VK_AUTO' => 'N', 'VK_SND_ID' => 'HP', 'VK_VERSION' => '008', 'VK_ENCODING' => 'ISO-8859-4',
+        'VK_REC_ACC' => '221038811930', 'VK_CURR' => 'EUR',
+        'VK_MAC' => 'geOA+gjLJlFouGMih0WhbQwTehZM1FVus1OhO34yt8shekINWOzUi6gLymq9HYSDIAx/Gw2iUOKGxzhCRsXu3fxjVVlXpS9YRQfFF8HG1zoU2OUiNBZVa+7bGGDLOy+ZIhnyaW1I3jIFXHd57xDyCVCQvB0Ot4Ya9yE3YMKHTk4='
+      }
+      
+      Ipizza::Provider::Swedbank.file_cert = File.expand_path('../../../certificates/swedbank_production.pem', __FILE__)
+    end
+    
+    it 'parses and verifies the payment response from bank' do
+      Ipizza::Provider::Swedbank.new.payment_response(@params).should be_valid
+    end
   end
 
   describe '#authentication_request' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ipizza
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Priit Haamer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 +03:00
+date: 2011-07-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - spec/certificates/seb_test_priv.pem
 - spec/certificates/seb_test_pub.crt
 - spec/certificates/seb_test_pub.pem
+- spec/certificates/swedbank_production.pem
 - spec/config/config.yml
 - spec/config/plain_config.yml
 - spec/ipizza/authentication_response_spec.rb
@@ -157,6 +158,7 @@ test_files:
 - spec/certificates/seb_test_priv.pem
 - spec/certificates/seb_test_pub.crt
 - spec/certificates/seb_test_pub.pem
+- spec/certificates/swedbank_production.pem
 - spec/config/config.yml
 - spec/config/plain_config.yml
 - spec/ipizza/authentication_response_spec.rb