A platform for community discussion. Free, open, simple.
FIX: Validate user note length against `max_post_length` (#42240)
Gabriel Grubba099285da70bf
diff --git a/plugins/discourse-user-notes/app/controllers/discourse_user_notes/user_notes_controller.rb b/plugins/discourse-user-notes/app/controllers/discourse_user_notes/user_notes_controller.rbindex e20a2941d91..6c48918ebd4 100644--- a/plugins/discourse-user-notes/app/controllers/discourse_user_notes/user_notes_controller.rb+++ b/plugins/discourse-user-notes/app/controllers/discourse_user_notes/user_notes_controller.rb@@ -15,6 +15,13 @@ module DiscourseUserNotesenddef create+ raw = params[:user_note][:raw]+ if raw.to_s.length > SiteSetting.max_post_length+ return(+ render_json_error(I18n.t("user_notes.note_too_long", max: SiteSetting.max_post_length))+ )+ end+user = User.where(id: params[:user_note][:user_id]).firstraise Discourse::NotFound if user.blank?extras = {}@@ -26,8 +33,7 @@ module DiscourseUserNotesextras[:reviewable_id] = reviewable_idend- user_note =- DiscourseUserNotes.add_note(user, params[:user_note][:raw], current_user.id, extras)+ user_note = DiscourseUserNotes.add_note(user, raw, current_user.id, extras)render json: create_json(user_note)enddiff --git a/plugins/discourse-user-notes/config/locales/server.en.yml b/plugins/discourse-user-notes/config/locales/server.en.ymlindex 96d2187e3a0..2f4c5edd206 100644--- a/plugins/discourse-user-notes/config/locales/server.en.yml+++ b/plugins/discourse-user-notes/config/locales/server.en.yml@@ -6,6 +6,7 @@ en:user_notes:official_warning: "Received an official warning from @%{username} -- %{warning_link}"+ note_too_long: "User note must be %{max} characters or fewer."user_suspended: "@%{username} suspended this account until %{suspended_till}. Reason: %{reason}"user_silenced: "@%{username} silenced this account until %{silenced_till}. Reason: %{reason}"diff --git a/plugins/discourse-user-notes/spec/requests/user_notes_controller_spec.rb b/plugins/discourse-user-notes/spec/requests/user_notes_controller_spec.rbindex 7e146085f69..749f13c098c 100644--- a/plugins/discourse-user-notes/spec/requests/user_notes_controller_spec.rb+++ b/plugins/discourse-user-notes/spec/requests/user_notes_controller_spec.rb@@ -10,6 +10,28 @@ describe DiscourseUserNotes::UserNotesController dobefore { SiteSetting.user_notes_enabled = true }describe "#create" do+ it "rejects notes longer than the maximum post length" do+ SiteSetting.max_post_length = 10+ sign_in(moderator)++ post "/user_notes",+ params: {+ user_note: {+ user_id: user.id,+ raw: "a" * 11,+ },+ },+ headers: {+ "ACCEPT" => "application/json",+ }++ expect(response.status).to eq(422)+ expect(response.parsed_body["errors"]).to contain_exactly(+ I18n.t("user_notes.note_too_long", max: SiteSetting.max_post_length),+ )+ expect(DiscourseUserNotes.notes_for(user.id)).to be_empty+ end+context "when post_id references a PM the moderator cannot see" dofab!(:pm_topic) doFabricate(