sepafm 0.1.2 → 0.1.3

data/lib/sepa/xml_templates/application_request/download_file_list.xml

@@ -5,7 +5,6 @@
   <Timestamp></Timestamp>
   <Status></Status>
   <Environment></Environment>
-  <TargetId></TargetId>
   <SoftwareId></SoftwareId>
   <FileType></FileType>
   <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">

data/lib/sepa/xml_templates/application_request/upload_file.xml

@@ -4,7 +4,6 @@
   <Command></Command>
   <Timestamp></Timestamp>
   <Environment></Environment>
-  <TargetId></TargetId>
   <SoftwareId></SoftwareId>
   <FileType></FileType>
   <Content></Content>

data/lib/sepa/xml_templates/soap/download_file_list.xml

@@ -4,7 +4,7 @@
               xmlns:cor="http://bxd.fi/CorporateFileService" xmlns:bxd="http://model.bxd.fi">
   <env:Body
           xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-          wsu:Id="sdf6sa7d86f87s6df786sd87f6s8fsda">
+          wsu:Id="">
     <cor:downloadFileListin xmlns:cor="http://bxd.fi/CorporateFileService">
       <bxd:RequestHeader xmlns:bxd="http://model.bxd.fi">
         <bxd:SenderId></bxd:SenderId>

data/lib/sepa/xml_templates/soap/header.xml

@@ -10,19 +10,19 @@
               xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
               EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary"
               ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"
-              wsu:Id="sdgdsg76sdg78sdg78d6gs"></wsse:BinarySecurityToken>
+              wsu:Id=""></wsse:BinarySecurityToken>
       <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
         <dsig:SignedInfo>
           <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
           <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-          <dsig:Reference URI="#dsfg8sdg87dsf678g6dsg6ds7fg">
+          <dsig:Reference URI="">
             <dsig:Transforms>
               <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
             </dsig:Transforms>
             <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
             <dsig:DigestValue></dsig:DigestValue>
           </dsig:Reference>
-          <dsig:Reference URI="#sdf6sa7d86f87s6df786sd87f6s8fsda">
+          <dsig:Reference URI="">
             <dsig:Transforms>
               <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
             </dsig:Transforms>
@@ -33,13 +33,14 @@
         <dsig:SignatureValue></dsig:SignatureValue>
         <dsig:KeyInfo>
           <wsse:SecurityTokenReference>
-            <wsse:Reference URI="#sdgdsg76sdg78sdg78d6gs"/>
+            <wsse:Reference URI=""
+                            ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
           </wsse:SecurityTokenReference>
         </dsig:KeyInfo>
       </dsig:Signature>
       <wsu:Timestamp
               xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-              wsu:Id="dsfg8sdg87dsf678g6dsg6ds7fg">
+              wsu:Id="">
         <wsu:Created></wsu:Created>
         <wsu:Expires></wsu:Expires>
       </wsu:Timestamp>

data/lib/sepafm.rb

@@ -32,6 +32,7 @@ OASIS_UTILITY = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecur
 OASIS_SECEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
 XML_DATA = 'http://bxd.fi/xmldata/'
 BXD = 'http://model.bxd.fi'
+XMLENC = 'http://www.w3.org/2001/04/xmlenc#'
 
 # Nordea XML namespaces
 NORDEA_PKI = 'http://bxd.fi/CertificateService'

data/readme.md

