ipizza 1.0.0 → 2.0.0

data/lib/ipizza/provider/krediidipank.rb

@@ -1,50 +1,4 @@
 module Ipizza::Provider
-  class Krediidipank
-
-    class << self
-      attr_accessor :service_url, :return_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding, :lang, :rec_acc, :rec_name
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      if service == 1001
-        req.sign_params['VK_ACC'] = self.class.rec_acc
-        req.sign_params['VK_NAME'] = self.class.rec_name
-      end
-
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_LANG' => self.class.lang
-      }
-
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-
-      return response
-    end
+  class Krediidipank < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/lhv.rb

@@ -0,0 +1,4 @@
+module Ipizza::Provider
+  class Lhv < Ipizza::Provider::Base
+  end
+end

data/lib/ipizza/provider/nordea/authentication_request.rb

@@ -18,7 +18,7 @@ module Ipizza::Provider
     private
     
     def mac_data_string(key)
-      order = ['ACTION_ID', 'VERS', 'RCVID', 'LANGCODE', 'STAMP', 'IDTYPE', 'RETLINK', 'CANLINK', 'REJLINK', 'KEYVERS', 'ALG']
+      order = %w(ACTION_ID VERS RCVID LANGCODE STAMP IDTYPE RETLINK CANLINK REJLINK KEYVERS ALG)
       
       datastr = order.inject('') do |memo, param|
         memo << params[param].to_s << '&'
@@ -26,4 +26,4 @@ module Ipizza::Provider
       datastr << key << '&'
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/authentication_response.rb

@@ -27,11 +27,15 @@ module Ipizza::Provider
     def info_social_security_id
       valid? ? @params['B02K_CUSTID'] : ''
     end
-    
+
+    def authentication_info
+      @authentication_info ||= Ipizza::Authentication.new(user_name: info_name, user_id: info_social_security_id)
+    end
+
     private
     
     def mac_data_string(key)
-      order = ['VERS', 'TIMESTMP', 'IDNBR', 'STAMP', 'CUSTNAME', 'KEYVERS', 'ALG', 'CUSTID', 'CUSTTYPE']
+      order = %w(VERS TIMESTMP IDNBR STAMP CUSTNAME KEYVERS ALG CUSTID CUSTTYPE)
       
       datastr = order.inject('') do |memo, param|
         memo << @params["B02K_#{param}"].to_s << '&'
@@ -39,4 +43,4 @@ module Ipizza::Provider
       datastr << key << '&'
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/payment_request.rb

@@ -18,7 +18,7 @@ module Ipizza::Provider
     private
     
     def mac_data_string(key)
-      order = ['VERSION', 'STAMP', 'RCV_ID', 'AMOUNT', 'REF', 'DATE', 'CUR']
+      order = %w(VERSION STAMP RCV_ID AMOUNT REF DATE CUR)
       
       datastr = order.inject('') do |memo, param|
         memo << params[param].to_s
@@ -30,4 +30,4 @@ module Ipizza::Provider
       datastr
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/payment_response.rb

@@ -13,7 +13,7 @@ module Ipizza::Provider
     end
     
     def success?
-      if @valid && !@params['RETURN_PAID'].blank? then true else false end
+      @valid && !@params['RETURN_PAID'].blank?
     end
     
     def valid?
@@ -21,13 +21,13 @@ module Ipizza::Provider
     end
     
     def payment_info
-      @payment_info ||= Ipizza::Payment.new(:stamp => @params['RETURN_STAMP'], :refnum => @params['RETURN_REF'])
+      @payment_info ||= Ipizza::Payment.new(stamp: @params['RETURN_STAMP'], refnum: @params['RETURN_REF'])
     end
     
     private
     
     def mac_data_string(key)
-      order = ['RETURN_VERSION', 'RETURN_STAMP', 'RETURN_REF', 'RETURN_PAID']
+      order = %w(RETURN_VERSION RETURN_STAMP RETURN_REF RETURN_PAID)
       
       datastr = order.inject('') do |memo, param|
         memo << @params[param].to_s
@@ -40,4 +40,4 @@ module Ipizza::Provider
       datastr
     end
   end
-end
+end

data/lib/ipizza/provider/sampo.rb

@@ -1,49 +1,4 @@
 module Ipizza::Provider
-  class Sampo
-
-    class << self
-      attr_accessor :service_url, :return_url, :file_key, :key_secret, :file_cert, :snd_id, :lang, :rec_acc, :rec_name
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      if service == 1001
-        req.sign_params['VK_ACC'] = self.class.rec_acc
-        req.sign_params['VK_NAME'] = self.class.rec_name
-      end
-
-      req.extra_params = {
-        'VK_RETURN' => self.class.return_url,
-        'VK_LANG' => self.class.lang
-      }
-
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-
-      return response
-    end
+  class Sampo < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/seb.rb

@@ -1,81 +1,4 @@
 module Ipizza::Provider
-  class Seb
-    
-    class << self
-      attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding, :rec_acc, :rec_name
-    end
-    
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      # TODO: add 1001 support
-      # if service == 1001
-      #   req.sign_params['VK_ACC'] = self.rec_acc
-      #   req.sign_params['VK_NAME'] = self.rec_name
-      # end
-      
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_CANCEL' => self.class.cancel_url
-      }
-      
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-    
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-      
-      return response
-    end
-
-    def authentication_request(service_no = 4001)
-      req = Ipizza::AuthenticationRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_REPLY' => '3002',
-        'VK_RETURN' => self.class.return_url,
-        'VK_DATE' => Date.today.strftime('%d.%m.%Y'),
-        'VK_TIME' => Time.now.strftime('%H:%M:%S')
-      }
-    
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding
-      }
-    
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REPLY', 'VK_RETURN', 'VK_DATE', 'VK_TIME']
-    
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-    
-    def authentication_response(params)
-      response = Ipizza::AuthenticationResponse.new(params)
-      response.verify(self.class.file_cert)
-      return response
-    end
-
+  class Seb < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/swedbank.rb

@@ -1,69 +1,4 @@
 module Ipizza::Provider
-  class Swedbank
-
-    class << self
-      attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => '1002',
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_CANCEL' => self.class.cancel_url
-      }
-
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-      return response
-    end
-
-    def authentication_request(service_no = 4001)
-      req = Ipizza::AuthenticationRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_REPLY' => '3002',
-        'VK_RETURN' => self.class.return_url,
-        'VK_DATE' => Date.today.strftime('%d.%m.%Y'),
-        'VK_TIME' => Time.now.strftime('%H:%M:%S')
-      }
-
-      req.extra_params = {
-        'VK_ENCODING' => self.class.encoding
-      }
-
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REPLY', 'VK_RETURN', 'VK_DATE', 'VK_TIME']
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def authentication_response(params)
-      response = Ipizza::AuthenticationResponse.new(params)
-      response.verify(self.class.file_cert, self.class.encoding)
-      return response
-    end
+  class Swedbank < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/request.rb

@@ -4,7 +4,14 @@ module Ipizza
     attr_accessor :extra_params
     attr_accessor :sign_params
     attr_accessor :service_url
-    
+
+    PARAM_ORDER = {
+      '1011' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_STAMP VK_AMOUNT VK_CURR VK_ACC VK_NAME VK_REF VK_MSG VK_RETURN VK_CANCEL VK_DATETIME),
+      '1012' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_STAMP VK_AMOUNT VK_CURR VK_REF VK_MSG VK_RETURN VK_CANCEL VK_DATETIME),
+      '4011' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REPLY VK_RETURN VK_DATETIME VK_RID),
+      '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
@@ -14,4 +21,4 @@ module Ipizza
       sign_params.merge(extra_params)
     end
   end
-end
+end

data/lib/ipizza/response.rb

@@ -3,21 +3,19 @@ class Ipizza::Response
   attr_accessor :verify_params
   attr_accessor :verify_params_order
   
-  @@response_param_order = {
-    '1101' => ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REC_ID', 'VK_STAMP', 'VK_T_NO', 'VK_AMOUNT', 'VK_CURR', 'VK_REC_ACC', 'VK_REC_NAME', 'VK_SND_ACC', 'VK_SND_NAME', 'VK_REF', 'VK_MSG', 'VK_T_DATE'],
-    '3002' => ['VK_SERVICE', 'VK_VERSION', 'VK_USER', 'VK_DATE', 'VK_TIME', 'VK_SND_ID', 'VK_INFO'],
-    '1901' => ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REC_ID', 'VK_STAMP', 'VK_REF', 'VK_MSG'],
-    '1902' => ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REC_ID', 'VK_STAMP', 'VK_REF', 'VK_MSG', 'VK_ERROR_CODE']
+  PARAM_ORDER = {
+    '1111' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REC_ID VK_STAMP VK_T_NO VK_AMOUNT VK_CURR VK_REC_ACC VK_REC_NAME VK_SND_ACC VK_SND_NAME VK_REF VK_MSG VK_T_DATETIME),
+    '3012' => %w(VK_SERVICE VK_VERSION VK_USER VK_DATETIME VK_SND_ID VK_REC_ID VK_USER_NAME VK_USER_ID VK_COUNTRY VK_OTHER VK_TOKEN VK_RID),
+    '3013' => %w(VK_SERVICE VK_VERSION VK_DATETIME VK_SND_ID VK_REC_ID VK_NONCE VK_USER_NAME VK_USER_ID VK_COUNTRY VK_OTHER VK_TOKEN VK_RID),
+    '1911' => %w(VK_SERVICE VK_VERSION VK_SND_ID VK_REC_ID VK_STAMP VK_REF VK_MSG)
   }  
   
   def initialize(params)
     @params = params
   end
 
