jubilee 0.4.0 → 0.4.1

data/jubilee.gemspec

@@ -0,0 +1,100 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "jubilee"
+  s.version = "0.4.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Isaiah Peng"]
+  s.date = "2013-09-16"
+  s.description = "Jubilee is a experimental webserver built for speed, it's based on Vertx."
+  s.email = "issaria@gmail.com"
+  s.executables = ["jubilee", "jubilee_d"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".ruby-version",
+    ".travis.yml",
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/jubilee",
+    "bin/jubilee_d",
+    "examples/jubilee/keystore.jks",
+    "examples/jubilee/server-keystore.jks",
+    "examples/ssl/ServerTest.java",
+    "examples/ssl/webroot/index.html",
+    "jars/jackson-core-2.2.2.jar",
+    "jars/netty-all-4.0.4.Final.jar",
+    "jars/vertx-core-2.1.0-SNAPSHOT.jar",
+    "java/src/jubilee/JubileeService.java",
+    "java/src/org/jruby/jubilee/Const.java",
+    "java/src/org/jruby/jubilee/RackApplication.java",
+    "java/src/org/jruby/jubilee/RackEnvironment.java",
+    "java/src/org/jruby/jubilee/RackErrors.java",
+    "java/src/org/jruby/jubilee/RackInput.java",
+    "java/src/org/jruby/jubilee/RackResponse.java",
+    "java/src/org/jruby/jubilee/Server.java",
+    "java/src/org/jruby/jubilee/deploy/Starter.java",
+    "java/src/org/jruby/jubilee/impl/DefaultRackEnvironment.java",
+    "java/src/org/jruby/jubilee/impl/NullIO.java",
+    "java/src/org/jruby/jubilee/impl/RubyIORackErrors.java",
+    "java/src/org/jruby/jubilee/impl/RubyIORackInput.java",
+    "jubilee.gemspec",
+    "lib/jubilee.rb",
+    "lib/jubilee/application.rb",
+    "lib/jubilee/cli.rb",
+    "lib/jubilee/configuration.rb",
+    "lib/jubilee/const.rb",
+    "lib/jubilee/jubilee.jar",
+    "lib/jubilee/response.rb",
+    "lib/jubilee/server.rb",
+    "lib/jubilee/version.rb",
+    "lib/rack/handler/jubilee.rb",
+    "test/.ruby-version",
+    "test/config/app.rb",
+    "test/jubilee/test_cli.rb",
+    "test/jubilee/test_config.rb",
+    "test/jubilee/test_rack_server.rb",
+    "test/jubilee/test_response.rb",
+    "test/jubilee/test_server.rb",
+    "test/jubilee/test_upload.rb",
+    "test/sinatra_app/app.rb",
+    "test/sinatra_app/config.ru",
+    "test/sinatra_app/public/test.html",
+    "test/sinatra_app/unicorn.conf.rb",
+    "test/test_helper.rb"
+  ]
+  s.homepage = "http://github.com/isaiah/jubilee"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "JRuby webserver based on Vertx"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.4.1"])
+      s.add_runtime_dependency(%q<spoon>, ["~> 0.0.4"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<rack>, [">= 1.4.1"])
+      s.add_dependency(%q<spoon>, ["~> 0.0.4"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 1.4.1"])
+    s.add_dependency(%q<spoon>, ["~> 0.0.4"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/lib/jubilee/configuration.rb

@@ -1,5 +1,7 @@
 module Jubilee
   class Configuration
+    attr_reader :app
+
     def initialize(options, &block)
       @options = options
       @block = block
@@ -9,15 +11,6 @@ module Jubilee
       @app = load_rack_adapter(@options, &@block)
     end
 
-    def app
-      if !@options[:quiet] and @options[:environment] == "development"
-        logger = @options[:logger] || STDOUT
-        Rack::CommonLogger.new(@app, logger)
-      else
-        @app
-      end
-    end
-
     def port
       @options[:Port]
     end
@@ -41,18 +34,36 @@ module Jubilee
     private
     def load_rack_adapter(options, &block)
       if block
-        app = Rack::Builder.new(&block).to_app
+        inner_app = Rack::Builder.new(&block).to_app
       else
         if options[:rackup]
           Kernel.load(options[:rackup])
-          app = Object.const_get(File.basename(options[:rackup], '.rb').capitalize.to_sym).new
+          inner_app = Object.const_get(File.basename(options[:rackup], '.rb').capitalize.to_sym).new
         else
           Dir.chdir options[:chdir] if options[:chdir]
-          app, opts = Rack::Builder.parse_file "config.ru"
+          inner_app, opts = Rack::Builder.parse_file "config.ru"
         end
       end
-      app
+      case ENV["RACK_ENV"]
+      when "development"
+        Rack::Builder.new do
+          use Rack::ContentLength
+          use Rack::Chunked
+          use Rack::CommonLogger, $stderr
+          use Rack::ShowExceptions
+          use Rack::Lint
+          run inner_app
+        end.to_app
+      when "deployment"
+        Rack::Builder.new do
+          use Rack::ContentLength
+          use Rack::Chunked
+          use Rack::CommonLogger, $stderr
+          run inner_app
+        end.to_app
+      else
+        inner_app
+      end
     end
-
   end
 end

data/lib/jubilee/server.rb

@@ -2,8 +2,7 @@ require 'rack/methodoverride'
 module Jubilee
   class Server < VertxServer
     def initialize(app, opts = {})
-      app = Rack::MethodOverride.new(app)
-      options = {Port: 3215, ssl: false}.merge(opts)
+      options = {Port: 3215, ssl: false, number_of_workers: 4}.merge(opts)
       if (options[:ssl]) && options[:keystore_path].nil?
           raise ArgumentError, "Please provide a keystore for ssl"
       end

data/test/jubilee/{test_persistent.rb → test_response.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'timeout'
 require 'socket'
-class TestPersistent < MiniTest::Unit::TestCase
+class TestResponse < MiniTest::Unit::TestCase
   def setup
     @valid_request = "GET / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
     @close_request = "GET / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\nConnection: Close\r\n\r\n"
@@ -26,7 +26,6 @@ class TestPersistent < MiniTest::Unit::TestCase
 
     @server = Jubilee::Server.new @simple
     @server.start
-
     sleep 0.1
     @client = TCPSocket.new @host, @port
   end
@@ -243,5 +242,32 @@ class TestPersistent < MiniTest::Unit::TestCase
     assert_equal "HTTP/1.1 200 OK\r\ncontent-length: #{sz}\r\nx-header: Works\r\n\r\n", lines(4, c2)
     assert_equal "Hello", c2.read(5)
   end
+
+  def test_client_shutdown_writes
+    bs = 15609315 * rand
+    sock = TCPSocket.new('127.0.0.1', @port)
+    sock.syswrite("PUT /hello HTTP/1.1\r\n")
+    sock.syswrite("Host: example.com\r\n")
+    sock.syswrite("Transfer-Encoding: chunked\r\n")
+    sock.syswrite("Trailer: X-Foo\r\n")
+    sock.syswrite("\r\n")
+    sock.syswrite("%x\r\n" % [ bs ])
+    sock.syswrite("F" * bs)
+    sock.syswrite("\r\n0\r\nX-")
+    "Foo: bar\r\n\r\n".each_byte do |x|
+      sock.syswrite x.chr
+      sleep 0.05
+    end
+    # we wrote the entire request before shutting down, server should
+    # continue to process our request and never hit EOFError on our sock
+    sock.shutdown(Socket::SHUT_WR)
+    buf = sock.read
+    assert_equal 'Hello', buf.split(/\r\n\r\n/).last
+    next_client = Net::HTTP.get(URI.parse("http://127.0.0.1:#@port/"))
+    assert_equal 'Hello', next_client
+    lines = File.readlines("test_stderr.#$$.log")
+    assert lines.grep(/^Unicorn::ClientShutdown: /).empty?
+    assert_nil sock.close
+  end
 =end
 end

data/test/jubilee/test_server.rb

@@ -42,7 +42,6 @@ class TestJubileeServer < MiniTest::Unit::TestCase
     skip
   end
 
-  
   def test_url_scheme_for_https
     app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
     server = Jubilee::Server.new(app, {port:@port, ssl:true, 
@@ -65,4 +64,5 @@ class TestJubileeServer < MiniTest::Unit::TestCase
     server.stop
     assert_equal "https", body
   end
+
 end

data/test/jubilee/test_upload.rb

@@ -0,0 +1,298 @@
+# -*- encoding: binary -*-
+
+require 'test_helper'
+require 'digest/md5'
+
+class TestUpload < MiniTest::Unit::TestCase
+
+  def setup
+    @addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+    @port = 3215
+    @hdr = {'Content-Type' => 'text/plain', 'Content-Length' => '0'}
+    @bs = 4096
+    @count = 256
+    @server = nil
+    @sha1 = Digest::SHA1.new
+
+    # we want random binary data to test 1.9 encoding-aware IO craziness
+    @random = File.open('/dev/urandom','rb')
+    @sha1_app = lambda do |env|
+      sha1 = Digest::SHA1.new
+      input = env['rack.input']
+      resp = {}
+
+      i = 0
+      while buf = input.read(@bs)
+        sha1.update(buf)
+        i += 1
+      end
+      resp[:sha1] = sha1.hexdigest
+
+      # rewind and read again
+      input.rewind
+      sha1.reset
+
+      while buf = input.read(@bs)
+        sha1.update(buf)
+      end
+
+      if resp[:sha1] == sha1.hexdigest
+        resp[:sysread_read_byte_match] = true
+      end
+      resp[:content_md5] = env['HTTP_CONTENT_MD5']
+
+      [ 200, @hdr.merge({'X-Resp' => resp.inspect}), [] ]
+    end
+  end
+
+  def teardown
+    @server.stop
+    @random.close
+  end
+
+  def test_put
+    start_server(@sha1_app)
+    sock = TCPSocket.new(@addr, @port)
+    sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n")
+    @count.times do |i|
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      sock.syswrite(buf)
+    end
+    read = sock.read.split(/\r\n/)
+    assert_equal "HTTP/1.0 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal @sha1.hexdigest, resp[:sha1]
+  end
+
+  def test_put_content_md5
+    start_server(@sha1_app)
+    md5 = Digest::MD5.new
+    sock = TCPSocket.new(@addr, @port)
+    sock.syswrite("PUT / HTTP/1.0\r\nTransfer-Encoding: chunked\r\n" \
+                  "Trailer: Content-MD5\r\n\r\n")
+    @count.times do |i|
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      md5.update(buf)
+      sock.syswrite("#{'%x' % buf.size}\r\n")
+      sock.syswrite(buf << "\r\n")
+    end
+    sock.syswrite("0\r\n")
+
+    content_md5 = [ md5.digest! ].pack('m').strip.freeze
+    sock.syswrite("Content-MD5: #{content_md5}\r\n\r\n")
+    read = sock.read.split(/\r\n/)
+    assert_equal "HTTP/1.0 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal @sha1.hexdigest, resp[:sha1]
+    #assert_equal content_md5, resp[:content_md5]
+  end
+
+  def test_put_trickle_small
+    start_server(@sha1_app)
+    @count, @bs = 2, 128
+    assert_equal 256, length
+    sock = TCPSocket.new(@addr, @port)
+    hdr = "PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n"
+    @count.times do
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      hdr << buf
+      sock.syswrite(hdr)
+      hdr = ''
+      sleep 0.6
+    end
+    read = sock.read.split(/\r\n/)
+    assert_equal "HTTP/1.0 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal @sha1.hexdigest, resp[:sha1]
+  end
+
+  def test_put_keepalive_truncates_small_overwrite
+    start_server(@sha1_app)
+    sock = TCPSocket.new(@addr, @port)
+    to_upload = length + 1
+    sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{to_upload}\r\n\r\n")
+    @count.times do
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      sock.syswrite(buf)
+    end
+    sock.syswrite('12345') # write 4 bytes more than we expected
+    @sha1.update('1')
+
+    buf = sock.readpartial(4096)
+    while buf !~ /\r\n\r\n/
+      buf << sock.readpartial(4096)
+    end
+    read = buf.split(/\r\n/)
+    assert_equal "HTTP/1.0 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    #assert_equal to_upload, resp[:size]
+    assert_equal @sha1.hexdigest, resp[:sha1]
+  end
+
+  def test_put_excessive_overwrite_closed
+    tmp = Tempfile.new('overwrite_check')
+    tmp.sync = true
+    start_server(lambda { |env|
+      nr = 0
+      while buf = env['rack.input'].read(65536)
+        nr += buf.size
+      end
+      tmp.write(nr.to_s)
+      [ 200, @hdr, [] ]
+    })
+    sock = TCPSocket.new(@addr, @port)
+    buf = ' ' * @bs
+    sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n")
+
+    @count.times { sock.syswrite(buf) }
+    assert_raises(Errno::ECONNRESET, Errno::EPIPE) do
+      16384.times { sock.syswrite(buf) }
+    end
+    sock.gets
+    tmp.rewind
+    assert_equal length, tmp.read.to_i
+  end
+
+  # Despite reading numerous articles and inspecting the 1.9.1-p0 C
+  # source, Eric Wong will never trust that we're always handling
+  # encoding-aware IO objects correctly.  Thus this test uses shell
+  # utilities that should always operate on files/sockets on a
+  # byte-level.
+  def test_uncomfortable_with_onenine_encodings
+    # POSIX doesn't require all of these to be present on a system
+    which('curl') or return
+    which('sha1sum') or return
+    which('dd') or return
+
+    start_server(@sha1_app)
+
+    tmp = Tempfile.new('dd_dest')
+    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
+                        "bs=#{@bs}", "count=#{@count}"),
+           "dd #@random to #{tmp}")
+    sha1_re = %r!\b([a-f0-9]{40})\b!
+    sha1_out = `sha1sum #{tmp.path}`
+
+    assert $?.success?, 'sha1sum ran OK'
+
+    assert_match(sha1_re, sha1_out)
+    sha1 = sha1_re.match(sha1_out)[1]
+    resp = `curl -isSfN -T#{tmp.path} http://#@addr:#@port/`
+
+    assert $?.success?, 'curl ran OK'
+    assert_match(%r!\b#{sha1}\b!, resp)
+    assert_match(/sysread_read_byte_match/, resp)
+
+    # small StringIO path
+    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
+                        "bs=1024", "count=1"),
+           "dd #@random to #{tmp}")
+    sha1_re = %r!\b([a-f0-9]{40})\b!
+    sha1_out = `sha1sum #{tmp.path}`
+    assert $?.success?, 'sha1sum ran OK'
+
+    assert_match(sha1_re, sha1_out)
+    sha1 = sha1_re.match(sha1_out)[1]
+    resp = `curl -isSfN -T#{tmp.path} http://#@addr:#@port/`
+    assert $?.success?, 'curl ran OK'
+    assert_match(%r!\b#{sha1}\b!, resp)
+    assert_match(/sysread_read_byte_match/, resp)
+  end
+
+=begin
+  def test_chunked_upload_via_curl
+    # POSIX doesn't require all of these to be present on a system
+    which('curl') or return
+    which('sha1sum') or return
+    which('dd') or return
+
+    start_server(@sha1_app)
+
+    tmp = Tempfile.new('dd_dest')
+    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
+                        "bs=#{@bs}", "count=#{@count}"),
+           "dd #@random to #{tmp}")
+    sha1_re = %r!\b([a-f0-9]{40})\b!
+    sha1_out = `sha1sum #{tmp.path}`
+    assert $?.success?, 'sha1sum ran OK'
+
+    assert_match(sha1_re, sha1_out)
+    sha1 = sha1_re.match(sha1_out)[1]
+    cmd = "curl -H 'X-Expect-Size: #{tmp.size}' --tcp-nodelay \
+           -isSf --no-buffer -T- " \
+          "http://#@addr:#@port/"
+    resp = Tempfile.new('resp')
+    resp.sync = true
+
+    rd, wr = IO.pipe
+    wr.sync = rd.sync = true
+    pid = fork {
+      STDIN.reopen(rd)
+      rd.close
+      wr.close
+      STDOUT.reopen(resp)
+      exec cmd
+    }
+    rd.close
+
+    tmp.rewind
+    @count.times { |i|
+      wr.write(tmp.read(@bs))
+      sleep(rand / 10) if 0 == i % 8
+    }
+    wr.close
+    pid, status = Process.waitpid2(pid)
+
+    resp.rewind
+    resp = resp.read
+    assert status.success?, 'curl ran OK'
+    assert_match(%r!\b#{sha1}\b!, resp)
+    assert_match(/sysread_read_byte_match/, resp)
+    assert_match(/expect_size_match/, resp)
+  end
+=end
+
+  def test_curl_chunked_small
+    # POSIX doesn't require all of these to be present on a system
+    which('curl') or return
+    which('sha1sum') or return
+    which('dd') or return
+
+    start_server(@sha1_app)
+
+    tmp = Tempfile.new('dd_dest')
+    # small StringIO path
+    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
+                        "bs=1024", "count=1"),
+           "dd #@random to #{tmp}")
+    sha1_re = %r!\b([a-f0-9]{40})\b!
+    sha1_out = `sha1sum #{tmp.path}`
+    assert $?.success?, 'sha1sum ran OK'
+
+    assert_match(sha1_re, sha1_out)
+    sha1 = sha1_re.match(sha1_out)[1]
+    resp = `curl -H 'X-Expect-Size: #{tmp.size}' --tcp-nodelay \
+            -isSf --no-buffer -T- http://#@addr:#@port/ < #{tmp.path}`
+    assert $?.success?, 'curl ran OK'
+    assert_match(%r!\b#{sha1}\b!, resp)
+    assert_match(/sysread_read_byte_match/, resp)
+    #assert_match(/expect_size_match/, resp)
+  end
+
+  private
+
+  def length
+    @bs * @count
+  end
+
+  def start_server(app)
+    @server = Jubilee::Server.new app
+    @server.start
+    sleep 0.1
+  end
+
+end