@@ -3,6 +3,7 @@
 [![Code Climate](https://codeclimate.com/github/devlab-oy/sepa.png)](https://codeclimate.com/github/devlab-oy/sepa)
 [![Code Climate](https://codeclimate.com/github/devlab-oy/sepa/coverage.png)](https://codeclimate.com/github/devlab-oy/sepa)
 [![Build Status](https://travis-ci.org/devlab-oy/sepa.svg?branch=master)](https://travis-ci.org/devlab-oy/sepa)
+[![Gem Version](https://badge.fury.io/rb/sepafm.svg)](http://badge.fury.io/rb/sepafm)
 
 This project aims to create an open source implementation of SEPA Financial Messages using Web Services. Project implementation is done in Ruby.
 
@@ -155,7 +156,6 @@ params = {
   command: :create_certificate,
   customer_id: '360817',
   environment: 'customertest',
-  key_generator_type: 'software',
   encryption_cert_pkcs10: danske_enc_cert_request,
   signing_cert_pkcs10: danske_signing_cert_request,
   pin: '1234'
@@ -197,10 +197,10 @@ response.ca_certificate
     * get_user_info
     * get_certificate
     * get_bank_certificate
-* **customer_id** - Your personal id with the bank.
+* **customer_id** - Your customer id with the bank.
 * **environment** - Must be either PRODUCTION or TEST
 * **status** - For filtering stuff. Must be either NEW, DOWNLOADED or ALL
-* **target_id** - Some specification of the folder which to access in the bank.
+* **target_id** - Some specification of the folder which to access in the bank (Nordea only)
 * **language** - Language must be either FI, EN or SV
 * **file_type** - File types to upload or download:
     * LMP300 = Laskujen maksupalvelu (lähtevä)
@@ -213,8 +213,6 @@ response.ca_certificate
 * **content** - The payload to send.
 * **file_reference** - File reference for :download_file command
 * **pin** - Your personal pin-code provided by the bank
-* **service** - For testing value is service, otherwise ISSUER
-* **bank_root_cert_serial** - Serial number for Danske bank certificate download (1111110002)
 
 ---
 

data/sepafm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'SEPA Financial Messages using Web Services'
   spec.homepage      = 'https://github.com/devlab-oy/sepa'
   spec.license       = 'MIT'
-  spec.authors       = ['Joni Kanerva', 'Mika Myllynen', 'Tommi Jarvinen']
+  spec.authors       = ['Joni Kanerva', 'Mika Myllynen', 'Tommi Järvinen']
   spec.email         = ['joni@devlab.fi']
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'savon',       '~> 2.5'
-  spec.add_dependency 'nokogiri',    '~> 1.6'
   spec.add_dependency 'activemodel', '~> 4.1'
-  spec.add_dependency 'minitest',    '~> 5.3'
+  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency 'savon', '~> 2.5'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.3'
   spec.add_development_dependency 'dotenv', '~> 0.11'
+  spec.add_development_dependency 'minitest', '~> 5.3'
+  spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'rubyntlm', '~> 0.3'
 end

data/test/sepa/banks/danske/danske_cert_response_test.rb

@@ -18,32 +18,32 @@ class DanskeCertResponseTest < ActiveSupport::TestCase
 
   # Tests for get bank certificate
   test 'should have correct bank signing cert with get_bank_certificate command' do
-    bank_signing_cert = @get_bank_cert_response.bank_signing_cert
+    bank_signing_cert = @get_bank_cert_response.bank_signing_certificate
     refute_nil bank_signing_cert
     assert_equal bank_signing_cert.to_s, DANSKE_BANK_SIGNING_CERT
   end
 
   test 'should have corrent bank encryption cert with get bank certificate command' do
-    bank_encryption_cert = @get_bank_cert_response.bank_encryption_cert
+    bank_encryption_cert = @get_bank_cert_response.bank_encryption_certificate
     refute_nil bank_encryption_cert
     assert_equal bank_encryption_cert.to_s, DANSKE_BANK_ENCRYPTION_CERT
   end
 
-  test 'should have correct bank root cert with get bank certificate command' do
-    bank_root_cert = @get_bank_cert_response.bank_root_cert
+  test 'should have correct bank root certificate with get bank certificate command' do
+    bank_root_cert = @get_bank_cert_response.bank_root_certificate
     refute_nil bank_root_cert
     assert_equal bank_root_cert.to_s, DANSKE_BANK_ROOT_CERT
   end
 
   # Tests for create certificate
   test 'should have own encryption certificate with create certificate command' do
-    own_encryption_cert = @create_certificate_response.own_encryption_cert
+    own_encryption_cert = @create_certificate_response.own_encryption_certificate
     refute_nil own_encryption_cert
     assert own_encryption_cert.respond_to? :sign
   end
 
   test 'should have on signing certificate with create certificate command' do
-    own_signing_cert = @create_certificate_response.own_signing_cert
+    own_signing_cert = @create_certificate_response.own_signing_certificate
     refute_nil own_signing_cert
     assert own_signing_cert.respond_to? :sign
   end

data/test/sepa/banks/danske/danske_cert_soap_builder_test.rb

@@ -2,34 +2,33 @@ require 'test_helper'
 
 class DanskeCertSoapBuilderTest < ActiveSupport::TestCase
   def setup
-    @create_cert_params = danske_create_cert_params
+    @danske_create_certificate_params = danske_create_certificate_params
 
-    @cert_request = Sepa::SoapBuilder.new(@create_cert_params)
-    @enc_private_key = OpenSSL::PKey::RSA.new File.read("#{DANSKE_TEST_KEYS_PATH}/enc_private_key.pem")
+    @cert_request = Sepa::SoapBuilder.new(@danske_create_certificate_params)
+    @enc_private_key = rsa_key File.read("#{DANSKE_TEST_KEYS_PATH}/enc_private_key.pem")
     @doc = Nokogiri::XML(@cert_request.to_xml)
 
     # Namespaces
     @pkif = 'http://danskebank.dk/PKI/PKIFactoryService'
     @dsig = 'http://www.w3.org/2000/09/xmldsig#'
-    @xenc = 'http://www.w3.org/2001/04/xmlenc#'
   end
 
   def test_should_raise_error_if_command_missing
-    @create_cert_params.delete(:command)
+    @danske_create_certificate_params.delete(:command)
 
     assert_raises(ArgumentError) do
-      Sepa::SoapBuilder.new(@create_cert_params)
+      Sepa::SoapBuilder.new(@danske_create_certificate_params)
     end
   end
 
   def test_sender_id_is_properly_set
     sender_id = @doc.at("SenderId", "xmlns" => @pkif).content
-    assert_equal sender_id, @create_cert_params[:customer_id]
+    assert_equal sender_id, @danske_create_certificate_params[:customer_id]
   end
 
   def test_customer_id_is_properly_set
     customer_id = @doc.at("CustomerId", "xmlns" => @pkif).content
-    assert_equal customer_id, @create_cert_params[:customer_id]
+    assert_equal customer_id, @danske_create_certificate_params[:customer_id]
   end
 
   def test_request_id_is_properly_set
@@ -54,28 +53,28 @@ class DanskeCertSoapBuilderTest < ActiveSupport::TestCase
   end
 
   def test_certificate_is_added_properly
-    embedded_cert = @doc.at("X509Certificate", 'xmlns' => @dsig).content.gsub(/\s+/, "")
+    embedded_certificate = @doc.at("X509Certificate", 'xmlns' => @dsig).content.gsub(/\s+/, "")
 
-    actual_cert = @create_cert_params[:enc_cert]
-    actual_cert = actual_cert.split('-----BEGIN CERTIFICATE-----')[1]
-    actual_cert = actual_cert.split('-----END CERTIFICATE-----')[0]
-    actual_cert.gsub!(/\s+/, "")
+    actual_certificate = @danske_create_certificate_params[:encryption_certificate]
+    actual_certificate = actual_certificate.split('-----BEGIN CERTIFICATE-----')[1]
+    actual_certificate = actual_certificate.split('-----END CERTIFICATE-----')[0]
+    actual_certificate.gsub!(/\s+/, "")
 
-    assert_equal embedded_cert, actual_cert
+    assert_equal embedded_certificate, actual_certificate
   end
 
   def test_encrypted_key_is_added_properly_and_can_be_decrypted
-    enc_key = @doc.css("CipherValue", 'xmlns' => @xenc)[0].content
+    enc_key = @doc.css("CipherValue", 'xmlns' => XMLENC)[0].content
     enc_key = decode enc_key
     assert @enc_private_key.private_decrypt(enc_key)
   end
 
   def test_encypted_data_is_added_properly_and_can_be_decrypted
-    enc_key = @doc.css("CipherValue", 'xmlns' => @xenc)[0].content
+    enc_key = @doc.css("CipherValue", 'xmlns' => XMLENC)[0].content
     enc_key = decode enc_key
     key = @enc_private_key.private_decrypt(enc_key)
 
-    encypted_data = @doc.css("CipherValue", 'xmlns' => @xenc)[1].content
+    encypted_data = @doc.css("CipherValue", 'xmlns' => XMLENC)[1].content
     encypted_data = decode encypted_data
     iv = encypted_data[0, 8]
     encypted_data = encypted_data[8, encypted_data.length]

data/test/sepa/banks/danske/danske_certificate_application_request_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class DanskeCertificateApplicationRequestTest < ActiveSupport::TestCase
+  setup do
+    @danske_create_certificate_params = danske_create_certificate_params
+@danske_create_certificate_params[:environment] = :test
+@danske_create_certificate_application_request    =
+        Sepa::ApplicationRequest.new @danske_create_certificate_params
+  end
+
+  test 'should set environment to customertest when test in parameters' do
+    environment_node =
+        @danske_create_certificate_application_request.to_nokogiri.at('tns|Environment')
+    assert_equal environment_node.content, 'customertest'
+  end
+end

data/test/sepa/banks/danske/danske_generic_soap_builder_test.rb

@@ -5,23 +5,23 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   def setup
     keys_path = File.expand_path('../keys', __FILE__)
 
-    private_key_path = "#{keys_path}/signing_private_key.pem"
-    private_key = File.read private_key_path
+    signing_private_key_path = "#{keys_path}/signing_key.pem"
+    signing_private_key = File.read signing_private_key_path
 
-    signing_cert_path = "#{keys_path}/own_signing_cert.pem"
-    signing_cert = File.read signing_cert_path
+    signing_certificate_path = "#{keys_path}/own_signing_cert.pem"
+    signing_certificate = File.read signing_certificate_path
 
-    enc_cert_path = "#{keys_path}/own_enc_cert.pem"
-    enc_cert = File.read enc_cert_path
+    encryption_certificate_path = "#{keys_path}/own_enc_cert.pem"
+    encryption_certificate = File.read encryption_certificate_path
 
-    @nordea_generic_params = {
+    @danske_generic_params = {
       bank: :danske,
-      private_key: OpenSSL::PKey::RSA.new(private_key),
+      signing_private_key: rsa_key(signing_private_key),
       command: :upload_file,
       customer_id: '360817',
       environment: 'TEST',
-      enc_cert: enc_cert,
-      cert: signing_cert,
+      encryption_certificate: encryption_certificate,
+      signing_certificate: signing_certificate,
       language: 'EN',
       status: 'ALL',
       target_id: 'Danske FI',
@@ -30,7 +30,7 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
       file_reference: "11111111A12006030329501800000014",
     }
 
-    @soap_request = Sepa::SoapBuilder.new(@nordea_generic_params)
+    @soap_request = Sepa::SoapBuilder.new(@danske_generic_params)
 
     @doc = Nokogiri::XML(@soap_request.to_xml)
 
@@ -39,55 +39,55 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   end
 
   def test_should_initialize_request_with_proper_params
-    assert Sepa::SoapBuilder.new(@nordea_generic_params).to_xml
+    assert Sepa::SoapBuilder.new(@danske_generic_params).to_xml
   end
 
   def test_should_get_error_if_command_missing
-    @nordea_generic_params.delete(:command)
+    @danske_generic_params.delete(:command)
 
     assert_raises(ArgumentError) do
-      Sepa::SoapBuilder.new(@nordea_generic_params)
+      Sepa::SoapBuilder.new(@danske_generic_params)
     end
   end
 
   def test_should_load_correct_template_with_download_file_list
-    @nordea_generic_params[:command] = :download_file_list
-    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@nordea_generic_params).to_xml)
+    @danske_generic_params[:command] = :download_file_list
+    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@danske_generic_params).to_xml)
 
     assert doc.at('//cor:downloadFileListin', 'cor' => 'http://bxd.fi/CorporateFileService')
   end
 
   def test_should_load_correct_template_with_get_user_info
-    @nordea_generic_params[:command] = :get_user_info
-    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@nordea_generic_params).to_xml)
+    @danske_generic_params[:command] = :get_user_info
+    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@danske_generic_params).to_xml)
 
     assert doc.at('//cor:getUserInfoin', 'cor' => 'http://bxd.fi/CorporateFileService')
   end
 
   def test_should_load_correct_template_with_download_file
-    @nordea_generic_params[:command] = :download_file
-    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@nordea_generic_params).to_xml)
+    @danske_generic_params[:command] = :download_file
+    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@danske_generic_params).to_xml)
 
     assert doc.at('//cor:downloadFilein', 'cor' => 'http://bxd.fi/CorporateFileService')
   end
 
   def test_should_load_correct_template_with_upload_file
