logstash-codec-collectd 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f9e68d07f513e2d05f223797b8c285fa1098bde
-  data.tar.gz: 77c9f1bbde0a5861240c6526e819655ba60f25f5
+  metadata.gz: a7b71a7a15a13360ff43a9f49a21c37d20733f0e
+  data.tar.gz: 5006e663de530455333dc945da8a43f5e4139057
 SHA512:
-  metadata.gz: a21a0071c0ab97388dcc82d746e0acba4005984fd169e55e934d78e08bc60b73cde4018cc93ac0b74117f0ebd53a6fcade6db58727c0bf4537c723a734c601e2
-  data.tar.gz: c50af4e4de30003d49f8f2efdd685b599059c1d496f8f4d8055d5afee4bd4cdf089f2d15dfa242568831ea4b350bdf199077876f5b6ee339490512caa433ca6b
+  metadata.gz: 94098945b3da4c007e85445d567dbb3d3597e62b0fd834cf5df2a870d022dd46eca09aae1b3e401ac9ab0890377352ab60c484910f5f77b0b2a55a0928a52adb
+  data.tar.gz: fc9094b60a7d990b1cc750ac8da9232e98541d24ef5f5f1fbc8fbd0a0d715b5625bf20dd5618254a0d08777cb00e12a6763791d18c5e090344637bd1385a7638

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+
+# 2.0.0
+  * synchronize access to OpenSSL::Cipher (not thread-safe)
+  * use Digest for digests instead of OpenSSL::Digest and OpenSSL::HMAC (not thread-safe)
+  * fix collectd packet mangling under high load conditions
 # 1.0.1
   * Bug fix release including the necessary vendored files.
 # 0.1.10

data/CONTRIBUTORS

@@ -9,6 +9,7 @@ Contributors:
 * Richard Pijnenburg (electrical)
 * Suyog Rao (suyograo)
 * andis
+* Frank de Jong (frapex)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash/codecs/collectd.rb

@@ -45,10 +45,13 @@ class NaNError < LogStash::Error; end
 class LogStash::Codecs::Collectd < LogStash::Codecs::Base
   config_name "collectd"
 
+  @@openssl_mutex = Mutex.new
+
   AUTHFILEREGEX = /([^:]+): (.+)/
 
   PLUGIN_TYPE = 2
   COLLECTD_TYPE = 4
+  COLLECTD_VALUES = 6
   SIGNATURE_TYPE = 512
   ENCRYPTION_TYPE = 528
 
@@ -59,7 +62,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
     3               => "plugin_instance",
     COLLECTD_TYPE   => "collectd_type",
     5               => "type_instance",
-    6               => "values",
+    COLLECTD_VALUES => "values",
     7               => "interval",
     8               => "@timestamp",
     9               => "interval",
@@ -69,22 +72,6 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
     ENCRYPTION_TYPE => "encryption"
   }
 
-  PLUGIN_TYPE_FIELDS = {
-    'host' => true,
-    '@timestamp' => true,
-    'type_instance' => true,
-    'severity' => true,
-  }
-
-  COLLECTD_TYPE_FIELDS = {
-    'host' => true,
-    '@timestamp' => true,
-    'plugin' => true,
-    'plugin_instance' => true,
-    'type_instance' => true,
-    'severity' => true,
-  }
-
   INTERVAL_VALUES_FIELDS = {
     "interval" => true,
     "values" => true,
@@ -93,10 +80,10 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
 
   INTERVAL_BASE_FIELDS = {
     'host' => true,
-    'collectd_type' => true,
+    '@timestamp' => true,
     'plugin' => true,
     'plugin_instance' => true,
-    '@timestamp' => true,
+    'collectd_type' => true,
     'type_instance' => true,
   }
 
@@ -160,11 +147,15 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
       if @authfile.nil?
         raise "Security level is set to #{@security_level}, but no authfile was configured"
       else
-        # Load OpenSSL and instantiate Digest and Crypto functions
+        # Load Digest and instantiate functions
+        require 'digest'
+        @sha256 = Digest::SHA256.new
+        @sha1 = Digest::SHA1.new
+
+        # Load OpenSSL and instantiate functions
         require 'openssl'
-        @sha256 = OpenSSL::Digest::Digest.new('sha256')
-        @sha1 = OpenSSL::Digest::Digest.new('sha1')
         @cipher = OpenSSL::Cipher.new('AES-256-OFB')
+
         @auth = {}
         parse_authfile
       end
@@ -207,7 +198,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
       byte1, byte2 = body.pack("C*").unpack("NN")
       Time.at(( ((byte1 << 32) + byte2) * (2**-30) )).utc
     end
-    # Hi resolution intervals
+    # Hi-Resolution intervals
     hiresinterval_decoder = lambda do |body|
       byte1, byte2 = body.pack("C*").unpack("NN")
       Time.at(( ((byte1 << 32) + byte2) * (2**-30) )).to_i
@@ -297,7 +288,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
   def get_values(id, body)
     drop = false
     add_tag = false
-    if id == 6
+    if id == COLLECTD_VALUES
       retval, drop, add_nan_tag = @id_decoder[id].call(body)
     # Use hash + closure/lambda to speed operations
     else
@@ -349,7 +340,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
     key = get_key(user)
     return false if key.nil?
 
-    return OpenSSL::HMAC.digest(@sha256, key, user+payload) == signature
+    return Digest::HMAC.digest(user+payload, key, Digest::SHA256) == signature
   end # def verify_signature
 
   private
@@ -364,16 +355,20 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
       return []
     end
 
-    # Set the correct state of the cipher instance
-    @cipher.decrypt
-    @cipher.padding = 0
-    @cipher.iv = iv
-    @cipher.key = @sha256.digest(key);
-    # Decrypt the content
-    plaintext = @cipher.update(content) + @cipher.final
-    # Reset the state, as adding a new key to an already instantiated state
-    # results in an exception
-    @cipher.reset
+    # Coordinate access to OpenSSL::Cipher as it is not thread safe
+    plaintext = nil
+    @@openssl_mutex.synchronize do
+      # Set the correct state of the cipher instance
+      @cipher.decrypt
+      @cipher.padding = 0
+      @cipher.iv = iv
+      @cipher.key = @sha256.digest(key)
+      # Decrypt the content
+      plaintext = @cipher.update(content) + @cipher.final
+      # Reset the state, as adding a new key to an already instantiated state
+      # results in an exception
+      @cipher.reset
+    end
 
     # The plaintext contains a SHA1 hash as checksum in the first 160 bits
     # (20 octets) of the rest of the data
@@ -420,19 +415,6 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
         raise(EncryptionError) if payload.empty?
         was_encrypted = true
         next
-      when PLUGIN_TYPE
-        # We've reached a new plugin, delete everything except for the the host
-        # field, because there's only one per packet and the timestamp field,
-        # because that one goes in front of the plugin
-        collectd.each_key do |k|
-          collectd.delete(k) unless PLUGIN_TYPE_FIELDS.has_key?(k)
-        end
-      when COLLECTD_TYPE
-        # We've reached a new type within the plugin section, delete all fields
-        # that could have something to do with the previous type (if any)
-        collectd.each_key do |k|
-          collectd.delete(k) unless COLLECTD_TYPE_FIELDS.has_key?(k)
-        end
       end
 
       raise(EncryptionError) if !was_encrypted and @security_level == SECURITY_ENCR

data/logstash-codec-collectd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-collectd'
-  s.version         = '2.0.0'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read events from the collectd binary protocol"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-collectd
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: