A platform for community discussion. Free, open, simple.
FIX: Don't allow arbitrary values for user field enums on signup (#40018)
Ted Johansson1635f1207626
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rbindex 70c29298ffb..d0da1a3ff53 100644--- a/app/controllers/users_controller.rb+++ b/app/controllers/users_controller.rb@@ -718,11 +718,11 @@ class UsersController < ApplicationController# Handle custom fieldsuser_fields = UserField.allif user_fields.present?- field_params = params[:user_fields] || {}fields = user.custom_fieldsuser_fields.each do |f|- field_val = field_params[f.id.to_s]+ field_val = clean_custom_field_values(f)+ field_val = nil if field_val == "false"if field_val.blank?return fail_with("login.missing_user_field") if f.required?else@@ -2106,7 +2106,7 @@ class UsersController < ApplicationControllerenddef clean_custom_field_values(field)- field_values = params[:user_fields][field.id.to_s]+ field_values = params.dig(:user_fields, field.id.to_s)return field_values if field_values.nil? || field_values.empty?diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 154e9b29db6..b457654ed4f 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -1659,6 +1659,24 @@ RSpec.describe UsersController doinclude_examples "failed signup"end+ context "when using an unknown value for an enum user field on signup" do+ fab!(:user_field, :user_field_dropdown)++ let(:create_params) do+ {+ name: @user.name,+ username: @user.username,+ password: "strongpassword",+ email: @user.email,+ user_fields: {+ user_field.id.to_s => "Juice",+ },+ }+ end++ include_examples "failed signup"+ end+context "with custom fields" dofab!(:user_field)fab!(:another_field, :user_field)