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

Raise error on unpermitted params.

Browse Source 
Fail loudly if we forget to whitelist a param instead of silently
ignoring it.

misc models: convert to strong params.

artist commentaries: convert to strong params.

* Disallow changing or setting post_id to a nonexistent post.

artists: convert to strong params.

* Disallow setting `is_banned` in create/update actions. Changing it
  this way instead of with the ban/unban actions would leave the artist in
  a partially banned state.

bans: convert to strong params.

* Disallow changing the user_id after the ban has been created.

comments: convert to strong params.

favorite groups: convert to strong params.

news updates: convert to strong params.

post appeals: convert to strong params.

post flags: convert to strong params.

* Disallow users from setting the `is_deleted` / `is_resolved` flags.

ip bans: convert to strong params.

user feedbacks: convert to strong params.

* Disallow users from setting `disable_dmail_notification` when creating feedbacks.
* Disallow changing the user_id after the feedback has been created.

notes: convert to strong params.

wiki pages: convert to strong params.

* Also fix non-Builders being able to delete wiki pages.

saved searches: convert to strong params.

pools: convert to strong params.

* Disallow setting `post_count` or `is_deleted` in create/update actions.

janitor trials: convert to strong params.

post disapprovals: convert to strong params.

* Factor out quick-mod bar to shared partial.
* Fix quick-mod bar to use `Post#is_approvable?` to determine visibility
  of Approve button.

dmail filters: convert to strong params.

password resets: convert to strong params.

user name change requests: convert to strong params.

posts: convert to strong params.

users: convert to strong params.

* Disallow setting password_hash, last_logged_in_at, last_forum_read_at,
  has_mail, and dmail_filter_attributes[user_id].

* Remove initialize_default_image_size (dead code).

uploads: convert to strong params.

* Remove `initialize_status` because status already defaults to pending
  in the database.

tag aliases/implications: convert to strong params.

tags: convert to strong params.

forum posts: convert to strong params.

* Disallow changing the topic_id after creating the post.
* Disallow setting is_deleted (destroy/undelete actions should be used instead).
* Remove is_sticky / is_locked (nonexistent attributes).

forum topics: convert to strong params.

* merges https://github.com/evazion/danbooru/tree/wip-rails-5.1
* lock pg gem to 0.21 (1.0.0 is incompatible with rails 5.1.4)
* switch to factorybot and change all references

Co-authored-by: r888888888 <r888888888@gmail.com>
Co-authored-by: evazion <noizave@gmail.com>

add diffs
This commit is contained in:
r888888888
2018-04-02 10:51:26 -07:00
committed by Albert Yi
parent 01eda51020
commit abce4d2551
362 changed files with 4796 additions and 4799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
test/unit/ban_test.rb
View File

@@ -4,7 +4,7 @@ class BanTest < ActiveSupport::TestCase
context "A ban" do
context "created by an admin" do
setup do
@banner = FactoryGirl.create(:admin_user)
@banner = FactoryBot.create(:admin_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -16,42 +16,42 @@ class BanTest < ActiveSupport::TestCase
end
should "set the is_banned flag on the user" do
user = FactoryGirl.create(:user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:user)
ban = FactoryBot.build(:ban, :user => user, :banner => @banner)
ban.save
user.reload
assert(user.is_banned?)
end
should "not be valid against another admin" do
user = FactoryGirl.create(:admin_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:admin_user)
ban = FactoryBot.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
end
should "be valid against anyone who is not an admin" do
user = FactoryGirl.create(:moderator_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:moderator_user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = FactoryGirl.create(:contributor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:contributor_user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = FactoryGirl.create(:gold_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:gold_user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = FactoryGirl.create(:user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
end
end
context "created by a moderator" do
setup do
@banner = FactoryGirl.create(:moderator_user)
@banner = FactoryBot.create(:moderator_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -63,47 +63,47 @@ class BanTest < ActiveSupport::TestCase
end
should "not be valid against an admin or moderator" do
user = FactoryGirl.create(:admin_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:admin_user)
ban = FactoryBot.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = FactoryGirl.create(:moderator_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:moderator_user)
ban = FactoryBot.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
end
should "be valid against anyone who is not an admin or a moderator" do
user = FactoryGirl.create(:contributor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:contributor_user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = FactoryGirl.create(:gold_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:gold_user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = FactoryGirl.create(:user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
user = FactoryBot.create(:user)
ban = FactoryBot.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
end
end
should "initialize the expiration date" do
user = FactoryGirl.create(:user)
admin = FactoryGirl.create(:admin_user)
user = FactoryBot.create(:user)
admin = FactoryBot.create(:admin_user)
CurrentUser.scoped(admin) do
ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
ban = FactoryBot.create(:ban, :user => user, :banner => admin)
assert_not_nil(ban.expires_at)
end
end
should "update the user's feedback" do
user = FactoryGirl.create(:user)
admin = FactoryGirl.create(:admin_user)
user = FactoryBot.create(:user)
admin = FactoryBot.create(:admin_user)
assert(user.feedback.empty?)
CurrentUser.scoped(admin) do
FactoryGirl.create(:ban, :user => user, :banner => admin)
FactoryBot.create(:ban, :user => user, :banner => admin)
end
assert(!user.feedback.empty?)
assert_equal("negative", user.feedback.last.category)
@@ -112,11 +112,11 @@ class BanTest < ActiveSupport::TestCase
context "Searching for a ban" do
should "find a given ban" do
CurrentUser.user = FactoryGirl.create(:admin_user)
CurrentUser.user = FactoryBot.create(:admin_user)
CurrentUser.ip_addr = "127.0.0.1"
user = FactoryGirl.create(:user)
ban = FactoryGirl.create(:ban, user: user)
user = FactoryBot.create(:user)
ban = FactoryBot.create(:ban, user: user)
params = {
user_name: user.name,
banner_name: ban.banner.name,
@@ -133,10 +133,10 @@ class BanTest < ActiveSupport::TestCase
context "by user id" do
setup do
@admin = FactoryGirl.create(:admin_user)
@admin = FactoryBot.create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
@user = FactoryGirl.create(:user)
@user = FactoryBot.create(:user)
end
teardown do
@@ -146,7 +146,7 @@ class BanTest < ActiveSupport::TestCase
context "when only expired bans exist" do
setup do
@ban = FactoryGirl.create(:ban, :user => @user, :banner => @admin, :duration => -1)
@ban = FactoryBot.create(:ban, :user => @user, :banner => @admin, :duration => -1)
end
should "not return expired bans" do
@@ -156,7 +156,7 @@ class BanTest < ActiveSupport::TestCase
context "when active bans still exist" do
setup do
@ban = FactoryGirl.create(:ban, :user => @user, :banner => @admin, :duration => 1)
@ban = FactoryBot.create(:ban, :user => @user, :banner => @admin, :duration => 1)
end
should "return active bans" do