makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-26 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17010] Clean up code and move some functions to core js

Browse source 
PHPBB3-17010
This commit is contained in:
Marc Alexander 2023-06-24 09:40:35 +02:00
parent 7410c3be6f
commit 3cbe14eb4a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
phpBB/adm/style/ajax.js
View file

@ -160,24 +160,13 @@ phpbb.addAjaxCallback('row_delete', function(res) {
/** /**
* This callback generates the VAPID keys for the web push notification service. * This callback generates the VAPID keys for the web push notification service.
*/ */
phpbb.addAjaxCallback('generate_vapid_keys', (res) => { phpbb.addAjaxCallback('generate_vapid_keys', () => {
function rawKeyToBase64(rawKey) {
const keyBuffer = new Uint8Array(rawKey);
let keyText = '';
const keyLength = keyBuffer.byteLength;
for (let i = 0; i < keyLength; i++) {
keyText += String.fromCharCode(keyBuffer[i]);
}
keyText = window.btoa(keyText);
return keyText;
}
function base64SafeEncode(base64String) {
const base64URL = base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
return base64URL;
}
/**
* Generate VAPID keypair with public and private key string
*
* @returns {Promise<{privateKey: string, publicKey: string}|null>}
*/
async function generateVAPIDKeys() { async function generateVAPIDKeys() {
try { try {
// Generate a new key pair using the Subtle Crypto API // Generate a new key pair using the Subtle Crypto API
@ -190,28 +179,26 @@ phpbb.addAjaxCallback('generate_vapid_keys', (res) => {
['deriveKey', 'deriveBits'] ['deriveKey', 'deriveBits']
); );
// Export the private key as a JWK (JSON Web Key) object
const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey); const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey);
console.log(privateKeyJwk.d);
const privateKeyString = privateKeyJwk.d; const privateKeyString = privateKeyJwk.d;
// Export the public key as a JWK object
const publicKeyBuffer = await crypto.subtle.exportKey('raw', keyPair.publicKey); const publicKeyBuffer = await crypto.subtle.exportKey('raw', keyPair.publicKey);
const publicKeyString = base64SafeEncode(rawKeyToBase64(publicKeyBuffer)); const publicKeyString = phpbb.base64UrlEncode(phpbb.rawKeyToBase64(publicKeyBuffer));
console.log(publicKeyString);
return { return {
privateKey: privateKeyString, privateKey: privateKeyString,
publicKey: publicKeyString publicKey: publicKeyString
}; };
} catch (error) { } catch (error) {
console.error('Error generating private key:', error); console.error('Error generating keys with SubtleCrypto:', error);
return null; return null;
} }
} }
generateVAPIDKeys().then(keyPair => { generateVAPIDKeys().then(keyPair => {
if (!keyPair) {
return;
}
const publicKeyInput = document.querySelector('#webpush_vapid_public'); const publicKeyInput = document.querySelector('#webpush_vapid_public');
const privateKeyInput = document.querySelector('#webpush_vapid_private'); const privateKeyInput = document.querySelector('#webpush_vapid_private');
publicKeyInput.value = keyPair.publicKey; publicKeyInput.value = keyPair.publicKey;

27
phpBB/assets/javascript/core.js
View file

@ -1677,6 +1677,33 @@ phpbb.getFunctionByName = function (functionName) {
return context[func]; return context[func];
}; };
/**
* Convert raw key ArrayBuffer to base64 string.
*
* @param {ArrayBuffer} rawKey Raw key array buffer as exported by SubtleCrypto exportKey()
* @returns {string} Base64 encoded raw key string
*/
phpbb.rawKeyToBase64 = (rawKey) => {
const keyBuffer = new Uint8Array(rawKey);
let keyText = '';
const keyLength = keyBuffer.byteLength;
for (let i = 0; i < keyLength; i++) {
keyText += String.fromCharCode(keyBuffer[i]);
}
return window.btoa(keyText);
};
/**
* Base64URL encode base64 encoded string
*
* @param {string} base64String Base64 encoded string
* @returns {string} Base64URL encoded string
*/
phpbb.base64UrlEncode = (base64String) => {
return base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
};
/** /**
* Register page dropdowns. * Register page dropdowns.
*/ */