github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:13:38 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: DiscourseIpInfo.mmdb_download incorrectly joining URLs (#26545)

Browse Source 
This commit changes `DiscourseIpInfo.mmdb_download` to use `File.join`
instead of `URI.join` when `GlobalSetting.maxmind_mirror_url` has been
configured. This is necessary because `URI.join` does not work the way I
expect it to work when I implemented it previously.

`URI.join("http://www.example.com/mirror", "test.tar.gz") results in
`http://www.example.com/test.tar.gz` instead of our expected
`http://www.exmaple.com/mirror/test.tar.gz`. For our simple use case
here, `File.join` is sufficient.
This commit is contained in:
Alan Guo Xiang Tan 2024-04-08 10:27:40 +08:00 committed by GitHub
parent 3ce386c22f
commit 6edadeab27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/discourse_ip_info.rb
View File

@ -27,7 +27,7 @@ class DiscourseIpInfo
def self.mmdb_download(name) def self.mmdb_download(name)
url = url =
if GlobalSetting.maxmind_mirror_url.present? if GlobalSetting.maxmind_mirror_url.present?
URI.join(GlobalSetting.maxmind_mirror_url, "#{name}.tar.gz").to_s File.join(GlobalSetting.maxmind_mirror_url, "#{name}.tar.gz").to_s
else else
if GlobalSetting.maxmind_license_key.blank? if GlobalSetting.maxmind_license_key.blank?
STDERR.puts "MaxMind IP database updates require a license" STDERR.puts "MaxMind IP database updates require a license"

15
lib/discourse_ip_info_spec.rb
View File

@ -3,9 +3,20 @@
RSpec.describe DiscourseIpInfo do RSpec.describe DiscourseIpInfo do
describe ".mmdb_download" do describe ".mmdb_download" do
it "should download the MaxMind databases from the right URL when `maxmind_mirror_url` global setting has been configured" do it "should download the MaxMind databases from the right URL when `maxmind_mirror_url` global setting has been configured" do
global_setting :maxmind_mirror_url, "https://example.com/mirror/" global_setting :maxmind_mirror_url, "https://b.www.example.com/mirror"
stub_request(:get, "https://example.com/mirror/GeoLite2-City.tar.gz").to_return( stub_request(:get, "https://b.www.example.com/mirror/GeoLite2-City.tar.gz").to_return(
status: 200,
body: "",
)
described_class.mmdb_download("GeoLite2-City")
end
it "should download the MaxMind databases from the right URL when `maxmind_mirror_url` global setting has been configured and has a trailing slash" do
global_setting :maxmind_mirror_url, "https://b.www.example.com/mirror/"
stub_request(:get, "https://b.www.example.com/mirror/GeoLite2-City.tar.gz").to_return(
status: 200, status: 200,
body: "", body: "",
) )