elasticsearch 7.16.1 → 7.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e6b06d07bf9c649bd9214313a2a22e9e60f240e6ff6106b58004d7ab1e5634'
-  data.tar.gz: f8c0451361d9c6595accbed70e119b4c27132778e077facbde7095279de063e8
+  metadata.gz: 9403b07ac2419ebe981f7434c53a6751ff895869250c9cfee72d39b498e19da6
+  data.tar.gz: 8ba7804340871f3c01eb2a8bcb4ad381231b3a000cc086b5c8e0f53a003a9972
 SHA512:
-  metadata.gz: 45fee5845c4ac6f90e42aaf6ad4efe846f9e4d9d949aa9b947cfb8601032ed9d9f2a51ceff62ce302657635f56285519bf44dc7a25c0fe8113df247a31c2dee2
-  data.tar.gz: 65b2c8ba484a54328da3bd26f089e22a305582e764e10a68e50730e88468b045f0ecae234640b55b0b41cda3be378ed6641428b43d7babc7ac5acae8c3e72e40
+  metadata.gz: e0ceede38bba023ed0c92eec140bb031ca4ef023586c01d002217fbaa4dc19e56c362b2d28994183676b539722a8f852fbf834fdd8bf5b62f0f509aa8382a951
+  data.tar.gz: 73e57f061914f521699f7e270456ef8e1879b53846225ffc0e6c6c83a91637feb410541f690e018d14db46185149507cb51cc0ca5dfb57d1730e34adda1e0a1e

data/elasticsearch.gemspec

@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'elasticsearch-transport', '7.16.1'
-  s.add_dependency 'elasticsearch-api',       '7.16.1'
+  s.add_dependency 'elasticsearch-transport', '7.17.1'
+  s.add_dependency 'elasticsearch-api',       '7.17.1'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)

data/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '7.16.1'.freeze
+  VERSION = '7.17.1'.freeze
 end

data/lib/elasticsearch.rb

@@ -50,7 +50,8 @@ module Elasticsearch
       begin
         response = elasticsearch_validation_request
       rescue Elasticsearch::Transport::Transport::Errors::Unauthorized,
-             Elasticsearch::Transport::Transport::Errors::Forbidden
+             Elasticsearch::Transport::Transport::Errors::Forbidden,
+             Elasticsearch::Transport::Transport::Errors::RequestEntityTooLarge
         @verified = true
         warn(SECURITY_PRIVILEGES_VALIDATION_WARNING)
         return
@@ -58,7 +59,7 @@ module Elasticsearch
 
       body = if response.headers['content-type'] == 'application/yaml'
                require 'yaml'
-               YAML.load(response.body)
+               YAML.safe_load(response.body)
              else
                response.body
              end

data/spec/integration/characters_escaping_spec.rb

@@ -0,0 +1,94 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
+require 'spec_helper'
+
+context 'Elasticsearch client' do
+  let(:client) do
+    Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')
+  end
+  let(:index) { 'tvs' }
+
+  after do
+    client.indices.delete(index: index)
+  end
+
+  context 'escaping spaces in ids' do
+    it 'escapes spaces for id when using index' do
+      response = client.index(index: index, id: 'a test 1', body: { name: 'A test 1' }, refresh: true)
+      expect(response['_id']).to eq 'a test 1'
+
+      response = client.search(index: index)
+      expect(response['hits']['hits'].first['_id']).to eq 'a test 1'
+
+      # Raises exception, _id is unrecognized
+      expect do
+        client.index(index: index, _id: 'a test 2', body: { name: 'A test 2' })
+      end.to raise_exception ArgumentError
+
+      # Raises exception, id is a query parameter
+      expect do
+        client.index(index: index, body: { name: 'A test 3', _id: 'a test 3' })
+      end.to raise_exception Elasticsearch::Transport::Transport::Errors::BadRequest
+    end
+
+    it 'escapes spaces for id when using create' do
+      # Works with create
+      response = client.create(index: index, id: 'a test 4', body: { name: 'A test 4' })
+      expect(response['_id']).to eq 'a test 4'
+    end
+
+    it 'escapes spaces for id when using bulk' do
+      body = [
+        { create: { _index: index, _id: 'a test 5', data: { name: 'A test 5' } } }
+      ]
+      expect(client.bulk(body: body, refresh: true))
+
+      response = client.search(index: index)
+      expect(
+        response['hits']['hits'].select { |a| a['_id'] == 'a test 5' }.size
+      ).to eq 1
+    end
+  end
+
+  context 'it doesnae escape plus signs in id' do
+    it 'escapes spaces for id when using index' do
+      response = client.index(index: index, id: 'a+test+1', body: { name: 'A test 1' })
+      expect(response['_id']).to eq 'a+test+1'
+    end
+
+    it 'escapes spaces for id when using create' do
+      # Works with create
+      response = client.create(index: index, id: 'a+test+2', body: { name: 'A test 2' })
+      expect(response['_id']).to eq 'a+test+2'
+    end
+
+    it 'escapes spaces for id when using bulk' do
+      body = [
+        { create: { _index: index, _id: 'a+test+3', data: { name: 'A test 3' } } }
+      ]
+      expect(client.bulk(body: body, refresh: true))
+
+      response = client.search(index: index)
+      expect(
+        response['hits']['hits'].select { |a| a['_id'] == 'a+test+3' }.size
+      ).to eq 1
+    end
+  end
+end

data/spec/unit/elasticsearch_product_validation_spec.rb

@@ -96,6 +96,27 @@ describe 'Elasticsearch: Validation' do
     end
   end
 
+  context 'When Elasticsearch replies with status 403' do
+    let(:status) { 413 }
+    let(:body) { {}.to_json }
+
+    it 'Verifies the request but shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      verify_request_stub
+      count_request_stub
+
+      valid_requests_and_expectations
+
+      fake_stderr.rewind
+      expect(fake_stderr.string).to eq("#{Elasticsearch::SECURITY_PRIVILEGES_VALIDATION_WARNING}\n")
+    ensure
+      $stderr = stderr
+    end
+  end
+
   context 'When the Elasticsearch version is >= 7.14' do
     context 'With a valid Elasticsearch response' do
       let(:body) { { 'version' => { 'number' => '7.14.0' } }.to_json }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.16.1
+  version: 7.17.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.16.1
+        version: 7.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.16.1
+        version: 7.17.1
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.16.1
+        version: 7.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.16.1
+        version: 7.17.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/elasticsearch-ruby.rb
 - lib/elasticsearch.rb
 - lib/elasticsearch/version.rb
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb
@@ -229,11 +230,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch
 test_files:
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb