minbox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bfc6208f399c85b149fb9febe81a997940696a0802d7326aa91aa55261e8d5
-  data.tar.gz: 77d432c13608ac84e4c9dcee94c018569d52ab9bdf486b08d28f626dd3def4ab
+  metadata.gz: 2c500238d8a8cfc853fd4ec9a252a7a0cde7f421e1bd31a4695c312288110e23
+  data.tar.gz: 80b489dd81313d68e7e8e8e479060d22dd105b3b0570357eb489340d145ab0d4
 SHA512:
-  metadata.gz: fb60ac240af6400731e5b4031ef5d86b73739761ccc82c650a0b931ed3e4e5562fe24ed97b1d5765d01ecae9c3334622dba72b1bed3aa235179bd47ba2a8d9bc
-  data.tar.gz: 2d5c4b97db3e4b5d1d0621bc0a4af5eb461bd44ba1165362335cf9609bb173301c5498d860e94933be95e611bc7a351d1682f6fa5ac25455bf5348d4d756e5cb
+  metadata.gz: 7bd692169477f0e2fe78d1611ac32bdc83cdd9980a8feacf15c6574cd6d471ebe98503e6d049fba23ef991db8d5eaafc960bad31ec38d50e8c47e02efaf3b3a7
+  data.tar.gz: 601d89064f6f2189b097615815a6b46f13d4a66989c4138815a9ea5bfb8e56c449aa829d6df10e8ddf065d737dba0520d07b98ddbe9b9f9ac1ea088a79ebe1ce

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.6-alpine
+ENV PACKAGES build-base tzdata
+RUN apk update && \
+    apk upgrade && \
+    apk add $PACKAGES && \
+    rm -fr /var/cache/apk/* && \
+    apk del build-base
+WORKDIR /opt/minbox
+RUN gem install minbox
+CMD ["minbox", "server", "localhost", "25", "--output=stdout file"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minbox (0.1.0)
+    minbox (0.1.1)
       mail (~> 2.7)
       redis (~> 4.1)
       thor (~> 0.20)
@@ -9,7 +9,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
+    faker (1.9.3)
+      i18n (>= 0.7)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mini_mime (1.0.1)
@@ -35,6 +40,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  faker (~> 1.9)
   minbox!
   rake (~> 10.0)
   rspec (~> 3.0)

data/bin/docker-build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cp Dockerfile pkg/
+docker pull ruby:2.6-alpine
+docker image build \
+  -t "mokhan/minbox:latest" \
+  -f pkg/Dockerfile pkg/
+
+if [[ -z "${DOCKER_PUSH}" ]]; then
+  echo 'skip push'
+else
+  echo 'pushing...'
+  docker push "mokhan/minbox:latest"
+fi

data/lib/minbox.rb

@@ -1,6 +1,10 @@
+require 'base64'
+require 'logger'
 require 'socket'
 
+require "minbox/core"
 require "minbox/publisher"
+require "minbox/client"
 require "minbox/server"
 require "minbox/version"
 

data/lib/minbox/cli.rb

@@ -14,18 +14,19 @@ module Minbox
           from 'Your Name <me@example.org>'
           to 'Destination Address <them@example.com>'
           subject 'test message'
-          body 'This is a test message.'
+          body "#{Time.now} This is a test message."
         end
         require 'net/smtp'
         Net::SMTP.start(host, port) do |smtp|
-          smtp.send_message(mail.to_s, 'me@example.org', 'them@example.com')
+          smtp.send_message(mail.to_s, 'me+1@example.org', 'them+1@example.com')
+          smtp.send_message(mail.to_s, 'me+2@example.org', 'them+2@example.com')
         end
       end
 
       method_option :output, type: :array, default: ['stdout']
       desc 'server <HOST> <PORT>', 'SMTP server'
       def server(host = 'localhost', port = '25')
-        publisher = publishers_for(options[:output])
+        publisher = Publisher.from(options[:output])
         Server.new(host, port).listen! do |mail|
           publisher.publish(mail)
         end
@@ -35,23 +36,6 @@ module Minbox
       def version
         say Minbox::VERSION
       end
-
-      private
-
-      def publishers_for(output)
-        publisher = Publisher.new
-        output.each do |x|
-          case x
-          when 'stdout'
-            publisher.add(LogPublisher.new)
-          when 'redis'
-            publisher.add(RedisPublisher.new)
-          when 'file'
-            publisher.add(FilePublisher.new)
-          end
-        end
-        publisher
-      end
     end
   end
 end

data/lib/minbox/client.rb

@@ -0,0 +1,135 @@
+module Minbox
+  class Client
+    attr_reader :host, :socket, :logger
+
+    def initialize(host, socket, logger)
+      @host = host
+      @logger = logger
+      @socket = socket
+    end
+
+    def handle(&block)
+      write "220"
+      while connected? && (line = read)
+        case line
+        when /^EHLO/i then ehlo(line)
+        when /^HELO/i then helo(line)
+        when /^MAIL FROM/i then mail_from(line)
+        when /^RCPT TO/i then rcpt_to(line)
+        when /^DATA/i then data(line, &block)
+        when /^QUIT/i then quit
+        when /^STARTTLS/i then start_tls
+        when /^RSET/i then reset
+        when /^NOOP/i then noop
+        when /^AUTH PLAIN/i then auth_plain(line)
+        when /^AUTH LOGIN/i then auth_login(line)
+        else
+          logger.error(line)
+          write '502 Invalid/unsupported command'
+        end
+      end
+    end
+
+    private
+
+    def quit
+      write "221 Bye"
+      close
+    end
+
+    def data(line, &block)
+      write "354 End data with <CR><LF>.<CR><LF>"
+      body = []
+      line = read
+      until line.nil? || line.match(/^\.\r\n$/)
+        body << line
+        line = read
+      end
+      write "250 OK"
+      block.call(Mail.new(body.join))
+    end
+
+    def rcpt_to(line)
+      write "250 OK"
+    end
+
+    def mail_from(line)
+      write "250 OK"
+    end
+
+    def ehlo(line)
+      _ehlo, _client_domain = line.split(" ")
+      write "250-#{host}"
+      #write "250 AUTH PLAIN LOGIN"
+      write "250-ENHANCEDSTATUSCODES"
+      write "250 OK"
+    end
+
+    def helo(line)
+      _ehlo, _client_domain = line.split(" ")
+      write "250 #{host}"
+    end
+
+    def start_tls
+      write "502 TLS not available"
+    end
+
+    def reset
+      write '250 OK'
+    end
+
+    def noop
+      write '250 OK'
+    end
+
+    def auth_plain(line)
+      data = line.gsub(/AUTH PLAIN ?/i, '')
+      if data.strip == ''
+        write '334'
+        data = read
+      end
+      parts = Base64.decode64(data).split("\0")
+      username, password = parts[-2], parts[-1]
+      logger.debug("#{username}:#{password}")
+      return write '535 Authenticated failed - protocol error' unless username && password
+      write "235 2.7.0 Authentication successful"
+    end
+
+    def auth_login(line)
+      username = line.gsub!(/AUTH LOGIN ?/i, '')
+      if username.strip == ''
+        write '334 VXNlcm5hbWU6'
+        username = read
+        write '334 UGFzc3dvcmQ6'
+      else
+        write '334 UGFzc3dvcmQ6'
+      end
+      password = Base64.decode64(read)
+      logger.debug("#{username}:#{password}")
+
+      return write '535 Authenticated failed - protocol error' unless username && password
+      write "235 2.7.0 Authentication successful"
+    end
+
+    def write(message)
+      message = "#{message}\r\n"
+      logger.debug("S: #{message.inspect}")
+      socket.puts message
+    end
+
+    def read
+      line = socket.gets
+      logger.debug("C: #{line.inspect}")
+      line
+    end
+
+    def close
+      socket&.close
+      @socket = nil
+    end
+
+    def connected?
+      @socket
+    end
+  end
+end

data/lib/minbox/core.rb

@@ -0,0 +1,9 @@
+module Minbox
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+end

data/lib/minbox/publisher.rb

@@ -13,17 +13,35 @@ module Minbox
     end
 
     def publish(mail)
-      publishers.each { |x| x.publish(mail) }
+      Thread.new do
+        Minbox.logger.debug("Publishing: #{mail.message_id}")
+        publishers.each { |x| x.publish(mail) }
+      end
+    end
+
+    def self.from(outputs)
+      publisher = Publisher.new
+      outputs.each do |x|
+        case x
+        when 'stdout'
+          publisher.add(LogPublisher.new)
+        when 'redis'
+          publisher.add(RedisPublisher.new)
+        when 'file'
+          publisher.add(FilePublisher.new)
+        end
+      end
+      publisher
     end
   end
 
   class LogPublisher
-    def initialize(logger = STDOUT)
+    def initialize(logger = Minbox.logger)
       @logger = logger
     end
 
     def publish(mail)
-      @logger.puts mail.to_s
+      @logger.debug(mail.to_s)
     end
   end
 

data/lib/minbox/server.rb

@@ -1,53 +1,32 @@
 module Minbox
   class Server
-    attr_reader :host, :port
+    attr_reader :host, :port, :logger
 
-    def initialize(host, port)
+    def initialize(host = 'localhost', port = 25, logger = Minbox.logger)
       @host = host
       @port = port
+      @logger = logger
     end
 
-    def listen!
-      server = TCPServer.new(port.to_i)
+    def listen!(&block)
+      logger.debug("Starting server on port #{port}...")
+      @server = TCPServer.new(port.to_i)
+      logger.debug("Server started!")
+
       loop do
-        yield handle(server.accept)
+        handle(@server.accept, &block)
+      rescue StandardError => error
+        logger.error(error)
       end
     end
 
-    def handle(client)
-      mail = { headers: [], body: [] }
-
-      client.puts "220"
-      ehlo, _client_domain = client.gets.split(" ")
-
-      if ["HELO", "EHLO"].include?(ehlo)
-        client.puts "250-#{host}"
-        client.puts "250 OK"
-      else
-        puts 'Ooops...'
-        client.close
-        return
-      end
-
-      data = client.gets
-      until data.start_with?("DATA")
-        mail[:headers] << data
-        client.puts "250 OK"
-        data = client.gets
-      end
-      client.puts "354 End data with <CR><LF>.<CR><LF>"
-
-      data = client.gets
-      until data.match(/^\.\r\n$/)
-        mail[:body] << data
-        data = client.gets
-      end
-
-      client.puts "250 OK"
-      client.puts "221 Bye"
-      client.close
+    def handle(socket, &block)
+      logger.debug("client connected: #{socket.inspect}")
+      Client.new(host, socket, logger).handle(&block)
+    end
 
-      Mail.new(mail[:body].join)
+    def shutdown!
+      @server&.close
     end
   end
 end

data/lib/minbox/version.rb

@@ -1,3 +1,3 @@
 module Minbox
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/minbox.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "redis", "~> 4.1"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "faker", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minbox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,16 +119,20 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/docker-build
 - bin/setup
 - exe/minbox
 - lib/minbox.rb
 - lib/minbox/cli.rb
+- lib/minbox/client.rb
+- lib/minbox/core.rb
 - lib/minbox/publisher.rb
 - lib/minbox/server.rb
 - lib/minbox/version.rb