Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-20 10:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add byte length checks to poll question and options during create

Browse Source 
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
This commit is contained in:
automated-signal
2025-11-12 09:41:40 -06:00
committed by GitHub
parent 8338227617
commit da43ea66a6
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ts/components/PollCreateModal.dom.tsx
View File

@@ -23,6 +23,7 @@ import {
POLL_OPTIONS_MAX_COUNT,
} from '../types/Polls.dom.js';
import { count as countGraphemes } from '../util/grapheme.std.js';
import { MAX_MESSAGE_BODY_BYTE_LENGTH } from '../util/longAttachment.std.js';
type PollOption = {
id: string;
@@ -212,20 +213,34 @@ export function PollCreateModal({
hasQuestionError: boolean;
hasOptionsError: boolean;
} => {
const errors: Array<string> = [];
const hasQuestionError = !question.trim();
const nonEmptyOptions = options.filter(opt => opt.value.trim());
const hasOptionsError = nonEmptyOptions.length < POLL_OPTIONS_MIN_COUNT;
const questionErrors: Array<string> = [];
const optionErrors: Array<string> = [];
if (hasQuestionError) {
errors.push(i18n('icu:PollCreateModal__Error--RequiresQuestion'));
const questionValue = question.trim();
if (!questionValue) {
questionErrors.push(i18n('icu:PollCreateModal__Error--RequiresQuestion'));
}
if (Buffer.byteLength(questionValue) > MAX_MESSAGE_BODY_BYTE_LENGTH) {
questionErrors.push(i18n('icu:PollCreateModal__Error--QuestionTooLong'));
}
if (hasOptionsError) {
errors.push(i18n('icu:PollCreateModal__Error--RequiresTwoOptions'));
const optionValues = options.map(opt => opt.value.trim());
const nonEmptyOptions = optionValues.filter(value => value);
if (nonEmptyOptions.length < POLL_OPTIONS_MIN_COUNT) {
optionErrors.push(i18n('icu:PollCreateModal__Error--RequiresTwoOptions'));
}
const optionOverByteLength = optionValues.find(
value => Buffer.byteLength(value) > MAX_MESSAGE_BODY_BYTE_LENGTH
);
if (optionOverByteLength) {
optionErrors.push(i18n('icu:PollCreateModal__Error--OptionTooLong'));
}
return { errors, hasQuestionError, hasOptionsError };
return {
errors: questionErrors.concat(optionErrors),
hasQuestionError: questionErrors.length > 0,
hasOptionsError: optionErrors.length > 0,
};
}, [question, options, i18n]);
const handleSend = useCallback(() => {