czech_post_b2b_client 1.2.1 → 1.2.6

data/lib/czech_post_b2b_client/response_parsers/base_parser.rb

@@ -50,9 +50,7 @@ module CzechPostB2bClient
       end
 
       def response_root_node
-        if response_service_data.keys.include?(response_root_node_name)
-          return response_service_data.dig(response_root_node_name)
-        end
+        return response_service_data.dig(response_root_node_name) if response_service_data.keys.include?(response_root_node_name)
 
         errors.add(:xml, "Cannot find `#{response_root_node_name}` in `serviceData` node.")
         fail_on_structure_parsing

data/lib/czech_post_b2b_client/response_parsers/get_result_parcels_parser.rb

@@ -48,9 +48,7 @@ module CzechPostB2bClient
         # more parcel_codes for one parcel_id => probably errors
         old_p_code = value[:parcel_code]
         new_p_code = pd_hash[:parcel_code]
-        if old_p_code != new_p_code
-          raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
-        end
+        raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'" if old_p_code != new_p_code
 
         value
       end

data/lib/czech_post_b2b_client/response_parsers/parcel_service_sync_parser.rb

@@ -44,7 +44,11 @@ module CzechPostB2bClient
 
       def parcel_data_from(rp_hash)
         { parcel_code: rp_hash['parcelCode'],
-          states: [state_hash_from(rp_hash.dig('parcelDataResponse'))] }
+          states: parcel_states_form(rp_hash.dig('parcelDataResponse')) }
+      end
+
+      def parcel_states_form(data_responses)
+        [data_responses].flatten.collect { |data_response| state_hash_from(data_response) }
       end
 
       def print_data_from(print_hash)
@@ -62,7 +66,6 @@ module CzechPostB2bClient
 
       def updated_result_value_for(value, parcel_params_result_hash)
         pd_hash = parcel_data_from(parcel_params_result_hash)
-
         return pd_hash if value.nil?
 
         # merging states
@@ -71,9 +74,7 @@ module CzechPostB2bClient
         # more parcel_codes for one parcel_id => probably errors
         old_p_code = value[:parcel_code]
         new_p_code = pd_hash[:parcel_code]
-        if old_p_code != new_p_code
-          raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
-        end
+        raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'" if old_p_code != new_p_code
 
         value
       end

data/lib/czech_post_b2b_client/services/api_caller.rb

@@ -55,7 +55,8 @@ module CzechPostB2bClient
         request = Net::HTTP::Post.new service_uri.request_uri, headers
         request.body = request_xml
 
-        debug_msg = "CzechPost B2B REQUEST: #{request} to #{service_uri.request_uri} with body:\n#{request.body}"
+        debug_msg = "CzechPost B2B REQUEST: #{request} to #{service_uri.request_uri}" \
+                    " with headers: #{headers}\n and body:\n#{request.body}"
         CzechPostB2bClient.logger.debug(debug_msg)
 
         request
@@ -74,6 +75,7 @@ module CzechPostB2bClient
           use_ssl: true,
           verify_mode: OpenSSL::SSL::VERIFY_PEER,
           keep_alive_timeout: 30,
+          ciphers: secure_and_available_ciphers,
           cert: OpenSSL::X509::Certificate.new(File.read(configuration.certificate_path)),
           # cert_password: configuration.certificate_password,
           key: OpenSSL::PKey::RSA.new(File.read(configuration.private_key_path), configuration.private_key_password),
@@ -105,7 +107,8 @@ module CzechPostB2bClient
         return 'error code not found in XML' unless error_match
 
         error_code = error_match[1].to_i
-        error = CzechPostB2bClient::B2BErrors.new_by_code(error_code)
+        error_details = result.xml.match(%r{<(?:\w+\:)?errorDescription>(.*)</(?:\w+\:)?errorDescription>})
+        error = CzechPostB2bClient::B2BErrors.new_by_code(error_code, error_details[1])
         return "error code [#{error_code}] is unknown" unless error
 
         error.message
@@ -116,6 +119,15 @@ module CzechPostB2bClient
         errors.add(:connection, "#{error.class} > #{service_uri} - #{error}")
         fail!
       end
+
+      def secure_and_available_ciphers
+        # Available non-weak suites for b2b.postaonline.cz (https://www.ssllabs.com/ssltest/analyze.html?d=b2b.postaonline.cz)
+        # TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (0xc030)   ECDH secp384r1 (eq. 7680 bits RSA)   FS	256
+        # TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (0xc02f)   ECDH secp384r1 (eq. 7680 bits RSA)   FS
+        # which have following names in OpenSSL (see `openssl ciphers`)
+
+        %w[ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES128-GCM-SHA256]
+      end
     end
   end
 end

data/lib/czech_post_b2b_client/services/parcels_send_process_updater.rb

@@ -63,7 +63,7 @@ module CzechPostB2bClient
           response_code = response_state[:code]
           next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
 
-          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}") # rubocop:disable Layout/LineLength
+          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
         end
       end
     end

data/lib/czech_post_b2b_client/services/parcels_sync_sender.rb

@@ -80,7 +80,7 @@ module CzechPostB2bClient
           response_code = response_state[:code]
           next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
 
-          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}") # rubocop:disable Layout/LineLength
+          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
         end
       end
     end

data/lib/czech_post_b2b_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CzechPostB2bClient
-  VERSION = '1.2.1'
+  VERSION = '1.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czech_post_b2b_client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - Petr Mlčoch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -614,6 +614,7 @@ files:
 - lib/czech_post_b2b_client.rb
 - lib/czech_post_b2b_client/b2b_errors.rb
 - lib/czech_post_b2b_client/configuration.rb
+- lib/czech_post_b2b_client/logger.rb
 - lib/czech_post_b2b_client/post_services.rb
 - lib/czech_post_b2b_client/printing_templates.rb
 - lib/czech_post_b2b_client/request_builders.rb
@@ -674,8 +675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Accessing B2B API of Czech Post for bulk processing of packages ("B2B - WS