ipizza 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed9393a3cf761d93af6cacfe5ab9f5290bd9f9fa07df805eba6e8923c302b80
-  data.tar.gz: 8543fd69e9b7c1c523bdbed2f20ac511b8fef3f3661987d4a960c27df9827bab
+  metadata.gz: b51199bfdb214aa4b638a72b87308e7377749b8e08094b630f960ba2287a030f
+  data.tar.gz: 413c63448960f66ad1e5d740ef5cf2fbe3bbc96ae66258064ef793c345e3157d
 SHA512:
-  metadata.gz: 9172fb1cbe9b620439a73b41b12d53f0e6bfd5f4ce2d219f0398ab6c4136716200463885ba692cf34b70675e4151f3536398c10a4bf59e9817b09f2c3b52eb69
-  data.tar.gz: 01010f397f8c724adcf89e9db463f7ba6ba9277501ef243957e58b8a7e2eb863c840d9a533e921ec4f953dd10d76479676b0ade0b7bf24da69891bc8fc6cfd7e
+  metadata.gz: 2fed4f773566efcadb0ad2a14fb370347381465553c3c691e1855905135a8165e8cfe00de5e61dc0f628a357b7ed101341e9a20577db27ff78bd5ed17340d3e1
+  data.tar.gz: 8fce210209665ae8b111da0c76ada6dcf25f25ee530ef15a36c5e3b0bd23ad208e6b35b3be390bee223672494e35cfcf333e9d1a705b1e0247f681c04e873931

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ipizza (2.2.0)
+    ipizza (2.2.2)
 
 GEM
   remote: http://rubygems.org/

data/README.markdown

@@ -1,6 +1,6 @@
 Implements iPizza protocol to communicate with Estonian Banks.
 
