hermeneutics 1.21 → 1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e095f585149d4c8a07af7a415cfcc003a3958cc45f4611490b3a018f19b94b
-  data.tar.gz: 20e963ec38f9c4dbace27a15c6c39097ab6bbf6a52528a2b5d4e40aaba15c193
+  metadata.gz: 81d01a3292ca2c19c8a0a7f285262c44584bb7d91d658dc5650774f9828bcd92
+  data.tar.gz: 92bf5d6e7c81f27da58666bba8e5df0716bafcefef2daec6b0dca1f716f2b20d
 SHA512:
-  metadata.gz: 760bea637b51c7852ee0b6678af340f60e98fcab925f3376ff5e7ff147106a3d4532b1e7f8e3a3d0eada210826fa26467adb50c99a4c81978bdb08b795b819bf
-  data.tar.gz: 1e34626ab27cb6210a20d57f0e30bab31475b8d4040406fcab0636ca97f5a69c4edce39c8f3e9ceee5ddeb425b7e32816680c3c0f9fb6a2149a1a8181e5a0856
+  metadata.gz: b97a17139583cd4955b413e09affd7349544d36ff0228d9c4238879567e9ed83c922f5f0d2a5cb41009afc7ebe94330ff7187d8d75c0452dc7e17b5e3bb23757
+  data.tar.gz: 198822fd194ff176303b2d05ab599d662458e6e9100ee0d1c711ce819ddb7da324c6b86377a148fce0ff0a1e16492e8947eed8e894d88512a73fef9d2cf120b4

data/LICENSE

@@ -1,6 +1,6 @@
 = Hermeneutics  --  Ruby mail and CGI handling
 
-Copyright (c) 2011-2013, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (c) 2011-2024, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/hermeneutics/cli/imap.rb

@@ -16,7 +16,6 @@ module Hermeneutics
 
       PORT, PORT_SSL = 143, 993
 
-      class Error          < StandardError ; end
       class UnspecResponse < Error         ; end
       class ServerBye      < Error         ; end
       class ServerError    < Error         ; end
@@ -37,7 +36,7 @@ module Hermeneutics
 
       def initialize *args
         super
-        @tag = "H%04d" % 0
+        @tag = "%s%04d" % [ TAG_PREFIX, 0]
         @info = [ get_response]
         start_watch
       end

data/lib/hermeneutics/cli/lmtp.rb

