@ruvector/edge-net 0.5.0 → 0.5.3

package/plugins/implementations/e2e-encryption.js

@@ -7,7 +7,7 @@
  * @module @ruvector/edge-net/plugins/e2e-encryption
  */
 
-import { randomBytes, createCipheriv, createDecipheriv, createHash } from 'crypto';
+import { randomBytes, createCipheriv, createDecipheriv, createHash, pbkdf2Sync, hkdfSync } from 'crypto';
 
 export class E2EEncryptionPlugin {
     constructor(config = {}) {
@@ -38,16 +38,41 @@ export class E2EEncryptionPlugin {
 
     /**
      * Establish encrypted session with peer
+     * Uses HKDF for secure key derivation with proper entropy
      */
     async establishSession(peerId, peerPublicKey) {
-        // In production: X25519 key exchange
-        // For demo: Generate shared secret from peer ID
-        const sharedSecret = createHash('sha256')
-            .update(peerId + '-' + Date.now())
-            .digest();
+        // Generate cryptographically secure random material
+        const ephemeralSecret = randomBytes(32);
+        const salt = randomBytes(32);
+
+        // In production: X25519 key exchange with peerPublicKey
+        // For now: Use HKDF for secure key derivation
+        // HKDF is a proper KDF that extracts entropy and expands it securely
+        let sharedSecret;
+        try {
+            // Use HKDF (preferred) - extract-then-expand
+            sharedSecret = hkdfSync(
+                'sha256',           // hash algorithm
+                ephemeralSecret,    // input key material
+                salt,               // salt
+                `edge-net-e2e-${peerId}`, // info/context
+                32                  // output length
+            );
+        } catch (e) {
+            // Fallback to PBKDF2 if HKDF not available (older Node)
+            // 100,000 iterations for security
+            sharedSecret = pbkdf2Sync(
+                ephemeralSecret,
+                salt,
+                100000,  // iterations
+                32,      // key length
+                'sha256'
+            );
+        }
 
         const sessionKey = {
             key: sharedSecret,
+            salt: salt,
             iv: randomBytes(16),
             createdAt: Date.now(),
             messageCount: 0,
@@ -57,7 +82,8 @@ export class E2EEncryptionPlugin {
 
         return {
             sessionId: createHash('sha256').update(sharedSecret).digest('hex').slice(0, 16),
-            publicKey: randomBytes(32).toString('hex'), // Our ephemeral public key
+            publicKey: ephemeralSecret.toString('hex'), // Our ephemeral public key
+            salt: salt.toString('hex'),
         };
     }
 
@@ -117,18 +143,37 @@ export class E2EEncryptionPlugin {
 
     /**
      * Rotate session keys for forward secrecy
+     * Uses HKDF for secure key rotation
      */
     _rotateKeys() {
         const now = Date.now();
         for (const [peerId, session] of this.sessionKeys) {
             if (now - session.createdAt > this.config.keyRotationInterval) {
-                // Generate new session key
-                const newKey = createHash('sha256')
-                    .update(session.key)
-                    .update(randomBytes(32))
-                    .digest();
+                // Generate new session key using HKDF with previous key as IKM
+                const newSalt = randomBytes(32);
+                let newKey;
+
+                try {
+                    newKey = hkdfSync(
+                        'sha256',
+                        session.key,
+                        newSalt,
+                        `edge-net-rotate-${peerId}-${now}`,
+                        32
+                    );
+                } catch (e) {
+                    // Fallback to PBKDF2
+                    newKey = pbkdf2Sync(
+                        session.key,
+                        newSalt,
+                        100000,
+                        32,
+                        'sha256'
+                    );
+                }
 
                 session.key = newKey;
+                session.salt = newSalt;
                 session.createdAt = now;
                 session.messageCount = 0;
             }