gelfd2 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3499cd8199e37e4da3a8ff9ca40f532e15369f
-  data.tar.gz: acf0f142d4f915d3f2381be5c96f8b71abf58d70
+  metadata.gz: ace6f71696dcfd3d301731d7e94ed7fa42132e15
+  data.tar.gz: 7a845badc222fdd38ebc76109a45e2d6509dd133
 SHA512:
-  metadata.gz: be9ca319feb6f9dce7bfb779ecb20af6391e33e4fa110c09a661ecbb6792f8519c2f88563e08e1e827e98d7ca9e33c2cb89a8316dfb41af7b1532d376327623c
-  data.tar.gz: 6f42adedef1b33599c89f27a1bae7e9e183de63055fa7188cfc13a88f2eaceaa91049e349c7a7d61d2ff58ced68315a9c6eb0a74b0f86fec9dfa020247acef75
+  metadata.gz: 8c14a7512b1ac0536a69812115c90fb95d8f7328f16c827fccbc1baac69f33c00a83d9a21c7e4659387f5540d6484a9230d6b363b02c2b277d10a6a4dc85a454
+  data.tar.gz: 102409e0d8da8bb854fa2a582c447b427c4569473f1ee7ecb2b0bf0605f59f4aabec689a95579dd2c0baa6448fac00cfe00b2ef0e957166b147124f4bc105c21

data/.travis.yml

@@ -1,8 +1,9 @@
+language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.3.1
-  - rbx
+  - 2.3
+  - 2.4
+  - rbx-3.86
   - jruby
 
 script: "bundle exec rake test"

data/lib/gelfd2.rb

@@ -1,10 +1,10 @@
-require "gelfd2/version"
+require 'gelfd2/version'
 
 module Gelfd2
-  CHUNKED_MAGIC = [0x1e,0x0f].pack('C*').freeze
-  ZLIB_MAGIC = [0x78,0x9c].pack('C*').freeze
-  GZIP_MAGIC = [0x1f,0x8b].pack('C*').freeze
-  UNCOMPRESSED_MAGIC = [0x1f,0x3c].pack('C*').freeze
+  CHUNKED_MAGIC = [0x1e, 0x0f].pack('C*').freeze
+  ZLIB_MAGIC = [0x78, 0x9c].pack('C*').freeze
+  GZIP_MAGIC = [0x1f, 0x8b].pack('C*').freeze
+  UNCOMPRESSED_MAGIC = [0x1f, 0x3c].pack('C*').freeze
   HEADER_LENGTH = 12
   DATA_LENGTH = 8192 - HEADER_LENGTH
   MAX_CHUNKS = 128

data/lib/gelfd2/chunked_parser.rb

@@ -1,48 +1,64 @@
 module Gelfd2
   class ChunkedParser
-    @@chunk_map = Hash.new {|hash,key| hash[key] = {:total_chunks => 0, :chunks => {} } }
+    class << self
 
-    attr_accessor :message_id, :max_chunks, :decoded_data, :chunks, :seen
+      attr_accessor :message_id, :max_chunks, :decoded_data, :chunks, :seen
 
-    def self.parse(data)
-      msg_id = self.parse_chunk(data)
-      if @@chunk_map[msg_id][:chunks].size == @@chunk_map[msg_id][:total_chunks]
+      def parse(data)
+        @chunk_map ||= Hash.new { |hash, key| hash[key] = { total_chunks: 0, msg_ttl: 0, chunks: {} } }
+        @msg_timeout ||= 20
+        @last_cleanup ||= 0
+        msg_id = parse_chunk(data)
+        return unless @chunk_map[msg_id][:chunks].size == @chunk_map[msg_id][:total_chunks]
+        cleanup_chunks
         assemble_chunks(msg_id)
       end
-    end
 
-    def self.assemble_chunks(msg_id)
-      buff = ''
-      chunks = @@chunk_map[msg_id][:chunks]
-      chunks.keys.sort.each do |k|
-        buff += chunks[k]
+      def assemble_chunks(msg_id)
+        buff = ''
+        chunks = @chunk_map[msg_id][:chunks]
+        chunks.keys.sort.each do |k|
+          buff += chunks[k]
+        end
+        begin
+          # TODO
+          # This has a chance for an DoS
+          # you can send a chunked message as a chunked message
+          t = Parser.parse(buff.clone)
+          @chunk_map.delete(msg_id)
+          t
+        rescue Exception => e
+          "Exception: #{e.message}"
+        end
       end
-      begin
-        # TODO
-        # This has a chance for an DoS
-        # you can send a chunked message as a chunked message
-        t = Parser.parse(buff.clone)
-        @@chunk_map.delete(msg_id)
-        t
-      rescue Exception => e
-        "Exception: #{e.message}"
+
+      def parse_chunk(data)
+        header = data[0..1]
+        raise NotChunkedDataError, "This doesn't look like a Chunked GELF message!" if header != CHUNKED_MAGIC
+        begin
+          msg_id = data[2..9].unpack('C*').join
+          seq_number, total_number = data[10].ord, data[11].ord
+          zlib_chunk = data[12..-1]
+          raise TooManyChunksError, "#{total_number} greater than #{MAX_CHUNKS}" if total_number > MAX_CHUNKS
+          @chunk_map[msg_id][:total_chunks] = total_number.to_i
+          @chunk_map[msg_id][:chunks][seq_number.to_i] = zlib_chunk
+          @chunk_map[msg_id][:ttl] = Time.now.to_i + @msg_timeout
+          msg_id
+        end
       end
-    end
 
-    private
-    def self.parse_chunk(data)
-      header = data[0..1]
-      raise NotChunkedDataError, "This doesn't look like a Chunked GELF message!" if header != CHUNKED_MAGIC
-      begin
-        msg_id = data[2..9].unpack('C*').join
-        seq_number, total_number = data[10].ord, data[11].ord
-        zlib_chunk = data[12..-1]
-        raise TooManyChunksError, "#{total_number} greater than #{MAX_CHUNKS}" if total_number > MAX_CHUNKS
-        @@chunk_map[msg_id][:total_chunks] = total_number.to_i
-        @@chunk_map[msg_id][:chunks].merge!({seq_number.to_i => zlib_chunk})
-        msg_id
+      def cleanup_chunks
+        # Run check every @msg_timeout seconds
+        now = Time.now.to_i
+        return unless now > @last_cleanup + @msg_timeout
+        begin
+          @last_cleanup = now
+          @chunk_map.each do |msg_id, msg|
+            next if msg[:ttl] > now
+            @chunk_map.delete(msg_id)
+          end
+        end
       end
     end
-
   end
 end

data/lib/gelfd2/parser.rb

@@ -1,22 +1,20 @@
 module Gelfd2
   class Parser
-
-    def self.parse(data)
-      header = data[0..1]
-      case header
-      when ZLIB_MAGIC
-        ZlibParser.parse(data)
-      when CHUNKED_MAGIC
-        ChunkedParser.parse(data)
-      when GZIP_MAGIC
-        GzipParser.parse(data)
-      else
-        # by default assume the payload to be "raw, uncompressed" GELF, parsing will fail if it's malformed.
-        data
+    class << self
+      def parse(data)
+        header = data[0..1]
+        case header
+        when ZLIB_MAGIC
+          ZlibParser.parse(data)
+        when CHUNKED_MAGIC
+          ChunkedParser.parse(data)
+        when GZIP_MAGIC
+          GzipParser.parse(data)
+        else
+          # by default assume the payload to be "raw, uncompressed" GELF, parsing will fail if it's malformed.
+          data
+        end
       end
     end
-
   end
 end
-
-

data/lib/gelfd2/version.rb

@@ -1,3 +1,3 @@
 module Gelfd2
-  VERSION = "0.3.0"
+  VERSION = '0.4.1'
 end

data/test/tc_chunked.rb

@@ -9,7 +9,7 @@ class TestChhunkedGelf < Test::Unit::TestCase
   def test_chunked_message
     files = Dir.glob("#{FIXTURE_PATH}/*.chunk")
     files.each do |file|
-      data = File.open("#{file}", "rb") {|f| f.read}
+      data = File.open("#{file}", "rb") { |f| f.read }
       @t = Gelfd2::Parser.parse(data)
     end
     assert_equal(JSON_MESSAGE, @t)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gelfd2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John E. Vincent
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gelfd2
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Pure ruby gelf server and decoding library