logstash-core 5.6.14-java → 5.6.15-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846a8f95ca9c915eadc9704ae09edc275f4383c6
-  data.tar.gz: 1ae6d513bde1f0ca0015780e6cc8a7451492fe37
+  metadata.gz: e68ba6fa0739dfe292bc782d79d303c5bc1d7aeb
+  data.tar.gz: fb599314938b1ffcfead95e62ae05faa2d84bbe0
 SHA512:
-  metadata.gz: fa22764bdec6c65e1e39884e45c09160d97c16df5655c3d171cd06184370b505cd58497ed8521ba6b448d5dec5d02f1f1d387878a3671c4ca5b297400ebef382
-  data.tar.gz: 44a5c1e403ad7fc01ba24beacc65df3101e76b571f7de25a4b9ce114cb04d45ed4b9bcc0cd2ed24eb88b111e142b0d915cc23166cd2c7ce9ee1fc7ea997b66c5
+  metadata.gz: 856bc505c204555882d71a3b27f8b230593a41ad78321f428a2d80469e54b26b6c6f05e5b7a04778dfe06706de7400fe728993d93e40e1172deaa49afe46a80a
+  data.tar.gz: af15ca3cc86fc8f9acc55c1072aa8c6a0edcf2864e8c04a0a86b3702dfa527d13516f7488a210b46c00c59cd16aa92f5bc65fe180c54f71714a18d9e9181a996

data/lib/logstash/util/safe_uri.rb

@@ -15,7 +15,7 @@ class LogStash::Util::SafeURI
   attr_reader :uri
 
   public
-  def initialize(arg)    
+  def initialize(arg)
     @uri = case arg
            when String
              arg = "//#{arg}" if HOSTNAME_PORT_REGEX.match(arg)
@@ -27,6 +27,7 @@ class LogStash::Util::SafeURI
            else
              raise ArgumentError, "Expected a string, java.net.URI, or URI, got a #{arg.class} creating a URL"
            end
+    raise ArgumentError, "URI is not valid - host is not specified" if @uri.host.nil?
   end
 
   def to_s

data/logstash-core.gemspec

@@ -53,7 +53,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "sinatra", '~> 1.4', '>= 1.4.6'
   gem.add_runtime_dependency 'puma', '~> 2.16'
-  gem.add_runtime_dependency "jruby-openssl", "0.9.19" # >= 0.9.13 Required to support TLSv1.2
+  gem.add_runtime_dependency "jruby-openssl", "~> 0.10.1" # >= 0.9.13 Required to support TLSv1.2
   gem.add_runtime_dependency "chronic_duration", "0.10.6"
 
   # TODO(sissel): Treetop 1.5.x doesn't seem to work well, but I haven't

data/spec/logstash/util/safe_uri_spec.rb

@@ -32,5 +32,45 @@ module LogStash module Util
         end
       end
     end
+
+    describe "#initialize" do
+      context 'when host is required' do
+        MALFORMED_URIS = ['http:/user:pass@localhost:9600', 'http:/localhost', 'http:/localhost:9600', 'h;localhost', 'http:://localhost']
+
+        context 'malformed uris via string' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              expect{LogStash::Util::SafeURI.new(arg)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via java.net.URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              java_uri = java.net.URI.new(arg)
+              expect{LogStash::Util::SafeURI.new(java_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via Ruby URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              ruby_uri = URI.parse(arg)
+              expect{LogStash::Util::SafeURI.new(ruby_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'uris with a valid host' do
+          ['http://user:pass@notlocalhost:9600', 'http://notlocalhost', 'https://notlocalhost:9600', '//notlocalhost', 'notlocalhost', 'notlocalhost:9200'].each do |arg|
+            it "#{arg}: should resolve host correctly" do
+              expect(LogStash::Util::SafeURI.new(arg).host).to eq('notlocalhost')
+            end
+          end
+        end
+      end
+    end
   end
 end end

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 5.6.14
-logstash-core: 5.6.14
+logstash: 5.6.15
+logstash-core: 5.6.15
 logstash-core-plugin-api: 2.1.29
 
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.6.14
+  version: 5.6.15
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -151,17 +151,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.10.1
   name: jruby-openssl
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: