jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove CurrentUser.ip_addr.

Browse Source 
Remove the `CurrentUser.ip_addr` global variable and replace it with
`request.remote_ip`. Before we had to track the current user's IP in a
global variable so that when we edited a post for example, we could pass
down the user's IP to the model and save it in the post_versions table.
Now that we now longer save IPs in version tables, we don't need a global
variable to get access to the current user's IP outside of controllers.
This commit is contained in:
evazion
2022-09-18 04:41:01 -05:00
parent d4da8499ce
commit 1d2bac7b95
41 changed files with 15 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/unit/application_record.rb
View File

@@ -28,18 +28,15 @@ class ApplicationRecordTest < ActiveSupport::TestCase
@user1 = create(:user)
@user2 = create(:user)
CurrentUser.scoped(@user1, "1.1.1.1") do
CurrentUser.scoped(@user1) do
Tag.parallel_each do |tag|
assert_equal(@user1, CurrentUser.user)
assert_equal("1.1.1.1", CurrentUser.ip_addr)
CurrentUser.scoped(@user2, "2.2.2.2") do
CurrentUser.scoped(@user2) do
assert_equal(@user2, CurrentUser.user)
assert_equal("2.2.2.2", CurrentUser.ip_addr)
end
assert_equal(@user1, CurrentUser.user)
assert_equal("1.1.1.1", CurrentUser.ip_addr)
end
end
end

2
test/unit/artist_commentary_test.rb
View File

@@ -4,12 +4,10 @@ class ArtistCommentaryTest < ActiveSupport::TestCase
setup do
user = FactoryBot.create(:user)
CurrentUser.user = user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "A post should not have more than one commentary" do

2
test/unit/artist_test.rb
View File

@@ -17,12 +17,10 @@ class ArtistTest < ActiveSupport::TestCase
setup do
user = travel_to(1.month.ago) {FactoryBot.create(:user)}
CurrentUser.user = user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "parse inactive urls" do

2
test/unit/artist_url_test.rb
View File

@@ -8,12 +8,10 @@ class ArtistURLTest < ActiveSupport::TestCase
context "An artist url" do
setup do
CurrentUser.user = FactoryBot.create(:user)
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "allow urls to be marked as inactive" do

5
test/unit/ban_test.rb
View File

