logstash-core 6.8.8-java → 6.8.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42894860b18c174aa9664bffd1518c001452109a00476094a8423104d91cbe5
-  data.tar.gz: 906608418ab20053c9f6caa88d4c6028ed0ff476d4a8bf327e271c003f11b155
+  metadata.gz: a483ab8ba590384e4a07e555f0012e9fab46096507f9b117d58a6e5d2233580e
+  data.tar.gz: 331a0544551ec432d76cbaead6010aed0fc04f015e38b9be127beae256cf1003
 SHA512:
-  metadata.gz: bba9aafe9ce3d120534a84e58313a645326f2812284b39247a0f18ee34761f091c6fde2ea6864214ce349709aaa1e02526db61d7a9e8f9fa098aa63022a47ef9
-  data.tar.gz: b7bc09ccf8eec2692e1d494a3d35e427a4ee83b2be52cdabb205566c4930b516c4a87273c4feee9b4d1dd37ac1874194648fc5c2f6dbcd899f3b2bc3ea07c359
+  metadata.gz: cb55ae7ed4849e11a098ef44374ad7069090383da9dfcd9000c9cf83337c50bab8c88b781332384b0c98934d8bc1940fd575af568df950b029557823c9725ca4
+  data.tar.gz: ab8084c066eddf69a27654efe9e024b51d27e5a10bb58662bf42593e7490a62c04956b23d95b3fe36f9e59f79800215992bedc242068af2a6733e23ae2ec5a34

data/lib/logstash/util/lazy_singleton.rb

@@ -0,0 +1,33 @@
+require 'thread' # Mutex
+
+# A [LazySingleton] wraps the result of the provided block,
+# which is guaranteed to be called at-most-once, even if the
+# block's return value is nil.
+class ::LogStash::Util::LazySingleton
+
+  def initialize(&block)
+    @mutex = Mutex.new
+    @block = block
+    @instantiated = false
+  end
+
+  def instance
+    unless @instantiated
+      @mutex.synchronize do
+        unless @instantiated
+          @instance = @block.call
+          @instantiated = true
+        end
+      end
+    end
+
+    return @instance
+  end
+
+  def reset!
+    @mutex.synchronize do
+      @instantiated = false
+      @instance = nil
+    end
+  end
+end

data/lib/logstash/util/substitution_variables.rb

@@ -2,12 +2,17 @@
 
 java_import "org.logstash.secret.store.SecretStoreExt"
 
+require_relative 'lazy_singleton'
+
 module ::LogStash::Util::SubstitutionVariables
 
   include LogStash::Util::Loggable
 
   SUBSTITUTION_PLACEHOLDER_REGEX = /\${(?<name>[a-zA-Z_.][a-zA-Z0-9_.]*)(:(?<default>[^}]*))?}/
 
+  SECRET_STORE = ::LogStash::Util::LazySingleton.new { load_secret_store }
+  private_constant :SECRET_STORE
+
   # Recursive method to replace substitution variable references in parameters
   def deep_replace(value)
     if value.is_a?(Hash)
@@ -42,7 +47,7 @@ module ::LogStash::Util::SubstitutionVariables
       logger.debug("Replacing `#{placeholder}` with actual value")
 
       #check the secret store if it exists
-      secret_store = SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+      secret_store = SECRET_STORE.instance
       replacement = secret_store.nil? ? nil : secret_store.retrieveSecret(SecretStoreExt.getStoreId(name))
       #check the environment
       replacement = ENV.fetch(name, default) if replacement.nil?
@@ -54,4 +59,20 @@ module ::LogStash::Util::SubstitutionVariables
     end
   end # def replace_placeholders
 
+  class << self
+    private
+
+    # loads a secret_store from disk if available, or returns nil
+    #
+    # @api private
+    # @return [SecretStoreExt,nil]
+    def load_secret_store
+      SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+    end
+
+    # @api test
+    def reset_secret_store
+      SECRET_STORE.reset!
+    end
+  end
 end

data/spec/logstash/settings_spec.rb

@@ -158,6 +158,11 @@ describe LogStash::Settings do
 
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     context "placeholders in flat logstash.yml" do
@@ -211,6 +216,7 @@ describe LogStash::Settings do
 
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     before do
@@ -225,6 +231,10 @@ describe LogStash::Settings do
       ENV.delete('a')
     end
 
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
     subject do
       settings = described_class.new
       settings.register(LogStash::Setting::ArrayCoercible.new("host", String, []))

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.8.8
-logstash-core: 6.8.8
+logstash: 6.8.9
+logstash-core: 6.8.9
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.8.8
+  version: 6.8.9
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -455,6 +455,7 @@ files:
 - lib/logstash/util/duration_formatter.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
+- lib/logstash/util/lazy_singleton.rb
 - lib/logstash/util/loggable.rb
 - lib/logstash/util/manticore_ssl_config_helper.rb
 - lib/logstash/util/modules_setting_array.rb