8000 Avoid failing with invalid sso callback data (#326) by tomsontom · Pull Request #370 · keycloak/keycloak-js · GitHub
[go: up one dir, main page]
Skip to content

Avoid failing with invalid sso callback data (#326) #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomsontom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid failing with invalid sso callback data (#326) #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions lib/keycloak.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ export interface KeycloakInitOptions {
*/
silentCheckSsoFallback?: boolean

/**
* Specifies the prefix for the silent check-sso callback.
*/
silentCheckSsoCallbackPrefix?: string

/**
* Set the OpenID Connect flow.
* @default standard
Expand Down
18 changes: 16 additions & 2 deletions lib/keycloak.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ export default class Keycloak {
silentCheckSsoRedirectUri
/** @type {boolean} */
silentCheckSsoFallback = true
/** @type {string=} */
silentCheckSsoCallbackPrefix
/** @type {KeycloakPkceMethod} */
pkceMethod = 'S256'
enableLogging = false
Expand Down Expand Up @@ -261,6 +263,10 @@ export default class Keycloak {
this.silentCheckSsoFallback = initOptions.silentCheckSsoFallback
}

if (typeof initOptions.silentCheckSsoCallbackPrefix === 'string') {
this.silentCheckSsoCallbackPrefix = initOptions.silentCheckSsoCallbackPrefix
}

if (typeof initOptions.pkceMethod !== 'undefined') {
if (initOptions.pkceMethod !== 'S256' && initOptions.pkceMethod !== false) {
throw new TypeError(`Invalid value for pkceMethod', expected 'S256' or false but got ${initOptions.pkceMethod}.`)
Expand Down Expand Up @@ -1072,11 +1078,19 @@ export default class Keycloak {
* @param {MessageEvent} event
*/
const messageCallback = async (event) => {
if (event.origin !== window.location.origin || iframe.contentWindow !== event.source) {
if (event.origin !== window.location.origin || iframe.contentWindow !== event.source || typeof event.data !== 'string') {
return
}

const oauth = this.#parseCallback(event.data)
let callbackData = event.data;
if(this.silentCheckSsoCallbackPrefix) {
if (!callbackData.startsWith(this.silentCheckSsoCallbackPrefix)) {
return
}
callbackData = callbackData.slice(this.silentCheckSsoCallbackPrefix.length)
}

const oauth = this.#parseCallback(callbackData)

try {
await this.#processCallback(oauth)
Expand Down
0