Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Refactor passkey base64 helpers (#2468)

Leendert de Borstb5616b13f2f0
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
index 3dc0ef09e..e4c185e71 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
@@ -1,6 +1,7 @@
import { isSameItem, scopedKey } from '@aliasvault/client/database/ItemRef';
import { manifestForItemIn, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { extractDomain, filterItems, AutofillMatchingMode } from '@aliasvault/client/rust/RustCore';
+import { base64UrlToBytes, bytesToBase64Url } from '@aliasvault/client/utilities/Base64';
import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@aliasvault/models/vault';
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -109,7 +110,7 @@ const PasskeyCreate: React.FC = () => {
*/
if (data.publicKey.user?.id && passkey.UserHandle) {
try {
- const requestUserIdBytes = PasskeyHelper.base64urlToBytes(data.publicKey.user.id);
+ const requestUserIdBytes = base64UrlToBytes(data.publicKey.user.id);
const passkeyUserHandle = passkey.UserHandle instanceof Uint8Array ? passkey.UserHandle : new Uint8Array(passkey.UserHandle);
// Compare byte arrays
@@ -356,7 +357,7 @@ const PasskeyCreate: React.FC = () => {
let userHandleBytes: Uint8Array | null = null;
if (stored.userId) {
try {
- userHandleBytes = PasskeyHelper.base64urlToBytes(stored.userId);
+ userHandleBytes = base64UrlToBytes(stored.userId);
} catch {
// If conversion fails, store as null
userHandleBytes = null;
@@ -372,7 +373,7 @@ const PasskeyCreate: React.FC = () => {
PublicKey: JSON.stringify(stored.publicKey),
PrivateKey: JSON.stringify(stored.privateKey),
DisplayName: request.publicKey.user.displayName || request.publicKey.user.name || '',
- PrfKey: stored.prfSecret ? PasskeyHelper.base64urlToBytes(stored.prfSecret) : undefined,
+ PrfKey: stored.prfSecret ? base64UrlToBytes(stored.prfSecret) : undefined,
AdditionalData: null
});
}
@@ -385,7 +386,7 @@ const PasskeyCreate: React.FC = () => {
let userHandleBytes: Uint8Array | null = null;
if (stored.userId) {
try {
- userHandleBytes = PasskeyHelper.base64urlToBytes(stored.userId);
+ userHandleBytes = base64UrlToBytes(stored.userId);
} catch {
// If conversion fails, store as null
userHandleBytes = null;
@@ -401,7 +402,7 @@ const PasskeyCreate: React.FC = () => {
PublicKey: JSON.stringify(stored.publicKey),
PrivateKey: JSON.stringify(stored.privateKey),
DisplayName: request.publicKey.user.displayName || request.publicKey.user.name || '',
- PrfKey: stored.prfSecret ? PasskeyHelper.base64urlToBytes(stored.prfSecret) : undefined,
+ PrfKey: stored.prfSecret ? base64UrlToBytes(stored.prfSecret) : undefined,
AdditionalData: null
});
} else {
@@ -430,7 +431,7 @@ const PasskeyCreate: React.FC = () => {
let userHandleBytes: Uint8Array | null = null;
if (stored.userId) {
try {
- userHandleBytes = PasskeyHelper.base64urlToBytes(stored.userId);
+ userHandleBytes = base64UrlToBytes(stored.userId);
} catch {
// If conversion fails, store as null
userHandleBytes = null;
@@ -446,7 +447,7 @@ const PasskeyCreate: React.FC = () => {
PublicKey: JSON.stringify(stored.publicKey),
PrivateKey: JSON.stringify(stored.privateKey),
DisplayName: request.publicKey.user.displayName || request.publicKey.user.name || '',
- PrfKey: stored.prfSecret ? PasskeyHelper.base64urlToBytes(stored.prfSecret) : undefined,
+ PrfKey: stored.prfSecret ? base64UrlToBytes(stored.prfSecret) : undefined,
AdditionalData: null
});
}
@@ -459,8 +460,8 @@ const PasskeyCreate: React.FC = () => {
prf: {
enabled: true,
results: prfResults ? {
- first: PasskeyHelper.bytesToBase64url(new Uint8Array(prfResults.first)),
- second: prfResults.second ? PasskeyHelper.bytesToBase64url(new Uint8Array(prfResults.second)) : undefined
+ first: bytesToBase64Url(new Uint8Array(prfResults.first)),
+ second: prfResults.second ? bytesToBase64Url(new Uint8Array(prfResults.second)) : undefined
} : undefined
}
};
diff --git a/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts b/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
index faa42d28f..37acad23d 100644
--- a/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
+++ b/apps/browser-extension/src/utils/passkey/PasskeyAssertionService.ts
@@ -4,6 +4,8 @@
* Shared helper that turns a stored passkey into a WebAuthn assertion response.
*/
+import { base64ToBytes, bytesToBase64, bytesToBase64Url } from '@aliasvault/client/utilities/Base64';
+
import { PasskeyAuthenticator } from './PasskeyAuthenticator';
import { PasskeyHelper } from './PasskeyHelper';
@@ -42,12 +44,7 @@ function parsePrfSalt(input: unknown): Uint8Array {
// Base64 string format
if (typeof input === 'string') {
- const decoded = atob(input);
- const bytes = new Uint8Array(decoded.length);
- for (let i = 0; i < decoded.length; i++) {
- bytes[i] = decoded.charCodeAt(i);
- }
- return bytes;
+ return base64ToBytes(input);
}
throw new Error('Unknown PRF input format');
@@ -107,7 +104,7 @@ export async function buildPasskeyAssertion(
// The PRF secret (hmac-secret) is stored as raw bytes; the authenticator wants base64url.
let prfSecret: string | undefined;
if (storedPasskey.PrfKey) {
- prfSecret = PasskeyHelper.bytesToBase64url(storedPasskey.PrfKey);
+ prfSecret = bytesToBase64Url(new Uint8Array(storedPasskey.PrfKey));
}
// The user handle is stored as raw bytes; serialize to base64url for the assertion.
@@ -116,7 +113,7 @@ export async function buildPasskeyAssertion(
const userHandleBytes = storedPasskey.UserHandle instanceof Uint8Array
? storedPasskey.UserHandle
: new Uint8Array(storedPasskey.UserHandle);
- userIdBase64 = PasskeyHelper.bytesToBase64url(userHandleBytes);
+ userIdBase64 = bytesToBase64Url(userHandleBytes);
}
const storedRecord: StoredPasskeyRecord = {
@@ -149,10 +146,10 @@ export async function buildPasskeyAssertion(
let prfResults: { first: string; second?: string } | undefined;
if (assertion.prfResults) {
prfResults = {
- first: PasskeyHelper.arrayBufferToBase64(assertion.prfResults.first)
+ first: bytesToBase64(new Uint8Array(assertion.prfResults.first))
};
if (assertion.prfResults.second) {
- prfResults.second = PasskeyHelper.arrayBufferToBase64(assertion.prfResults.second);
+ prfResults.second = bytesToBase64(new Uint8Array(assertion.prfResults.second));
}
}
diff --git a/apps/browser-extension/src/utils/passkey/PasskeyAuthenticator.ts b/apps/browser-extension/src/utils/passkey/PasskeyAuthenticator.ts
index e65de47dc..d8d79b9fc 100644
--- a/apps/browser-extension/src/utils/passkey/PasskeyAuthenticator.ts
+++ b/apps/browser-extension/src/utils/passkey/PasskeyAuthenticator.ts
@@ -1,6 +1,5 @@
import { passkeyCreate, passkeyGetAssertion, passkeyPickAlgorithm } from '@aliasvault/client/rust/WasmPasskey';
-
-import { PasskeyHelper } from './PasskeyHelper';
+import { base64UrlToBytes, bytesToBase64, bytesToBase64Url } from '@aliasvault/client/utilities/Base64';
import type { CreateRequest, GetRequest, StoredPasskeyRecord } from './types';
import type { PasskeyPrfResults } from '@aliasvault/client/rust/WasmPasskey';
@@ -46,7 +45,7 @@ export class PasskeyAuthenticator {
const selfAttestationClientDataHash = attestation === 'none' || attestation === 'indirect' ? undefined : await PasskeyAuthenticator.sha256(clientDataJSON);
const prfInputs = opts?.enablePrf && opts.prfInputs
- ? { first: PasskeyHelper.base64urlToBytes(opts.prfInputs.first), second: opts.prfInputs.second ? PasskeyHelper.base64urlToBytes(opts.prfInputs.second) : undefined }
+ ? { first: base64UrlToBytes(opts.prfInputs.first), second: opts.prfInputs.second ? base64UrlToBytes(opts.prfInputs.second) : undefined }
: undefined;
const created = await passkeyCreate({
@@ -63,10 +62,10 @@ export class PasskeyAuthenticator {
if (req.publicKey.user?.id) {
userIdB64 = typeof req.publicKey.user.id === 'string'
? req.publicKey.user.id
- : PasskeyHelper.arrayBufferToBase64(req.publicKey.user.id);
+ : bytesToBase64(new Uint8Array(req.publicKey.user.id));
}
- const credentialIdB64u = PasskeyHelper.bytesToBase64url(credentialIdBytes);
+ const credentialIdB64u = bytesToBase64Url(credentialIdBytes);
const stored: StoredPasskeyRecord = {
rpId,
credentialId: credentialIdB64u,
@@ -75,17 +74,17 @@ export class PasskeyAuthenticator {
userId: userIdB64,
userName: req.publicKey.user?.name,
userDisplayName: req.publicKey.user?.displayName,
- prfSecret: created.prfSecret ? PasskeyHelper.bytesToBase64url(created.prfSecret) : undefined
+ prfSecret: created.prfSecret ? bytesToBase64Url(created.prfSecret) : undefined
};
const credential = {
id: credentialIdB64u,
rawId: credentialIdB64u,
response: {
- clientDataJSON: PasskeyHelper.bytesToBase64url(clientDataJSON),
- attestationObject: PasskeyHelper.bytesToBase64url(created.attestationObject),
- authenticatorData: PasskeyHelper.bytesToBase64url(created.authenticatorData),
- publicKey: PasskeyHelper.bytesToBase64url(created.publicKeySpki),
+ clientDataJSON: bytesToBase64Url(clientDataJSON),
+ attestationObject: bytesToBase64Url(created.attestationObject),
+ authenticatorData: bytesToBase64Url(created.authenticatorData),
+ publicKey: bytesToBase64Url(created.publicKeySpki),
publicKeyAlgorithm: algorithm
},
type: 'public-key' as const
@@ -125,15 +124,15 @@ export class PasskeyAuthenticator {
privateKeyJwk: JSON.stringify(rec.privateKey),
uvPerformed,
prfInputs,
- prfSecret: rec.prfSecret ? PasskeyHelper.base64urlToBytes(rec.prfSecret) : undefined
+ prfSecret: rec.prfSecret ? base64UrlToBytes(rec.prfSecret) : undefined
});
return {
id: rec.credentialId,
rawId: rec.credentialId,
- clientDataJSON: PasskeyHelper.bytesToBase64url(clientDataJSON),
- authenticatorData: PasskeyHelper.bytesToBase64url(assertion.authenticatorData),
- signature: PasskeyHelper.bytesToBase64url(assertion.signature),
+ clientDataJSON: bytesToBase64Url(clientDataJSON),
+ authenticatorData: bytesToBase64Url(assertion.authenticatorData),
+ signature: bytesToBase64Url(assertion.signature),
userHandle: rec.userId ? rec.userId.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '') : null,
prfResults: PasskeyAuthenticator.prfResults(assertion.prfResults)
};
@@ -205,7 +204,7 @@ export class PasskeyAuthenticator {
if (typeof challenge === 'string') {
return challenge.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
}
- return PasskeyHelper.bytesToBase64url(PasskeyAuthenticator.bytes(challenge));
+ return bytesToBase64Url(PasskeyAuthenticator.bytes(challenge));
}
}
diff --git a/apps/browser-extension/src/utils/passkey/PasskeyHelper.ts b/apps/browser-extension/src/utils/passkey/PasskeyHelper.ts
index f4b3ba640..5b2b48887 100644
--- a/apps/browser-extension/src/utils/passkey/PasskeyHelper.ts
+++ b/apps/browser-extension/src/utils/passkey/PasskeyHelper.ts
@@ -1,5 +1,7 @@
+import { base64UrlToBytes, bytesToBase64Url } from '@aliasvault/client/utilities/Base64';
+
/**
- * Credential id conversions between GUID text, bytes and base64url, plus the base64 helpers of the passkey flow.
+ * Credential id conversions between GUID text, bytes and base64url.
*/
export class PasskeyHelper {
/**
@@ -43,79 +45,17 @@ export class PasskeyHelper {
].join('-');
}
- /**
- * Convert byte array to base64url string
- */
- private static bytesToBase64Url(bytes: Uint8Array): string {
- let binary = '';
- bytes.forEach(b => binary += String.fromCharCode(b));
- const base64 = btoa(binary);
- return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
- }
-
- /**
- * Convert base64url string to byte array
- * Handles both base64url (URL-safe) and regular base64 formats
- * Strips trailing '=' padding if present
- */
- private static base64UrlToBytes(base64url: string): Uint8Array {
- // Strip trailing '=' padding if present (handles regular base64 format)
- let input = base64url.replace(/=+$/, '');
-
- // Convert base64url to base64 (replace URL-safe characters)
- let base64 = input.replace(/-/g, '+').replace(/_/g, '/');
-
- // Add padding if needed
- while (base64.length % 4) {
- base64 += '=';
- }
-
- const binary = atob(base64);
- const bytes = new Uint8Array(binary.length);
- for (let i = 0; i < binary.length; i++) {
- bytes[i] = binary.charCodeAt(i);
- }
- return bytes;
- }
-
/**
* Convert GUID to base64url for WebAuthn credential ID
*/
public static guidToBase64url(guid: string): string {
- return this.bytesToBase64Url(this.guidToBytes(guid));
+ return bytesToBase64Url(PasskeyHelper.guidToBytes(guid));
}
/**
* Convert base64url to GUID for database lookup
*/
public static base64urlToGuid(base64url: string): string {
- return this.bytesToGuid(this.base64UrlToBytes(base64url));
- }
-
- /**
- * Convert bytes to a standard (not URL-safe) base64 string
- */
- public static arrayBufferToBase64(buffer: ArrayBuffer | Uint8Array): string {
- const bytes = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
- let binary = '';
- for (let i = 0; i < bytes.length; i++) {
- binary += String.fromCharCode(bytes[i]);
- }
- return btoa(binary);
- }
-
- /**
- * Convert byte array to base64url string (public wrapper)
- */
- public static bytesToBase64url(bytes: Uint8Array | number[]): string {
- const uint8Array = bytes instanceof Uint8Array ? bytes : new Uint8Array(bytes);
- return this.bytesToBase64Url(uint8Array);
- }
-
- /**
- * Convert base64url string to byte array (public wrapper)
- */
- public static base64urlToBytes(base64url: string): Uint8Array {
- return this.base64UrlToBytes(base64url);
+ return PasskeyHelper.bytesToGuid(base64UrlToBytes(base64url));
}
}
diff --git a/core/client/src/auth/MobileLoginProtocol.ts b/core/client/src/auth/MobileLoginProtocol.ts
index d87240a59..f55671f22 100644
--- a/core/client/src/auth/MobileLoginProtocol.ts
+++ b/core/client/src/auth/MobileLoginProtocol.ts
@@ -1,4 +1,4 @@
-import { bytesToBase64 } from '../utilities/Base64';
+import { bytesToBase64Url } from '../utilities/Base64';
/**
* What the QR code of a mobile login request carries.
@@ -34,7 +34,7 @@ export class MobileLoginProtocol {
*/
public static async computePublicKeyHash(publicKeyJwk: string): Promise<string> {
const digest = await MobileLoginProtocol.sha256(publicKeyJwk);
- return bytesToBase64(digest).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+ return bytesToBase64Url(digest);
}
/**
diff --git a/core/client/src/utilities/Base64.ts b/core/client/src/utilities/Base64.ts
index e5bcdbac5..62d449b39 100644
--- a/core/client/src/utilities/Base64.ts
+++ b/core/client/src/utilities/Base64.ts
@@ -48,3 +48,22 @@ export function base64ToBytes(base64: string): Uint8Array<ArrayBuffer> {
}
return bytes;
}
+
+/**
+ * Encode raw bytes as unpadded base64url (RFC 4648 section 5).
+ * @param bytes - the bytes to encode
+ * @returns The base64url representation of the bytes, without `=` padding
+ */
+export function bytesToBase64Url(bytes: Uint8Array): string {
+ return bytesToBase64(bytes).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
+/**
+ * Decode base64url back into raw bytes. Also accepts standard base64, padded or not.
+ * @param base64url - the base64url- or base64-encoded bytes
+ * @returns The decoded bytes
+ */
+export function base64UrlToBytes(base64url: string): Uint8Array<ArrayBuffer> {
+ const base64 = base64url.replace(/=+$/, '').replace(/-/g, '+').replace(/_/g, '/');
+ return base64ToBytes(base64.padEnd(base64.length + ((4 - (base64.length % 4)) % 4), '='));
+}