- {region.caption || region.extracted_text || t("Unknown")}
+ {region.caption ? {region.caption}
: null}
+ {region.extracted_text ? (
+
+ {renderImageText(region.extracted_text)}
+
+ ) : region.caption ? null : (
+ t("Unknown")
+ )}
{region.tags.length ? (
{t("Image tags")}: {region.tags.join(", ")}
diff --git a/frontend/src/oidcReturnUrl.test.ts b/frontend/src/oidcReturnUrl.test.ts
index de6e95502..8582445ec 100644
--- a/frontend/src/oidcReturnUrl.test.ts
+++ b/frontend/src/oidcReturnUrl.test.ts
@@ -18,6 +18,11 @@ describe("OIDC return URL handling", () => {
expect(returnUrlFromLocation({ pathname: "//evil.example", search: "", hash: "" })).toBe("/");
});
+ it("rejects backslash and control-character paths that can change URL parsing", () => {
+ expect(restoreOidcReturnUrl({ returnUrl: "/\\evil.example" })).toBe("/");
+ expect(restoreOidcReturnUrl({ returnUrl: "/\u0000post=abc" })).toBe("/");
+ });
+
it("restores an object or serialized OIDC state before storage fallback", () => {
rememberOidcReturnUrl("/?post=stored-before-direct");
expect(restoreOidcReturnUrl("/?post=from-direct-state")).toBe(
diff --git a/frontend/src/oidcReturnUrl.ts b/frontend/src/oidcReturnUrl.ts
index 027d2f55b..45bef5dd4 100644
--- a/frontend/src/oidcReturnUrl.ts
+++ b/frontend/src/oidcReturnUrl.ts
@@ -4,10 +4,16 @@ const MAX_OIDC_RETURN_URL_LENGTH = 4096;
type UrlLike = Pick;
function isSafeReturnUrl(value: string): boolean {
+ const hasControlCharacter = [...value].some((character) => {
+ const code = character.charCodeAt(0);
+ return code <= 0x1f || code === 0x7f;
+ });
return (
value.length <= MAX_OIDC_RETURN_URL_LENGTH &&
value.startsWith("/") &&
- !value.startsWith("//")
+ !value.startsWith("//") &&
+ !value.includes("\\") &&
+ !hasControlCharacter
);
}