bootic_client 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a1f5f52be0931537722e1a90599316a94fc25a
-  data.tar.gz: 994665adf0866edd214518729480b3ee3689cd6c
+  metadata.gz: cd25c5f81c531e803321755d311bf34fc4085870
+  data.tar.gz: 98dd11f9b4574dd18312d1c74cc720b72af756ab
 SHA512:
-  metadata.gz: 3d786e2494e082587bbb684a0a7b078b2f6c43e3b3ba55d8b07c5a929b7deaf47db16a6a122e71574e64dfdaae8331edd39492ff38567f8fa48b078ac8d1820e
-  data.tar.gz: a9a3950497449be5c852b9bc4e4cc99a001e81084cc78ac5f7abc3c8acd924c86326ab768e5fcb4ebdca1021a3adbebaf81b2606e14961ba547254d0d55e70e0
+  metadata.gz: 92f2be1137f77c506327f372c04d20cd2875f9776cb4747b0cd2b2374efe03c61edab6810c59120fa0463572c7ac2659967ecfb8c6fb02230124cd2779b04001
+  data.tar.gz: 80e85f49f20396b049d463988016c3bde5b4d88120d3b0769e4bfe4cd3e5fc2e1452684333f3503844cd4056e0fec45b7d4039f0ffe18a0497e659cbb16e39b2

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## [Unreleased](https://github.com/bootic/bootic_client.rb/tree/HEAD)
+
+[Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.24...HEAD)
+
+**Merged pull requests:**
+
+- Make HTTP cache serialize binary data \(ex. images\) safely [\#21](https://github.com/bootic/bootic_client.rb/pull/21) ([ismasan](https://github.com/ismasan))
+
+## [v0.0.24](https://github.com/bootic/bootic_client.rb/tree/v0.0.24) (2019-05-07)
+[Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.23...v0.0.24)
+
+**Merged pull requests:**
+
+- Update gems, fix HTTP cache [\#20](https://github.com/bootic/bootic_client.rb/pull/20) ([ismasan](https://github.com/ismasan))
+
+## [v0.0.23](https://github.com/bootic/bootic_client.rb/tree/v0.0.23) (2019-05-04)
+[Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.22...v0.0.23)
+
 ## [v0.0.22](https://github.com/bootic/bootic_client.rb/tree/v0.0.22) (2019-05-04)
 [Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.21...v0.0.22)
 
@@ -12,6 +30,10 @@
 ## [v0.0.21](https://github.com/bootic/bootic_client.rb/tree/v0.0.21) (2018-08-30)
 [Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.20...v0.0.21)
 
+**Merged pull requests:**
+
+- Add :user\_agent option [\#13](https://github.com/bootic/bootic_client.rb/pull/13) ([ismasan](https://github.com/ismasan))
+
 ## [v0.0.20](https://github.com/bootic/bootic_client.rb/tree/v0.0.20) (2018-07-05)
 [Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.19...v0.0.20)
 
@@ -53,7 +75,6 @@
 
 **Merged pull requests:**
 
-- Add :user\_agent option [\#13](https://github.com/bootic/bootic_client.rb/pull/13) ([ismasan](https://github.com/ismasan))
 - Base64-encode any attribute that responds to \#read [\#7](https://github.com/bootic/bootic_client.rb/pull/7) ([ismasan](https://github.com/ismasan))
 
 ## [v0.0.14](https://github.com/bootic/bootic_client.rb/tree/v0.0.14) (2016-04-26)
@@ -73,6 +94,10 @@
 ## [v0.0.12](https://github.com/bootic/bootic_client.rb/tree/v0.0.12) (2016-01-11)
 [Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.11...v0.0.12)
 
+**Merged pull requests:**
+
+- Faraday http cache 1.2.2, Vary header support. [\#4](https://github.com/bootic/bootic_client.rb/pull/4) ([ismasan](https://github.com/ismasan))
+
 ## [v0.0.11](https://github.com/bootic/bootic_client.rb/tree/v0.0.11) (2015-10-28)
 [Full Changelog](https://github.com/bootic/bootic_client.rb/compare/v0.0.10...v0.0.11)
 
@@ -91,7 +116,6 @@
 
 **Merged pull requests:**
 
-- Faraday http cache 1.2.2, Vary header support. [\#4](https://github.com/bootic/bootic_client.rb/pull/4) ([ismasan](https://github.com/ismasan))
 - Basic auth strategy [\#2](https://github.com/bootic/bootic_client.rb/pull/2) ([ismasan](https://github.com/ismasan))
 
 ## [v0.0.7](https://github.com/bootic/bootic_client.rb/tree/v0.0.7) (2015-03-07)

data/lib/bootic_client/client.rb

@@ -59,14 +59,21 @@ module BooticClient
       end
     end
 
-    class UTF8JSON
+    class SafeCacheSerializer
+      PREFIX = '__booticclient__base64__:'.freeze
+      PREFIX_EXP = %r{^#{PREFIX}}.freeze
+
       def self.dump(data)
-        data[:body] = data[:body].force_encoding('UTF-8') if data[:body].is_a?(String)
+        data[:body] = "#{PREFIX}#{Base64.strict_encode64(data[:body])}" if data[:body].is_a?(String)
         JSON.dump(data)
       end
 
       def self.load(string)
-        JSON.load(string)
+        data = JSON.load(string)
+        if data['body'] =~ PREFIX_EXP
+          data['body'] = Base64.strict_decode64(data['body'].sub(PREFIX, ''))
+        end
+        data
       end
     end
 
@@ -74,7 +81,7 @@ module BooticClient
 
     def conn(&block)
       @conn ||= Faraday.new do |f|
-        cache_options = {serializer: UTF8JSON, shared_cache: false, store: options[:cache_store]}
+        cache_options = {serializer: SafeCacheSerializer, shared_cache: false, store: options[:cache_store]}
         cache_options[:logger] = options[:logger] if options[:logging]
 
         f.use :http_cache, cache_options

data/lib/bootic_client/version.rb

@@ -1,3 +1,3 @@
 module BooticClient
-  VERSION = "0.0.24".freeze
+  VERSION = "0.0.25".freeze
 end

data/spec/safe_cache_serializer_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe BooticClient::Client::SafeCacheSerializer do
+  context 'deserializing existing non-base64 content' do
+    it 'does not attempt Base64 decoding' do
+      result = described_class.load('{"headers": {"foo": 1}, "body": "hello"}')
+      expect(result['body']).to eq 'hello'
+    end
+  end
+
+  context 'Base64-encoding and decoding' do
+    it 'decodes body if flagged as Base64' do
+      body = Base64.strict_encode64('hello')
+      encoded = %({"headers": {"foo": 1}, "body": "__booticclient__base64__:#{body}"})
+      result = described_class.load(encoded)
+      expect(result['body']).to eq 'hello'
+    end
+
+    it 'encodes as Base64 with flag prefix' do
+      data = Base64.strict_encode64('{"headers": {"foo": 1}, "body": "hello"}')
+      encoded = described_class.dump({headers: {foo: 1}, body: 'hello'})
+      parsed = JSON.load(encoded)
+      expect(parsed['body']).to eq "__booticclient__base64__:#{Base64.strict_encode64('hello')}"
+    end
+
+    it 'encodes and decodes' do
+      encoded = described_class.dump({headers: {foo: 1}, body: 'hello'})
+      decoded = described_class.load(encoded)
+      expect(decoded['body']).to eq 'hello'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_client
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -197,6 +197,7 @@ files:
 - spec/memcache_storage_spec.rb
 - spec/relation_spec.rb
 - spec/response_handlers_spec.rb
+- spec/safe_cache_serializer_spec.rb
 - spec/spec_helper.rb
 - spec/strategy_spec.rb
 - spec/whiny_uri_spec.rb
@@ -237,6 +238,7 @@ test_files:
 - spec/memcache_storage_spec.rb
 - spec/relation_spec.rb
 - spec/response_handlers_spec.rb
+- spec/safe_cache_serializer_spec.rb
 - spec/spec_helper.rb
 - spec/strategy_spec.rb
 - spec/whiny_uri_spec.rb