Compare commits
No commits in common. "0c883dfcacaef6aeabd4509b0e3e2d47dc1becc9" and "b545e3875e53d50514d43deff80a9d6ff5eec874" have entirely different histories.
0c883dfcac
...
b545e3875e
13
package.json
13
package.json
@ -28,19 +28,17 @@
|
||||
"license": "ISC",
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.38.0",
|
||||
"@testing-library/jest-dom": "^6.1.4",
|
||||
"@types/jest": "^29.5.8",
|
||||
"@typescript-eslint/eslint-plugin": "^8.46.2",
|
||||
"@typescript-eslint/parser": "^8.46.2",
|
||||
"eslint": "^9.38.0",
|
||||
"jest": "^29.7.0",
|
||||
"prettier": "^3.3.3",
|
||||
"ts-jest": "^29.1.1",
|
||||
"typescript": "^5.3.3",
|
||||
"vite": "^5.4.11",
|
||||
"vite-plugin-static-copy": "^1.0.6",
|
||||
"vite-plugin-top-level-await": "^1.6.0",
|
||||
"vite-plugin-wasm": "^3.5.0"
|
||||
"jest": "^29.7.0",
|
||||
"ts-jest": "^29.1.1",
|
||||
"@types/jest": "^29.5.8",
|
||||
"@testing-library/jest-dom": "^6.1.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.7.8",
|
||||
@ -49,6 +47,7 @@
|
||||
"pdf-lib": "^1.17.1",
|
||||
"sweetalert2": "^11.14.5",
|
||||
"vite-plugin-copy": "^0.1.6",
|
||||
"vite-plugin-html": "^3.2.2"
|
||||
"vite-plugin-html": "^3.2.2",
|
||||
"vite-plugin-wasm": "^3.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -132,21 +132,15 @@ export async function initHomePage(): Promise<void> {
|
||||
});
|
||||
|
||||
try {
|
||||
console.log('🔧 Getting services instance...');
|
||||
const service = await Services.getInstance();
|
||||
console.log('🔧 Getting device address...');
|
||||
const spAddress = await service.getDeviceAddress();
|
||||
console.log('🔧 Generating create button...');
|
||||
generateCreateBtn();
|
||||
console.log('🔧 Displaying emojis...');
|
||||
displayEmojis(spAddress);
|
||||
|
||||
// Hide loading spinner after initialization
|
||||
console.log('🔧 Hiding loading spinner...');
|
||||
hideHomeLoadingSpinner();
|
||||
console.log('✅ Home page initialization completed');
|
||||
} catch (error) {
|
||||
console.error('❌ Error initializing home page:', error);
|
||||
console.error('Error initializing home page:', error);
|
||||
hideHomeLoadingSpinner();
|
||||
throw error;
|
||||
}
|
||||
@ -360,22 +354,20 @@ export function initContentMenu() {
|
||||
export function initIframeCommunication() {
|
||||
// Listen for messages from parent window
|
||||
window.addEventListener('message', event => {
|
||||
// Filter out browser extension messages first
|
||||
if (
|
||||
event.data.source === 'react-devtools-content-script' ||
|
||||
event.data.hello === true ||
|
||||
!event.data.type ||
|
||||
event.data.type.startsWith('Pass::') ||
|
||||
event.data.type === 'PassClientScriptReady'
|
||||
) {
|
||||
return; // Ignore browser extension messages
|
||||
}
|
||||
|
||||
// Security check - in production, verify event.origin
|
||||
console.log('📨 Received message from parent:', event.data);
|
||||
|
||||
const { type, data } = event.data;
|
||||
|
||||
// Filter out browser extension messages
|
||||
if (
|
||||
event.data.source === 'react-devtools-content-script' ||
|
||||
event.data.hello === true ||
|
||||
!type
|
||||
) {
|
||||
return; // Ignore browser extension messages
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case 'TEST_MESSAGE':
|
||||
console.log('🧪 Test message received:', data.message);
|
||||
@ -405,10 +397,6 @@ export function initIframeCommunication() {
|
||||
console.log('👂 Parent is listening for messages');
|
||||
break;
|
||||
|
||||
case 'IFRAME_READY':
|
||||
console.log('✅ Iframe is ready and initialized');
|
||||
break;
|
||||
|
||||
default:
|
||||
console.log('❓ Unknown message type from parent:', type);
|
||||
}
|
||||
|
||||
@ -61,7 +61,8 @@ async function handleLocation(path: string) {
|
||||
|
||||
await new Promise(requestAnimationFrame);
|
||||
|
||||
// Essential functions are now handled directly in the application
|
||||
// Initialize essential functions
|
||||
await initEssentialFunctions();
|
||||
|
||||
// const modalService = await ModalService.getInstance()
|
||||
// modalService.injectValidationModal()
|
||||
|
||||
@ -45,10 +45,10 @@ export class MemoryManager {
|
||||
this.isMonitoring = true;
|
||||
this.logMemoryStats();
|
||||
|
||||
// Vérifier la mémoire toutes les 2 minutes
|
||||
// Vérifier la mémoire toutes les 30 secondes
|
||||
setInterval(() => {
|
||||
this.checkMemoryUsage();
|
||||
}, 120000);
|
||||
}, 30000);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -104,55 +104,28 @@ export class SecureCredentialsService {
|
||||
const encryptedSpendKey = await this.encryptKey(credentialData.spendKey, masterKey);
|
||||
const encryptedScanKey = await this.encryptKey(credentialData.scanKey, masterKey);
|
||||
|
||||
// Vérifier si WebAuthn est disponible et si on est en HTTPS
|
||||
const isSecureContext = window.isSecureContext;
|
||||
const hasWebAuthn = navigator.credentials && navigator.credentials.create;
|
||||
|
||||
let credential = null;
|
||||
|
||||
if (isSecureContext && hasWebAuthn) {
|
||||
// Stocker dans les credentials du navigateur (HTTPS requis)
|
||||
try {
|
||||
credential = await navigator.credentials.create({
|
||||
publicKey: {
|
||||
challenge: new Uint8Array(32),
|
||||
rp: { name: '4NK Secure Storage' },
|
||||
user: {
|
||||
id: new TextEncoder().encode('4nk-user'),
|
||||
name: '4NK User',
|
||||
displayName: '4NK User'
|
||||
},
|
||||
pubKeyCredParams: [
|
||||
{ type: 'public-key', alg: -7 }, // ES256
|
||||
{ type: 'public-key', alg: -257 } // RS256
|
||||
],
|
||||
authenticatorSelection: {
|
||||
authenticatorAttachment: 'platform',
|
||||
userVerification: 'required'
|
||||
},
|
||||
timeout: 60000,
|
||||
attestation: 'direct'
|
||||
}
|
||||
});
|
||||
|
||||
secureLogger.info('WebAuthn credential created successfully', {
|
||||
component: 'SecureCredentialsService',
|
||||
operation: 'webauthn_create'
|
||||
});
|
||||
} catch (error) {
|
||||
secureLogger.warn('WebAuthn credential creation failed, using fallback', error as Error, {
|
||||
component: 'SecureCredentialsService',
|
||||
operation: 'webauthn_create'
|
||||
});
|
||||
// Stocker dans les credentials du navigateur
|
||||
const credential = await navigator.credentials.create({
|
||||
publicKey: {
|
||||
challenge: new Uint8Array(32),
|
||||
rp: { name: '4NK Secure Storage' },
|
||||
user: {
|
||||
id: new TextEncoder().encode('4nk-user'),
|
||||
name: '4NK User',
|
||||
displayName: '4NK User'
|
||||
},
|
||||
pubKeyCredParams: [
|
||||
{ type: 'public-key', alg: -7 }, // ES256
|
||||
{ type: 'public-key', alg: -257 } // RS256
|
||||
],
|
||||
authenticatorSelection: {
|
||||
authenticatorAttachment: 'platform',
|
||||
userVerification: 'required'
|
||||
},
|
||||
timeout: 60000,
|
||||
attestation: 'direct'
|
||||
}
|
||||
} else {
|
||||
secureLogger.info('WebAuthn not available (HTTP context), using fallback storage', {
|
||||
component: 'SecureCredentialsService',
|
||||
operation: 'webauthn_fallback',
|
||||
isSecureContext,
|
||||
hasWebAuthn
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
if (credential) {
|
||||
// Stocker les données chiffrées dans IndexedDB
|
||||
@ -288,7 +261,7 @@ export class SecureCredentialsService {
|
||||
},
|
||||
keyMaterial,
|
||||
{ name: 'AES-GCM', length: 256 },
|
||||
true, // Make key extractable
|
||||
false,
|
||||
['encrypt', 'decrypt']
|
||||
);
|
||||
}
|
||||
@ -299,19 +272,15 @@ export class SecureCredentialsService {
|
||||
private async deriveSpendKey(masterKey: CryptoKey, salt: Uint8Array): Promise<string> {
|
||||
const spendSalt = new Uint8Array([...salt, 0x73, 0x70, 0x65, 0x6e, 0x64]); // "spend"
|
||||
|
||||
// Use HMAC with the master key to derive spend key
|
||||
const hmacKey = await crypto.subtle.importKey(
|
||||
'raw',
|
||||
await crypto.subtle.exportKey('raw', masterKey),
|
||||
{ name: 'HMAC', hash: 'SHA-256' },
|
||||
false,
|
||||
['sign']
|
||||
);
|
||||
|
||||
const spendKeyMaterial = await crypto.subtle.sign(
|
||||
'HMAC',
|
||||
hmacKey,
|
||||
spendSalt
|
||||
const spendKeyMaterial = await crypto.subtle.deriveBits(
|
||||
{
|
||||
name: 'PBKDF2',
|
||||
salt: spendSalt,
|
||||
iterations: 1000,
|
||||
hash: 'SHA-256'
|
||||
},
|
||||
masterKey,
|
||||
256
|
||||
);
|
||||
|
||||
return Array.from(new Uint8Array(spendKeyMaterial))
|
||||
@ -325,19 +294,15 @@ export class SecureCredentialsService {
|
||||
private async deriveScanKey(masterKey: CryptoKey, salt: Uint8Array): Promise<string> {
|
||||
const scanSalt = new Uint8Array([...salt, 0x73, 0x63, 0x61, 0x6e]); // "scan"
|
||||
|
||||
// Use HMAC with the master key to derive scan key
|
||||
const hmacKey = await crypto.subtle.importKey(
|
||||
'raw',
|
||||
await crypto.subtle.exportKey('raw', masterKey),
|
||||
{ name: 'HMAC', hash: 'SHA-256' },
|
||||
false,
|
||||
['sign']
|
||||
);
|
||||
|
||||
const scanKeyMaterial = await crypto.subtle.sign(
|
||||
'HMAC',
|
||||
hmacKey,
|
||||
scanSalt
|
||||
const scanKeyMaterial = await crypto.subtle.deriveBits(
|
||||
{
|
||||
name: 'PBKDF2',
|
||||
salt: scanSalt,
|
||||
iterations: 1000,
|
||||
hash: 'SHA-256'
|
||||
},
|
||||
masterKey,
|
||||
256
|
||||
);
|
||||
|
||||
return Array.from(new Uint8Array(scanKeyMaterial))
|
||||
|
||||
@ -195,20 +195,6 @@ export default class Services {
|
||||
// Nettoyer les caches périodiquement
|
||||
this.startCacheCleanup();
|
||||
|
||||
// Initialiser le service PBKDF2 pour les credentials sécurisés
|
||||
try {
|
||||
const { secureCredentialsService } = await import('./secure-credentials.service');
|
||||
secureLogger.info('PBKDF2 service initialized for secure credentials', {
|
||||
component: 'Services',
|
||||
operation: 'pbkdf2_init'
|
||||
});
|
||||
} catch (error) {
|
||||
secureLogger.warn('Failed to initialize PBKDF2 service', error as Error, {
|
||||
component: 'Services',
|
||||
operation: 'pbkdf2_init'
|
||||
});
|
||||
}
|
||||
|
||||
secureLogger.info('Services initialized', {
|
||||
component: 'Services',
|
||||
operation: 'initialization'
|
||||
@ -700,10 +686,6 @@ export default class Services {
|
||||
|
||||
if (!relayAddress) {
|
||||
console.log('⏳ Waiting for relays to be ready...');
|
||||
// Update UI status
|
||||
const { updateCreatorStatus } = await import('../utils/sp-address.utils');
|
||||
updateCreatorStatus('⏳ Waiting for relays to be ready...');
|
||||
|
||||
await this.getRelayReadyPromise();
|
||||
relayAddress = this.getAllRelays()[0]?.spAddress;
|
||||
}
|
||||
@ -1674,10 +1656,6 @@ export default class Services {
|
||||
}
|
||||
|
||||
public async getProcess(processId: string): Promise<Process | null> {
|
||||
if (!processId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (this.processesCache[processId]) {
|
||||
return this.processesCache[processId];
|
||||
} else {
|
||||
@ -2289,16 +2267,10 @@ export default class Services {
|
||||
console.log('Requesting data from peers');
|
||||
const membersList = this.getAllMembers();
|
||||
try {
|
||||
// Convert objects to strings for WASM compatibility
|
||||
const rolesString = JSON.stringify(roles);
|
||||
const membersString = JSON.stringify(membersList);
|
||||
const stateIdsString = JSON.stringify(stateIds);
|
||||
|
||||
const res = this.sdkClient.request_data(processId, stateIdsString, rolesString, membersString);
|
||||
const res = this.sdkClient.request_data(processId, stateIds, roles, membersList);
|
||||
await this.handleApiReturn(res);
|
||||
} catch (e) {
|
||||
console.error('Error requesting data from peers:', e);
|
||||
throw e;
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2444,7 +2444,7 @@ function handleWordsInput() {
|
||||
}
|
||||
|
||||
// Update creator status
|
||||
export function updateCreatorStatus(message: string, isError: boolean = false) {
|
||||
function updateCreatorStatus(message: string, isError: boolean = false) {
|
||||
const container = getCorrectDOM('login-4nk-component') as HTMLElement;
|
||||
const statusElement = container.querySelector('#creator-status');
|
||||
if (statusElement) {
|
||||
@ -2697,34 +2697,6 @@ export async function prepareAndSendPairingTx(): Promise<void> {
|
||||
|
||||
console.log(`🔍 DEBUG: Creator address: ${creatorAddress}`);
|
||||
|
||||
// Update UI with creator address
|
||||
updateCreatorStatus(`Creator address: ${creatorAddress}`);
|
||||
|
||||
// Initialize secure credentials with PBKDF2 and browser credentials
|
||||
try {
|
||||
const { secureCredentialsService } = await import('../services/secure-credentials.service');
|
||||
|
||||
// Check if we're in a secure context (HTTPS)
|
||||
if (window.isSecureContext) {
|
||||
updateCreatorStatus('🔐 Initializing secure credentials with browser...');
|
||||
} else {
|
||||
updateCreatorStatus('🔐 Initializing secure credentials (HTTP mode - WebAuthn not available)...');
|
||||
}
|
||||
|
||||
// This will trigger the browser popup for WebAuthn (only in HTTPS)
|
||||
const credentials = await secureCredentialsService.generateSecureCredentials('4nk-pairing-password');
|
||||
console.log('✅ Secure credentials initialized with PBKDF2 and WebAuthn');
|
||||
|
||||
if (window.isSecureContext) {
|
||||
updateCreatorStatus('✅ Secure credentials ready (WebAuthn enabled)');
|
||||
} else {
|
||||
updateCreatorStatus('✅ Secure credentials ready (fallback mode - use HTTPS for WebAuthn)');
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('⚠️ Secure credentials initialization failed:', error);
|
||||
updateCreatorStatus('⚠️ Using fallback credentials');
|
||||
}
|
||||
|
||||
// Create pairing process with creator's address
|
||||
const createPairingProcessReturn = await service.createPairingProcess(
|
||||
creatorAddress, // Use creator's address as memberPublicName
|
||||
|
||||
@ -34,8 +34,7 @@ export async function initWebsocket(url: string) {
|
||||
secureLogger.warn('Invalid WebSocket message received', {
|
||||
component: 'WebSocket',
|
||||
operation: 'message_validation',
|
||||
errors: validation.errors,
|
||||
messagePreview: msgData.substring(0, 100) // Log first 100 chars for debugging
|
||||
errors: validation.errors
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
import { defineConfig } from 'vite';
|
||||
import path from 'path';
|
||||
import wasm from 'vite-plugin-wasm';
|
||||
import topLevelAwait from 'vite-plugin-top-level-await';
|
||||
import path from 'path'
|
||||
|
||||
export default defineConfig({
|
||||
optimizeDeps: {
|
||||
include: ['qrcode']
|
||||
},
|
||||
plugins: [
|
||||
wasm(),
|
||||
topLevelAwait()
|
||||
],
|
||||
plugins: [],
|
||||
build: {
|
||||
outDir: 'dist',
|
||||
target: 'esnext',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user