mir/moebooru
2
0
Fork 0
mirror of https://github.com/moebooru/moebooru synced 2025-09-03 23:45:12 +00:00
Code Issues Releases Wiki Activity

Immediately check url scheme in lib/download.

Browse Source
This commit is contained in:
Edho Arief
2012-11-17 05:58:03 -08:00
parent bfde63f92b
commit 75a1f0b3cd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/download.rb
View File

@@ -28,16 +28,17 @@ module Danbooru
while true while true
url = Addressable::URI.parse(source) url = Addressable::URI.parse(source)
url.host = url.normalized_host url.host = url.normalized_host
unless url.scheme == 'http' or url.scheme == 'https'
raise SocketError, "URL must be HTTP or HTTPS"
end
# check if the request uri is not percent-encoded # check if the request uri is not percent-encoded
if url.request_uri.match /[^!*'();:@&=+$,\/?#\[\]ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\-_.~%]/ if url.request_uri.match /[^!*'();:@&=+$,\/?#\[\]ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\-_.~%]/
url.path = Addressable::URI.encode(url.path) url.path = Addressable::URI.encode(url.path)
url.query = Addressable::URI.encode(url.query) url.query = Addressable::URI.encode(url.query)
end end
unless url.scheme == 'http' or url.scheme == 'https'
raise SocketError, "URL must be HTTP or HTTPS"
end
unless url.port unless url.port
url.port = url.scheme == 'https' ? 443 : 80 url.port = url.scheme == 'https' ? 443 : 80
end end