logstash-filter-translate 3.3.1 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bd945dee5e20dbc7eb6837c655e807373ee8923dcbd498c9fcf5b1065c6661
-  data.tar.gz: 878df6d8dfcc5fa53bb617163b0ddfe6feeb8e876aed9668b337f66dc8472221
+  metadata.gz: 2159e15fd76b237d148128893d1ee1de04787628a72f31a889021220d24ecd68
+  data.tar.gz: '05348931cfb26f1f6968ebe703c43c9d4b0f744deba529c66bc4b8887805b79d'
 SHA512:
-  metadata.gz: d45ec30865d73884f9564f3680fdc1fb230c9fa71507c86d475e6ec0759d13863080f8c237ab34b38ccad08bca0781ab1d8a8523955841db2d0a0334091a9cf3
-  data.tar.gz: 443284f8db270ec6081a2017bd6597733be886643232d97a7630c99e1b194970183e0a7d070ed511bdb1d8069e7f929a991d608798a35d8bd5408878806945d5
+  metadata.gz: e0c5b356db73ea5815fad77e8335c4788857cf3bd9f79688152d0152fbf4e9cfd76297f0d0289a407f502a7475adf389398e2cbc9c69166337dc90dab0db1fc8
+  data.tar.gz: c66b52755ff2913c3e840ae08476636c07cd5cb90cebaaf9d8d128f4f0e132cb0b4b332730c2522ff79b1c9f76f2181f12063c54c8bac1adb7afa16c850ae82f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.4.1
+  - Fix the limitation of the size of yaml file that exceeds 3MB [#97](https://github.com/logstash-plugins/logstash-filter-translate/pull/97)
+
+## 3.4.0
+ - Refactor: leverage scheduler mixin [#93](https://github.com/logstash-plugins/logstash-filter-translate/pull/93)
+
 ## 3.3.1
   - Refactor: reading .csv for JRuby 9.3 compatibility [#94](https://github.com/logstash-plugins/logstash-filter-translate/pull/94)
 

data/docs/index.asciidoc

@@ -108,6 +108,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-source>> |<<string,string>>|Yes
 | <<plugins-{type}s-{plugin}-refresh_behaviour>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-target>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-yaml_dictionary_code_point_limit>> |<<number,number>>|No
 |=======================================================================
 
 Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -421,5 +422,15 @@ The target field you wish to populate with the translated code.
 If you set this value to the same value as `source` field, the plugin does a substitution, and
 the filter will succeed. This will clobber the old value of the source field!
 
+
+[id="plugins-{type}s-{plugin}-yaml_dictionary_code_point_limit"]
+===== `yaml_dictionary_code_point_limit`
+
+* Value type is <<number,number>>
+* Default value is 134217728 (128MB for 1 byte code points)
+
+The max amount of code points in the YAML file in `dictionary_path`. Please be aware that byte limit depends on the encoding.
+This setting is effective for YAML file only. YAML over the limit throws exception.
+
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]

data/lib/logstash/filters/dictionary/file.rb

@@ -1,18 +1,17 @@
 # encoding: utf-8
-require 'concurrent/atomic/atomic_boolean'
-require 'rufus-scheduler'
 require "logstash/util/loggable"
 require "logstash/filters/fetch_strategy/file"
 
-java_import 'java.util.concurrent.locks.ReentrantReadWriteLock'
-
 module LogStash module Filters module Dictionary
   class DictionaryFileError < StandardError; end
 
   class File
-    def self.create(path, refresh_interval, refresh_behaviour, exact, regex)
+
+    include LogStash::Util::Loggable
+
+    def self.create(path, refresh_interval, refresh_behaviour, exact, regex, **file_type_args)
       if /\.y[a]?ml$/.match(path)
-        instance = YamlFile.new(path, refresh_interval, exact, regex)
+        instance = YamlFile.new(path, refresh_interval, exact, regex, file_type_args)
       elsif path.end_with?(".json")
         instance = JsonFile.new(path, refresh_interval, exact, regex)
       elsif path.end_with?(".csv")
@@ -30,19 +29,17 @@ module LogStash module Filters module Dictionary
       end
     end
 
-    include LogStash::Util::Loggable
     attr_reader :dictionary, :fetch_strategy
 
-    def initialize(path, refresh_interval, exact, regex)
+    def initialize(path, refresh_interval, exact, regex, **file_type_args)
       @dictionary_path = path
       @refresh_interval = refresh_interval
       @short_refresh = @refresh_interval <= 300
-      @stopping = Concurrent::AtomicBoolean.new # ported from jdbc_static, need a way to prevent a scheduled execution from running a load.
       rw_lock = java.util.concurrent.locks.ReentrantReadWriteLock.new
       @write_lock = rw_lock.writeLock
       @dictionary = Hash.new
       @update_method = method(:merge_dictionary)
-      initialize_for_file_type
+      initialize_for_file_type(file_type_args)
       args = [@dictionary, rw_lock]
       klass = case
               when exact && regex then FetchStrategy::File::ExactRegex
@@ -51,13 +48,6 @@ module LogStash module Filters module Dictionary
               end
       @fetch_strategy = klass.new(*args)
       load_dictionary(raise_exception = true)
-      stop_scheduler(initial = true)
-      start_scheduler unless @refresh_interval <= 0 # disabled, a scheduler interval of zero makes no sense
-    end
-
-    def stop_scheduler(initial = false)
-      @stopping.make_true unless initial
-      @scheduler.shutdown(:wait) if @scheduler
     end
 
     def load_dictionary(raise_exception=false)
@@ -65,7 +55,7 @@ module LogStash module Filters module Dictionary
         @dictionary_mtime = ::File.mtime(@dictionary_path).to_f
         @update_method.call
       rescue Errno::ENOENT
-        @logger.warn("dictionary file read failure, continuing with old dictionary", :path => @dictionary_path)
+        logger.warn("dictionary file read failure, continuing with old dictionary", :path => @dictionary_path)
       rescue => e
         loading_exception(e, raise_exception)
       end
@@ -78,7 +68,7 @@ module LogStash module Filters module Dictionary
 
     protected
 
-    def initialize_for_file_type
+    def initialize_for_file_type(**file_type_args)
       # sub class specific initializer
     end
 
@@ -88,13 +78,6 @@ module LogStash module Filters module Dictionary
 
     private
 
-    def start_scheduler
-      @scheduler = Rufus::Scheduler.new
-      @scheduler.interval("#{@refresh_interval}s", :overlap => false) do
-        reload_dictionary
-      end
-    end
-
     def merge_dictionary
       @write_lock.lock
       begin
@@ -116,14 +99,15 @@ module LogStash module Filters module Dictionary
       end
     end
 
+    # scheduler executes this method, periodically
     def reload_dictionary
-      return if @stopping.true?
       if @short_refresh
         load_dictionary if needs_refresh?
       else
         load_dictionary
       end
     end
+    public :reload_dictionary
 
     def needs_refresh?
       @dictionary_mtime != ::File.mtime(@dictionary_path).to_f
@@ -136,7 +120,7 @@ module LogStash module Filters module Dictionary
         dfe.set_backtrace(e.backtrace)
         raise dfe
       else
-        @logger.warn("#{msg}, continuing with old dictionary", :dictionary_path => @dictionary_path)
+        logger.warn("#{msg}, continuing with old dictionary", :dictionary_path => @dictionary_path)
       end
     end
   end

data/lib/logstash/filters/dictionary/json_file.rb

@@ -6,9 +6,6 @@ module LogStash module Filters module Dictionary
 
     protected
 
-    def initialize_for_file_type
-    end
-
     def read_file_into_dictionary
       content = IO.read(@dictionary_path, :mode => 'r:bom|utf-8')
       @dictionary.update(LogStash::Json.load(content)) unless content.nil? || content.empty?

data/lib/logstash/filters/dictionary/yaml_file.rb

@@ -7,18 +7,20 @@ module LogStash module Filters module Dictionary
 
     protected
 
-    def initialize_for_file_type
+    def initialize_for_file_type(**file_type_args)
       @visitor = YamlVisitor.create
+
+      @parser = Psych::Parser.new(Psych::TreeBuilder.new)
+      @parser.code_point_limit = file_type_args[:yaml_code_point_limit]
     end
 
     def read_file_into_dictionary
       # low level YAML read that tries to create as
       # few intermediate objects as possible
       # this overwrites the value at key
-      @visitor.accept_with_dictionary(
-        @dictionary, Psych.parse_stream(
-          IO.read(@dictionary_path, :mode => 'r:bom|utf-8')
-      ))
+      yaml_string = IO.read(@dictionary_path, :mode => 'r:bom|utf-8')
+      @parser.parse(yaml_string, @dictionary_path)
+      @visitor.accept_with_dictionary(@dictionary, @parser.handler.root)
     end
   end
 end end end

data/lib/logstash/filters/translate.rb

@@ -4,6 +4,7 @@ require "logstash/namespace"
 require 'logstash/plugin_mixins/ecs_compatibility_support'
 require 'logstash/plugin_mixins/validator_support/field_reference_validation_adapter'
 require 'logstash/plugin_mixins/deprecation_logger_support'
+require 'logstash/plugin_mixins/scheduler'
 
 require "logstash/filters/dictionary/memory"
 require "logstash/filters/dictionary/file"
@@ -44,6 +45,8 @@ class Translate < LogStash::Filters::Base
 
   extend LogStash::PluginMixins::ValidatorSupport::FieldReferenceValidationAdapter
 
+  include LogStash::PluginMixins::Scheduler
+
   config_name "translate"
 
   # The name of the logstash event field containing the value to be compared for a
@@ -99,6 +102,12 @@ class Translate < LogStash::Filters::Base
   # as the original text, and the second column as the replacement.
   config :dictionary_path, :validate => :path
 
+  # The max amount of code points in the YAML file in `dictionary_path`. Please be aware that byte limit depends on the encoding.
+  # Snakeyaml 1.33 has a default limit 3MB. YAML file over the limit throws exception. JSON and CSV currently do not have such limit.
+  # The limit could be too small in some use cases. Setting a bigger number in `yaml_dictionary_code_point_limit` to relax the restriction.
+  # The default value is 128MB for code points of size 1 byte
+  config :yaml_dictionary_code_point_limit, :validate => :number
+
   # When using a dictionary file, this setting will indicate how frequently
   # (in seconds) logstash will check the dictionary file for updates.
   config :refresh_interval, :validate => :number, :default => 300
@@ -177,8 +186,22 @@ class Translate < LogStash::Filters::Base
       )
     end
 
+    # check and set yaml code point limit
+    # set lookup dictionary
     if @dictionary_path
-      @lookup = Dictionary::File.create(@dictionary_path, @refresh_interval, @refresh_behaviour, @exact, @regex)
+      if yaml_file?(@dictionary_path)
+        @yaml_dictionary_code_point_limit ||= 134_217_728
+
+        if @yaml_dictionary_code_point_limit <= 0
+          raise LogStash::ConfigurationError, "Please set a positive number in `yaml_dictionary_code_point_limit => #{@yaml_dictionary_code_point_limit}`."
+        else
+          @lookup = Dictionary::File.create(@dictionary_path, @refresh_interval, @refresh_behaviour, @exact, @regex, yaml_code_point_limit: @yaml_dictionary_code_point_limit)
+        end
+      elsif @yaml_dictionary_code_point_limit != nil
+        raise LogStash::ConfigurationError, "Please remove `yaml_dictionary_code_point_limit` for dictionary file in JSON or CSV format"
+      else
+        @lookup = Dictionary::File.create(@dictionary_path, @refresh_interval, @refresh_behaviour, @exact, @regex)
+      end
     else
       @lookup = Dictionary::Memory.new(@dictionary, @exact, @regex)
     end
@@ -228,11 +251,11 @@ class Translate < LogStash::Filters::Base
     else
       @logger.debug? && @logger.debug("#{self.class.name}: Dictionary translation method - Fuzzy")
     end
-  end # def register
 
-  def close
-    @lookup.stop_scheduler
-  end
+    if @lookup.respond_to?(:reload_dictionary) && @refresh_interval > 0 # a scheduler interval of zero makes no sense
+      scheduler.interval("#{@refresh_interval}s", overlap: false) { @lookup.reload_dictionary }
+    end
+  end # def register
 
   def filter(event)
     return unless @updater.test_for_inclusion(event, @override)
@@ -242,5 +265,9 @@ class Translate < LogStash::Filters::Base
       @logger.error("Something went wrong when attempting to translate from dictionary", :exception => e, :source => @source, :event => event.to_hash)
     end
   end # def filter
+
+  def yaml_file?(path)
+    /\.y[a]?ml$/.match(path)
+  end
 end # class LogStash::Filters::Translate
 end end

data/logstash-filter-translate.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-translate'
-  s.version         = '3.3.1'
+  s.version         = '3.4.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Replaces field contents based on a hash or YAML file"
   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"
@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~> 1.2'
   s.add_runtime_dependency 'logstash-mixin-validator_support', '~> 1.0'
   s.add_runtime_dependency 'logstash-mixin-deprecation_logger_support', '~> 1.0'
-  s.add_runtime_dependency 'rufus-scheduler'
+  s.add_runtime_dependency "logstash-mixin-scheduler", '~> 1.0'
+  s.add_runtime_dependency "psych", ">= 5.1.0"
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'rspec-sequencing'

data/spec/filters/scheduling_spec.rb

@@ -57,9 +57,9 @@ describe LogStash::Filters::Translate do
             end
           end
           .then_after(1.2, "wait then translate again") do
-            subject.filter(event)
             try(5) do
-              wait(0.1).for{event.get("[translation]")}.to eq("12"), "field [translation] did not eq '12'"
+              subject.filter(event)
+              wait(0.5).for{event.get("[translation]")}.to eq("12"), "field [translation] did not eq '12'"
             end
           end
           .then("stop") do
@@ -88,9 +88,9 @@ describe LogStash::Filters::Translate do
             end
           end
           .then_after(1.2, "wait then translate again") do
-            subject.filter(event)
             try(5) do
-              wait(0.1).for{event.get("[translation]")}.to eq("22"), "field [translation] did not eq '22'"
+              subject.filter(event)
+              wait(0.5).for{event.get("[translation]")}.to eq("22"), "field [translation] did not eq '22'"
             end
           end
           .then("stop") do

data/spec/filters/translate_spec.rb

@@ -240,6 +240,85 @@ describe LogStash::Filters::Translate do
       end
     end
 
+    describe "when using a yml dictionary with code point limit" do
+      let(:config) do
+        {
+          "source"      => "status",
+          "target"      => "translation",
+          "dictionary_path"  => dictionary_path,
+          "yaml_dictionary_code_point_limit" => dictionary_size  # the file is 18 bytes
+        }
+      end
+      let(:dictionary_path)  { TranslateUtil.build_fixture_path("dict.yml") }
+      let(:event) { LogStash::Event.new("status" => "a") }
+
+      context "dictionary is over limit" do
+        let(:dictionary_size) { 17 }
+
+        it "raises exception" do
+          expect { subject.register }.to raise_error(/The incoming YAML document exceeds/)
+        end
+      end
+
+      context "dictionary is within limit" do
+        let(:dictionary_size) { 18 }
+
+        it "returns the exact translation" do
+          subject.register
+          subject.filter(event)
+          expect(event.get("translation")).to eq(1)
+        end
+      end
+
+      context "limit set to zero" do
+        let(:dictionary_size) { 0 }
+
+        it "raises configuration exception" do
+          expect { subject.register }.to raise_error(LogStash::ConfigurationError, /Please set a positive number/)
+        end
+      end
+
+      context "limit is unset" do
+        let(:config) do
+          {
+            "source"      => "status",
+            "target"      => "translation",
+            "dictionary_path"  => dictionary_path,
+          }
+        end
+
+        it "sets the limit to 128MB" do
+          subject.register
+          expect(subject.instance_variable_get(:@yaml_dictionary_code_point_limit)).to eq(134_217_728)
+        end
+      end
+
+      context "dictionary is json and limit is set" do
+        let(:dictionary_path)  { TranslateUtil.build_fixture_path("dict.json") }
+        let(:dictionary_size) { 100 }
+
+        it "raises configuration exception" do
+          expect { subject.register }.to raise_error(LogStash::ConfigurationError, /Please remove `yaml_dictionary_code_point_limit` for dictionary file in JSON or CSV format/)
+        end
+      end
+
+      context "dictionary is json and limit is unset" do
+        let(:config) do
+          {
+            "source"      => "status",
+            "target"      => "translation",
+            "dictionary_path"  => TranslateUtil.build_fixture_path("dict.json"),
+          }
+        end
+
+        it "returns the exact translation" do
+          subject.register
+          subject.filter(event)
+          expect(event.get("translation")).to eq(10)
+        end
+      end
+    end
+
     context "when using a map tagged yml file" do
       let(:dictionary_path)  { TranslateUtil.build_fixture_path("tag-map-dict.yml") }
       let(:event) { LogStash::Event.new("status" => "six") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-translate
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +72,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: logstash-mixin-scheduler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: rufus-scheduler
+        version: 5.1.0
+  name: psych
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -206,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Replaces field contents based on a hash or YAML file