fluent-plugin-pcapng 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110864a2d98c115bfb5812c962d8ab0a16714f02
-  data.tar.gz: fed160b8c87ca9384afd1ae040f2ebb46e218032
+  metadata.gz: eb4f5af91a684948ad0feee2ea46a9689a9bcfc3
+  data.tar.gz: 298aaeada09bfeb83dd7b8345e7493bc8e85dbd7
 SHA512:
-  metadata.gz: eadfc181296531df19333c4bd85cd991528aadbacbd929a5000439cc40df9bfb77ce0c91814b5812126eb70f05f696feb3a1c91cef4ee7aed7c35458424c466c
-  data.tar.gz: b054b651fba5dc43e4cfcda0beeaaec8835663e9c0f319c491687e7cb1b9bded8de2f9c02d40d6619422c6d1af2925592966514cee5777d884add310cc5e0a24
+  metadata.gz: f6d9ecfff8537d1bbff964ec16bcc7d08f5caada3fd345e32297ee97e1b1486bc11c2d7debd451aaedd34e2631314f641b2d844aa25d1bd3a006cac620066120
+  data.tar.gz: 195d0d475432ff7b2ebe67184073741d031db79045dbe5ef30c69c17770c6fef987216299f1f9c13317dcd24f2ca2299808149e5593b622b26d3c4f974a41092

data/fluent-plugin-pcapng.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-pcapng"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["enukane"]
   spec.email         = ["enukane@glenda9.org"]
   spec.description   = %q{Fluentd plugin for tshark (pcapng) monitoring from specified interface}

data/lib/fluent/plugin/in_pcapng.rb

@@ -77,7 +77,7 @@ module Fluent
     def run
       options = build_options(@fields)
       options += build_extra_flags(@extra_flags)
-      cmdline = "tshark -i #{Shellwords(@interface)} -T fields -E separator=\",\" -E quote=d #{options}"
+      cmdline = "tshark -i #{Shellwords.escape(@interface)} -T fields -E separator=\",\" -E quote=d #{options}"
       log.debug format("pcapng: %s", cmdline)
       _stdin, stdout, stderr, @th_tshark = *Open3.popen3(cmdline)
 
@@ -96,7 +96,7 @@ module Fluent
     def build_options(fields)
       options = ""
       fields.each do |field|
-        options += "-e #{Shellwords.escape(field)}"
+        options += "-e #{Shellwords.escape(field)} "
       end
       return options
     end

data/test/test_in_ngpcap.rb

@@ -72,4 +72,9 @@ class PcapngInputTest < Test::Unit::TestCase
     instance = create_driver(config).instance
     assert_raise ArgumentError do instance.build_extra_flags(instance.extra_flags) end
   end
+
+  def test_build_options_with_valid_flags
+    instance = create_driver.instance
+    assert_equal "-e frame.time_epoch -e dns.qry.name -e dns.qry.type -e dns.qry.class -e dns.id -e ip.src -e ip.dst ", instance.build_options(instance.fields)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pcapng
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - enukane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd