mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-09 13:01:00 +00:00
fix(security): keep the theme boot script a literal and drop regex tag stripping
The boot script interpolated its two colours; it is one string literal now, checked against THEME_COLOR by the script's own tests. The retired-route guard escapes every regex metacharacter including the backslash, and the two markup tests read text by walking the string instead of stripping tags with a regex.
This commit is contained in:
1 parent
8b5199ee00
commit
312e5de2b2
4 files changed
+59
-18
No files matched your search
@@ -42,22 +42,38 @@ function Probe({
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The text of rendered markup: every character outside a `<…>` tag. A walk
|
||||
* rather than a tag-stripping regex, which can leave a tag behind when one
|
||||
* is split across another.
|
||||
*/
|
||||
function textOf(html: string): string {
|
||||
let out = "";
|
||||
let inTag = false;
|
||||
for (const ch of html) {
|
||||
if (ch === "<") inTag = true;
|
||||
else if (ch === ">") inTag = false;
|
||||
else if (!inTag) out += ch;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
function read(
|
||||
type: string,
|
||||
value: number,
|
||||
unit: string,
|
||||
locale: "en" | "de" = "en",
|
||||
) {
|
||||
return renderToStaticMarkup(
|
||||
<I18nProvider
|
||||
initialLocale={locale}
|
||||
initialMessages={locale === "de" ? deMessages : enMessages}
|
||||
>
|
||||
<Probe type={type} value={value} unit={unit} />
|
||||
</I18nProvider>,
|
||||
)
|
||||
.replace(/<[^>]+>/g, "")
|
||||
.replace(/<!-- -->/g, "");
|
||||
return textOf(
|
||||
renderToStaticMarkup(
|
||||
<I18nProvider
|
||||
initialLocale={locale}
|
||||
initialMessages={locale === "de" ? deMessages : enMessages}
|
||||
>
|
||||
<Probe type={type} value={value} unit={unit} />
|
||||
</I18nProvider>,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
describe("a day's values in their charts' spelling", () => {
|
||||
|
||||
@@ -48,6 +48,22 @@ const coverage = {
|
||||
missing: ["ACTIVITY", "SLEEP"],
|
||||
};
|
||||
|
||||
/**
|
||||
* The text of rendered markup: every character outside a `<…>` tag. A walk
|
||||
* rather than a tag-stripping regex, which can leave a tag behind when one
|
||||
* is split across another.
|
||||
*/
|
||||
function textOf(html: string): string {
|
||||
let out = "";
|
||||
let inTag = false;
|
||||
for (const ch of html) {
|
||||
if (ch === "<") inTag = true;
|
||||
else if (ch === ">") inTag = false;
|
||||
else if (!inTag) out += ch;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
function render(node: React.ReactNode, locale: Locale = "en"): string {
|
||||
return renderToStaticMarkup(
|
||||
<I18nProvider initialLocale={locale}>{node}</I18nProvider>,
|
||||
@@ -642,9 +658,7 @@ describe("<HealthScoreCard> composite states", () => {
|
||||
// The onset is an instant; it reads as the day it falls on in the
|
||||
// profile timezone, in the user's date format, never as raw ISO.
|
||||
// v1.42 — the date is a link to its day; the sentence reads the same.
|
||||
expect(rest.replace(/<[^>]+>/g, "")).toMatch(
|
||||
/Rest Mode active since \d{2}\/\d{2}\/2026\./,
|
||||
);
|
||||
expect(textOf(rest)).toMatch(/Rest Mode active since \d{2}\/\d{2}\/2026\./);
|
||||
expect(rest).not.toContain("T23:30:00");
|
||||
expect(rest).toContain('data-slot="health-score-tension"');
|
||||
expect(rest).toContain('data-slot="health-score-return-to-band"');
|
||||
@@ -672,7 +686,7 @@ describe("<HealthScoreCard> composite states", () => {
|
||||
/>,
|
||||
);
|
||||
const rest = atRest(html);
|
||||
expect(rest.replace(/<[^>]+>/g, "")).toMatch(
|
||||
expect(textOf(rest)).toMatch(
|
||||
/Rest Mode active since (07\/20\/2026|20\/07\/2026)/,
|
||||
);
|
||||
// The date opens the day it names, in the profile timezone.
|
||||
|
||||
Reference in new issue
Block a user