sepafm 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12a4088afb4ab54adbbab5c077ffabed2637060
-  data.tar.gz: 677279058018c696a4f5e6d0b2e47a82527213ca
+  metadata.gz: e3a2be4081eef183a47eae2d15775937b0afdeb7
+  data.tar.gz: 84c058d1e86826ddc435abb1aaa66ff4c73d4a7a
 SHA512:
-  metadata.gz: 6ed8c28c79a852890cfaf17c34180cbfe2291800ff742215eb0e80c52b3ccb7ad00496499c3cc83b68407f1ce46febfd0aab4a4659d5a4e4d6392230020a54d0
-  data.tar.gz: ac504dbcb51ab54f63fdc72b991fbfb07aea8e5529fd280b1ef4d686faa3641751184910a988f38aab4bbc0e9ccfe8e825bfdfdb8a8c7365dc45ac04ec9c446f
+  metadata.gz: c4c73d8aa2da66edc8d915bd0690230e40c944e91acc5fc4de51134830ba5dc3e797d42d6b73a155632d1330c92b1d08cf7594589aa7aebad1b0c332cbdc6ff5
+  data.tar.gz: 4388e0c0357a779f637b731ff726f6cc81585c71bf88bddadeb160d37f7ea535d7e3f742c7f080cad204aa33b135ec7547ce75d31bcb26766e04723a68ea7dbc

data/lib/sepa/attribute_checks.rb

@@ -71,15 +71,24 @@ module Sepa
     end
 
     def check_presence_and_length(attribute, length, error_message)
-      unless send(attribute) && send(attribute).respond_to?(:size) && send(attribute).size < length
-        errors.add(attribute, error_message)
-      end
+      check = true
+      check &&= send(attribute)
+      check &&= send(attribute).respond_to? :size
+      check &&= send(attribute).size < length
+      check &&= send(attribute).size > 0
+
+      errors.add(attribute, error_message) unless check
     end
 
     def check_content
       return unless command == :upload_file
 
-      errors.add(:content, CONTENT_ERROR_MESSAGE) unless content && content.respond_to?(:length)
+      check = true
+      check &&= content
+      check &&= content.respond_to? :length
+      check &&= content.length > 0
+
+      errors.add(:content, CONTENT_ERROR_MESSAGE) unless check
     end
 
     def check_pin

data/lib/sepa/banks/danske/danske_response.rb

@@ -45,7 +45,7 @@ module Sepa
     end
 
     def certificate
-      if @command == :create_certificate
+      if [:get_bank_certificate, :create_certificate].include? @command
         @certificate ||= begin
           extract_cert(doc, 'X509Certificate', DSIG)
         end
@@ -72,9 +72,9 @@ module Sepa
       def find_node_by_uri(uri)
         return super unless [:get_bank_certificate, :create_certificate].include? @command
 
-        node = doc.at("[xml|id='#{uri}']").clone
-        node.at('xmlns|Signature', xmlns: DSIG).remove
-        node
+        doc_without_signature = doc.dup
+        doc_without_signature.at('xmlns|Signature', xmlns: DSIG).remove
+        doc_without_signature.at("[xml|id='#{uri}']")
       end
 
       def decrypt_application_response
@@ -129,13 +129,5 @@ module Sepa
         nil
       end
 
-      def verify_signature
-        super unless [:get_bank_certificate, :create_certificate].include? @command
-      end
-
-      def validate_hashes
-        super unless [:get_bank_certificate, :create_certificate].include? @command
-      end
-
   end
 end

data/lib/sepa/response.rb

@@ -8,7 +8,7 @@ module Sepa
 
     validate  :document_must_validate_against_schema
     validate  :client_errors
-    validate  :response_code_is_ok
+    validate  :validate_response_code
     validate  :validate_hashes
     validate  :verify_signature
     validate  :verify_certificate
@@ -29,6 +29,9 @@ module Sepa
     # i.e. verbose: true
     def hashes_match?(options = {})
       digests = find_digest_values
+
+      return false if digests.empty?
+
       nodes = find_nodes_to_verify(digests)
 
       verified_digests = digests.select do |uri, digest|
@@ -176,7 +179,7 @@ module Sepa
         doc.at("[xmlns|Id='#{uri}']", xmlns: OASIS_UTILITY)
       end
 
-      def response_code_is_ok
+      def validate_response_code
         return if @error
 
         unless %w(00 24).include? response_code
@@ -185,22 +188,36 @@ module Sepa
       end
 
       def validate_hashes
+        return if @error
+        return unless response_code_is_ok?
         unless hashes_match?
           errors.add(:base, HASH_ERROR_MESSAGE)
         end
       end
 
       def verify_signature
+        return if @error
+        return unless response_code_is_ok?
+
         unless signature_is_valid?
           errors.add(:base, SIGNATURE_ERROR_MESSAGE)
         end
       end
 
       def verify_certificate
+        return if @error
+        return unless response_code_is_ok?
+
         unless certificate_is_trusted?
           errors.add(:base, 'The certificate in the response is not trusted')
         end
       end
 
+      def response_code_is_ok?
+        return true if %w(00 24).include? response_code
+
+        false
+      end
+
   end
 end

