Skip to content

PH67833: Update JavaScript used in OIDC session management #32826

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

Merged
merged 1 commit into from
Sep 12, 2025
Merged

PH67833: Update JavaScript used in OIDC session management #32826

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
15 changes: 0 additions & 15 deletions dev/com.ibm.ws.security.openidconnect.server/resources/scripts/enc-base64-min.js
View file
Open in desktop

This file was deleted.

29 changes: 20 additions & 9 deletions dev/com.ibm.ws.security.openidconnect.server/resources/scripts/opiframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
/*******************************************************************************
* Copyright (c) 2019 IBM Corporation and others.
* Copyright (c) 2019, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
window.addEventListener("message", receiveMessage, false);

/**
* Generate a cryptographic hash of a string.
*/
function hash(string) {
const encodedString = new TextEncoder().encode(string);
return crypto.subtle.digest('SHA-256', encodedString).then((hashBuffer) => {
const hashArray = Array.from(new Uint8Array(hashBuffer));
const hashHex = hashArray
.map((bytes) => bytes.toString(16).padStart(2, '0'))
.join('');
return hashHex;
});
}

/**
* Get the current browser state value from the browser state cookie.
*
Expand Down Expand Up @@ -41,13 +52,13 @@ function getBrowserState() {
* @returns A Base64-encoded SHA-256 hash of the concatenation of all of the
* provided arguments.
*/
function calculateSessionState(clientId, browserState, salt) {
async function calculateSessionState(clientId, browserState, salt) {
var stringToHash = clientId + '' + browserState;
if (salt) {
stringToHash = stringToHash + '' + salt;
}
var sessionState = CryptoJS.SHA256(stringToHash);
sessionState = sessionState.toString(CryptoJS.enc.Base64);
var sessionState = await hash(stringToHash);
sessionState = btoa(sessionState);
if (salt) {
sessionState = sessionState + '.' + salt;
}
Expand All @@ -65,7 +76,7 @@ function calculateSessionState(clientId, browserState, salt) {
*
* @param message
*/
function receiveMessage(message) {
async function receiveMessage(message) {
if (message.origin !== EXPECTED_ORIGIN) {
console.log("Unable to complete request from " + message.origin);
return;
Expand Down Expand Up @@ -94,7 +105,7 @@ function receiveMessage(message) {
salt = stateAndSalt[1];
}

var sessionState = calculateSessionState(clientId, browserState, salt);
var sessionState = await calculateSessionState(clientId, browserState, salt);

var msg = "changed";
// Ensure both the type and value of the two session states are equivalent
Expand Down
23 changes: 0 additions & 23 deletions dev/com.ibm.ws.security.openidconnect.server/resources/scripts/sha256.js
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions dev/com.ibm.ws.security.openidconnect.server/resources/sessionMgmt.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
Copyright (c) 2019 IBM Corporation and others.
Copyright (c) 2019, 2025 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0

Contributors:
IBM Corporation - initial API and implementation
-->
<html>
<head>
Expand All @@ -35,8 +32,6 @@ if (expectedRpOrigin != null) {
}
}
%>
<script src="scripts/sha256.js"></script>
<script src="scripts/enc-base64-min.js"></script>
<script src="scripts/opiframe.js"></script>
<script>
var EXPECTED_ORIGIN = '<%= expectedRpOrigin %>';
Expand Down