From 99221e4028016900fc8ddc04b2da07a9a5c229e8 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 18 Sep 2018 11:38:19 -0500 Subject: [PATCH] Downloads::File: fix SSRF attack when fetching remote size (#2498). Fixes the banned IP check not being applied when fetching the remote file size. This allowed one to trick Danbooru into sending HEAD requests to private IPs: http://danbooru.donmai.us/uploads/new?url=http://127.0.0.1/test.jpg --- app/logical/downloads/file.rb | 34 +++++++++++++++++--------------- test/unit/downloads/file_test.rb | 13 +++++++++++- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/app/logical/downloads/file.rb b/app/logical/downloads/file.rb index d6f7018fd..6b6aed58c 100644 --- a/app/logical/downloads/file.rb +++ b/app/logical/downloads/file.rb @@ -1,11 +1,15 @@ module Downloads class File + include ActiveModel::Validations class Error < Exception ; end RETRIABLE_ERRORS = [Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EIO, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Timeout::Error, IOError] delegate :data, to: :strategy - attr_accessor :source, :referer + attr_reader :url, :referer + + validate :validate_url + validate :validate_local_hosts # Prevent Cloudflare from potentially mangling the image. See issue #3528. def self.uncached_url(url, headers = {}) @@ -27,14 +31,13 @@ module Downloads end end - def initialize(source, referer=nil) - # source can potentially get rewritten in the course - # of downloading a file, so check it again - @source = source + def initialize(url, referer=nil) + @url = Addressable::URI.parse(url) rescue nil @referer = referer end def size + validate! options = { timeout: 3, headers: strategy.headers }.deep_merge(Danbooru.config.httparty_options) res = HTTParty.head(strategy.file_url, options) @@ -47,6 +50,7 @@ module Downloads end def download!(tries: 3, **options) + validate! url = self.class.uncached_url(strategy.file_url, strategy.headers) Retriable.retriable(on: RETRIABLE_ERRORS, tries: tries, base_interval: 0) do @@ -55,22 +59,20 @@ module Downloads end end - def validate_local_hosts(url) + def validate_local_hosts ip_addr = IPAddr.new(Resolv.getaddress(url.hostname)) if Danbooru.config.banned_ip_for_download?(ip_addr) - raise Error.new("Banned server for download") + errors[:base] << "Downloads from #{ip_addr} are not allowed" end end - def http_get_streaming(src, file: Tempfile.new(binmode: true), headers: {}, max_size: Danbooru.config.max_file_size) - url = URI.parse(src) - - unless url.is_a?(URI::HTTP) || url.is_a?(URI::HTTPS) - raise Error.new("URL must be HTTP or HTTPS") - end - - validate_local_hosts(url) + def validate_url + errors[:base] << "URL must not be blank" if url.blank? + errors[:base] << "'#{url}' is not a valid url" if !url.host.present? + errors[:base] << "'#{url}' is not a valid url. Did you mean 'http://#{url}'?" if !url.scheme.in?(%w[http https]) + end + def http_get_streaming(url, file: Tempfile.new(binmode: true), headers: {}, max_size: Danbooru.config.max_file_size) size = 0 options = { stream_body: true, timeout: 10, headers: headers } @@ -90,7 +92,7 @@ module Downloads end # def def strategy - @strategy ||= Sources::Strategies.find(source, referer) + @strategy ||= Sources::Strategies.find(url.to_s, referer) end end end diff --git a/test/unit/downloads/file_test.rb b/test/unit/downloads/file_test.rb index d742044c5..e8e4cce91 100644 --- a/test/unit/downloads/file_test.rb +++ b/test/unit/downloads/file_test.rb @@ -8,6 +8,18 @@ module Downloads @download = Downloads::File.new(@source) end + context "for a banned IP" do + should "prevent downloads" do + Resolv.expects(:getaddress).returns("127.0.0.1") + assert_raise(ActiveModel::ValidationError) { Downloads::File.new("http://evil.com").download! } + end + + should "prevent fetching the size" do + Resolv.expects(:getaddress).returns("127.0.0.1") + assert_raise(ActiveModel::ValidationError) { Downloads::File.new("http://evil.com").size } + end + end + context "that fails" do should "retry three times before giving up" do HTTParty.expects(:get).times(3).raises(Errno::ETIMEDOUT) @@ -34,7 +46,6 @@ module Downloads should "store the file in the tempfile path" do tempfile, strategy = @download.download! - assert_equal(@source, @download.source) assert_operator(tempfile.size, :>, 0, "should have data") end end