data/lib/sepa/version.rb

@@ -1,3 +1,3 @@
 module Sepa
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

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

@@ -65,23 +65,31 @@ class DanskeCertResponseTest < ActiveSupport::TestCase
     assert ca_certificate.respond_to? :sign
   end
 
-  # TODO: Get test to pass
   test 'hashes should match' do
-    skip 'for some reason the digest verification does not work with danske certificate responses'
-
+    assert @get_bank_cert_response.hashes_match?
     assert @create_certificate_response.hashes_match?
   end
 
-  # TODO: Get test to pass
-  test 'hashes shouldnt match when data is corrupted' do
-    skip 'for some reason the digest verification does not work with danske certificate responses'
+  test 'hashes shouldnt match if they are not found' do
+    refute @get_bank_certificate_not_ok_response.hashes_match?
+  end
 
+  test 'hashes shouldnt match when data is corrupted' do
     assert_output /These digests failed to verify: {"#response"=>"2vCYl3h7ksRgk7IyV2axgpXxTWM="}/ do
       @create_certificate_response.doc.at('xmlns|ReturnText', xmlns: DANSKE_PKI).content = 'kana'
       refute @create_certificate_response.hashes_match?({ verbose: true })
     end
   end
 
+  test 'signatures in correct responses should verify' do
+    assert @get_bank_cert_response.signature_is_valid?
+    assert @create_certificate_response.signature_is_valid?
+  end
+
+  test 'signature should not verify if not found' do
+    refute @get_bank_certificate_not_ok_response.signature_is_valid?
+  end
+
   test 'should not be valid when response code is not 00 in get bank certificate' do
     refute @get_bank_certificate_not_ok_response.valid?
     refute_empty @get_bank_certificate_not_ok_response.errors.messages

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

@@ -65,7 +65,7 @@ class NordeaResponseTest < ActiveSupport::TestCase
     @body_altered = Sepa::NordeaResponse.new options
   end
 
-  def test_should_be_valid
+  test 'valid responses should be valid' do
     assert @dfl.valid?, @dfl.errors.messages
     assert @uf.valid?, @uf.errors.messages
     assert @df_tito.valid?, @df_tito.errors.messages
@@ -74,12 +74,12 @@ class NordeaResponseTest < ActiveSupport::TestCase
     assert @gc.valid?, @gc.errors.messages
   end
 
-  def test_should_fail_with_improper_params
+  test 'should fail with improper params' do
     a = Sepa::NordeaResponse.new({ response: "Jees", command: 'not'})
     refute a.valid?
   end
 
-  def test_should_complain_if_ar_not_valid_against_schema
+  test 'should complain if application response is not valid against schema' do
     a = Sepa::NordeaResponse.new({ response: "<ar>text</ar>", command: 'notvalid' })
     refute a.valid?
   end
@@ -121,7 +121,6 @@ class NordeaResponseTest < ActiveSupport::TestCase
 
   # TODO: Implement test
   test 'response should not be valid when wrong certificate is embedded in soap' do
-
   end
 
   test 'signature should verify with correct responses' do
@@ -144,9 +143,6 @@ class NordeaResponseTest < ActiveSupport::TestCase
     assert_equal File.read("#{NORDEA_TEST_RESPONSE_PATH}/dfl.xml"), @dfl.to_s
   end
 
-  ##
-  # Tests for download file command
-
   # tito: Electronic account statement
   def test_content_can_be_extracted_when_file_type_is_tito
     refute_nil @df_tito.content
@@ -157,9 +153,6 @@ class NordeaResponseTest < ActiveSupport::TestCase
     refute_nil @df_ktl.content
   end
 
-  ##
-  # Tests for download file list command
-
   test 'content can be extracted from download file list response' do
     refute_nil @dfl.content
   end
@@ -168,23 +161,14 @@ class NordeaResponseTest < ActiveSupport::TestCase
     assert_equal 14, @dfl.file_references.length
   end
 
-  ##
-  # Tests for upload file list command
-
   test 'upload file list command returns a response' do
     refute_nil @uf.content
   end
 
-  ##
-  # Tests for get user info command
-
   test 'content can be extracted from get user info response' do
     refute_nil @gui.content
   end
 
-  ##
-  # Tests for get certificate command
-
   test 'certificate can be extracted from get certificate response' do
     assert_nothing_raised do
       x509_certificate @gc.own_signing_certificate

data/test/sepa/client_test.rb

@@ -297,7 +297,7 @@ class ClientTest < ActiveSupport::TestCase
   end
 
   test "should_check_pin_with_create_certificate" do
-    invalid_pins = [nil, false, true]
+    invalid_pins = [nil, false, true, ""]
 
     invalid_pins.each do |invalid_pin|
       @danske_create_certificate_params[:command] = :create_certificate

data/test/sepa/sepa_test.rb

@@ -4,7 +4,7 @@ class TestSepa < ActiveSupport::TestCase
 
   def test_version_must_be_defined
     refute_nil Sepa::VERSION
-    assert_equal "0.1.4", Sepa::VERSION
+    assert_equal "0.1.5", Sepa::VERSION
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepafm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Joni Kanerva