Skip to content
Merged

Fix #46

Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/utils/stringUtils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import validator from "validator";
import sanitizeHtml from "sanitize-html";

/**
Expand Down Expand Up @@ -30,10 +29,17 @@ export function sanitizeString(
str: string,
options?: { preserveEntities?: boolean },
): string {
const trimmed = str.trim();
const trimmed = str.trim().normalize("NFC");

const sanitizePlainText = (value: string): string =>
sanitizeHtml(value, {
allowedTags: [],
allowedAttributes: {},
disallowedTagsMode: "discard",
});

if (!options?.preserveEntities) {
return validator.escape(trimmed);
return sanitizePlainText(trimmed);
}

const preservedEntities = ["­", "​", " "];
Expand All @@ -47,7 +53,7 @@ export function sanitizeString(
placeholders.set(token, entity);
});

let escaped = validator.escape(protectedValue);
let escaped = sanitizePlainText(protectedValue);
placeholders.forEach((entity, token) => {
escaped = escaped.replaceAll(token, entity);
});
Expand Down
Loading