zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-30 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2472 from internetee/renovate/rubygems-pdfkit-vulnerability

Browse source 
Update dependency pdfkit to v0.8.7.2 [SECURITY]
This commit is contained in:
OlegPhenomenon 2022-11-08 11:14:32 +02:00 • committed by GitHub
commit 1c26cea87d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -341,7 +341,7 @@ GEM
paper_trail (13.0.0) paper_trail (13.0.0)
activerecord (>= 5.2) activerecord (>= 5.2)
request_store (~> 1.1) request_store (~> 1.1)
pdfkit (0.8.7) pdfkit (0.8.7.2)
pg (1.4.4) pg (1.4.4)
pg_query (2.1.2) pg_query (2.1.2)
google-protobuf (>= 3.17.1) google-protobuf (>= 3.17.1)

2
app/controllers/epp/base_controller.rb
View file

@ -34,7 +34,7 @@ module Epp
code: '2502', code: '2502',
msg: Shunter.default_error_message) msg: Shunter.default_error_message)
handle_errors handle_errors
log_exception(exception) log_exception(exception) unless Rails.env.test?
end end
def respond_with_command_failed_error(exception) def respond_with_command_failed_error(exception)

2
app/controllers/repp/v1/base_controller.rb
View file

@ -29,7 +29,7 @@ module Repp
render(json: @response, status: :unauthorized) render(json: @response, status: :unauthorized)
rescue Shunter::ThrottleError => e rescue Shunter::ThrottleError => e
@response = { code: 2502, message: Shunter.default_error_message } @response = { code: 2502, message: Shunter.default_error_message }
logger.error e.to_s logger.error e.to_s unless Rails.env.test?
render(json: @response, status: :bad_request) render(json: @response, status: :bad_request)
ensure ensure
create_repp_log create_repp_log

2
app/lib/shunter/integration/throttle.rb
View file

@ -26,7 +26,7 @@ module Shunter
logger.info "Request from #{throttled_user.class}/#{throttled_user.id} is coming through throttling" logger.info "Request from #{throttled_user.class}/#{throttled_user.id} is coming through throttling"
yield if block_given? yield if block_given?
else else
logger.info "Too many requests from #{throttled_user.class}/#{throttled_user.id}." logger.info "Too many requests from #{throttled_user.class}/#{throttled_user.id}." unless Rails.env.test?
raise Shunter::ThrottleError raise Shunter::ThrottleError
end end
end end

12
test/models/epp/response/result/code_test.rb
View file

@ -1,5 +1,11 @@
require 'test_helper' require 'test_helper'
class Hash
def contain?(other)
self.merge(other) == self
end
end
class EppResponseResultCodeTest < ActiveSupport::TestCase class EppResponseResultCodeTest < ActiveSupport::TestCase
def test_creates_code_by_key def test_creates_code_by_key
key = :completed_successfully key = :completed_successfully
@ -84,10 +90,10 @@ class EppResponseResultCodeTest < ActiveSupport::TestCase
2306 => 'Parameter value policy error', 2306 => 'Parameter value policy error',
2308 => 'Data management policy violation', 2308 => 'Data management policy violation',
2400 => 'Command failed', 2400 => 'Command failed',
2501 => 'Authentication error; server closing connection', 2501 => 'Authentication error; server closing connection'
2502 => Shunter.default_error_message
} }
assert_equal descriptions, Epp::Response::Result::Code.default_descriptions
assert Epp::Response::Result::Code.default_descriptions.contain? descriptions
end end
def test_equality def test_equality