agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate kcSanitize

Browse Source
This commit is contained in:
Joseph Garrone
2024-09-22 20:41:18 +02:00
parent 6dc51dfab3
commit 95e861099f
15 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/account/Template.tsx
View File

@ -1,5 +1,6 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { getKcClsx } from "keycloakify/account/lib/kcClsx"; import { getKcClsx } from "keycloakify/account/lib/kcClsx";
import { useSetClassName } from "keycloakify/tools/useSetClassName"; import { useSetClassName } from "keycloakify/tools/useSetClassName";
import { useInitialize } from "keycloakify/account/Template.useInitialize"; import { useInitialize } from "keycloakify/account/Template.useInitialize";
@ -126,7 +127,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
<span <span
className="kc-feedback-text" className="kc-feedback-text"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: message.summary __html: kcSanitize(message.summary)
}} }}
/> />
</div> </div>

5
src/account/pages/Totp.tsx
View File

@ -1,5 +1,6 @@
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import { getKcClsx } from "keycloakify/account/lib/kcClsx"; import { getKcClsx } from "keycloakify/account/lib/kcClsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { PageProps } from "keycloakify/account/pages/PageProps"; import type { PageProps } from "keycloakify/account/pages/PageProps";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -159,7 +160,7 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("totp") __html: kcSanitize(messagesPerField.get("totp"))
}} }}
/> />
)} )}
@ -190,7 +191,7 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("userLabel") __html: kcSanitize(messagesPerField.get("userLabel"))
}} }}
/> />
)} )}

3
src/login/Template.tsx
View File

@ -1,5 +1,6 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { TemplateProps } from "keycloakify/login/TemplateProps"; import type { TemplateProps } from "keycloakify/login/TemplateProps";
import { getKcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx } from "keycloakify/login/lib/kcClsx";
import { useSetClassName } from "keycloakify/tools/useSetClassName"; import { useSetClassName } from "keycloakify/tools/useSetClassName";
@ -145,7 +146,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
<span <span
className={kcClsx("kcAlertTitleClass")} className={kcClsx("kcAlertTitleClass")}
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: message.summary __html: kcSanitize(message.summary)
}} }}
/> />
</div> </div>

3
src/login/i18n/withJsx/useI18n.tsx
View File

@ -1,4 +1,5 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { createGetI18n, type KcContextLike } from "../noJsx/getI18n"; import { createGetI18n, type KcContextLike } from "../noJsx/getI18n";
import type { GenericI18n_noJsx } from "../noJsx/GenericI18n_noJsx"; import type { GenericI18n_noJsx } from "../noJsx/GenericI18n_noJsx";
import { Reflect } from "tsafe/Reflect"; import { Reflect } from "tsafe/Reflect";
@ -50,7 +51,7 @@ export function createUseI18n<
<div <div
data-kc-msg={msgKey} data-kc-msg={msgKey}
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: htmlString __html: kcSanitize(htmlString)
}} }}
/> />
); );

3
src/login/lib/useUserProfileForm.tsx
View File

@ -3,6 +3,7 @@ import { useMemo, useReducer, useEffect, Fragment, type Dispatch } from "react";
import { assert, type Equals } from "tsafe/assert"; import { assert, type Equals } from "tsafe/assert";
import { id } from "tsafe/id"; import { id } from "tsafe/id";
import { structuredCloneButFunctions } from "keycloakify/tools/structuredCloneButFunctions"; import { structuredCloneButFunctions } from "keycloakify/tools/structuredCloneButFunctions";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { useConstCallback } from "keycloakify/tools/useConstCallback"; import { useConstCallback } from "keycloakify/tools/useConstCallback";
import { emailRegexp } from "keycloakify/tools/emailRegExp"; import { emailRegexp } from "keycloakify/tools/emailRegExp";
import { formatNumber } from "keycloakify/tools/formatNumber"; import { formatNumber } from "keycloakify/tools/formatNumber";
@ -661,7 +662,7 @@ function useGetErrors(params: { kcContext: KcContextLike_useGetErrors; i18n: I18
<span <span
key={0} key={0}
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: errorMessageStr __html: kcSanitize(errorMessageStr)
}} }}
/> />
), ),

3
src/login/pages/Error.tsx
View File

