Skip to content

A platform for community discussion. Free, open, simple.

FIX: Add reverse DNS timeout to DiscourseIpInfo (#40593)

Alan Guo Xiang Tanc1408b6d5ad4
diff --git a/lib/discourse_ip_info.rb b/lib/discourse_ip_info.rb
index 534e90253d1..94c597a2bd8 100644
--- a/lib/discourse_ip_info.rb
+++ b/lib/discourse_ip_info.rb
@@ -6,6 +6,8 @@ require "resolv"
class DiscourseIpInfo
include Singleton
+ HOSTNAME_LOOKUP_TIMEOUT_SECONDS = 1
+
def initialize
open_db(DiscourseIpInfo.path)
end
@@ -141,13 +143,14 @@ class DiscourseIpInfo
end
end
- # this can block for quite a while
- # only use it explicitly when needed
if resolve_hostname
begin
- result = Resolv::DNS.new.getname(ip)
+ dns = Resolv::DNS.new
+ dns.timeouts = HOSTNAME_LOOKUP_TIMEOUT_SECONDS
+
+ result = dns.getname(ip)
ret[:hostname] = result&.to_s
- rescue Resolv::ResolvError
+ rescue Resolv::ResolvError, Timeout::Error
end
end
diff --git a/spec/lib/discourse_ip_info_spec.rb b/spec/lib/discourse_ip_info_spec.rb
index 0da2049cd60..43157313dfc 100644
--- a/spec/lib/discourse_ip_info_spec.rb
+++ b/spec/lib/discourse_ip_info_spec.rb
@@ -1,6 +1,46 @@
# frozen_string_literal: true
RSpec.describe DiscourseIpInfo do
+ describe ".get" do
+ let(:ip) { "81.2.69.142" }
+ let(:expected_ip_info) do
+ {
+ city: "London",
+ country: "United Kingdom",
+ country_code: "GB",
+ geoname_ids: [6_255_148, 2_635_167, 2_643_743, 6_269_131],
+ location: "London, England, United Kingdom",
+ region: "England",
+ latitude: 51.5142,
+ longitude: -0.0931,
+ }
+ end
+
+ before { described_class.open_db(Rails.root.join("spec/fixtures/mmdb").to_s) }
+
+ it "returns IP info without hostname when reverse DNS is interrupted" do
+ Resolv::DNS.any_instance.stubs(:getname).with(ip).raises(Timeout::Error)
+
+ result = described_class.get(ip, resolve_hostname: true)
+
+ expect(result).to eq(expected_ip_info)
+ end
+
+ it "sets a timeout for reverse DNS" do
+ resolver = Resolv::DNS.new
+ resolver
+ .expects(:timeouts=)
+ .with { |timeouts| Array(timeouts).present? && Array(timeouts).sum <= 5 }
+ resolver.stubs(:getname).with(ip).raises(Resolv::ResolvError)
+
+ Resolv::DNS.stubs(:new).returns(resolver)
+
+ result = described_class.get(ip, resolve_hostname: true)
+
+ expect(result).to eq(expected_ip_info)
+ end
+ end
+
describe ".mmdb_download" do
before { Discourse::Utils.stubs(:execute_command) }
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index bd5dc404d19..45a127bb7de 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -2242,6 +2242,27 @@ RSpec.describe Admin::UsersController do
before { sign_in(admin) }
include_examples "IP info retrieval possible"
+
+ it "returns IP info without hostname when reverse DNS is interrupted" do
+ ip = "81.2.69.142"
+
+ DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s)
+ Resolv::DNS.any_instance.stubs(:getname).with(ip).raises(Timeout::Error)
+
+ get "/admin/users/ip-info.json", params: { ip: ip }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body.symbolize_keys).to eq(
+ city: "London",
+ country: "United Kingdom",
+ country_code: "GB",
+ geoname_ids: [6_255_148, 2_635_167, 2_643_743, 6_269_131],
+ location: "London, England, United Kingdom",
+ region: "England",
+ latitude: 51.5142,
+ longitude: -0.0931,
+ )
+ end
end
context "when logged in as a moderator" do