-  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)
+  def verify(certificate_path)
+    mac_string = Ipizza::Util.mac_data_string(@params, PARAM_ORDER[@params['VK_SERVICE']])
 
     @valid = Ipizza::Util.verify_signature(certificate_path, @params['VK_MAC'], mac_string)
   end

data/lib/ipizza/util.rb

@@ -56,14 +56,18 @@ module Ipizza
         end
       end
 
+      def time_to_iso8601(time)
+        time.strftime('%Y-%m-%dT%H:%M:%S%z')
+      end
+
       private
 
-      # p(x) is length of the field x represented by three digits
+      # p(x) is length of the field x represented by three digits. When request encoding is in UTF-8 then characters count is calculated otherwise characters byte size is used.
       def func_p(val)
-        if RUBY_VERSION < '1.9'
-          sprintf("%03i", val.size)
-        else 
-          sprintf("%03i", val.bytesize)
+        if RUBY_VERSION < '1.9' || val.encoding.name == 'UTF-8'
+          sprintf('%03i', val.size)
+        else
+          sprintf('%03i', val.bytesize)
         end
       end
     end

data/lib/ipizza/version.rb

@@ -1,3 +1,3 @@
 module Ipizza
-  VERSION = '1.0.0'
-end
+  VERSION = '2.0.0'
+end

data/spec/certificates/pangalink_danske_bank_cert.pem

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDnjCCAoYCCQClrBEsOVn1vzANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+RUUxETAPBgNVBAgMCEhhcmp1bWFhMRAwDgYDVQQHDAdUYWxsaW5uMREwDwYDVQQK
+DAhFZGljeSBPVTERMA8GA1UECwwIYmFua2xpbmsxFjAUBgNVBAMMDXBhbmdhbGlu
+ay5uZXQxHjAcBgkqhkiG9w0BCQEWD3RhbmVsQGVkaWN5LmNvbTAeFw0xNTAyMDIx
+MDI3NTBaFw0zNTAxMjgxMDI3NTBaMIGQMQswCQYDVQQGEwJFRTERMA8GA1UECAwI
+SGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xETAPBgNVBAoMCEVkaWN5IE9VMREw
+DwYDVQQLDAhiYW5rbGluazEWMBQGA1UEAwwNcGFuZ2FsaW5rLm5ldDEeMBwGCSqG
+SIb3DQEJARYPdGFuZWxAZWRpY3kuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuxA7bXTG7uOub63Z/BHMNnD5QtMgEZLBsiARrdHaLCq0zmuk3lF8
+0jkihPrmuuNGKDBirsfxIX2cLpPgxChNb+F2NaOKc09eb4kb+Kgb6rXsHUCnhzHY
+4A1/YJ7r542aEGN/zdE2vj2Ci/H3ylOhGjmKaclSao3Je8tmiWgftEBO5ogWrHl6
+Hdn4WoOuytog2NoPsI+EdzjEqRs0s9DO4n6RwSKNa0GrRjySWe2HZ977Mm8+3yc0
+jZGsIHLHsqG+oMiFxpZ5PHovT/ZOEUp6uMB9N3MIUT0u1oSCduPYKWtRbky0MyUL
+cx4mhBXzKaCmoQzZu3w952oyYqjIk4YquwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCaoWTP6l6JVIiyLka5KHygz1Y5ICxa1XRz0tkSpfOpTRE9oxmJ/lnynOuJ21xA
+cunc2ObLOX5FAQrt2STUtl7NNQ4GRRA5Y7+PUaqFr8r4SfB5B6/ZQoiBfE9h2dHm
+DI5QlpaR2Z2MgiRCb4H4avBBKpXU6hvy5v6DBNV7w13KvRhz9whhcjANvterdyMp
+gR24mgsTvbb9oE/s7AqjlJfAu+LPUPNRKDA/N/ZYeYUxLvRVJUdW5/3CZ6dXniH/
+FpdVJmOX9l9mq7vHchLdGbRnLzUK1TFDZA1g8ubei0hEVHQJxhLx3IWVvGHF1tXB
+6m9i9JQpHu9zLWhzmWQWVLFe
+-----END CERTIFICATE-----