as2 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0225c8faac2c9bb92938878b8f2f2f919c50589d368fe4480d5ad96541d3e0ca
-  data.tar.gz: 897d1831f060e7ee248e2a0a6031d5b76d47b5f099d3d46ef93a000a78712873
+  metadata.gz: 2cc88a7c3befd19715a142f886fcac0429911b1b2c6d4df8e5c6f6797c6469c2
+  data.tar.gz: ba6943a989242be148d7e39c896f61747b8455888883b60ff179d6bf53e25309
 SHA512:
-  metadata.gz: 0c2a13a733a35bf8a284077258a52ed3e1da95d4c70b23053b220ff89050178be6a4478f859aba6c341866295dc1abf501ddae322f83ddcc38a297adea4c6559
-  data.tar.gz: af1bfdcad847e185db4cb1b0be09b2c49e8b6d8d8cf77c2abe8357fcaae1e8f5018688088eb8161e30fcf3c820b5fc6c0c5e3ade286123f2a51087697f105089
+  metadata.gz: 14dc1ecb69d8678db913d9ee2425ae35f3e2e1b9a927a3a573e36e9a704dd4a7ab994d7c98182bf0053f40520040f0001fbc8b1390c82ebd57aa7e5c3495e99c
+  data.tar.gz: e43327ebbeac9bd46a2ccc4e3cd13f6354de46a3507fe01b134ecf33feef6643555c63e2ad2310debf8b3a23ec88c985d869087bf4cce29a2c54d8d06cfa753a

data/as2.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Simple AS2 server and client implementation}
   spec.description   = %q{Simple AS2 server and client implementation. Follows the AS2 implementation from http://as2.mendelson-e-c.com}
-  spec.homepage      = "https://github.com/andjosh/as2"
+  spec.homepage      = "https://github.com/alexdean/as2"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/lib/as2/message.rb

@@ -2,6 +2,28 @@ module As2
   class Message
     attr_reader :verification_error
 
+    # given multiple parts of a message, choose the one most likely to be the actual content we care about
+    #
+    # @param [Array<Mail::Part>]
+    # @return [Mail::Part, nil]
+    def self.choose_attachment(mail_parts)
+      return nil if mail_parts.nil?
+
+       # if there are multiple content parts, try to prefer the EDI content.
+      candidates = mail_parts
+                   .select { |part| part.content_type.to_s['pkcs7-signature'].nil? } # skip signature
+                   .sort_by { |part| part.content_type.to_s.match(/^application\/edi/i) ? 0 : 1 }
+      candidates[0]
+    end
+
+    # @param [Mail::Part] attachment
+    # @param [String] mic_algorithm
+    # @return [String] message integrity check string
+    def self.mic(attachment, mic_algorithm)
+      digest = As2::DigestSelector.for_code(mic_algorithm)
+      digest.base64digest(attachment.raw_source.lstrip)
+    end
+
     def initialize(message, private_key, public_certificate)
       # TODO: might need to use OpenSSL::PKCS7.read_smime rather than .new sometimes
       @pkcs7 = OpenSSL::PKCS7.new(message)
@@ -80,8 +102,7 @@ module As2
     end
 
     def mic
-      digest = As2::DigestSelector.for_code(mic_algorithm)
-      digest.base64digest(attachment.raw_source.strip)
+      self.class.mic(attachment, mic_algorithm)
     end
 
     def mic_algorithm
@@ -90,13 +111,11 @@ module As2
 
     # Return the attached file, use .filename and .body on the return value
     def attachment
-      if mail.has_attachments?
-        # TODO: match 'application/edi*', test with 'application/edi-x12'
-        # test also with "application/edi-consent; name=this_is_a_filename.txt"
-        mail.parts.find{ |a| a.content_type.match(/^application\/edi/) }
-      else
-        mail
-      end
+      self.class.choose_attachment(parts)
+    end
+
+    def parts
+      mail&.parts
     end
 
     private

data/lib/as2/version.rb

@@ -1,3 +1,3 @@
 module As2
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: as2
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - OfficeLuv
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -168,7 +168,7 @@ files:
 - lib/as2/mime_generator.rb
 - lib/as2/server.rb
 - lib/as2/version.rb
-homepage: https://github.com/andjosh/as2
+homepage: https://github.com/alexdean/as2
 licenses:
 - MIT
 metadata: