abce4d2551
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
108 lines
2.9 KiB
Ruby
108 lines
2.9 KiB
Ruby
class UsersController < ApplicationController
|
|
respond_to :html, :xml, :json
|
|
skip_before_action :api_check
|
|
|
|
def new
|
|
@user = User.new
|
|
respond_with(@user)
|
|
end
|
|
|
|
def edit
|
|
@user = User.find(params[:id])
|
|
check_privilege(@user)
|
|
respond_with(@user)
|
|
end
|
|
|
|
def index
|
|
if params[:name].present?
|
|
@user = User.find_by_name(params[:name])
|
|
if @user.nil?
|
|
raise "No user found with name: #{params[:name]}"
|
|
else
|
|
redirect_to user_path(@user)
|
|
end
|
|
else
|
|
@users = User.search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
|
|
respond_with(@users) do |format|
|
|
format.xml do
|
|
render :xml => @users.to_xml(:root => "users")
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def search
|
|
end
|
|
|
|
def show
|
|
@user = User.find(params[:id])
|
|
@presenter = UserPresenter.new(@user)
|
|
respond_with(@user, methods: @user.full_attributes)
|
|
end
|
|
|
|
def create
|
|
@user = User.new(user_params(:create))
|
|
if !Danbooru.config.enable_recaptcha? || verify_recaptcha(model: @user)
|
|
@user.save
|
|
if @user.errors.empty?
|
|
session[:user_id] = @user.id
|
|
else
|
|
flash[:notice] = "Sign up failed: #{@user.errors.full_messages.join("; ")}"
|
|
end
|
|
set_current_user
|
|
respond_with(@user)
|
|
else
|
|
flash[:notice] = "Sign up failed"
|
|
redirect_to new_user_path
|
|
end
|
|
end
|
|
|
|
def update
|
|
@user = User.find(params[:id])
|
|
check_privilege(@user)
|
|
@user.update(user_params(:update))
|
|
cookies.delete(:favorite_tags)
|
|
cookies.delete(:favorite_tags_with_categories)
|
|
if @user.errors.any?
|
|
flash[:notice] = @user.errors.full_messages.join("; ")
|
|
else
|
|
flash[:notice] = "Settings updated"
|
|
end
|
|
respond_with(@user, location: edit_user_path(@user))
|
|
end
|
|
|
|
def cache
|
|
@user = User.find(params[:id])
|
|
@user.update_cache
|
|
render plain: ""
|
|
end
|
|
|
|
private
|
|
|
|
def check_privilege(user)
|
|
raise User::PrivilegeError unless (user.id == CurrentUser.id || CurrentUser.is_admin?)
|
|
end
|
|
|
|
def user_params(context)
|
|
permitted_params = %i[
|
|
password old_password password_confirmation email
|
|
comment_threshold default_image_size favorite_tags blacklisted_tags
|
|
time_zone per_page custom_style
|
|
|
|
receive_email_notifications always_resize_images enable_post_navigation
|
|
new_post_navigation_layout enable_privacy_mode
|
|
enable_sequential_post_navigation hide_deleted_posts style_usernames
|
|
enable_auto_complete show_deleted_children
|
|
disable_categorized_saved_searches disable_tagged_filenames
|
|
enable_recent_searches disable_cropped_thumbnails disable_mobile_gestures
|
|
enable_safe_mode disable_responsive_mode
|
|
]
|
|
|
|
permitted_params += [dmail_filter_attributes: %i[id words]]
|
|
permitted_params << :name if context == :create
|
|
permitted_params << :level if CurrentUser.is_admin?
|
|
|
|
params.require(:user).permit(permitted_params)
|
|
end
|
|
end
|