minbox 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c500238d8a8cfc853fd4ec9a252a7a0cde7f421e1bd31a4695c312288110e23
-  data.tar.gz: 80b489dd81313d68e7e8e8e479060d22dd105b3b0570357eb489340d145ab0d4
+  metadata.gz: 7aa7df98b9f03f4db8a1971c248579b5f033fef52ff74479c5bababac5ef416f
+  data.tar.gz: 30507d43a907f6a4eb730930b88e11b56b99bfdd0f45b63500271efcee3d8a90
 SHA512:
-  metadata.gz: 7bd692169477f0e2fe78d1611ac32bdc83cdd9980a8feacf15c6574cd6d471ebe98503e6d049fba23ef991db8d5eaafc960bad31ec38d50e8c47e02efaf3b3a7
-  data.tar.gz: 601d89064f6f2189b097615815a6b46f13d4a66989c4138815a9ea5bfb8e56c449aa829d6df10e8ddf065d737dba0520d07b98ddbe9b9f9ac1ea088a79ebe1ce
+  metadata.gz: ea55e3fd8bd032f1666bdbcf7a6892456502379cbabeac6de95a3572e66a8386f25e2f3ef6027b04ae806710b1359d46b7d149d14af836aa627a3f4e18777865
+  data.tar.gz: 0c2ad2a2d4803945869874e5bbd2cd1e6aed03944cdf1a18b774d173569c2a61481a7e0b1a21c385f4e4343346c5ea7f213331314a95e021694ec002a7d41ae3

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+server.pem
 
 # rspec failure tracking
 .rspec_status

data/.ruby-version

@@ -0,0 +1 @@
+2.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minbox (0.1.1)
+    minbox (0.1.2)
       mail (~> 2.7)
       redis (~> 4.1)
       thor (~> 0.20)

data/lib/minbox/cli.rb

@@ -1,5 +1,7 @@
-require 'thor'
 require 'mail'
+require 'net/smtp'
+require 'openssl'
+require 'thor'
 
 require 'minbox'
 
@@ -16,18 +18,19 @@ module Minbox
           subject 'test message'
           body "#{Time.now} This is a test message."
         end
-        require 'net/smtp'
         Net::SMTP.start(host, port) do |smtp|
+          smtp.debug_output= Minbox.logger
           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']
+      method_option :tls, type: :boolean, default: false
       desc 'server <HOST> <PORT>', 'SMTP server'
       def server(host = 'localhost', port = '25')
         publisher = Publisher.from(options[:output])
-        Server.new(host, port).listen! do |mail|
+        Server.new(host, port, options[:tls]).listen! do |mail|
           publisher.publish(mail)
         end
       end

data/lib/minbox/client.rb

@@ -1,15 +1,15 @@
 module Minbox
   class Client
-    attr_reader :host, :socket, :logger
+    attr_reader :server, :socket, :logger
 
-    def initialize(host, socket, logger)
-      @host = host
+    def initialize(server, socket, logger)
+      @server = server
       @logger = logger
       @socket = socket
     end
 
     def handle(&block)
-      write "220"
+      write "220 #{server.host} ESMTP"
       while connected? && (line = read)
         case line
         when /^EHLO/i then ehlo(line)
@@ -28,6 +28,10 @@ module Minbox
           write '502 Invalid/unsupported command'
         end
       end
+      close
+    rescue Errno::ECONNRESET, Errno::EPIPE => error
+      logger.error(error)
+      close
     end
 
     private
@@ -46,7 +50,7 @@ module Minbox
         line = read
       end
       write "250 OK"
-      block.call(Mail.new(body.join))
+      block.call(Mail.new(body.join)) unless body.empty?
     end
 
     def rcpt_to(line)
@@ -59,19 +63,25 @@ module Minbox
 
     def ehlo(line)
       _ehlo, _client_domain = line.split(" ")
-      write "250-#{host}"
-      #write "250 AUTH PLAIN LOGIN"
+      write "250-#{server.host} offers a warm hug of welcome"
+      write "250-8BITMIME"
       write "250-ENHANCEDSTATUSCODES"
+      #write "250-STARTTLS"# if server.tls?
+      #write "250 AUTH PLAIN LOGIN"
       write "250 OK"
     end
 
     def helo(line)
       _ehlo, _client_domain = line.split(" ")
-      write "250 #{host}"
+      write "250 #{server.host}"
     end
 
     def start_tls
-      write "502 TLS not available"
+      write "220 Ready to start TLS"
+
+      socket = OpenSSL::SSL::SSLSocket.new(@socket, server.ssl_context)
+      socket.sync_close = true
+      @socket = socket.accept
     end
 
     def reset

data/lib/minbox/server.rb

@@ -1,16 +1,23 @@
 module Minbox
   class Server
-    attr_reader :host, :port, :logger
+    attr_reader :host, :port, :logger, :key
 
-    def initialize(host = 'localhost', port = 25, logger = Minbox.logger)
+    def initialize(host = 'localhost', port = 25, tls = false, logger = Minbox.logger)
       @host = host
       @port = port
       @logger = logger
+      @tls = tls
+      @key = OpenSSL::PKey::RSA.new(2048)
+    end
+
+    def tls?
+      @tls
     end
 
     def listen!(&block)
       logger.debug("Starting server on port #{port}...")
       @server = TCPServer.new(port.to_i)
+      @server = upgrade(@server) if tls?
       logger.debug("Server started!")
 
       loop do
@@ -22,11 +29,56 @@ module Minbox
 
     def handle(socket, &block)
       logger.debug("client connected: #{socket.inspect}")
-      Client.new(host, socket, logger).handle(&block)
+      Client.new(self, socket, logger).handle(&block)
     end
 
     def shutdown!
       @server&.close
     end
+
+    def ssl_context
+      @ssl_context ||=
+        begin
+          ssl_context = OpenSSL::SSL::SSLContext.new
+          ssl_context.cert = certificate_for(key)
+          ssl_context.key = key
+          ssl_context.ssl_version = :TLSv1_2
+          ssl_context
+        end
+    end
+
+    private
+
+    def upgrade(tcp_server)
+      server = OpenSSL::SSL::SSLServer.new(tcp_server, ssl_context)
+      server.start_immediately = true
+      server
+    end
+
+    def certificate_for(private_key)
+      certificate = OpenSSL::X509::Certificate.new
+      subject = '/C=CA/ST=AB/L=Calgary/O=minbox/OU=development/CN=minbox'
+      certificate.subject = certificate.issuer = OpenSSL::X509::Name.parse(subject)
+      certificate.not_before = Time.now
+      certificate.not_after = certificate.not_before + 30 * 24 * 60 * 60 # 30 days
+      certificate.public_key = private_key.public_key
+      certificate.serial = 1
+      certificate.version = 2
+      apply_ski_extension_to(certificate)
+      certificate.sign(private_key, OpenSSL::Digest::SHA256.new)
+      certificate
+    end
+
+    def apply_ski_extension_to(certificate)
+      extensions = OpenSSL::X509::ExtensionFactory.new
+      extensions.subject_certificate = certificate
+      extensions.issuer_certificate = certificate
+      certificate.add_extension(
+        extensions.create_extension('subjectKeyIdentifier', 'hash', false)
+      )
+      certificate.add_extension(
+        extensions.create_extension('keyUsage', 'keyEncipherment,digitalSignature', true)
+      )
+    end
   end
 end

data/lib/minbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Dockerfile
 - Gemfile