stitches 4.2.0.RC1 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff331a78189008795f3789617197c5bf4ac77fb9b2db8fe036256903668656ba
-  data.tar.gz: 2757ff4ef4739e826b60406726547b225693f44846d811c0c8fd0afa093eb55a
+  metadata.gz: 076cbbf3b2dfdd8b9b01d5c9f80cc091c223f14008fd7d45ceb2fff58bf454a0
+  data.tar.gz: a0d73979c10617fd6567aa7089236da49c7d2f1e1f58648931af5f5a0d7562b4
 SHA512:
-  metadata.gz: c6a9e99b2f0410ba3e1bff9c851fde7ec923154388667ea86c7a080354eb3943a2188e33336cc23e5ea530a98851e1fdf00ceb750cd246ebc95a3f43f2ecb95e
-  data.tar.gz: ed1f7f688b16629940ccd0f7b201ad6b47e9fcfdc005969dd3fdff7264fb45bd7c31d572a1dda5a962386bf567e07bb1823dbab66ccea40e8bed9650d67b59c9
+  metadata.gz: 46e0364ba7c84f2fe1ca66cac2b74236b173bd023b4573b41f0ed718c66828c1131075802e7cc388f427f7de81af6e9bc13c763429f68382ce6a8729d548e988
+  data.tar.gz: af3e5c6b23f9134ee842b300a65afcf13455d3842516696e3774e35a324d590271058f581db1451ecccbbf23c3c70f63ec2d12476c0306a1dfdf50825c7e5d55

data/lib/stitches/api_client_access_wrapper.rb

@@ -33,7 +33,7 @@ module Stitches::ApiClientAccessWrapper
 
     disabled_at = api_client.respond_to?(:disabled_at) ? api_client.disabled_at : nil
     if disabled_at && disabled_at > configuration.disabled_key_leniency_in_seconds.seconds.ago
-      message = "Allowing disabled ApiClient: #{api_client.name} with key #{api_client.key} disabled at #{disabled_at}"
+      message = "Allowing disabled ApiClient: #{api_client.name} with key #{redact_key(api_client)} disabled at #{disabled_at}"
       if disabled_at > configuration.disabled_key_leniency_error_log_threshold_in_seconds.seconds.ago
         logger.warn(message)
       else
@@ -41,11 +41,15 @@ module Stitches::ApiClientAccessWrapper
       end
       return api_client
     else
-      logger.error("Rejecting disabled ApiClient: #{api_client.name} with key #{api_client.key}")
+      logger.error("Rejecting disabled ApiClient: #{api_client.name} with key #{redact_key(api_client)}")
     end
     nil
   end
 
+  def self.redact_key(api_client)
+    "*****#{api_client.key.to_s[-8..-1]}"
+  end
+
   def self.logger
     if defined?(StitchFix::Logger::LogWriter)
       StitchFix::Logger::LogWriter

data/lib/stitches/generator_files/db/migrate/add_disabled_at_to_api_clients.rb

@@ -1,8 +1,4 @@
-<% if Rails::VERSION::MAJOR >= 5 %>
-class AddEnabledToApiClients < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]
-<% else %>
-class AddEnabledToApiClients < ActiveRecord::Migration
-<% end %>
+class AddDisabledAtToApiClients < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]<% end %>
   def change
     add_column :api_clients, :disabled_at, "timestamp with time zone", null: true
   end

data/lib/stitches/generator_files/db/migrate/add_enabled_to_api_clients.rb

@@ -1,8 +1,4 @@
-<% if Rails::VERSION::MAJOR >= 5 %>
-class AddEnabledToApiClients < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]
-<% else %>
-class AddEnabledToApiClients < ActiveRecord::Migration
-<% end %>
+class AddEnabledToApiClients < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]<% end %>
   def change
     add_column :api_clients, :enabled, :bool, null: false, default: true
     remove_index :api_clients, [:name ] # existing one would be unique

data/lib/stitches/generator_files/db/migrate/create_api_clients.rb

@@ -1,8 +1,4 @@
-<% if Rails::VERSION::MAJOR >= 5 %>
-class CreateApiClients < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]
-<% else %>
-class CreateApiClients < ActiveRecord::Migration
-<% end %>
+class CreateApiClients < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]<% end %>
   def change
     create_table :api_clients do |t|
       t.string :name, null: false

data/lib/stitches/generator_files/db/migrate/enable_uuid_ossp_extension.rb

@@ -1,8 +1,4 @@
-<% if Rails::VERSION::MAJOR >= 5 %>
-class EnableUuidOsspExtension < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]
-<% else %>
-class EnableUuidOsspExtension < ActiveRecord::Migration
-<% end %>
+class EnableUuidOsspExtension < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]<% end %>
   def change
     enable_extension 'uuid-ossp'
   end

data/lib/stitches/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stitches
-  VERSION = '4.2.0.RC1'
+  VERSION = '4.2.1'
 end

data/spec/api_key_middleware_spec.rb

@@ -102,10 +102,11 @@ RSpec.describe "/api/hellos", type: :request do
         context "when disabled_at is set to a time older than three days ago" do
           let(:disabled_at) { 4.day.ago }
 
-          it "allows the call" do
+          it "does not allow the call" do
             execute_call
 
             expect_unauthorized
+
           end
         end
 
@@ -162,7 +163,9 @@ RSpec.describe "/api/hellos", type: :request do
 
           it "logs error about the disabled key to the Rails.logger" do
             allow(Rails.logger).to receive(:warn)
-            allow(Rails.logger).to receive(:error)
+            allow(Rails.logger).to receive(:error) do |message1|
+              expect(message1).not_to include uuid
+            end
 
             execute_call
 
@@ -210,7 +213,10 @@ RSpec.describe "/api/hellos", type: :request do
             let(:disabled_at) { 101.seconds.ago }
 
             it "forbids the call" do
-              allow(Rails.logger).to receive(:error)
+              allow(Rails.logger).to receive(:error) do |message1|
+                expect(message1).not_to include uuid
+              end
+
               execute_call
 
               expect_unauthorized
@@ -235,7 +241,9 @@ RSpec.describe "/api/hellos", type: :request do
             let(:disabled_at) { 25.seconds.ago }
 
             it "allows the call" do
-              allow(Rails.logger).to receive(:warn)
+              allow(Rails.logger).to receive(:warn) do |message1|
+                expect(message1).not_to include uuid
+              end
 
               execute_call
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stitches
 version: !ruby/object:Gem::Version
-  version: 4.2.0.RC1
+  version: 4.2.1
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -289,9 +289,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.20
 signing_key: