Support HTTPS in Downloads::File#http_get_streaming
This commit is contained in:
@@ -41,8 +41,8 @@ module Downloads
|
|||||||
limit = 4
|
limit = 4
|
||||||
|
|
||||||
while true
|
while true
|
||||||
unless url.is_a?(URI::HTTP)
|
unless url.is_a?(URI::HTTP) || url.is_a?(URI::HTTPS)
|
||||||
raise Error.new("URL must be HTTP")
|
raise Error.new("URL must be HTTP or HTTPS")
|
||||||
end
|
end
|
||||||
|
|
||||||
headers = {
|
headers = {
|
||||||
@@ -50,7 +50,7 @@ module Downloads
|
|||||||
}
|
}
|
||||||
@source, headers = before_download(source, headers)
|
@source, headers = before_download(source, headers)
|
||||||
|
|
||||||
Net::HTTP.start(url.host, url.port) do |http|
|
Net::HTTP.start(url.host, url.port, :use_ssl => url.is_a?(URI::HTTPS)) do |http|
|
||||||
http.read_timeout = 10
|
http.read_timeout = 10
|
||||||
http.request_get(url.request_uri, headers) do |res|
|
http.request_get(url.request_uri, headers) do |res|
|
||||||
case res
|
case res
|
||||||
|
|||||||
@@ -39,5 +39,24 @@ module Downloads
|
|||||||
assert_match(/image\/gif/, @download.content_type)
|
assert_match(/image\/gif/, @download.content_type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "A post download with an HTTPS source" do
|
||||||
|
setup do
|
||||||
|
@source = "https://www.google.com/intl/en_ALL/images/logo.gif"
|
||||||
|
@tempfile = Tempfile.new("danbooru-test")
|
||||||
|
@download = Downloads::File.new(@source, @tempfile.path)
|
||||||
|
end
|
||||||
|
|
||||||
|
teardown do
|
||||||
|
@tempfile.close
|
||||||
|
end
|
||||||
|
|
||||||
|
should "stream a file from an HTTPS source" do
|
||||||
|
@download.http_get_streaming do |resp|
|
||||||
|
assert_equal("200", resp.code)
|
||||||
|
assert(resp["Content-Length"].to_i > 0, "File should be larger than 0 bytes")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user