-Gem implements support for iPizza services (`1011`, `1012`, `4011` and `4012`) that are supported by members of the Estonian Banking Association [since October 2014](http://pangaliit.ee/et/arveldused/pangalingi-spetsifikatsioon).
+Gem implements support for iPizza services (`1011`, `1012`, `4011` and `4012`) that are supported by members of the Estonian Banking Association [since October 2014](https://pangaliit.ee/arveldused/pangalingi-spetsifikatsioon).
 
 If you need to use this gem with old iPizza services implementations (`1001`, `1002`, `4001` and `4002`), use 1.0.0 version of this gem (NB! support for these services will end on 31 December 2015).
 
@@ -37,20 +37,24 @@ At any time, configuration can be modified with `Ipizza::Config.configure` block
       service_url: http://foo.bar/swedbank
       return_url: http://mycompany.com/store
       cancel_url: http://mycompany.com/cancel
-      
+
       # Your private key file path. Can be specified relatively
       # to YAML file
       file_key: ./certificates/my_private.key
-      
+
       # If your private key is protected with password,
       # provide it here
       key_secret: private_key_password
-      
+
       # Path to bank's public key file. Can be specified
       # relatively to YAML file
       file_cert: ./certificates/bank_public.crt
+      login: dealer
       snd_id: dealer
       encoding: UTF-8
+      sign_algorithm: sha512 # default is sha1
+      verification_algorithm: sha512 # default is sha1
+      vk_version: "009" # VK_VERSION. Default is "008"
 
 ## Payment requests
 
@@ -77,20 +81,17 @@ At any time, configuration can be modified with `Ipizza::Config.configure` block
 
 This library currently works with four Estonian Banks. Here are their respective interface specifications:
 
-* [Swedbank](https://www.swedbank.ee/business/cash/ecommerce/banklink/description?language=EST)
-* [SEB](http://www.seb.ee/ari/maksete-kogumine/maksete-kogumine-internetis/tehniline-spetsifikatsioon)
-* [Danske Bank](http://www.danskebank.ee/et/14732.html)
-* [Krediidipank](http://www.krediidipank.ee/business/settlements/bank-link/index.html)
-* [LHV Bank](https://www.lhv.ee/pangateenused/pangalink/)
-* [Nordea](http://www.nordea.ee/Teenused+%C3%A4rikliendile/Igap%C3%A4evapangandus/Maksete+kogumine/E-makse/1562142.html) (*uses SOLO protocol*)
+* [Swedbank](https://www.swedbank.ee/business/cash/ecommerce/support)
+* [SEB](https://www.seb.ee/en/business/daily-banking/bank-link)
+* [LHV Bank](https://partners.lhv.ee/en/banklink)
 
 # Helpful links
 
 * [pangalink.net](https://pangalink.net/et/info)
-* [Repository](http://github.com/priithaamer/ipizza)
-* [Issue tracker](http://github.com/priithaamer/ipizza/issues)
+* [Repository](https://github.com/Voog/ipizza)
+* [Issue tracker](https://github.com/Voog/ipizza/issues)
 
 # Authors
 
-* Thanks to [all contributors](https://github.com/priithaamer/ipizza/graphs/contributors)!
+* Thanks to [all contributors](https://github.com/Voog/ipizza/graphs/contributors)!
 * Tarmo Talu (Thanks for the 7-3-1 algorithm)

data/lib/ipizza/provider/base.rb

@@ -1,6 +1,7 @@
 module Ipizza::Provider
   class Base
 
+    DEFAULT_VK_VERSION = '008'
     SUPPORTED_ENCODINGS = %w(UTF-8 ISO-8859-1 WINDOWS-1257)
 
     class << self
@@ -17,7 +18,8 @@ module Ipizza::Provider
                     :rec_acc,
                     :rec_name,
                     :encoding,
-                    :lang
+                    :lang,
+                    :vk_version
     end
 
     def payment_request(payment, service_no = 1012)
@@ -25,7 +27,7 @@ module Ipizza::Provider
       req.service_url = self.class.service_url
       req.sign_params = {
         'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
+        'VK_VERSION' => vk_version,
         'VK_SND_ID' => self.class.snd_id,
         'VK_STAMP' => payment.stamp,
         'VK_AMOUNT' => sprintf('%.2f', payment.amount),
@@ -47,7 +49,13 @@ module Ipizza::Provider
         'VK_LANG' => self.class.lang
       }
 
-      req.sign(self.class.file_key, self.class.key_secret, Ipizza::Request::PARAM_ORDER[service_no.to_s])
+      req.sign(
+        self.class.file_key,
+        self.class.key_secret,
+        Ipizza::Request::PARAM_ORDER[service_no.to_s],
+        Ipizza::Request::DEFAULT_MAC_PARAM,
+        self.class.sign_algorithm || Ipizza::Util::DEFAULT_HASH_ALGORITHM
+      )
       req
     end
 
@@ -65,7 +73,7 @@ module Ipizza::Provider
       req.service_url = self.class.service_url
       req.sign_params = {
         'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
+        'VK_VERSION' => vk_version,
         'VK_SND_ID' => self.class.snd_id,
         'VK_RETURN' => self.class.return_url,
         'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
@@ -87,7 +95,13 @@ module Ipizza::Provider
         'VK_LANG' => self.class.lang
       }
 
-      req.sign(self.class.file_key, self.class.key_secret, Ipizza::Request::PARAM_ORDER[service_no.to_s])
+      req.sign(
+        self.class.file_key,
+        self.class.key_secret,
+        Ipizza::Request::PARAM_ORDER[service_no.to_s],
+        Ipizza::Request::DEFAULT_MAC_PARAM,
+        self.class.sign_algorithm || Ipizza::Util::DEFAULT_HASH_ALGORITHM
+      )
       req
     end
 
@@ -105,5 +119,10 @@ module Ipizza::Provider
     def get_encoding(val)
       SUPPORTED_ENCODINGS.include?(val.to_s.upcase) ? val.to_s.upcase : 'UTF-8'
     end
+
+    def vk_version
+      str = self.class.vk_version.to_s.strip
+      str.empty? ? DEFAULT_VK_VERSION : str
+    end
   end
 end

data/lib/ipizza/request.rb

@@ -1,6 +1,8 @@
 module Ipizza
   class Request
 
+    DEFAULT_MAC_PARAM = 'VK_MAC'
+
     attr_accessor :extra_params
     attr_accessor :sign_params
     attr_accessor :service_url
@@ -12,9 +14,14 @@ module Ipizza
       '4012' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REC_ID VK_NONCE VK_RETURN VK_DATETIME VK_RID)
     }
 
-    def sign(privkey_path, privkey_secret, order, mac_param = 'VK_MAC')
-      signature = Ipizza::Util.sign(privkey_path, privkey_secret, Ipizza::Util.mac_data_string(sign_params, order))
-      self.sign_params[mac_param] = signature
+    def sign(privkey_path, privkey_secret, order, mac_param = nil, hash_algorithm = nil)
+      signature = Ipizza::Util.sign(
+        privkey_path,
+        privkey_secret,
+        Ipizza::Util.mac_data_string(sign_params, order),
+        hash_algorithm || Ipizza::Util::DEFAULT_HASH_ALGORITHM
+      )
+      self.sign_params[mac_param || DEFAULT_MAC_PARAM] = signature
     end
 
     def request_params

data/lib/ipizza/version.rb

@@ -1,3 +1,3 @@
 module Ipizza
-  VERSION = '2.2.0'
+  VERSION = '2.2.2'
 end

data/spec/config/config.yml

@@ -41,8 +41,9 @@ seb:
   key_secret: foobar
   encoding: UTF-8
   snd_id: sender
-  sign_algorithm: 'sha256'
-  verification_algorithm: 'sha256'
+  vk_version: '009'
+  sign_algorithm: 'sha512'
+  verification_algorithm: 'sha512'
 
 luminor:
   service_url: https://banklink.luminor.ee/test

data/spec/config/plain_config.yml

@@ -11,5 +11,6 @@ swedbank:
 
 seb:
   service_url: https://www.seb.ee/banklink
-  sign_algorithm: 'sha256'
-  verification_algorithm: 'sha1'
+  vk_version: '009'
+  sign_algorithm: 'sha512'
+  verification_algorithm: 'sha512'

data/spec/ipizza/config_spec.rb

@@ -6,7 +6,7 @@ describe Ipizza::Config do
     before(:each) do
       Ipizza::Config.load_from_file(File.expand_path(File.dirname(__FILE__) + '/../config/plain_config.yml'))
     end
-    
+
     it 'should load configuration from yml file' do
       Ipizza::Provider::Swedbank.service_url.should == 'https://www.swedbank.ee/banklink'
       Ipizza::Provider::Swedbank.return_url.should == 'http://test.local/return'
@@ -14,28 +14,29 @@ describe Ipizza::Config do
       Ipizza::Provider::Swedbank.key_secret.should == 'foobar'
       Ipizza::Provider::Swedbank.snd_id.should == 'dealer'
       Ipizza::Provider::Swedbank.encoding.should == 'UTF-8'
-      
+
       Ipizza::Provider::Seb.service_url.should == 'https://www.seb.ee/banklink'
-      Ipizza::Provider::Seb.sign_algorithm.should == 'sha256'
-      Ipizza::Provider::Seb.verification_algorithm.should == 'sha1'
+      Ipizza::Provider::Seb.sign_algorithm.should == 'sha512'
+      Ipizza::Provider::Seb.verification_algorithm.should == 'sha512'
+      Ipizza::Provider::Seb.vk_version.should == '009'
     end
-  
+
     it 'should load certificates from path relative to configuration file' do
       Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
       Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
     end
-    
+
     it 'should load certificates from absolute file paths' do
       cfg = {'swedbank' => YAML::load_file(File.expand_path(File.dirname(__FILE__) + '/../config/config.yml'))['swedbank']}
       cfg['swedbank']['file_key'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
       cfg['swedbank']['file_cert'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
-      
+
       Tempfile::open('config.yml') do |tmp|
         tmp << cfg.to_yaml
         tmp.flush
-        
+
         config = Ipizza::Config.load_from_file(File.expand_path(tmp.path))
-        
+
         Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
         Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
       end
@@ -50,18 +51,18 @@ describe Ipizza::Config do
 
       Ipizza::Provider::Swedbank.service_url.should == 'http://foo.bar/swedbank'
     end
-    
+
     it 'should raise an error if configuration parameter does not exist' do
       lambda { Ipizza::Config.configure { |c| c.swedbank_unknown_attr = 'foo' } }.should raise_error
       lambda { Ipizza::Config.configure { |c| c.spermbank_service_url = 'foo' } }.should raise_error
     end
-    
+
     it 'loads certificates from directory specified by certs_root' do
       Ipizza::Config.configure do |c|
         c.certs_root = File.expand_path(File.dirname(__FILE__) + '/../certificates')
         c.swedbank_file_cert = 'pangalink_seb_bank_cert.pem'
       end
-      
+
       Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_seb_bank_cert.pem')
     end
   end

data/spec/ipizza/provider/seb_spec.rb

@@ -16,7 +16,7 @@ describe Ipizza::Provider::Seb do
       req = Ipizza::Provider::Seb.new.payment_request(payment)
       params = {
         'VK_SERVICE' => '1012',
-        'VK_VERSION' => '008',
+        'VK_VERSION' => '009',
         'VK_SND_ID' => Ipizza::Provider::Seb.snd_id,
         'VK_STAMP' => payment.stamp,
         'VK_AMOUNT' => sprintf('%.2f', payment.amount),
@@ -27,7 +27,12 @@ describe Ipizza::Provider::Seb do
         'VK_CANCEL' => Ipizza::Provider::Seb.cancel_url,
         'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now)
       }
-      signature = Ipizza::Util.sign(Ipizza::Provider::Seb.file_key, Ipizza::Provider::Seb.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']))
+      signature = Ipizza::Util.sign(
+        Ipizza::Provider::Seb.file_key,
+        Ipizza::Provider::Seb.key_secret,
+        Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']),
+        Ipizza::Provider::Seb.sign_algorithm || Ipizza::Util::DEFAULT_HASH_ALGORITHM
+      )
       req.sign_params['VK_MAC'].should == signature
     end
   end
@@ -65,14 +70,19 @@ describe Ipizza::Provider::Seb do
       req = Ipizza::Provider::Seb.new.authentication_request
       params = {
         'VK_SERVICE' => '4011',
-        'VK_VERSION' => '008',
+        'VK_VERSION' => '009',
         'VK_SND_ID' => Ipizza::Provider::Seb.snd_id,
         'VK_RETURN' => Ipizza::Provider::Seb.return_url,
         'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
         'VK_RID' => '',
         'VK_REPLY' => '3012'
       }
-      signature = Ipizza::Util.sign(Ipizza::Provider::Seb.file_key, Ipizza::Provider::Seb.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']))
+      signature = Ipizza::Util.sign(
+        Ipizza::Provider::Seb.file_key,
+        Ipizza::Provider::Seb.key_secret,
+        Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']),
+        Ipizza::Provider::Seb.sign_algorithm || Ipizza::Util::DEFAULT_HASH_ALGORITHM
+      )
       req.sign_params['VK_MAC'].should == signature
     end
   end

data/spec/ipizza/provider_spec.rb

@@ -50,4 +50,32 @@ describe Ipizza::Provider do
       Ipizza::Provider.get('unkn').should be_nil
     end
   end
+
+  describe 'VK_VERSION override' do
+    let(:payment) do
+      Ipizza::Payment.new(stamp: 1, amount: '1.00', refnum: 1, message: 'Msg', currency: 'EUR')
+    end
+
+    before do
+      # Reset any custom value potentially set by other specs
+      Ipizza::Provider::Swedbank.vk_version = nil
+    end
+
+    it 'defaults to 008 when not set' do
+      req = Ipizza::Provider::Swedbank.new.payment_request(payment)
+      req.sign_params['VK_VERSION'].should == '008'
+    end
+
+    it 'uses overridden static value' do
+      Ipizza::Provider::Swedbank.vk_version = '009'
+      req = Ipizza::Provider::Swedbank.new.payment_request(payment)
+      req.sign_params['VK_VERSION'].should == '009'
+    end
+
+    it 'falls back when blank string provided' do
+      Ipizza::Provider::Swedbank.vk_version = '  '
+      req = Ipizza::Provider::Swedbank.new.authentication_request
+      req.sign_params['VK_VERSION'].should == '008'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipizza
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Priit Haamer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec