eventmachine 1.0.7-java → 1.0.8-java

data/ext/ssl.cpp

@@ -82,7 +82,7 @@ static char PrivateMaterials[] = {
 builtin_passwd_cb
 *****************/
 
-extern "C" int builtin_passwd_cb (char *buf, int bufsize, int rwflag, void *userdata)
+extern "C" int builtin_passwd_cb (char *buf UNUSED, int bufsize UNUSED, int rwflag UNUSED, void *userdata UNUSED)
 {
 	strcpy (buf, "kittycat");
 	return 8;
@@ -216,7 +216,7 @@ SslContext_t::~SslContext_t()
 SslBox_t::SslBox_t
 ******************/
 
-SslBox_t::SslBox_t (bool is_server, const string &privkeyfile, const string &certchainfile, bool verify_peer, const unsigned long binding):
+SslBox_t::SslBox_t (bool is_server, const string &privkeyfile, const string &certchainfile, bool verify_peer, const uintptr_t binding):
 	bIsServer (is_server),
 	bHandshakeCompleted (false),
 	bVerifyPeer (verify_peer),
@@ -392,7 +392,7 @@ int SslBox_t::PutPlaintext (const char *buf, int bufsize)
 
 	bool fatal = false;
 	bool did_work = false;
-	int pending =  BIO_pending(pbioWrite);
+	int pending = BIO_pending(pbioWrite);
 
 	while (OutboundQ.HasPages() && pending < SSLBOX_WRITE_BUFFER_SIZE) {
 		const char *page;
@@ -400,7 +400,7 @@ int SslBox_t::PutPlaintext (const char *buf, int bufsize)
 		OutboundQ.Front (&page, &length);
 		assert (page && (length > 0));
 		int n = SSL_write (pSSL, page, length);
-		pending =  BIO_pending(pbioWrite);
+		pending = BIO_pending(pbioWrite);
 
 		if (n > 0) {
 			did_work = true;
@@ -442,9 +442,9 @@ X509 *SslBox_t::GetPeerCert()
 ssl_verify_wrapper
 *******************/
 
-extern "C" int ssl_verify_wrapper(int preverify_ok, X509_STORE_CTX *ctx)
+extern "C" int ssl_verify_wrapper(int preverify_ok UNUSED, X509_STORE_CTX *ctx)
 {
-	unsigned long binding;
+	uintptr_t binding;
 	X509 *cert;
 	SSL *ssl;
 	BUF_MEM *buf;
@@ -453,7 +453,7 @@ extern "C" int ssl_verify_wrapper(int preverify_ok, X509_STORE_CTX *ctx)
 
 	cert = X509_STORE_CTX_get_current_cert(ctx);
 	ssl = (SSL*) X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-	binding = (unsigned long) SSL_get_ex_data(ssl, 0);
+	binding = (uintptr_t) SSL_get_ex_data(ssl, 0);
 
 	out = BIO_new(BIO_s_mem());
 	PEM_write_bio_X509(out, cert);

data/ext/ssl.h

@@ -61,7 +61,7 @@ class SslBox_t
 class SslBox_t
 {
 	public:
-		SslBox_t (bool is_server, const string &privkeyfile, const string &certchainfile, bool verify_peer, const unsigned long binding);
+		SslBox_t (bool is_server, const string &privkeyfile, const string &certchainfile, bool verify_peer, const uintptr_t binding);
 		virtual ~SslBox_t();
 
 		int PutPlaintext (const char*, int);

data/lib/em/protocols/line_and_text.rb

@@ -38,6 +38,7 @@ module EventMachine
         super
         lbp_init_line_state
       end
+
       def receive_data data
         if @lbp_mode == :lines
           begin

data/lib/em/protocols/linetext2.rb

@@ -40,7 +40,7 @@ module EventMachine
       MaxBinaryLength = 32*1024*1024
 
       #--
-      # Will be called recursively until there's no data to read.
+      # Will loop internally until there's no data left to read.
       # That way the user-defined handlers we call can modify the
       # handling characteristics on a per-token basis.
       #
@@ -52,45 +52,51 @@ module EventMachine
         @lt2_delimiter ||= "\n"
         @lt2_linebuffer ||= []
 
-        if @lt2_mode == :lines
-          if ix = data.index( @lt2_delimiter )
-            @lt2_linebuffer << data[0...ix]
-            ln = @lt2_linebuffer.join
-            @lt2_linebuffer.clear
-            if @lt2_delimiter == "\n"
-              ln.chomp!
+        remaining_data = data
+
+        while remaining_data.length > 0
+          if @lt2_mode == :lines
+            if ix = remaining_data.index( @lt2_delimiter )
+              @lt2_linebuffer << remaining_data[0...ix]
+              ln = @lt2_linebuffer.join
+              @lt2_linebuffer.clear
+              if @lt2_delimiter == "\n"
+                ln.chomp!
+              end
+              receive_line ln
+              remaining_data = remaining_data[(ix+@lt2_delimiter.length)..-1]
+            else
+              @lt2_linebuffer << remaining_data
+              remaining_data = ""
             end
-            receive_line ln
-            receive_data data[(ix+@lt2_delimiter.length)..-1]
-          else
-            @lt2_linebuffer << data
-          end
-        elsif @lt2_mode == :text
-          if @lt2_textsize
-            needed = @lt2_textsize - @lt2_textpos
-            will_take = if data.length > needed
-                          needed
-                        else
-                          data.length
-                        end
-
-            @lt2_textbuffer << data[0...will_take]
-            tail = data[will_take..-1]
-
-            @lt2_textpos += will_take
-            if @lt2_textpos >= @lt2_textsize
-              # Reset line mode (the default behavior) BEFORE calling the
-              # receive_binary_data. This makes it possible for user code
-              # to call set_text_mode, enabling chains of text blocks
-              # (which can possibly be of different sizes).
-              set_line_mode
-              receive_binary_data @lt2_textbuffer.join
-              receive_end_of_binary_data
+          elsif @lt2_mode == :text
+            if @lt2_textsize
+              needed = @lt2_textsize - @lt2_textpos
+              will_take = if remaining_data.length > needed
+                            needed
+                          else
+                            remaining_data.length
+                          end
+
+              @lt2_textbuffer << remaining_data[0...will_take]
+              tail = remaining_data[will_take..-1]
+
+              @lt2_textpos += will_take
+              if @lt2_textpos >= @lt2_textsize
+                # Reset line mode (the default behavior) BEFORE calling the
+                # receive_binary_data. This makes it possible for user code
+                # to call set_text_mode, enabling chains of text blocks
+                # (which can possibly be of different sizes).
+                set_line_mode
+                receive_binary_data @lt2_textbuffer.join
+                receive_end_of_binary_data
+              end
+
+              remaining_data = tail
+            else
+              receive_binary_data remaining_data
+              remaining_data = ""
             end
-
-            receive_data tail
-          else
-            receive_binary_data data
           end
         end
       end

data/lib/em/protocols/smtpclient.rb

@@ -48,20 +48,20 @@ module EventMachine
     #     puts 'Email failed!'
     #   }
     #
-    # Sending generated emails (using mailfactory)
+    # Sending generated emails (using Mail)
     #
-    #   mail = MailFactory.new
-    #   mail.to = 'someone@site.co'
-    #   mail.from = 'me@site.com'
-    #   mail.subject = 'hi!'
-    #   mail.text = 'hello world'
-    #   mail.html = '<h1>hello world</h1>'
+    #   mail = Mail.new do
+    #     from    'alice@example.com'
+    #     to      'bob@example.com'
+    #     subject 'This is a test email'
+    #     body    'Hello, world!'
+    #   end
     #
     #   email = EM::P::SmtpClient.send(
-    #     :domain=>'site.com',
-    #     :from=>mail.from,
+    #     :domain=>'example.com',
+    #     :from=>mail.from.first,
     #     :to=>mail.to,
-    #     :content=>"#{mail.to_s}\r\n.\r\n"
+    #     :message=>mail.to_s
     #   )
     #
     class SmtpClient < Connection
@@ -108,25 +108,29 @@ module EventMachine
       #   of each requested recipient is available after the call completes. TODO, we should define
       #   an overridable stub that will be called on rejection of a recipient or a sender, giving
       #   user code the chance to try again or abort the connection.
-      # :header => Required hash of values to be transmitted in the header of the message.
-      #   The hash keys are the names of the headers (do NOT append a trailing colon), and the values are strings
-      #   containing the header values. TODO, support Arrays of header values, which would cause us to
-      #   send that specific header line more than once.
+      #
+      # One of either :message, :content, or :header and :body is required:
+      #
+      # :message => String
+      #   A valid RFC2822 Internet Message.
+      # :content => String
+      #   Raw data which MUST be in correct SMTP body format, with escaped leading dots and a trailing
+      #   dot line.
+      # :header => String or Hash of values to be transmitted in the header of the message.
+      #   The hash keys are the names of the headers (do NOT append a trailing colon), and the values
+      #   are strings containing the header values. TODO, support Arrays of header values, which would
+      #   cause us to send that specific header line more than once.
       #
       #   @example
       #     :header => {"Subject" => "Bogus", "CC" => "myboss@example.com"}
       #
-      # :body => Optional string, defaults blank.
+      # :body => Optional String or Array of Strings, defaults blank.
       #   This will be passed as the body of the email message.
       #   TODO, this needs to be significantly beefed up. As currently written, this requires the caller
       #   to properly format the input into CRLF-delimited lines of 7-bit characters in the standard
       #   SMTP transmission format. We need to be able to automatically convert binary data, and add
-      #   correct line-breaks to text data. I think the :body parameter should remain as it is, and we
-      #   should add a :content parameter that contains autoconversions and/or conversion parameters.
-      #   Then we can check if either :body or :content is present and do the right thing.
-      # :content => Optional array or string
-      #   Alternative to providing header and body, an array or string of raw data which MUST be in
-      #   correct SMTP body format, including a trailing dot line
+      #   correct line-breaks to text data.
+      #
       # :verbose => Optional.
       #   If true, will cause a lot of information (including the server-side of the
       #   conversation) to be dumped to $>.
@@ -233,12 +237,15 @@ module EventMachine
         close_connection_after_writing
       end
 
+      def send_ehlo
+        send_data "EHLO #{@args[:domain]}\r\n"
+      end
+
       def receive_signon
         return invoke_error unless @range == 2
-        send_data "EHLO #{@args[:domain]}\r\n"
+        send_ehlo
         @responder = :receive_ehlo_response
       end
-
       def receive_ehlo_response
         return invoke_error unless @range == 2
         @server_caps = @msg
@@ -258,6 +265,15 @@ module EventMachine
       def receive_starttls_response
         return invoke_error unless @range == 2
         start_tls
+        invoke_ehlo_over_tls
+      end
+
+      def invoke_ehlo_over_tls
+        send_ehlo
+        @responder = :receive_ehlo_over_tls_response
+      end
+      def receive_ehlo_over_tls_response
+        return invoke_error unless @range == 2
         invoke_auth
       end
 
@@ -316,6 +332,10 @@ module EventMachine
         invoke_rcpt_to
       end
 
+      def escape_leading_dots(s)
+        s.gsub(/^\./, '..')
+      end
+
       def invoke_data
         send_data "DATA\r\n"
         @responder = :receive_data_response
@@ -323,25 +343,34 @@ module EventMachine
       def receive_data_response
         return invoke_error unless @range == 3
 
-        # The data to send can be given either in @args[:content] (an array or string of raw data
-        # which MUST be in correct SMTP body format, including a trailing dot line), or a header and
-        # body given in @args[:header] and @args[:body].
+        # The data to send can be given in either @args[:message], @args[:content], or the
+        # combination of @args[:header] and @args[:body].
+        #
+        #   - @args[:message] (String) MUST be a valid RFC2822 Internet Message
         #
-        if @args[:content]
+        #   - @args[:content] (String) MUST be in correct SMTP body format, with escaped
+        #     leading dots and a trailing dot line
+        #
+        #   - @args[:header]  (Hash or String)
+        #   - @args[:body]    (Array or String)
+        if @args[:message]
+          send_data escape_leading_dots(@args[:message].to_s)
+          send_data "\r\n.\r\n"
+        elsif @args[:content]
           send_data @args[:content].to_s
         else
           # The header can be a hash or an array.
           if @args[:header].is_a?(Hash)
-            (@args[:header] || {}).each {|k,v| send_data "#{k}: #{v}\r\n" }
+            (@args[:header] || {}).each {|k,v| send_data escape_leading_dots("#{k}: #{v}\r\n") }
           else
-            send_data @args[:header].to_s
+            send_data escape_leading_dots(@args[:header].to_s)
           end
           send_data "\r\n"
 
           if @args[:body].is_a?(Array)
-            @args[:body].each {|e| send_data e}
+            @args[:body].each {|e| send_data escape_leading_dots(e)}
           else
-            send_data @args[:body].to_s
+            send_data escape_leading_dots(@args[:body].to_s)
           end
 
           send_data "\r\n.\r\n"

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/lib/eventmachine.rb

@@ -184,7 +184,15 @@ module EventMachine
           add_timer(0) { signal_loopbreak }
         end
         @reactor_thread = Thread.current
-        run_machine
+
+        # Rubinius needs to come back into "Ruby space" for GC to work,
+        # so we'll crank the machine here.
+        if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+          while run_machine_once; end
+        else
+          run_machine
+        end
+
       ensure
         until @tails.empty?
           @tails.pop.call

data/tests/test_ltp2.rb

@@ -26,6 +26,26 @@ class TestLineText2 < Test::Unit::TestCase
     assert_equal( ["Line 1", "Line 2", "Line 3"], a.lines )
   end
 
+  # The basic test above shows that extra newlines are chomped
+  # This test shows that newlines are preserved if the delimiter isn't \n
+  class PreserveNewlines
+    include EM::Protocols::LineText2
+    attr_reader :lines
+    def initialize *args
+      super
+      @delim = "|"
+      set_delimiter @delim
+    end
+    def receive_line line
+      (@lines ||= []) << line
+    end
+  end
+  def test_preserve_newlines
+    a = PreserveNewlines.new
+    a.receive_data "aaa|bbb|ccc|\n|\r\n| \t ||"
+    assert_equal( ["aaa", "bbb", "ccc", "\n", "\r\n", " \t ", ""], a.lines )
+  end
+
   class ChangeDelimiter
     include EM::Protocols::LineText2
     attr_reader :lines

data/tests/test_smtpclient.rb

@@ -52,4 +52,24 @@ class TestSmtpClient < Test::Unit::TestCase
     assert(err)
   end
 
+
+  EM::Protocols::SmtpClient.__send__(:public, :escape_leading_dots)
+
+  def test_escaping
+    smtp = EM::Protocols::SmtpClient.new :domain => "example.com"
+
+    expectations = {
+      "Hello\r\n" => "Hello\r\n",
+      "\r\n.whatever\r\n" => "\r\n..whatever\r\n",
+      "\r\n.\r\n" => "\r\n..\r\n",
+      "\r\n.\r\n." => "\r\n..\r\n..",
+      ".\r\n.\r\n" => "..\r\n..\r\n",
+      "..\r\n" => "...\r\n"
+    }
+
+    expectations.each do |input, output|
+      assert_equal output, smtp.escape_leading_dots(input)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -192,6 +192,7 @@ files:
 - lib/em/version.rb
 - lib/eventmachine.rb
 - lib/jeventmachine.rb
+- lib/rubyeventmachine.jar
 - rakelib/cpp.rake_example
 - rakelib/package.rake
 - rakelib/test.rake
@@ -254,7 +255,6 @@ files:
 - tests/test_timers.rb
 - tests/test_ud.rb
 - tests/test_unbind_reason.rb
-- lib/rubyeventmachine.jar
 homepage: http://rubyeventmachine.com
 licenses:
 - Ruby
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: eventmachine
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Ruby/EventMachine library