diff --git a/lib/safe_fetch.rb b/lib/safe_fetch.rb index d664dcf6a..7f89c03c4 100644 --- a/lib/safe_fetch.rb +++ b/lib/safe_fetch.rb @@ -22,16 +22,11 @@ module SafeFetch class FileTooLargeError < Error; end class UnsupportedContentTypeError < Error; end class UnsupportedMethodError < Error; end -end -require_relative 'safe_fetch/request_options' -require_relative 'safe_fetch/fetcher' - -module SafeFetch def self.fetch(url, **, &) raise ArgumentError, 'block required' unless block_given? - Fetcher.new(RequestOptions.new(url: url, **)).fetch(&) + SafeFetch::Fetcher.new(SafeFetch::RequestOptions.new(url: url, **)).fetch(&) rescue SsrfFilter::InvalidUriScheme, URI::InvalidURIError => e raise InvalidUrlError, e.message rescue SsrfFilter::Error, Resolv::ResolvError => e