@@ -6,13 +6,11 @@ class BanTest < ActiveSupport::TestCase
setup do
@banner = FactoryBot.create(:admin_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
@banner = nil
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "set the is_banned flag on the user" do
@@ -54,7 +52,6 @@ class BanTest < ActiveSupport::TestCase
context "Searching for a ban" do
should "find a given ban" do
CurrentUser.user = FactoryBot.create(:admin_user)
CurrentUser.ip_addr = "127.0.0.1"
user = FactoryBot.create(:user)
ban = FactoryBot.create(:ban, user: user)
@@ -76,13 +73,11 @@ class BanTest < ActiveSupport::TestCase
setup do
@admin = FactoryBot.create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
@user = FactoryBot.create(:user)
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
end
end

2
test/unit/bulk_update_request_test.rb
View File

@@ -12,12 +12,10 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase
setup do
@admin = FactoryBot.create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should_eventually "parse tags with tag type prefixes inside the script" do

2
test/unit/comment_test.rb
View File

@@ -5,12 +5,10 @@ class CommentTest < ActiveSupport::TestCase
setup do
user = FactoryBot.create(:user)
CurrentUser.user = user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "that mentions a user" do

8
test/unit/current_user_test.rb
View File

@@ -3,7 +3,6 @@ require 'test_helper'
class CurrentUserTest < ActiveSupport::TestCase
setup do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "The current user" do
@@ -11,14 +10,11 @@ class CurrentUserTest < ActiveSupport::TestCase
user = FactoryBot.create(:user)
assert_nil(CurrentUser.user)
assert_nil(CurrentUser.ip_addr)
CurrentUser.user = user
CurrentUser.ip_addr = "1.2.3.4"
assert_not_nil(CurrentUser.user)
assert_equal(user.id, CurrentUser.user.id)
assert_equal("1.2.3.4", CurrentUser.ip_addr)
end
end
@@ -27,7 +23,7 @@ class CurrentUserTest < ActiveSupport::TestCase
user1 = FactoryBot.create(:user)
user2 = FactoryBot.create(:user)
CurrentUser.user = user1
CurrentUser.scoped(user2, nil) do
CurrentUser.scoped(user2) do
assert_equal(user2.id, CurrentUser.user.id)
end
assert_equal(user1.id, CurrentUser.user.id)
@@ -38,7 +34,7 @@ class CurrentUserTest < ActiveSupport::TestCase
user2 = FactoryBot.create(:user)
CurrentUser.user = user1
assert_raises(RuntimeError) do
CurrentUser.scoped(user2, nil) do
CurrentUser.scoped(user2) do
assert_equal(user2.id, CurrentUser.user.id)
raise "ERROR"
end

2
test/unit/d_text_test.rb
View File

@@ -46,12 +46,10 @@ class DTextTest < ActiveSupport::TestCase
context "#format_text" do
setup do
CurrentUser.user = create(:user)
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "add tag types to wiki links" do

2
test/unit/forum_post_test.rb
View File

@@ -5,13 +5,11 @@ class ForumPostTest < ActiveSupport::TestCase
setup do
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@topic = FactoryBot.create(:forum_topic)
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "that mentions a user" do

2
test/unit/forum_topic_test.rb
View File

@@ -6,13 +6,11 @@ class ForumTopicTest < ActiveSupport::TestCase
travel_to Time.now
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@topic = create(:forum_topic, title: "xxx", creator: @user)
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "#mark_as_read!" do

3
test/unit/pool_test.rb
View File

@@ -6,13 +6,10 @@ class PoolTest < ActiveSupport::TestCase
@user = FactoryBot.create(:user)
CurrentUser.user = @user
end
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "Searching pools" do

2
test/unit/post_disapproval_test.rb
View File

@@ -5,12 +5,10 @@ class PostDisapprovalTest < ActiveSupport::TestCase
setup do
@alice = FactoryBot.create(:moderator_user, name: "alice")
CurrentUser.user = @alice
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "a post disapproval" do

2
test/unit/post_query_builder_test.rb
View File

@@ -15,12 +15,10 @@ class PostQueryBuilderTest < ActiveSupport::TestCase
setup do
CurrentUser.user = create(:user)
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "Searching:" do

2
test/unit/post_sets/post_test.rb
View File

@@ -6,7 +6,6 @@ module PostSets
setup do
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@post_1 = FactoryBot.create(:post, :tag_string => "a")
@post_2 = FactoryBot.create(:post, :tag_string => "b")
@@ -15,7 +14,6 @@ module PostSets
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "a set for page 2" do

2
test/unit/post_test.rb
View File

@@ -17,14 +17,12 @@ class PostTest < ActiveSupport::TestCase
@user = FactoryBot.create(:user)
end
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
end
def teardown
super
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "Deletion:" do

2
test/unit/post_version_test.rb
View File

@@ -7,12 +7,10 @@ class PostVersionTest < ActiveSupport::TestCase
@user = FactoryBot.create(:user)
end
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "that has multiple versions: " do

1
test/unit/related_tag_query_test.rb
View File

@@ -4,7 +4,6 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
setup do
user = FactoryBot.create(:user)
CurrentUser.user = user
CurrentUser.ip_addr = "127.0.0.1"
end
context "#other_wiki_pages" do

2
test/unit/saved_search_test.rb
View File

@@ -5,7 +5,6 @@ class SavedSearchTest < ActiveSupport::TestCase
super
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@mock_redis = MockRedis.new
SavedSearch.stubs(:redis).returns(@mock_redis)
end
@@ -13,7 +12,6 @@ class SavedSearchTest < ActiveSupport::TestCase
def teardown
super
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context ".labels_for" do

1
test/unit/session_loader_test.rb
View File

@@ -18,7 +18,6 @@ class SessionLoaderTest < ActiveSupport::TestCase
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
CurrentUser.safe_mode = nil
end

1
test/unit/sources/pixiv_test.rb
View File

@@ -227,7 +227,6 @@ module Sources
context "translating the tags" do
setup do
CurrentUser.user = FactoryBot.create(:user)
CurrentUser.ip_addr = "127.0.0.1"
tags = {
"comic" => "漫画",

2
test/unit/tag_alias_test.rb
View File

@@ -9,12 +9,10 @@ class TagAliasTest < ActiveSupport::TestCase
user = FactoryBot.create(:user)
CurrentUser.user = user
end
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "on validation" do

2
test/unit/tag_implication_test.rb
View File

@@ -5,12 +5,10 @@ class TagImplicationTest < ActiveSupport::TestCase
setup do
@admin = create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "on validation" do

2
test/unit/tag_test.rb
View File

@@ -4,12 +4,10 @@ class TagTest < ActiveSupport::TestCase
setup do
@builder = FactoryBot.create(:builder_user)
CurrentUser.user = @builder
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "A tag category fetcher" do

2
test/unit/user_test.rb
View File

@@ -18,12 +18,10 @@ class UserTest < ActiveSupport::TestCase
setup do
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "promoting a user" do

5
test/unit/wiki_page_test.rb
View File

@@ -1,13 +1,8 @@
require 'test_helper'
class WikiPageTest < ActiveSupport::TestCase
setup do
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "A wiki page" do