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

Revert "DEV: Allow webmock to intercept `FinalDestination::HTTP` requests (#20575)" (#20576)

This commit is contained in:
Alan Guo Xiang Tan 2023-03-08 11:26:32 +08:00 committed by GitHub
parent 500d0f6daf
commit cf0a0945e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/final_destination/http.rb
View File

@ -1,47 +1,40 @@
# frozen_string_literal: true # frozen_string_literal: true
class FinalDestination class FinalDestination::HTTP < Net::HTTP
module SSRFSafeNetHTTP def connect
def connect original_open_timeout = @open_timeout
original_open_timeout = @open_timeout return super if @ipaddr
return super if @ipaddr
timeout_at = current_time + @open_timeout timeout_at = current_time + @open_timeout
# This iteration through addresses would normally happen in Socket#tcp # This iteration through addresses would normally happen in Socket#tcp
# We do it here because we're tightly controlling addresses rather than # We do it here because we're tightly controlling addresses rather than
# handing Socket#tcp a hostname # handing Socket#tcp a hostname
ips = ips = FinalDestination::SSRFDetector.lookup_and_filter_ips(@address, timeout: @connect_timeout)
FinalDestination::SSRFDetector.lookup_and_filter_ips(@address, timeout: @connect_timeout)
ips.each_with_index do |ip, index| ips.each_with_index do |ip, index|
debug "[FinalDestination] Attempting connection to #{ip}..." debug "[FinalDestination] Attempting connection to #{ip}..."
self.ipaddr = ip self.ipaddr = ip
remaining_time = timeout_at - current_time remaining_time = timeout_at - current_time
if remaining_time <= 0 if remaining_time <= 0
raise Net::OpenTimeout.new("Operation timed out - FinalDestination::HTTP") raise Net::OpenTimeout.new("Operation timed out - FinalDestination::HTTP")
end
@open_timeout = remaining_time
return super
rescue SystemCallError, Net::OpenTimeout => e
debug "[FinalDestination] Error connecting to #{ip}... #{e.message}"
was_last_attempt = index == ips.length - 1
raise if was_last_attempt
end end
ensure
@open_timeout = original_open_timeout
end
private @open_timeout = remaining_time
return super
def current_time rescue SystemCallError, Net::OpenTimeout => e
Process.clock_gettime(Process::CLOCK_MONOTONIC) debug "[FinalDestination] Error connecting to #{ip}... #{e.message}"
was_last_attempt = index == ips.length - 1
raise if was_last_attempt
end end
ensure
@open_timeout = original_open_timeout
end end
class HTTP < ::Net::HTTP private
include SSRFSafeNetHTTP
def current_time
Process.clock_gettime(Process::CLOCK_MONOTONIC)
end end
end end

10
spec/support/final_destination_helper.rb
View File

@ -7,15 +7,7 @@ WebMock::HttpLibAdapterRegistry.instance.register(
def self.enable! def self.enable!
FinalDestination.send(:remove_const, :HTTP) FinalDestination.send(:remove_const, :HTTP)
FinalDestination.send(:const_set, :HTTP, Net::HTTP)
# At this point, `Net::HTTP` has already been patched by WebMock so we need to re-declare `FinalDestination::HTTP`
# but inherit from the patched `Net::HTTP` class. This is to allow requests made using `FinalDestination::HTTP` to be
# intercepted by WebMock.
FinalDestination.send(
:const_set,
:HTTP,
Class.new(Net::HTTP) { include FinalDestination::SSRFSafeNetHTTP },
)
end end
def self.disable! def self.disable!