http-parser 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjlmZDQwNmJmYjJlNWMzY2NmZmFlZDcwNWQ2NDUwZjQ0OWIzNzljNw==
-  data.tar.gz: !binary |-
-    YjhiMTgxOTMxNGViODRmYjM0YTE5MmU1YTNmMmViZGM4ZjM1ZDhkMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODNiNzNmM2Q3ZjE4Mjk1NzFiMDQ5ZDM3YTUxNGM5OGVlNWI3MWMzMzQ5NjIx
-    NGQ0YTYyYzYyNDZhOTE4NTZkMGYxZjY3ZjllMzViZGY0Nzk3NDM0NmFjYTll
-    YzI3NjFiOGJiNjI0MmFmZDc4NjJkOTI0YmFlNjkwMmM5NDVmYmU=
-  data.tar.gz: !binary |-
-    Nzc3MTM3ZTc2ZTJjMzYxZThmY2IzMTJlMWQzZGU4MjIyZDNkODMyN2RmNWE2
-    OTNkYzYzMTM1MjM1MjMyOTUxZDkzY2VjMzk4YzU4NTZmMTQ2ODQwOWZkMWVj
-    ZmIyM2Q4MzkwN2Y4NmY5OTJkZGIyNTI0MTUyZWZkYzQ5ZDQxMWQ=
+SHA1:
+  metadata.gz: 4ee24befc2a0a23054f11edb4379b9b6b1f8d21a
+  data.tar.gz: 816280693464c8c5daa1c7fb20fe4954c3dd1a26
+SHA512:
+  metadata.gz: 1846519857ad32e3f688cf18f28fb3dd2cd33fa4c0a0909d6a2c934218b1ae5df30101b54a8b100cb8caaf28482a964e8e17ef5594abc91fddcb575d67ac5091
+  data.tar.gz: 82c5dba81e1673ab22497e5e1adda9d6f89ab115795747bc64a0043ced1511880c65d003b379a4f35e89976d92bdf793933bf196b2002876edb431f2c2dcc4c6

data/ext/http-parser/http_parser.c

