From efdee6ac7f2e32997c6551587c5167bcd9fef2c1 Mon Sep 17 00:00:00 2001 From: Jorge Tarrero Date: Thu, 3 Sep 2020 13:50:13 +0200 Subject: [PATCH] Bump cartodb-common to 0.3.4 --- .gitignore | 1 + Gemfile | 2 +- Gemfile.lock | 4 ++-- spec/requests/carto_logger_spec.rb | 12 ++++++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0ef77c6537..8d355b3a9b 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ app_config.yml database.yml build_resources/ .dockerignore +fake.log* diff --git a/Gemfile b/Gemfile index 6411efc4ff..2f85024aa3 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'google-cloud-pubsub', '1.2.0' # Service components (/services) gem 'virtus', '1.0.5' -gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', tag: 'v0.3.3' +gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', tag: 'v0.3.4' gem 'email_address', '~> 0.1.11' # Markdown diff --git a/Gemfile.lock b/Gemfile.lock index 69cbcdd17f..eff878534a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GIT GIT remote: https://github.com/cartodb/cartodb-common.git - revision: 26094bd1cff81b80841e11e0e463d4f98193c2a9 - tag: v0.3.3 + revision: 341004053e7198ab1021fb0722de18acd4a09520 + tag: v0.3.4 specs: cartodb-common (0.3.0) activesupport (~> 4.2.11.3) diff --git a/spec/requests/carto_logger_spec.rb b/spec/requests/carto_logger_spec.rb index ed08070ddf..d30ef3e0d7 100644 --- a/spec/requests/carto_logger_spec.rb +++ b/spec/requests/carto_logger_spec.rb @@ -45,10 +45,18 @@ describe(Carto::Common::Logger, type: :request) do it 'obfuscates sensitive parameters' do output = LogDeviceMock.capture_output do - get(root_path, password: 'password', nested: { token: 'token', auth_stuff: 'auth_stuff' }) + get( + root_path, + password: 'password', + nested: { token: 'token', auth_stuff: 'auth_stuff' }, + nested_array: %w[auth sensible_stuff] + ) end - expect(output).to match(/"password":"********".*"token":"*****".*"auth_stuff":"**********"/) + expect(output).to match(/password=(\*{8})/) + expect(output).to match(/nested\[token\]=(\*{5})/) + expect(output).to match(/nested\[auth_stuff\]=(\*{10})/) + expect(output).to match(/nested_array=(\*{4})(.*)(\*{14})/) end it 'logs request processing' do