Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 20:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: in multisite setup, links to the current forum are whitelisted when looking for spam hosts

Browse Source
This commit is contained in:
Neil Lalonde 2014-04-28 10:37:28 -04:00
parent e88e43bfb6
commit 340fd303c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/post.rb
View File

@ -167,6 +167,7 @@ class Post < ActiveRecord::Base
.reject{|h| !h.include?('.')} .reject{|h| !h.include?('.')}
hosts << GlobalSetting.hostname hosts << GlobalSetting.hostname
hosts << RailsMultisite::ConnectionManagement.current_hostname
end end

3
spec/models/post_spec.rb
View File

@ -798,8 +798,7 @@ describe Post do
describe "has_host_spam" do describe "has_host_spam" do
it "correctly detects host spam" do it "correctly detects host spam" do
post = Fabricate(:post, raw: "hello from my site http://www.somesite.com post = Fabricate(:post, raw: "hello from my site http://www.somesite.com http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}")
http://#{GlobalSetting.hostname} ")
post.total_hosts_usage.should == {"www.somesite.com" => 1} post.total_hosts_usage.should == {"www.somesite.com" => 1}
post.acting_user.trust_level = 0 post.acting_user.trust_level = 0