@ -1,4 +1,5 @@
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -19,7 +20,7 @@ export default function Error(props: PageProps<Extract<KcContext, { pageId: "err
headerNode={msg("errorTitle")} headerNode={msg("errorTitle")}
> >
<div id="kc-error-message"> <div id="kc-error-message">
<p className="instruction" dangerouslySetInnerHTML={{ __html: message.summary }} /> <p className="instruction" dangerouslySetInnerHTML={{ __html: kcSanitize(message.summary) }} />
{!skipLink && client !== undefined && client.baseUrl !== undefined && ( {!skipLink && client !== undefined && client.baseUrl !== undefined && (
<p> <p>
<a id="backToApplication" href={client.baseUrl}> <a id="backToApplication" href={client.baseUrl}>

7
src/login/pages/Info.tsx
View File

@ -1,4 +1,5 @@
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -19,7 +20,7 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
headerNode={ headerNode={
<span <span
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messageHeader ?? message.summary __html: kcSanitize(messageHeader ?? message.summary)
}} }}
/> />
} }
@ -28,7 +29,8 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
<p <p
className="instruction" className="instruction"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: (() => { __html: kcSanitize(
(() => {
let html = message.summary; let html = message.summary;
if (requiredActions) { if (requiredActions) {
@ -41,6 +43,7 @@ export default function Info(props: PageProps<Extract<KcContext, { pageId: "info
return html; return html;
})() })()
)
}} }}
/> />
{(() => { {(() => {

7
src/login/pages/Login.tsx
View File

@ -1,4 +1,5 @@
import { useState, useEffect, useReducer } from "react"; import { useState, useEffect, useReducer } from "react";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { assert } from "keycloakify/tools/assert"; import { assert } from "keycloakify/tools/assert";
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
@ -62,7 +63,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
{p.iconClasses && <i className={clsx(kcClsx("kcCommonLogoIdP"), p.iconClasses)} aria-hidden="true"></i>} {p.iconClasses && <i className={clsx(kcClsx("kcCommonLogoIdP"), p.iconClasses)} aria-hidden="true"></i>}
<span <span
className={clsx(kcClsx("kcFormSocialAccountNameClass"), p.iconClasses && "kc-social-icon-text")} className={clsx(kcClsx("kcFormSocialAccountNameClass"), p.iconClasses && "kc-social-icon-text")}
dangerouslySetInnerHTML={{ __html: p.displayName }} dangerouslySetInnerHTML={{ __html: kcSanitize(p.displayName) }}
></span> ></span>
</a> </a>
</li> </li>
@ -111,7 +112,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.getFirstError("username", "password") __html: kcSanitize(messagesPerField.getFirstError("username", "password"))
}} }}
/> />
)} )}
@ -139,7 +140,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.getFirstError("username", "password") __html: kcSanitize(messagesPerField.getFirstError("username", "password"))
}} }}
/> />
)} )}

5
src/login/pages/LoginConfigTotp.tsx
View File

@ -1,4 +1,5 @@
import { getKcClsx, KcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx, KcClsx } from "keycloakify/login/lib/kcClsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -117,7 +118,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("totp") __html: kcSanitize(messagesPerField.get("totp"))
}} }}
/> />
)} )}
@ -148,7 +149,7 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("userLabel") __html: kcSanitize(messagesPerField.get("userLabel"))
}} }}
/> />
)} )}

3
src/login/pages/LoginOtp.tsx
View File

@ -1,5 +1,6 @@
import { Fragment } from "react"; import { Fragment } from "react";
import { getKcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx } from "keycloakify/login/lib/kcClsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -75,7 +76,7 @@ export default function LoginOtp(props: PageProps<Extract<KcContext, { pageId: "
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("totp") __html: kcSanitize(messagesPerField.get("totp"))
}} }}
/> />
)} )}

3
src/login/pages/LoginPassword.tsx
View File

@ -1,4 +1,5 @@
import { useState, useEffect, useReducer } from "react"; import { useState, useEffect, useReducer } from "react";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import { assert } from "keycloakify/tools/assert"; import { assert } from "keycloakify/tools/assert";
import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx";
@ -65,7 +66,7 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { page
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("password") __html: kcSanitize(messagesPerField.get("password"))
}} }}
/> />
)} )}

3
src/login/pages/LoginRecoveryAuthnCodeInput.tsx
View File

@ -1,4 +1,5 @@
import { getKcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx } from "keycloakify/login/lib/kcClsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -48,7 +49,7 @@ export default function LoginRecoveryAuthnCodeInput(props: PageProps<Extract<KcC
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("recoveryCodeInput") __html: kcSanitize(messagesPerField.get("recoveryCodeInput"))
}} }}
/> />
)} )}

3
src/login/pages/LoginResetPassword.tsx
View File

@ -1,4 +1,5 @@
import { getKcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx } from "keycloakify/login/lib/kcClsx";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
import type { KcContext } from "../KcContext"; import type { KcContext } from "../KcContext";
import type { I18n } from "../i18n"; import type { I18n } from "../i18n";
@ -53,7 +54,7 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("username") __html: kcSanitize(messagesPerField.get("username"))
}} }}
/> />
)} )}

5
src/login/pages/LoginUpdatePassword.tsx
View File

@ -1,4 +1,5 @@
import { useEffect, useReducer } from "react"; import { useEffect, useReducer } from "react";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { assert } from "keycloakify/tools/assert"; import { assert } from "keycloakify/tools/assert";
import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx";
import type { PageProps } from "keycloakify/login/pages/PageProps"; import type { PageProps } from "keycloakify/login/pages/PageProps";
@ -52,7 +53,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("password") __html: kcSanitize(messagesPerField.get("password"))
}} }}
/> />
)} )}
@ -84,7 +85,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("password-confirm") __html: kcSanitize(messagesPerField.get("password-confirm"))
}} }}
/> />
)} )}

3
src/login/pages/Register.tsx
View File

@ -1,5 +1,6 @@
import { useState } from "react"; import { useState } from "react";
import type { LazyOrNot } from "keycloakify/tools/LazyOrNot"; import type { LazyOrNot } from "keycloakify/tools/LazyOrNot";
import { kcSanitize } from "keycloakify/lib/kcSanitize";
import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx"; import { getKcClsx, type KcClsx } from "keycloakify/login/lib/kcClsx";
import { clsx } from "keycloakify/tools/clsx"; import { clsx } from "keycloakify/tools/clsx";
import type { UserProfileFormFieldsProps } from "keycloakify/login/UserProfileFormFieldsProps"; import type { UserProfileFormFieldsProps } from "keycloakify/login/UserProfileFormFieldsProps";
@ -145,7 +146,7 @@ function TermsAcceptance(props: {
className={kcClsx("kcInputErrorMessageClass")} className={kcClsx("kcInputErrorMessageClass")}
aria-live="polite" aria-live="polite"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: messagesPerField.get("termsAccepted") __html: kcSanitize(messagesPerField.get("termsAccepted"))
}} }}
/> />
</div> </div>