logstash-codec-rfc6587 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd0b560d12d487e1dc9e3f6b8b3cbf9a43587f892a3fac6ba55f933b0c9475b
-  data.tar.gz: ba87571c3cdb4e1b5dc1f9b119ffb0fa294ddb6397c8be2417c64ba7972d2485
+  metadata.gz: e5adb89a59064d2b4fa6c6456fc6316773c7dda6f212c1b5d7da598e861ead16
+  data.tar.gz: d4465dde3f19103840dc48a65ed6872c0f3ab222bb94c2e98af1daefc77683a7
 SHA512:
-  metadata.gz: '069a119e9bcfb4c608aff665f1b27cebac0c686b3c67baf76456fe32187ec5dfaf6ae4aae1d2bbf14e28cf66cd01a7943decb309e29a6acd950dcd558f42e30f'
-  data.tar.gz: 97ce3065ac9225881d3cf603387871e8fab660b2a285740824266f9cc2f65bb79ec56bbe0fe53cea1edac3fb54874d3c2d2a4fc591e66996c95bf210902a74e9
+  metadata.gz: 83f832296b5189bf89f6c1a1c9006be09d90d7e03572df7e4f2bfcddbb149abc0fa38a6ac04ce1245f09e997985cfe059cc400621f865c4a9fce014127fa2c93
+  data.tar.gz: 4cd529e5d4b922fd053fc80a8fe7538fbb3a95f0be1d3a41a446a4dddf0eccd1778e03147d45b78c63326381eda2c9238edc6c5a5eb2d7e28c44fd24c13e6323

data/lib/logstash/codecs/rfc6587.rb

@@ -49,6 +49,7 @@ class LogStash::Codecs::Rfc6587 < LogStash::Codecs::Base
   def read(data)
     header = ""
     while c = data.read(1)
+      next if ["\0", "\x00"].include?(c)  # ignore null characters
       raise "Unknown header character '#{c}'" if not [@delimiter, nil, c.to_i.to_s].include?(c)
       header += c if c
       break if c == @delimiter or data.eof or c == nil
@@ -60,7 +61,8 @@ class LogStash::Codecs::Rfc6587 < LogStash::Codecs::Base
     end
 
     to_read = header.to_i
-    line = data.gets(to_read)
+    line = ""
+    to_read.times { line += data.getc }
 
     if not line
       @leftover = header

data/logstash-codec-rfc6587.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-rfc6587'
-  s.version         = '0.1.0'
+  s.version         = '0.1.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads lines as described in rfc6587"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic", "ThePsyjo"]
   s.email           = 'info@elastic.co'
-  s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.homepage        = "https://github.com/ThePsyjo/logstash-codec-rfc6587"
   s.require_paths = ["lib"]
 
   # Files

data/spec/codecs/rfc6587_spec.rb

@@ -49,6 +49,7 @@ describe LogStash::Codecs::Rfc6587, :ecs_compatibility_support do
   #end
 
   context "#decode" do
+
     it "should return an event from an ascii string" do
       decoded = false
       subject.decode("11 hello world") do |e|
@@ -59,6 +60,42 @@ describe LogStash::Codecs::Rfc6587, :ecs_compatibility_support do
       insist { decoded } == true
     end
 
+    it "should return nothing if input data is empty" do
+      decoded = false
+      subject.decode("") do |e|
+        decoded = true
+      end
+      insist { decoded } == false
+    end
+
+    it "should return nothing if input data is only '\\0' or '\\x00'" do
+      decoded = false
+      subject.decode("\0\x00") do |e|
+        decoded = true
+      end
+      insist { decoded } == false
+    end
+
+    it "should return an event from an ascii string prefixed with \\0" do
+      decoded = false
+      subject.decode("\x004 test") do |e|
+        decoded = true
+        insist { e.is_a?(LogStash::Event) }
+        insist { e.get("message") } == "test"
+      end
+      insist { decoded } == true
+    end
+
+    it "should contain correct results when input contains newline" do
+      result = []
+      subject.decode("5 line17 line2\n!5 line3") { |e| result << e }
+      subject.flush { |e| result << e }
+      expect(result.size).to eq(3)
+      expect(result[0].get("message")).to eq("line1")
+      expect(result[1].get("message")).to eq("line2\n!")
+      expect(result[2].get("message")).to eq("line3")
+    end
+
     ecs_compatibility_matrix(:disabled, :v1, :v8 => :v1) do |ecs_select|
 
       before(:each) do
@@ -109,6 +146,7 @@ describe LogStash::Codecs::Rfc6587, :ecs_compatibility_support do
         expect(result[1].get("message")).to eq("line2")
         expect(result[2].get("message")).to eq("line3")
       end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-rfc6587
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Elastic
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -21,8 +21,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,8 +38,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-event_support
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -52,8 +52,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
   name: logstash-mixin-ecs_compatibility_support
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -66,8 +66,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,8 +80,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: insist
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,7 +105,7 @@ files:
 - lib/logstash/codecs/rfc6587.rb
 - logstash-codec-rfc6587.gemspec
 - spec/codecs/rfc6587_spec.rb
-homepage: http://www.elastic.co/guide/en/logstash/current/index.html
+homepage: https://github.com/ThePsyjo/logstash-codec-rfc6587
 licenses:
 - Apache License (2.0)
 metadata: