search_flip 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f3e293add0a92612ea73a6b8d448cc3866f30c908d96af5700466254b779d1
-  data.tar.gz: 158f3cf97a4ac2443a38d71f61764e7b10e9ba9df21883722e1fa5e300f5d9ca
+  metadata.gz: d8c5d0e833c92cf4584fe620634d0c2633cc82248a5cae91c256799d280057f5
+  data.tar.gz: 62f5f4944c3a1dc823f75f9bcede05c69ab103d19ae19cfec8f3c518a3829723
 SHA512:
-  metadata.gz: 83e349b1b4f9a67335b71e2d818649e4550fe42ae39d354aae9ca078f7c484e37169e33eea5bd7802002e09e7efbc41f09e67fbb7024d7541037af7dd7081d8f
-  data.tar.gz: 559742084c2374b6c66f1ec3c9edd3c4193d897b3b2df2c3935e5a2587bf558aaf062fcb9428b2601b33abe0ab79c6b46e6c100ef3b1a25e845461a053da293f
+  metadata.gz: 5480c57d7d814d96903aab184a82831d4f78d3613249eb8c6951992deaf873bba00ee3d5f8053050775973ac70cb2fc4665b7b15503634b53e853b8d0c29b198
+  data.tar.gz: 648f80a25a38e6ec50ab3ecec25a4b6dee92902804c6ee82409d7084c27527cea9788458f5e674dcbf2d0eea5aef401a13e3f1a3b23bd2e6ef1c5659e3a915d3

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 
 # CHANGELOG
 
+## 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 = "3.7.0"
+  VERSION = "3.7.2"
 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: 3.7.0
+  version: 3.7.2
 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