search_flip 4.0.0.beta11 → 4.0.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e032e109a7c31df14182c17d874f793327081c3c4e5b866dbfb261e8aa4e503
-  data.tar.gz: 73a2ce2eb918e9f3da28f3bf129eb614c1da5492d138985732af4b41a9f15a41
+  metadata.gz: 8ab3b545145f3750e38cff9ceacb96680fd3096e77ef0b1e4ae1d661a5783183
+  data.tar.gz: 6290f88a3360c2b521e627f3186525ed50eccd40d58a257ed75b68bc01ba0af1
 SHA512:
-  metadata.gz: 152130c3a91ae69dcf53ff43534b0b853786900f1c03847ffead4d52254f95aec5dbfb48362d6386a61fdb92f128b68fc22b2b66f4df27f2a099a9d6db356eea
-  data.tar.gz: '09f13f81114378ebd9dea98ae713f5be8a27dea15966bf2fc05195900be8ed74c73d6aa46d6a458a4d4aaeb8467e32cc4296fce4e22dbfee672a1dc30d4af14f'
+  metadata.gz: 5347539030a480f75b46e554f0f850d6ae24fcd1ccee1f6044ad992e330ca8c21ba3fee264a69ed99cc2675a00c35e5d0f842130063eab54cc3082ded8c572f0
+  data.tar.gz: 30914f871f515959eb93d70b094bb609c87a74526f00b9f2e2a60c38dc905365be9c786f56d7e7e894230b5f2715c1b5f9f121c0827b947c21ff2a15d56b69a7

data/CHANGELOG.md

@@ -11,6 +11,14 @@
 * Added `SearchFlip::Connection#get_cluster_settings` and
   `#update_cluster_settings`
 
+## v3.7.2
+
+* Fix wrong AWS signatures by generating the json before passing it to http-rb
+
+## v3.7.1
+
+* Fix thread-safety issue of http-rb
+
 ## v3.7.0
 
 * Add `SearchFlip::Connection#bulk` to allow more clean bulk indexing to

data/lib/search_flip/aws_sigv4_plugin.rb

@@ -37,7 +37,6 @@ module SearchFlip
       }
 
       signature_request[:body] = options[:body] if options.key?(:body)
-      signature_request[:body] = options[:json].respond_to?(:to_str) ? options[:json] : JSON.generate(options[:json]) if options[:json]
 
       signature = signer.sign_request(signature_request)
 

data/lib/search_flip/http_client.rb

@@ -58,8 +58,22 @@ module SearchFlip
     private
 
     def execute(method, uri, options = {})
-      final_request = plugins.inject(self) { |res, cur| cur.call(res, method, uri, options) }
-      response = final_request.request.send(method, uri, options)
+      opts = options.dup
+      final_request = self
+
+      if opts[:json]
+        # Manually generate and pass the json body to http-rb to guarantee that
+        # we have the same json which is used for aws signatures and to
+        # guarantee that json is always generated as stated in the config
+
+        opts[:body] = JSON.generate(opts.delete(:json))
+        final_request = final_request.headers(content_type: "application/json")
+      end
+
+      final_request = plugins.inject(final_request) { |res, cur| cur.call(res, method, uri, opts) }
+      final_request = final_request.headers({}) # Prevent thread-safety issue of http-rb: https://github.com/httprb/http/issues/558
+
+      response = final_request.request.send(method, uri, opts)
 
       raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "4.0.0.beta11"
+  VERSION = "4.0.0.beta13"
 end

data/spec/search_flip/aws_sigv4_plugin_spec.rb

@@ -29,15 +29,17 @@ RSpec.describe SearchFlip::AwsSigv4Plugin do
     end
 
     it "feeds the http method, full url and body to the signer" do
+      body = JSON.generate(key: "value")
+
       signing_request = {
         http_method: "GET",
         url: "http://localhost/index?param=value",
-        body: JSON.generate(key: "value")
+        body: body
       }
 
       expect(plugin.signer).to receive(:sign_request).with(signing_request).and_call_original
 
-      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, json: { key: "value" })
+      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, body: body)
     end
   end
 end

data/spec/search_flip/http_client_spec.rb

@@ -36,6 +36,12 @@ RSpec.describe SearchFlip::HTTPClient do
 
         expect(SearchFlip::HTTPClient.new.send(method, "http://localhost/path", body: "body", params: { key: "value" }).body.to_s).to eq("success")
       end
+
+      it "generates json, passes it as body and sets the content type when the json option is used" do
+        stub_request(method, "http://localhost/path").with(body: '{"key":"value"}', headers: { "Content-Type" => "application/json" }).to_return(body: "success")
+
+        expect(SearchFlip::HTTPClient.new.send(method, "http://localhost/path", json: { "key" => "value" }).body.to_s).to eq("success")
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta11
+  version: 4.0.0.beta13
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord