Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: correctly use timeouts in `FileHelper` and `FinalDestination` (#12921) 

Previous refactors have lost usage of read_timeout in `FileHelper.download` and `FinalDestination` was incorrectly using `Net::HTTP.start` by setting `open_timeout` in the block instead of directly during the invocation.

Couldn't figure how to write a good test for this without slowing the spec.
This commit is contained in:
Joffrey JAFFEUX 2021-05-03 09:21:11 +02:00 committed by GitHub
parent f1e74c89a1
commit 64dda7112d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/file_helper.rb
View File

@ -49,7 +49,8 @@ class FileHelper
max_redirects: follow_redirect ? 5 : 0, max_redirects: follow_redirect ? 5 : 0,
skip_rate_limit: skip_rate_limit, skip_rate_limit: skip_rate_limit,
verbose: verbose, verbose: verbose,
validate_uri: validate_uri validate_uri: validate_uri,
timeout: read_timeout
) )
fd.get do |response, chunk, uri| fd.get do |response, chunk, uri|

6
lib/final_destination.rb
View File

@ -101,8 +101,7 @@ class FinalDestination
status_code, response_headers = nil status_code, response_headers = nil
catch(:done) do catch(:done) do
Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS)) do |http| Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS), open_timeout: timeout) do |http|
http.open_timeout = timeout
http.read_timeout = timeout http.read_timeout = timeout
http.request_get(@uri.request_uri, request_headers) do |resp| http.request_get(@uri.request_uri, request_headers) do |resp|
status_code = resp.code.to_i status_code = resp.code.to_i
@ -431,9 +430,8 @@ class FinalDestination
end end
def safe_session(uri) def safe_session(uri)
Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https")) do |http| Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https"), open_timeout: timeout) do |http|
http.read_timeout = timeout http.read_timeout = timeout
http.open_timeout = timeout
yield http yield http
end end
end end