@@ -0,0 +1,183 @@
+#
+#  lib/hermeneutics/cli/lmtp.rb  --  LMTP client
+#
+
+require "hermeneutics/cli/protocol"
+
+module Hermeneutics
+
+  module Cli
+
+    class LMTP < Protocol
+
+      CRLF = true
+
+      class UnspecError     < Error         ; end
+      class ServerNotReady  < Error         ; end
+      class NotOk           < Error         ; end
+      class NotReadyForData < Error         ; end
+      class Unused          < Error         ; end
+      class Uncaught        < Error         ; end
+
+      class <<self
+        private :new
+        def open socketfile
+          UNIXSocket.open socketfile do |s|
+            i = new s, nil
+            yield i
+          end
+        end
+      end
+
+      attr_reader :domain, :greet
+      attr_reader :advertised
+      attr_reader :last_response
+
+      def initialize *args
+        super
+        get_response.ok? or raise ServerNotReady, @last_response.msg
+        @rcpt = 0
+      end
+
+      def size
+        @advertised && @advertised[ :SIZE]
+      end
+
+
+      def lhlo host = nil
+        @advertised = {}
+        write_cmd "LHLO", host||Socket.gethostname
+        get_response_ok do |code,msg|
+          unless @domain then
+            @domain, @greet = msg.split nil, 2
+            next
+          end
+          keyword, param = msg.split nil, 2
+          keyword.upcase!
+          keyword = keyword.to_sym
+          case keyword
+            when :SIZE then param = Integer param
+            when :AUTH then param = param.split.map { |p| p.upcase! ; p.to_sym }
+          end
+          @advertised[ keyword] = param || true
+        end
+        unless @domain then
+          @domain, @greet = @last_response.msg.split nil, 2
+        end
+      end
+
+      def mail_from from
+        cmd "MAIL", "FROM:<#{from}>"
+      end
+
+      def rcpt_to to
+        cmd "RCPT", "TO:<#{to}>"
+        @rcpt += 1
+      end
+
+      def data reader
+        write_cmd "DATA"
+        get_response.waiting? or raise NotReadyForData, @last_response.msg
+        reader.each_line { |l|
+          l =~ /\A\./ and l = ".#{l}"
+          writeline l
+        }
+        writeline "."
+        get_response_rcpts
+      end
+
+      def bdat data
+        data.each { |d|
+          write_cmd "BDAT", d.bytesize
+          write d
+          get_response_ok
+        }
+        write_cmd "BDAT", 0, "LAST"
+        get_response_rcpts
+      end
+
+      def rset
+        cmd "RSET"
+      ensure
+        @rcpt = 0
+      end
+
+      def noop str = nil
+        cmd "NOOP"
+      end
+
+      def quit
+        cmd "QUIT"
+      end
+
+
+      private
+
+      def cmd name, *args, &block
+        write_cmd name, *args
+        get_response_ok &block
+      end
+
+      def write_cmd name, *args
+        l = [ name, *args].join " "
+        writeline l
+      end
+
+      class Response
+
+        attr_reader :code, :msg
+
+        def initialize code, msg
+          @code, @msg = code, msg
+        end
+
+        def kat ; code / 100 ; end
+
+        def to_s ; "%03d %s" % [ @code, @msg] ; end
+
+        def prelim?  ; kat == 1 ; end
+        def ok?      ; kat == 2 ; end
+        def waiting? ; kat == 3 ; end
+        def error?   ; kat == 4 ; end
+        def fatal?   ; kat == 5 ; end
+
+      end
+
+      def get_response_ok &block
+        get_response &block
+        @last_response.ok? or raise NotOk, @last_response.msg
+        true
+      end
+
+      def get_response
+        loop do
+          r = readline
+          if r =~ /\A(\d\d\d) / then
+            @last_response = Response.new $1.to_i, $'
+            break @last_response
+          elsif r =~ /\A(\d\d\d)-/ then
+            block_given? or raise Uncaught, r
+            yield $1.to_i, $'
+          else
+            raise UnspecError, r
+          end
+        end
+      end
+
+      def get_response_rcpts
+        r = []
+        @rcpt.times {
+          r.push get_response
+          @last_response.ok? or raise NotOk, @last_response.msg
+        }
+        r
+      ensure
+        @rcpt = 0
+      end
+
+    end
+
+  end
+
+end
+

data/lib/hermeneutics/cli/pop3.rb

@@ -14,7 +14,6 @@ module Hermeneutics
 
       PORT, PORT_SSL = 110, 995
 
-      class Error       < StandardError ; end
       class UnspecError < Error         ; end
       class AuthFail    < Error         ; end
       class Check       < Error         ; end

data/lib/hermeneutics/cli/protocol.rb

@@ -22,8 +22,12 @@ module Hermeneutics
 
   module Cli
 
+
     class Protocol
 
+      class Error   < StandardError ; end
+      class Timeout < Error         ; end
+
       class <<self
         private :new
         def open host, port, timeout: nil, ssl: false
@@ -80,7 +84,7 @@ module Hermeneutics
       end
 
       def readline
-        @socket.wait @timeout||0
+        wait
         r = @socket.readline
         r.chomp!
         @trace and $stderr.puts "S: #{r}"
@@ -94,7 +98,7 @@ module Hermeneutics
       end
 
       def read bytes
-        @socket.wait @timeout||0
+        wait
         r = @socket.read bytes
         @trace and $stderr.puts "S- #{r.inspect}"
         r
@@ -105,6 +109,12 @@ module Hermeneutics
         not @socket.ready?
       end
 
+      def wait
+        if @timeout then
+          raise Timeout unless @socket.wait @timeout
+        end
+      end
+
     end
 
 

data/lib/hermeneutics/cli/smtp.rb

@@ -14,7 +14,6 @@ module Hermeneutics
 
       PORT, PORT_SSL = 25, 465
 
-      class Error           < StandardError ; end
       class UnspecError     < Error         ; end
       class ServerNotReady  < Error         ; end
       class NotOk           < Error         ; end
@@ -194,7 +193,7 @@ module Hermeneutics
           r = readline
           if r =~ /\A(\d\d\d) / then
             @last_response = Response.new $1.to_i, $'
-            break
+            break @last_response
           elsif r =~ /\A(\d\d\d)-/ then
             block_given? or raise Uncaught, r
             yield $1.to_i, $'
@@ -202,12 +201,6 @@ module Hermeneutics
             raise UnspecError, r
           end
         end
-        @last_response
-      ensure
-        unless done? then
-          r = readline
-          r and raise Unused, "Unexpected data: #{r.inspect}"
-        end
       end
 
     end

data/lib/hermeneutics/escape.rb

@@ -235,7 +235,7 @@ module Hermeneutics
   # representing the ASCII code.  Eight bit characters should be masked the
   # same way.
   #
-  # An URL line does not store encoding information by itself.  A locator may
+  # A URL line does not store encoding information by itself.  A locator may
   # either say one of these:
   #
   #    http://www.example.com/subdir/index.html?umlfield=%C3%BCber+alles

data/lib/hermeneutics/mail.rb

@@ -248,7 +248,7 @@ module Hermeneutics
       }
       open_smtp conn do |smtp|
         log :INF, "Sending to", *tos
-        smtp.mail_from headers.from.first.plain
+        headers.from.empty? or smtp.mail_from headers.from.first.plain
         tos.each { |t| smtp.rcpt_to t }
         smtp.data m
       end
@@ -261,22 +261,22 @@ module Hermeneutics
     def open_smtp arg, &block
       if [ :mail_from, :rcpt_to, :data].map { |m| arg.respond_to? m }.all? then
         yield arg
-        return
-      end
-      a = {}
-      case arg
-        when nil       then h, p = "localhost", nil
-        when String    then h, p = arg.split ":" ; p &&= Integer p
-        when Array     then h, p = *arg
-        when Hash      then a = arg.clone ; h, p = (a.delete :host), (a.delete :port)
-        else                h, p = arg.host, arg.port ; arg.scheme == "smtps" and a[ :ssl] = true
-      end
-      require "hermeneutics/cli/smtp"
-      Cli::SMTP.open h, p, **a do |smtp|
-        smtp.helo
-        yield smtp
-      ensure
-        smtp.quit
+      else
+        a = {}
+        case arg
+          when nil       then h, p = "localhost", nil
+          when String    then h, p = arg.split ":" ; p &&= Integer p
+          when Array     then h, p = *arg
+          when Hash      then a = arg.clone ; h, p = (a.delete :host), (a.delete :port)
+          else                h, p = arg.host, arg.port ; arg.scheme == "smtps" and a[ :ssl] = true
+        end
+        require "hermeneutics/cli/smtp"
+        Cli::SMTP.open h, p, **a do |smtp|
+          smtp.helo
+          yield smtp
+        ensure
+          smtp.quit
+        end
       end
     end
 

data/lib/hermeneutics/version.rb

@@ -13,7 +13,7 @@
 module Hermeneutics
 
   NAME        = "hermeneutics"
-  VERSION     = "1.21".freeze
+  VERSION     = "1.23".freeze
   SUMMARY     = "CGI and mail handling"
 
   DESCRIPTION = <<~EOT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermeneutics
 version: !ruby/object:Gem::Version
-  version: '1.21'
+  version: '1.23'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: supplement
@@ -59,6 +59,7 @@ files:
 - lib/hermeneutics/cli/imap/commands.rb
 - lib/hermeneutics/cli/imap/parser.rb
 - lib/hermeneutics/cli/imap/utf7imap.rb
+- lib/hermeneutics/cli/lmtp.rb
 - lib/hermeneutics/cli/openssl.rb
 - lib/hermeneutics/cli/pop3.rb
 - lib/hermeneutics/cli/protocol.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby, at least 3.0
-rubygems_version: 3.5.6
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: CGI and mail handling