-    @nordea_generic_params[:command] = :upload_file
-    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@nordea_generic_params).to_xml)
+    @danske_generic_params[:command] = :upload_file
+    doc = Nokogiri::XML(Sepa::SoapBuilder.new(@danske_generic_params).to_xml)
 
     assert doc.at('//cor:uploadFilein', 'cor' => 'http://bxd.fi/CorporateFileService')
   end
 
   def test_should_raise_error_if_unrecognised_command
-    @nordea_generic_params[:command] = :wrong_command
+    @danske_generic_params[:command] = :wrong_command
 
     assert_raises(ArgumentError) do
-      soap = Sepa::SoapBuilder.new(@nordea_generic_params)
+      soap = Sepa::SoapBuilder.new(@danske_generic_params)
     end
   end
 
   def test_sender_id_is_properly_set
-    assert_equal @nordea_generic_params[:customer_id],
+    assert_equal @danske_generic_params[:customer_id],
       @doc.at("//bxd:SenderId", 'bxd' => 'http://model.bxd.fi').content
   end
 
@@ -108,7 +108,7 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   def test_language_is_set_correctly
     language_node = @doc.at("//bxd:Language", 'bxd' => 'http://model.bxd.fi')
 
-    assert_equal language_node.content, @nordea_generic_params[:language]
+    assert_equal language_node.content, @danske_generic_params[:language]
   end
 
   def test_user_agent_is_set_correctly
