Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Suspicious login detection (#6772)

This commit is contained in:
David Taylor 2018-12-14 16:30:34 +00:00 committed by GitHub
parent 77fe57f923
commit 1960236822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_auth_token.rb
View File

@ -36,7 +36,7 @@ class UserAuthToken < ActiveRecord::Base
def self.login_location(ip)
ipinfo = DiscourseIpInfo.get(ip)
ipinfo['latitude'] && ipinfo['longitude'] ? [ipinfo['latitude'], ipinfo['longitude']] : nil
ipinfo[:latitude] && ipinfo[:longitude] ? [ipinfo[:latitude], ipinfo[:longitude]] : nil
end
def self.distance(loc1, loc2)

16
spec/jobs/suspicious_login_spec.rb
View File

@ -4,20 +4,20 @@ describe Jobs::SuspiciousLogin do
let(:user) { Fabricate(:moderator) }
let(:zurich) { [47.3686498, 8.5391825] } # Zurich, Switzerland
let(:bern) { [46.947922, 7.444608] } # Bern, Switzerland
let(:london) { [51.5073509, -0.1277583] } # London, United Kingdom
let(:zurich) { { latitude: 47.3686498, longitude: 8.5391825 } } # Zurich, Switzerland
let(:bern) { { latitude: 46.947922, longitude: 7.444608 } } # Bern, Switzerland
let(:london) { { latitude: 51.5073509, longitude: -0.1277583 } } # London, United Kingdom
before do
UserAuthToken.stubs(:login_location).with("1.1.1.1").returns(zurich)
UserAuthToken.stubs(:login_location).with("1.1.1.2").returns(bern)
UserAuthToken.stubs(:login_location).with("1.1.2.1").returns(london)
DiscourseIpInfo.stubs(:get).with("1.1.1.1").returns(zurich)
DiscourseIpInfo.stubs(:get).with("1.1.1.2").returns(bern)
DiscourseIpInfo.stubs(:get).with("1.1.2.1").returns(london)
end
it "will correctly compute distance" do
def expect_distance(from, to, distance)
expect(UserAuthToken.distance(from, to).to_i).to eq(distance)
expect(UserAuthToken.distance(to, from).to_i).to eq(distance)
expect(UserAuthToken.distance(from.values, to.values).to_i).to eq(distance)
expect(UserAuthToken.distance(to.values, from.values).to_i).to eq(distance)
end
expect_distance(zurich, bern, 95)