ebb 0.0.2 → 0.0.3

data/src/parser.h

@@ -17,6 +17,7 @@ typedef void (*field_cb)(void *data, const char *field, size_t flen, const char
 
 typedef struct http_parser { 
   int cs;
+  int overflow_error;
   size_t body_start;
   int content_len;
   size_t nread;
@@ -36,10 +37,9 @@ typedef struct http_parser {
   element_cb http_version;
   element_cb header_done;
   element_cb content_length;
-  
 } http_parser;
 
-int http_parser_init(http_parser *parser);
+void http_parser_init(http_parser *parser);
 int http_parser_finish(http_parser *parser);
 size_t http_parser_execute(http_parser *parser, const char *data, size_t len, size_t off);
 int http_parser_has_error(http_parser *parser);

data/{benchmark/test.rb → test/basic_test.rb}

@@ -1,13 +1,17 @@
 require  File.dirname(__FILE__) + '/../ruby_lib/ebb'
 require 'test/unit'
 require 'net/http'
-require 'base64'
+require 'socket'
+require 'rubygems'
+require 'json'
 
+PORT = 4044
 
 class EbbTest < Test::Unit::TestCase
   def setup
     @pid = fork do
-      server = Ebb::Server.new(self, :port => 4044)
+      server = Ebb::Server.new(self, :port => PORT)
+      STDOUT.reopen "/dev/null", "a"
       server.start
     end
     sleep 0.5
@@ -19,11 +23,11 @@ class EbbTest < Test::Unit::TestCase
   end
   
   def get(path)
-    Net::HTTP.get_response(URI.parse("http://0.0.0.0:4044#{path}"))
+    Net::HTTP.get_response(URI.parse("http://0.0.0.0:#{PORT}#{path}"))
   end
   
   def post(path, data)
-    Net::HTTP.post_form(URI.parse("http://0.0.0.0:4044#{path}"), data)
+    Net::HTTP.post_form(URI.parse("http://0.0.0.0:#{PORT}#{path}"), data)
   end
   
   @@responses = {}
@@ -35,12 +39,6 @@ class EbbTest < Test::Unit::TestCase
       raise "bytes called with n <= 0" if n <= 0
       body = @@responses[n] || "C"*n
       status = 200
-    
-    elsif commands.include?('env')
-      env.delete('rack.input') # delete this because it's hard to marshal
-      env.delete('rack.errors')
-      body = Base64.encode64(Marshal.dump(env))
-      status = 200
       
     elsif commands.include?('test_post_length')
       input_body = ""
@@ -89,7 +87,7 @@ class EbbTest < Test::Unit::TestCase
   
   # this is rough but does detect major problems
   def test_ab
-    r = %x{ab -n 1000 -c 50 -q http://0.0.0.0:4044/bytes/123}
+    r = %x{ab -n 1000 -c 50 -q http://0.0.0.0:#{PORT}/bytes/123}
     assert r =~ /Requests per second:\s*(\d+)/, r
     assert $1.to_i > 100, r
   end
@@ -100,29 +98,84 @@ class EbbTest < Test::Unit::TestCase
       assert_equal 200, response.code.to_i, response.body
     end
   end
+end
+
+class EnvTest < Test::Unit::TestCase
+  def call(env)
+    env.delete('rack.input')
+    env.delete('rack.errors')
+    [200, {'Content-Type' => 'text/json'}, env.to_json]
+  end
   
-  def test_env
-    response = get('/env')
-    env = Marshal.load(Base64.decode64(response.body))
-    assert_equal '/env', env['PATH_INFO']
-    assert_equal '/env', env['REQUEST_PATH']
+  def setup
+    @pid = fork do
+      server = Ebb::Server.new(self, :port => PORT)
+      STDOUT.reopen "/dev/null", "a"
+      server.start
+    end
+    sleep 0.5
+  end
+  
+  def teardown
+    Process.kill('KILL', @pid)
+    sleep 0.5
+  end
+  
+  
+  ### Tests from Mongrel http11
+  
+  def request(request_string)
+    socket = TCPSocket.new("0.0.0.0", PORT)
+    socket.write(request_string)
+    lines = []
+    socket.read(500000).each_line { |l| lines << l }
+    env = JSON.parse(lines.last)
+  end
+  
+  def assert_drops_connection(request_string)
+    socket = TCPSocket.new("0.0.0.0", PORT)
+    socket.write(request_string)
+    assert socket.closed?
+  end
+  
+  
+  def test_parse_simple
+    env = request("GET / HTTP/1.1\r\n\r\n")
     assert_equal 'HTTP/1.1', env['SERVER_PROTOCOL']
+    assert_equal '/', env['REQUEST_PATH']
+    assert_equal 'HTTP/1.1', env['HTTP_VERSION']
+    assert_equal '/', env['REQUEST_URI']
     assert_equal 'CGI/1.2', env['GATEWAY_INTERFACE']
-    assert_equal '0.0.0.0', env['SERVER_NAME']
-    assert_equal '4044', env['SERVER_PORT']
-    assert_equal 'GET', env['REQUEST_METHOD']
+    assert_equal 'GET', env['REQUEST_METHOD']    
+    assert_nil env['FRAGMENT']
+    assert_nil env['QUERY_STRING']
   end
 end
 
+
 class EbbRailsTest < Test::Unit::TestCase
   # just to make sure there isn't some load error
   def test_ebb_rails_version
     out = %x{ruby #{Ebb::LIBDIR}/../bin/ebb_rails -v}
     assert_match %r{Ebb #{Ebb::VERSION}}, out
   end
+
+  #   def get(path)
+  #     Net::HTTP.get_response(URI.parse("http://0.0.0.0:4043#{path}"))
+  #   end
+  # 
+  #   def test_starting_with_many_options
+  #     %x{cd /tmp && rails ebb_test && ruby #{Ebb::LIBDIR}/../bin/ebb_rails start -d -e development -c /tmp/ebb_test -u www -g www -P /tmp/ebb.1.pid -p 4043 &}
+  #     response = get('/')
+  #     assert_equal 200, response.code
+  #   ensure
+  #     Process.kill('KILL', %x{cat /tmp/ebb.1.pid})
+  #   end
 end
 
 
+
+
 # 
 # class SocketTest < Test::Unit::TestCase
 #   def test_socket_creation

data/test/echo_server.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'json'
+require  File.dirname(__FILE__) + '/../ruby_lib/ebb'
+
+
+class EchoApp
+  def call(env)
+    env['rack.input'] = env['rack.input'].read(1000000)
+    env.delete('rack.errors')
+    [200, {'Content-Type' => 'text/json'}, env.to_json]
+  end
+end
+
+
+server = Ebb::Server.new(EchoApp.new, :port => 4037)
+server.start

data/test/env_test.rb

@@ -0,0 +1,114 @@
+require 'socket'
+require 'rubygems'
+require 'json'
+require 'test/unit'
+
+PORT = 4037
+
+# This test depends on echo_server running at port 4037. I do this so that
+# I can run a Python server at that port with a similar application and reuse
+# these tests.
+
+def send_request(request_string)
+  socket = TCPSocket.new("0.0.0.0", PORT)
+  socket.write(request_string)
+  lines = []
+  out = socket.read(5000000)
+  raise "Connection Closed on #{request_string.inspect}" if out.nil?
+  out.each_line { |l| lines << l }
+  env = JSON.parse(lines.last)
+rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EPIPE
+  return :fail
+rescue RuntimeError => e
+  if e.message =~ /Connection Closed/
+    return :fail
+  else
+    raise e
+  end
+rescue => e
+  puts "unknown exception: #{e.class}"
+  raise e
+ensure
+  socket.close unless socket.nil?
+end
+
+def drops_request?(request_string)
+  :fail == send_request(request_string)
+end
+
+class HttpParserTest < Test::Unit::TestCase
+  
+  def test_parse_simple
+    env = send_request("GET / HTTP/1.1\r\n\r\n")
+    
+    assert_equal 'HTTP/1.1', env['SERVER_PROTOCOL']
+    assert_equal '/', env['REQUEST_PATH']
+    assert_equal 'HTTP/1.1', env['HTTP_VERSION']
+    assert_equal '/', env['REQUEST_URI']
+    assert_equal 'CGI/1.2', env['GATEWAY_INTERFACE']
+    assert_equal 'GET', env['REQUEST_METHOD']    
+    assert_nil env['FRAGMENT']
+    assert_nil env['QUERY_STRING']
+    assert_nil env['rack.input']
+  end
+  
+  def test_parse_dumbfuck_headers
+    should_be_good = "GET / HTTP/1.1\r\naaaaaaaaaaaaa:++++++++++\r\n\r\n"
+    env = send_request(should_be_good)
+    assert_equal "++++++++++", env["HTTP_AAAAAAAAAAAAA"]
+    assert_nil env['rack.input']
+    
+    nasty_pound_header = "GET / HTTP/1.1\r\nX-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n\tRA==\r\n\t-----END CERTIFICATE-----\r\n\r\n"
+    assert drops_request?(nasty_pound_header) # Correct?
+  end
+  
+  def test_parse_error
+    assert drops_request?("GET / SsUTF/1.1")
+  end
+
+  def test_fragment_in_uri
+    env = send_request("GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n\r\n")
+    assert_equal '/forums/1/topics/2375?page=1', env['REQUEST_URI']
+    assert_equal 'posts-17408', env['FRAGMENT']
+    assert_nil env['rack.input']
+  end
+  
+  # lame random garbage maker
+  def rand_data(min, max, readable=true)
+    count = min + ((rand(max)+1) *10).to_i
+    res = count.to_s + "/"
+    
+    if readable
+      res << Digest::SHA1.hexdigest(rand(count * 100).to_s) * (count / 40)
+    else
+      res << Digest::SHA1.digest(rand(count * 100).to_s) * (count / 20)
+    end
+    
+    return res
+  end
+  
+  def test_horrible_queries
+    10.times do |c|
+      req = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-#{rand_data(1024, 1024+(c*1024))}: Test\r\n\r\n"
+      assert drops_request?(req), "large header names are caught"
+    end
+    
+    # then that large mangled field values are caught
+    10.times do |c|
+      req = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
+      assert drops_request?(req), "large mangled field values are caught"
+      ### XXX this is broken! fix me. this test should drop the request.
+    end
+    
+    # then large headers are rejected too
+    req = "GET /#{rand_data(10,120)} HTTP/1.1\r\n"
+    req << "X-Test: test\r\n" * (80 * 1024)
+    assert drops_request?(req), "large headers are rejected"
+    
+    # finally just that random garbage gets blocked all the time
+    10.times do |c|
+      req = "GET #{rand_data(1024, 1024+(c*1024), false)} #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
+      assert drops_request?(req), "random garbage gets blocked all the time"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebb
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - ry dahl
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 +01:00
+date: 2008-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 description: ""
-email: ry@tinyclouds.org
+email: ry at tiny clouds dot org
 executables: 
 - ebb_rails
 extensions: 
@@ -22,13 +22,10 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- src/parser.rl
 - src/ebb.c
-- src/ebb_ruby.c
-- src/parser.c
 - src/ebb.h
+- src/parser.c
 - src/parser.h
-- src/extconf.rb
 - libev/ev.c
 - libev/ev.h
 - libev/ev_epoll.c
@@ -39,6 +36,10 @@ files:
 - libev/ev_vars.h
 - libev/ev_win32.c
 - libev/ev_wrap.h
+- VERSION
+- README
+- src/ebb_ruby.c
+- src/extconf.rb
 - ruby_lib/daemonizable.rb
 - ruby_lib/ebb.rb
 - ruby_lib/rack
@@ -47,12 +48,12 @@ files:
 - benchmark/application.rb
 - benchmark/bench_results.rb
 - benchmark/server_test.rb
-- benchmark/test.rb
 - bin/ebb_rails
-- VERSION
-- README
+- test/basic_test.rb
+- test/echo_server.rb
+- test/env_test.rb
 has_rdoc: false
-homepage: http://repo.or.cz/w/ebb.git
+homepage: http://ebb.rubyforge.org
 post_install_message: 
 rdoc_options: []
 

data/src/parser.rl

@@ -1,200 +0,0 @@
-/**
- * Copyright (c) 2005 Zed A. Shaw
- * You can redistribute it and/or modify it under the same terms as Ruby.
- */
-#include "parser.h"
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-#define LEN(AT, FPC) (FPC - buffer - parser->AT)
-#define MARK(M,FPC) (parser->M = (FPC) - buffer)
-#define PTR_TO(F) (buffer + parser->F)
-
-/** machine **/
-%%{
-  machine http_parser;
-
-  action mark {MARK(mark, fpc); }
-
-
-  action start_field { MARK(field_start, fpc); }
-  action write_field { 
-    parser->field_len = LEN(field_start, fpc);
-  }
-
-  action start_value { MARK(mark, fpc); }
-  action write_value { 
-    if(parser->http_field != NULL) {
-      parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc));
-    }
-  }
-  
-  action content_length {
-    if(parser->content_length != NULL) {
-      parser->content_length(parser->data, PTR_TO(mark), LEN(mark, fpc));
-    }
-  }
-  
-  action request_method { 
-    if(parser->request_method != NULL) 
-      parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-  action request_uri { 
-    if(parser->request_uri != NULL)
-      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-
-  action start_query {MARK(query_start, fpc); }
-  action query_string { 
-    if(parser->query_string != NULL)
-      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc));
-  }
-
-  action http_version {	
-    if(parser->http_version != NULL)
-      parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-
-  action request_path {
-    if(parser->request_path != NULL)
-      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc));
-  }
-
-  action done { 
-    parser->body_start = fpc - buffer + 1; 
-    if(parser->header_done != NULL)
-      parser->header_done(parser->data, fpc + 1, pe - fpc - 1);
-    fbreak;
-  }
-
-
-#### HTTP PROTOCOL GRAMMAR
-# line endings
-  CRLF = "\r\n";
-
-# character types
-  CTL = (cntrl | 127);
-  safe = ("$" | "-" | "_" | ".");
-  extra = ("!" | "*" | "'" | "(" | ")" | ",");
-  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
-  unsafe = (CTL | " " | "\"" | "#" | "%" | "<" | ">");
-  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
-  unreserved = (alpha | digit | safe | extra | national);
-  escape = ("%" xdigit xdigit);
-  uchar = (unreserved | escape);
-  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
-  tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
-
-# elements
-  token = (ascii -- (CTL | tspecials));
-
-# URI schemes and absolute paths
-  scheme = ( alpha | digit | "+" | "-" | "." )* ;
-  absolute_uri = (scheme ":" (uchar | reserved )*);
-
-  path = (pchar+ ( "/" pchar* )*) ;
-  query = ( uchar | reserved )* %query_string ;
-  param = ( pchar | "/" )* ;
-  params = (param ( ";" param )*) ;
-  rel_path = (path? %request_path (";" params)?) ("?" %start_query query)?;
-  absolute_path = ("/"+ rel_path);
-
-  Request_URI = ("*" | absolute_uri | absolute_path) >mark %request_uri;
-  Method = (upper | digit | safe){1,20} >mark %request_method;
-
-  http_number = (digit+ "." digit+) ;
-  HTTP_Version = ("HTTP/" http_number) >mark %http_version ;
-  Request_Line = (Method " " Request_URI " " HTTP_Version CRLF) ;
-
-  field_name = (token -- ":")+ >start_field %write_field;
-
-  field_value = any* >start_value %write_value;
-
-  message_header = field_name ":" " "* field_value :> CRLF;
-  content_length = "Content-Length:"i " "* (field_value >mark %content_length) :> CRLF;
-  
-  Request = Request_Line (content_length | message_header)* ( CRLF @done);
-
-main := Request;
-}%%
-
-/** Data **/
-%% write data;
-
-int http_parser_init(http_parser *parser)  {
-  int cs = 0;
-  %% write init;
-  parser->cs = cs;
-  parser->body_start = 0;
-  parser->content_len = 0;
-  parser->mark = 0;
-  parser->nread = 0;
-  parser->field_len = 0;
-  parser->field_start = 0;    
-
-  return(1);
-}
-
-
-/** exec **/
-size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
-  const char *p, *pe;
-  int cs = parser->cs;
-
-  assert(off <= len && "offset past end of buffer");
-
-  p = buffer+off;
-  pe = buffer+len;
-
-  assert(*pe == '\0' && "pointer does not end on NUL");
-  assert(pe - p == len - off && "pointers aren't same distance");
-
-
-  %% write exec;
-
-  parser->cs = cs;
-  parser->nread += p - (buffer + off);
-
-  assert(p <= pe && "buffer overflow after parsing execute");
-  assert(parser->nread <= len && "nread longer than length");
-  assert(parser->body_start <= len && "body starts after buffer end");
-  assert(parser->mark < len && "mark is after buffer end");
-  assert(parser->field_len <= len && "field has length longer than whole buffer");
-  assert(parser->field_start < len && "field starts after buffer end");
-
-  if(parser->body_start) {
-    /* final \r\n combo encountered so stop right here */
-    %%write eof;
-    parser->nread++;
-  }
-
-  return(parser->nread);
-}
-
-int http_parser_finish(http_parser *parser)
-{
-  int cs = parser->cs;
-
-  %%write eof;
-
-  parser->cs = cs;
-
-  if (http_parser_has_error(parser) ) {
-    return -1;
-  } else if (http_parser_is_finished(parser) ) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-int http_parser_has_error(http_parser *parser) {
-  return parser->cs == http_parser_error;
-}
-
-int http_parser_is_finished(http_parser *parser) {
-  return parser->cs == http_parser_first_final;
-}