@@ -120,35 +120,33 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   def test_receiver_is_is_set_correctly
     receiver_id_node = @doc.at("//bxd:ReceiverId", 'bxd' => 'http://model.bxd.fi')
 
-    assert_equal receiver_id_node.content, @nordea_generic_params[:target_id]
+    assert_equal 'DABAFIHH', receiver_id_node.content
   end
 
   def test_cert_is_added_correctly
     wsse = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
 
-    added_cert = @doc.at(
+    added_certificate = @doc.at(
       "//wsse:BinarySecurityToken", 'wsse' => wsse
     ).content
 
-    actual_cert = OpenSSL::X509::Certificate.new(
-      @nordea_generic_params.fetch(:cert)
+    actual_certificate = OpenSSL::X509::Certificate.new(
+      @danske_generic_params.fetch(:signing_certificate)
     ).to_s
 
-    actual_cert = actual_cert.split('-----BEGIN CERTIFICATE-----')[1]
-    actual_cert = actual_cert.split('-----END CERTIFICATE-----')[0]
-    actual_cert = actual_cert.gsub(/\s+/, "")
+    actual_certificate = actual_certificate.split('-----BEGIN CERTIFICATE-----')[1]
+    actual_certificate = actual_certificate.split('-----END CERTIFICATE-----')[0]
+    actual_certificate = actual_certificate.gsub(/\s+/, "")
 
-    assert_equal added_cert, actual_cert
+    assert_equal added_certificate, actual_certificate
   end
 
   def test_body_digest_is_calculated_correctly
     sha1 = OpenSSL::Digest::SHA1.new
 
     # Digest which is calculated from the body and added to the header
-    added_digest = @doc.at(
-      "//dsig:Reference[@URI='#sdf6sa7d86f87s6df786sd87f6s8fsda']/dsig:DigestValue",
-      'dsig' => 'http://www.w3.org/2000/09/xmldsig#'
-    ).content
+    reference_node = @doc.css('dsig|Reference')[1]
+    added_digest = reference_node.at('dsig|DigestValue').content
 
     body_node = @doc.at(
       "//env:Body", 'env' => 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -192,10 +190,8 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   def test_header_timestamps_digest_is_calculated_correctly
     sha1 = OpenSSL::Digest::SHA1.new
 
-    added_digest = @doc.at(
-      "//dsig:Reference[@URI='#dsfg8sdg87dsf678g6dsg6ds7fg']/dsig:DigestValue",
-      'dsig' => 'http://www.w3.org/2000/09/xmldsig#'
-    ).content
+    reference_node = @doc.css('dsig|Reference')[0]
+    added_digest = reference_node.at('dsig|DigestValue').content
 
     wsu = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
 
@@ -216,7 +212,7 @@ class DanskeGenericSoapBuilderTest < ActiveSupport::TestCase
   def test_signature_is_calculated_correctly
     sha1 = OpenSSL::Digest::SHA1.new
 
-    private_key = OpenSSL::PKey::RSA.new(@nordea_generic_params.fetch(:private_key))
+    private_key = rsa_key(@danske_generic_params.fetch(:signing_private_key))
 
     added_signature = @doc.at(
       "//dsig:SignatureValue",

data/test/sepa/banks/nordea/nordea_application_request_test.rb

@@ -6,8 +6,8 @@ class NordeaApplicationRequestTest < ActiveSupport::TestCase
 
     # Convert the keys here since the conversion is usually done by the client and these tests
     # bypass the client
-    @nordea_generic_params[:private_key] = OpenSSL::PKey::RSA.new @nordea_generic_params[:private_key]
-    @nordea_generic_params[:cert] = OpenSSL::X509::Certificate.new @nordea_generic_params[:cert]
+    @nordea_generic_params[:signing_private_key] = rsa_key @nordea_generic_params[:signing_private_key]
+    @nordea_generic_params[:signing_certificate] = OpenSSL::X509::Certificate.new @nordea_generic_params[:signing_certificate]
 
     ar_file = Sepa::SoapBuilder.new(@nordea_generic_params).application_request
 
@@ -89,10 +89,12 @@ class NordeaApplicationRequestTest < ActiveSupport::TestCase
   end
 
   def test_should_have_environment_set_with_all_commands
-    assert_equal @doc_file.at_css("Environment").content, @nordea_generic_params[:environment]
-    assert_equal @doc_get.at_css("Environment").content, @nordea_generic_params[:environment]
-    assert_equal @doc_list.at_css("Environment").content, @nordea_generic_params[:environment]
-    assert_equal @doc_up.at_css("Environment").content, @nordea_generic_params[:environment]
+    expected_environment = @nordea_generic_params[:environment].upcase
+
+    assert_equal @doc_file.at_css("Environment").content, expected_environment
+    assert_equal @doc_get.at_css("Environment").content, expected_environment
+    assert_equal @doc_list.at_css("Environment").content, expected_environment
+    assert_equal @doc_up.at_css("Environment").content, expected_environment
   end
 
   def test_should_have_software_id_set_with_all_commands
@@ -124,10 +126,6 @@ class NordeaApplicationRequestTest < ActiveSupport::TestCase
     assert_equal @doc_list.at_css("TargetId").content, @nordea_generic_params[:target_id]
   end
 
-  def test_should_have_target_id_set_when_download_file
-    assert_equal @doc_file.at_css("TargetId").content, @nordea_generic_params[:target_id]
-  end
-
   def test_should_not_have_target_id_set_when_get_user_info
     refute @doc_get.at_css("TargetId")
   end
@@ -219,7 +217,7 @@ class NordeaApplicationRequestTest < ActiveSupport::TestCase
 
     # Calculate the actual signature
     keys_path = File.expand_path('../keys', __FILE__)
-    private_key = OpenSSL::PKey::RSA.new(File.read("#{keys_path}/nordea.key"))
+    private_key = rsa_key(File.read("#{keys_path}/nordea.key"))
 
     sha1 = OpenSSL::Digest::SHA1.new
     actual_signature = encode(private_key.sign(
@@ -230,23 +228,45 @@ class NordeaApplicationRequestTest < ActiveSupport::TestCase
   end
 
   def test_certificate_is_added_correctly
-    added_cert = @doc_file.at_css(
+    added_certificate = @doc_file.at_css(
       "dsig|X509Certificate", 'dsig' => 'http://www.w3.org/2000/09/xmldsig#'
     ).content
 
-    actual_cert = @nordea_generic_params.fetch(:cert).to_s
-    actual_cert = actual_cert.split('-----BEGIN CERTIFICATE-----')[1]
-    actual_cert = actual_cert.split('-----END CERTIFICATE-----')[0]
-    actual_cert.gsub!(/\s+/, "")
+    actual_certificate = @nordea_generic_params.fetch(:signing_certificate).to_s
+    actual_certificate = actual_certificate.split('-----BEGIN CERTIFICATE-----')[1]
+    actual_certificate = actual_certificate.split('-----END CERTIFICATE-----')[0]
+    actual_certificate.gsub!(/\s+/, "")
 
-    assert_equal added_cert, actual_cert
+    assert_equal added_certificate, actual_certificate
   end
 
-  def test_should_validate_against_schema
+  test 'download file should validate against schema' do
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('application_request.xsd'))
       assert xsd.valid?(@doc_file)
     end
   end
 
+  test 'upload file should validate against schema' do
+    Dir.chdir(SCHEMA_PATH) do
+      xsd = Nokogiri::XML::Schema(IO.read('application_request.xsd'))
+      xsd.validate(@doc_up).each do |error|
+        puts error
+      end
+    end
+  end
+
+  test 'download file list should validate against schema' do
+    Dir.chdir(SCHEMA_PATH) do
+      xsd = Nokogiri::XML::Schema(IO.read('application_request.xsd'))
+      assert xsd.valid?(@doc_list)
+    end
+  end
+
+  test 'get user info should validate against schema' do
+    Dir.chdir(SCHEMA_PATH) do
+      xsd = Nokogiri::XML::Schema(IO.read('application_request.xsd'))
+      assert xsd.valid?(@doc_get)
+    end
+  end
 end

data/test/sepa/banks/nordea/nordea_cert_application_request_test.rb

@@ -4,8 +4,8 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
   include Sepa::Utilities
 
   def setup
-    @get_cert_params = nordea_cert_params
-    ar_cert = Sepa::SoapBuilder.new(@get_cert_params).application_request
+    @nordea_get_certificate_params = nordea_get_certificate_params
+    ar_cert = Sepa::SoapBuilder.new(@nordea_get_certificate_params).application_request
     @xml = Nokogiri::XML(ar_cert.to_xml)
   end
 
@@ -17,19 +17,19 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
   end
 
   def test_should_initialize_with_only_get_certificate_params
-    assert Sepa::ApplicationRequest.new(@get_cert_params)
+    assert Sepa::ApplicationRequest.new(@nordea_get_certificate_params)
   end
 
   def test_should_get_argument_errors_unless_command_is_get_certificate
     assert_raises(ArgumentError) do
-      @get_cert_params[:command] = :wrong_command
-      ar = Sepa::ApplicationRequest.new(@get_cert_params)
+      @nordea_get_certificate_params[:command] = :wrong_command
+      ar = Sepa::ApplicationRequest.new(@nordea_get_certificate_params)
       ar.get_as_base64
     end
   end
 
   def test_should_have_customer_id_set
-    assert_equal @xml.at_css("CustomerId").content, @get_cert_params[:customer_id]
+    assert_equal @xml.at_css("CustomerId").content, @nordea_get_certificate_params[:customer_id]
   end
 
   def test_should_have_timestamp_set_properly
@@ -41,8 +41,9 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
     assert_equal @xml.at_css("Command").content, "GetCertificate"
   end
 
-  def test_should_have_environment_set
-    assert_equal @xml.at_css("Environment").content, @get_cert_params[:environment]
+  def test_should_have_environment_set_and_upcase
+    expected_environment = @nordea_get_certificate_params[:environment].upcase
+    assert_equal expected_environment, @xml.at_css("Environment").content
   end
 
   test 'should have software id set' do
@@ -50,16 +51,16 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
   end
 
   test 'should have service set' do
-    assert_equal @xml.at_css('Service').content, @get_cert_params[:service]
+    assert_equal @xml.at_css('Service').content, ''
   end
 
   test 'should have content set' do
-    assert_equal @xml.at_css('Content').content, format_cert_request(@get_cert_params[:csr])
+    assert_equal @xml.at_css('Content').content, format_cert_request(@nordea_get_certificate_params[:signing_csr])
   end
 
   test 'should have hmac set' do
     assert_equal @xml.at_css('HMAC').content,
-                 hmac(@get_cert_params[:pin], csr_to_binary(@get_cert_params[:csr]))
+                 hmac(@nordea_get_certificate_params[:pin], csr_to_binary(@nordea_get_certificate_params[:signing_csr]))
   end
 
   def test_should_validate_against_schema