@@ -634,7 +634,17 @@ size_t http_parser_execute (http_parser *parser,
 
     if (PARSING_HEADER(parser->state)) {
       ++parser->nread;
-      /* Buffer overflow attack */
+      /* Don't allow the total size of the HTTP headers (including the status
+       * line) to exceed HTTP_MAX_HEADER_SIZE.  This check is here to protect
+       * embedders against denial-of-service attacks where the attacker feeds
+       * us a never-ending header that the embedder keeps buffering.
+       *
+       * This check is arguably the responsibility of embedders but we're doing
+       * it on the embedder's behalf because most won't bother and this way we
+       * make the web a little safer.  HTTP_MAX_HEADER_SIZE is still far bigger
+       * than any reasonable request or response so this should never affect
+       * day-to-day operation.
+       */
       if (parser->nread > HTTP_MAX_HEADER_SIZE) {
         SET_ERRNO(HPE_HEADER_OVERFLOW);
         goto error;

data/ext/http-parser/http_parser.h

@@ -193,11 +193,11 @@ enum http_errno {
 
 struct http_parser {
   /** PRIVATE **/
-  unsigned char type : 2;     /* enum http_parser_type */
-  unsigned char flags : 6;    /* F_* values from 'flags' enum; semi-public */
-  unsigned char state;        /* enum state from http_parser.c */
-  unsigned char header_state; /* enum header_state from http_parser.c */
-  unsigned char index;        /* index into current matcher */
+  unsigned int type : 2;         /* enum http_parser_type */
+  unsigned int flags : 6;        /* F_* values from 'flags' enum; semi-public */
+  unsigned int state : 8;        /* enum state from http_parser.c */
+  unsigned int header_state : 8; /* enum header_state from http_parser.c */
+  unsigned int index : 8;        /* index into current matcher */
 
   uint32_t nread;          /* # bytes read in various scenarios */
   uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
@@ -205,16 +205,16 @@ struct http_parser {
   /** READ-ONLY **/
   unsigned short http_major;
   unsigned short http_minor;
-  unsigned short status_code; /* responses only */
-  unsigned char method;       /* requests only */
-  unsigned char http_errno : 7;
+  unsigned int status_code : 16; /* responses only */
+  unsigned int method : 8;       /* requests only */
+  unsigned int http_errno : 7;
 
   /* 1 = Upgrade header was present and the parser has exited because of that.
    * 0 = No upgrade header present.
    * Should be checked when http_parser_execute() returns in addition to
    * error checking.
    */
-  unsigned char upgrade : 1;
+  unsigned int upgrade : 1;
 
   /** PUBLIC **/
   void *data; /* A pointer to get hook to the "connection" or "socket" object */

data/lib/http-parser/parser.rb

@@ -1,6 +1,8 @@
 
 module HttpParser
     class Parser
+        CALLBACKS = [:on_message_begin, :on_url, :on_status_complete, :on_header_field, :on_header_value, :on_headers_complete, :on_body, :on_message_complete]
+
         #
         # Returns a new request/response instance variable
         #
@@ -12,9 +14,16 @@ module HttpParser
         #
         # Initializes the Parser instance.
         #
-        def initialize
+        def initialize(callback_obj = nil)
             @settings = ::HttpParser::Settings.new
             @callbacks = {} # so GC doesn't clean them up on java
+
+            if not callback_obj.nil?
+                CALLBACKS.each do |callback|
+                    self.__send__(callback, &callback_obj.method(callback)) if callback_obj.respond_to? callback
+                end
+            end
+
             yield self if block_given?
         end
 
@@ -24,7 +33,7 @@ module HttpParser
         # @yield [instance]
         #   The given block will be called when the HTTP message begins.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         def on_message_begin(&block)
@@ -40,7 +49,7 @@ module HttpParser
         #   The given block will be called when the Request URI is recognized
         #   within the Request-Line.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         # @yieldparam [String] url
@@ -60,7 +69,7 @@ module HttpParser
         # @yield [instance]
         #   The given block will be called when the status is recognized.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         def on_status_complete(&block)
@@ -76,7 +85,7 @@ module HttpParser
         #   The given block will be called when a Header name is recognized
         #   in the Headers.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         # @yieldparam [String] field
@@ -97,7 +106,7 @@ module HttpParser
         #   The given block will be called when a Header value is recognized
         #   in the Headers.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         # @yieldparam [String] value
@@ -117,7 +126,7 @@ module HttpParser
         # @yield [instance]
         #   The given block will be called when the Headers stop.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         def on_headers_complete(&block)
@@ -133,7 +142,7 @@ module HttpParser
         #   The given block will be called when the body is recognized in the
         #   message body.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         # @yieldparam [String] body
@@ -154,7 +163,7 @@ module HttpParser
         # @yield [instance]
         #   The given block will be called when the message completes.
         #
-        # @yieldparam [Paceman::HttpParser::Instance] instance
+        # @yieldparam [HttpParser::Instance] instance
         #   The state so far of the request / response being processed.
         #
         def on_message_complete(&block)
@@ -166,7 +175,7 @@ module HttpParser
         #
         # Parses data.
         #
-        # @param [Paceman::HttpParser::Instance] inst
+        # @param [HttpParser::Instance] inst
         #   The state so far of the request / response being processed.
         #
         # @param [String] data

data/lib/http-parser/version.rb

@@ -1,3 +1,3 @@
 module HttpParser
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
 end

data/spec/parser_spec.rb

@@ -284,5 +284,30 @@ describe HttpParser::Parser, "#initialize" do
             @begun.should == 2
         end
     end
+
+    describe "method based instead of block based" do
+        class SomeParserClass
+            attr_reader :url
+
+            def on_url(inst, data)
+                @url = data
+            end
+        end
+
+        let(:expected) { '/foo?q=1' }
+
+        it "should simplify the process" do
+            callbacks = SomeParserClass.new
+            parser = described_class.new(callbacks)
+
+            parser.parse @inst, "GET "
+
+            callbacks.url.should be_nil
+
+            parser.parse @inst, "#{expected} HTTP/1.1"
+
+            callbacks.url.should == expected
+        end
+    end
 end
 

metadata

@@ -1,79 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: http-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  type: :runtime
-  prerelease: false
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  type: :development
-  prerelease: false
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  type: :development
-  prerelease: false
-description: ! "    A super fast http parser for ruby.\n    Cross platform and multiple
-  ruby implementation support thanks to ffi.\n"
+        version: '0'
+description: |2
+      A super fast http parser for ruby.
+      Cross platform and multiple ruby implementation support thanks to ffi.
 email:
 - steve@cotag.me
 executables: []
@@ -82,12 +77,12 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- lib/http-parser.rb
 - lib/http-parser/errors.rb
 - lib/http-parser/ext.rb
 - lib/http-parser/parser.rb
 - lib/http-parser/types.rb
 - lib/http-parser/version.rb
+- lib/http-parser.rb
 - Rakefile
 - http-parser.gemspec
 - README.md
@@ -108,19 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to joyent/http-parser