logstash-core 6.1.4-java → 6.2.0-java

data/spec/logstash/legacy_ruby_timestamp_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "spec_helper"
-require "logstash/timestamp"
 require "bigdecimal"
 
 describe LogStash::Timestamp do

data/spec/logstash/output_delegator_spec.rb

@@ -11,7 +11,6 @@ describe LogStash::OutputDelegator do
     end
   end
 
-  let(:logger) { double("logger") }
   let(:events) { 7.times.map { LogStash::Event.new }}
   let(:plugin_args) { {"id" => "foo", "arg1" => "val1"} }
   let(:collector) { [] }
@@ -22,7 +21,7 @@ describe LogStash::OutputDelegator do
 
   include_context "execution_context"
 
-  subject { described_class.new(logger, out_klass, metric, execution_context, ::LogStash::OutputDelegatorStrategyRegistry.instance, plugin_args) }
+  subject { described_class.new(out_klass, metric, execution_context, ::LogStash::OutputDelegatorStrategyRegistry.instance, plugin_args) }
 
   context "with a plain output plugin" do
     let(:out_klass) { double("output klass") }
@@ -47,7 +46,6 @@ describe LogStash::OutputDelegator do
       allow(out_inst).to receive(:id).and_return("a-simple-plugin")
 
       allow(subject.metric_events).to receive(:increment).with(any_args)
-      allow(logger).to receive(:debug).with(any_args)
     end
 
     it "should initialize cleanly" do
@@ -56,7 +54,7 @@ describe LogStash::OutputDelegator do
 
     it "should push the name of the plugin to the metric" do
       expect(metric).to receive(:gauge).with(:name, out_klass.config_name)
-      described_class.new(logger, out_klass, metric, execution_context, ::LogStash::OutputDelegatorStrategyRegistry.instance, plugin_args)
+      described_class.new(out_klass, metric, execution_context, ::LogStash::OutputDelegatorStrategyRegistry.instance, plugin_args)
     end
 
     context "after having received a batch of events" do
@@ -112,7 +110,7 @@ describe LogStash::OutputDelegator do
           it "should find the correct concurrency type for the output" do
             expect(subject.concurrency).to eq(strategy_concurrency)
           end
-          
+
           it "should find the correct Strategy class for the worker" do
             expect(subject.strategy).to be_a(klass)
           end
@@ -130,7 +128,7 @@ describe LogStash::OutputDelegator do
               before do
                 allow(subject.strategy).to receive(method)
               end
-              
+
               it "should delegate #{method} to the strategy" do
                 subject.send(method, *args)
                 if args
@@ -145,7 +143,7 @@ describe LogStash::OutputDelegator do
               before do
                 allow(out_inst).to receive(method)
               end
-              
+
               it "should delegate #{method} to the strategy" do
                 subject.send(method, *args)
                 if args

data/spec/logstash/queue_factory_spec.rb

@@ -9,7 +9,7 @@ describe LogStash::QueueFactory do
     [
       LogStash::Setting::WritableDirectory.new("path.queue", Stud::Temporary.pathname),
       LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory", "memory_acked"]),
-      LogStash::Setting::Bytes.new("queue.page_capacity", "250mb"),
+      LogStash::Setting::Bytes.new("queue.page_capacity", "64mb"),
       LogStash::Setting::Bytes.new("queue.max_bytes", "1024mb"),
       LogStash::Setting::Numeric.new("queue.max_events", 0),
       LogStash::Setting::Numeric.new("queue.checkpoint.acks", 1024),

data/spec/logstash/settings_spec.rb

@@ -15,11 +15,17 @@ describe LogStash::Settings do
       it "should raise an exception" do
         expect { subject.register(numeric_setting) }.to raise_error
       end
+      it "registered? should return true" do
+        expect( subject.registered?(numeric_setting_name)).to be_truthy
+      end
     end
     context "if setting hasn't been registered" do
       it "should not raise an exception" do
         expect { subject.register(numeric_setting) }.to_not raise_error
       end
+      it "registered? should return false" do
+        expect( subject.registered?(numeric_setting_name)).to be_falsey
+      end
     end
   end
   describe "#get_setting" do
@@ -150,23 +156,31 @@ describe LogStash::Settings do
 
   describe "#from_yaml" do
 
-    context "env placeholders in flat logstash.yml" do
+    before :each do
+      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+    end
+
+    context "placeholders in flat logstash.yml" do
+
 
       after do
         ENV.delete('SOME_LOGSTASH_SPEC_ENV_VAR')
         ENV.delete('some.logstash.spec.env.var')
+        ENV.delete('a')
       end
       
       subject do
         settings = described_class.new
-        settings.register(LogStash::Setting::String.new("interpolated", "missing"))
-        settings.register(LogStash::Setting::String.new("with_dot", "missing"))
+        settings.register(LogStash::Setting::String.new("interpolated_env", "missing"))
+        settings.register(LogStash::Setting::String.new("with_dot_env", "missing"))
+        settings.register(LogStash::Setting::String.new("interpolated_store", "missing"))
         settings
       end
 
       let(:values) {{
-        "interpolated" => "${SOME_LOGSTASH_SPEC_ENV_VAR}",
-        "with_dot" => "${some.logstash.spec.env.var}"
+        "interpolated_env" => "${SOME_LOGSTASH_SPEC_ENV_VAR}",
+        "with_dot_env" => "${some.logstash.spec.env.var}",
+        "interpolated_store" => "${a}"
       }}
       let(:yaml_path) do
         p = Stud::Temporary.pathname
@@ -178,28 +192,37 @@ describe LogStash::Settings do
         p
       end
 
-      it "can interpolate environment into settings" do
-        expect(subject.get('interpolated')).to eq("missing")
-        expect(subject.get('with_dot')).to eq("missing")
-        ENV['SOME_LOGSTASH_SPEC_ENV_VAR'] = "correct_setting"
-        ENV['some.logstash.spec.env.var'] = "correct_setting_for_dotted"
+      it "can interpolate into settings" do
+        expect(subject.get('interpolated_env')).to eq("missing")
+        expect(subject.get('with_dot_env')).to eq("missing")
+        expect(subject.get('interpolated_store')).to eq("missing")
+        ENV['SOME_LOGSTASH_SPEC_ENV_VAR'] = "correct_setting_env"
+        ENV['some.logstash.spec.env.var'] = "correct_setting_for_dotted_env"
+        ENV['a'] = "wrong_value" # the store should take precedence
         subject.from_yaml(yaml_path)
-        expect(subject.get('interpolated')).to eq("correct_setting")
-        expect(subject.get('with_dot')).to eq("correct_setting_for_dotted")
+        expect(subject.get('interpolated_env')).to eq("correct_setting_env")
+        expect(subject.get('with_dot_env')).to eq("correct_setting_for_dotted_env")
+        expect(subject.get('interpolated_store')).to eq("A")
       end
     end
   end
 
-  context "env placeholders in nested logstash.yml" do
+  context "placeholders in nested logstash.yml" do
+
+    before :each do
+      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+    end
 
     before do
-      ENV['lsspecdomain'] = "domain1"
-      ENV['lsspecdomain2'] = "domain2"
+      ENV['lsspecdomain_env'] = "domain1"
+      ENV['lsspecdomain2_env'] = "domain2"
+      ENV['a'] = "wrong_value" # the store should take precedence
     end
 
     after do
-      ENV.delete('lsspecdomain')
-      ENV.delete('lsspecdomain2')
+      ENV.delete('lsspecdomain_env')
+      ENV.delete('lsspecdomain2_env')
+      ENV.delete('a')
     end
 
     subject do
@@ -210,10 +233,12 @@ describe LogStash::Settings do
     end
 
     let(:values) {{
-      "host" => ["dev1.${lsspecdomain}", "dev2.${lsspecdomain}"],
+      "host" => ["dev1.${lsspecdomain_env}", "dev2.${lsspecdomain_env}", "dev3.${a}"],
       "modules" => [
-        {"name" => "${lsspecdomain}", "testing" => "${lsspecdomain}"}, 
-        {"name" => "${lsspecdomain2}", "testing" => "${lsspecdomain2}"}
+        {"name" => "${lsspecdomain_env}", "testing" => "${lsspecdomain_env}"},
+        {"name" => "${lsspecdomain2_env}", "testing" => "${lsspecdomain2_env}"},
+        {"name" => "${a}", "testing" => "${a}"},
+        {"name" => "${b}", "testing" => "${b}"}
       ]
     }}
     let(:yaml_path) do
@@ -230,10 +255,12 @@ describe LogStash::Settings do
       expect(subject.get('host')).to match_array([])
       expect(subject.get('modules')).to match_array([])
       subject.from_yaml(yaml_path)
-      expect(subject.get('host')).to match_array(["dev1.domain1", "dev2.domain1"])
+      expect(subject.get('host')).to match_array(["dev1.domain1", "dev2.domain1", "dev3.A"])
       expect(subject.get('modules')).to match_array([
                                                       {"name" => "domain1", "testing" => "domain1"},
-                                                      {"name" => "domain2", "testing" => "domain2"}
+                                                      {"name" => "domain2", "testing" => "domain2"},
+                                                      {"name" => "A", "testing" => "A"},
+                                                      {"name" => "B", "testing" => "B"}
                                                     ])
     end
   end

data/spec/logstash/timestamp_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require "spec_helper"
-require "logstash/timestamp"
 
 describe LogStash::Timestamp do
   context "constructors" do

data/spec/logstash/util/secretstore_spec.rb

@@ -0,0 +1,69 @@
+require "logstash/util/secretstore"
+require "logstash/settings"
+
+describe LogStash::Util::SecretStore do
+
+  subject {LogStash::Util::SecretStore}
+
+  describe "with missing keystore" do
+    before :each do
+      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
+    end
+
+    it "should be not exist" do
+      expect(subject.exists?).to be_falsy
+      expect(subject.get_if_exists).to be_nil
+    end
+  end
+
+  describe "with implicit password keystore" do
+    before :each do
+      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
+    end
+
+    it "should be readable" do
+      expect(subject.get_if_exists.list).to include(subject.get_store_id("keystore.seed"))
+    end
+  end
+
+  describe "with explicit password keystore" do
+    before :each do
+      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
+    end
+
+    describe "and correct password" do
+      before do
+        ENV['LOGSTASH_KEYSTORE_PASS'] = "mypassword"
+      end
+
+      after do
+        ENV.delete('LOGSTASH_KEYSTORE_PASS')
+      end
+
+      it "should be readable" do
+        expect(subject.get_if_exists.list).to include(subject.get_store_id("keystore.seed"))
+      end
+    end
+
+    describe "and wrong password" do
+      before do
+        ENV['LOGSTASH_KEYSTORE_PASS'] = "not_the_correct_password"
+      end
+
+      after do
+        ENV.delete('LOGSTASH_KEYSTORE_PASS')
+      end
+
+      it "should be not readable" do
+        expect {subject.get_if_exists}.to raise_error.with_message(/Can not access Logstash keystore/)
+      end
+    end
+
+    describe "and missing password" do
+      it "should be not readable" do
+        expect {subject.get_if_exists}.to raise_error.with_message(/Could not determine keystore password/)
+      end
+    end
+  end
+
+end

data/spec/support/mocks_classes.rb

@@ -13,6 +13,23 @@ module LogStash
         # noop
       end
     end
+
+    class DummyBlockingInput < LogStash::Inputs::Base
+      config_name "dummyblockinginput"
+      milestone 2
+
+      def register
+        @latch = java.util.concurrent.CountDownLatch.new(1)
+      end
+
+      def run(_)
+        @latch.await
+      end
+
+      def stop
+        @latch.count_down
+      end
+    end
   end
 
   module Filters
@@ -39,13 +56,17 @@ module LogStash
         super
         @num_closes = 0
         @events = []
+        @mutex = Mutex.new
       end
 
       def register
       end
 
       def receive(event)
+        @mutex.lock
         @events << event
+      ensure
+          @mutex.unlock
       end
 
       def close

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.1.4
-logstash-core: 6.1.4
+logstash: 6.2.0
+logstash-core: 6.2.0
 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.1.4
+  version: 6.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -260,34 +260,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.4
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: jar-dependencies
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.9
-  name: ruby-maven
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -336,12 +308,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- gemspec_jars.rb
 - lib/logstash-core.rb
-- lib/logstash-core/logstash-core.jar
 - lib/logstash-core/logstash-core.rb
 - lib/logstash-core/version.rb
-- lib/logstash-core_jars.rb
 - lib/logstash/agent.rb
 - lib/logstash/api/app_helpers.rb
 - lib/logstash/api/command_factory.rb
@@ -495,6 +464,7 @@ files:
 - lib/logstash/util/prctl.rb
 - lib/logstash/util/retryable.rb
 - lib/logstash/util/safe_uri.rb
+- lib/logstash/util/secretstore.rb
 - lib/logstash/util/settings_helper.rb
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/util/substitution_variables.rb
@@ -606,6 +576,7 @@ files:
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
 - spec/logstash/util/safe_uri_spec.rb
+- spec/logstash/util/secretstore_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_acked_queue_spec.rb
@@ -638,15 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2
-- jar org.apache.logging.log4j:log4j-api, 2.6.2
-- jar org.apache.logging.log4j:log4j-core, 2.6.2
-- jar com.fasterxml.jackson.core:jackson-core, 2.9.1
-- jar com.fasterxml.jackson.core:jackson-databind, 2.9.1
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1
-- jar org.codehaus.janino:janino, 3.0.7
-- jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.1
+requirements: []
 rubyforge_project:
 rubygems_version: 2.6.13
 signing_key:
@@ -751,6 +714,7 @@ test_files:
 - spec/logstash/util/java_version_spec.rb
 - spec/logstash/util/plugin_version_spec.rb
 - spec/logstash/util/safe_uri_spec.rb
+- spec/logstash/util/secretstore_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_acked_queue_spec.rb

data/gemspec_jars.rb

@@ -1,12 +0,0 @@
-# This file is generated by Gradle as part of the build process. It extracts the build.gradle
-# runtime dependencies to generate this gemspec dependencies file to be eval'ed by the gemspec
-# for the jar-dependencies requirements.
-
-gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2"
-gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2"
-gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.1"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.1"
-gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1"
-gem.requirements << "jar org.codehaus.janino:janino, 3.0.7"
-gem.requirements << "jar com.fasterxml.jackson.dataformat:jackson-dataformat-cbor, 2.9.1"