@f2a/network 0.1.3 → 0.2.0

package/dist/core/e2ee-crypto.d.ts

@@ -26,21 +26,81 @@ export interface EncryptedMessage {
     /** 密钥派生使用的随机盐值（每次加密随机生成） */
     salt: string;
 }
+/**
+ * P1-2 修复：密钥确认挑战
+ */
+export interface KeyConfirmationChallenge {
+    /** 挑战随机数 */
+    challenge: string;
+    /** 发送方标识 */
+    senderId: string;
+    /** 时间戳防止重放 */
+    timestamp: number;
+}
+/**
+ * P1-2 修复：密钥确认响应
+ */
+export interface KeyConfirmationResponse {
+    /** 对挑战的响应（用共享密钥加密的挑战数据） */
+    challengeResponse: string;
+    /** 反向挑战随机数 */
+    counterChallenge: string;
+    /** 发送方标识 */
+    senderId: string;
+    /** 时间戳 */
+    timestamp: number;
+}
 /**
  * 密钥管理器
+ * P2-1 修复：实现 Disposable 接口
  */
-export declare class E2EECrypto {
+export declare class E2EECrypto implements Disposable {
     private keyPair;
     private peerPublicKeys;
     private sharedSecrets;
     private logger;
+    /** P2-10 修复：IV 使用记录，用于检测 IV 重用 */
+    private usedIVs;
+    /** P2-10 修复：IV 重用警告阈值 */
+    private static readonly IV_REUSE_WARN_THRESHOLD;
+    /** P1-2 修复：待处理的密钥确认挑战 */
+    private pendingChallenges;
+    /** P1-2 修复：已确认的密钥 */
+    private keyConfirmed;
+    /** P1-1 修复：挑战清理定时器 */
+    private challengeCleanupTimer;
+    /** P1-1 修复：挑战过期时间（5分钟） */
+    private static readonly CHALLENGE_EXPIRY_MS;
+    /** P1-1 修复：清理间隔（每分钟） */
+    private static readonly CHALLENGE_CLEANUP_INTERVAL_MS;
     constructor();
+    /**
+     * P1-1 修复：启动挑战清理定时器
+     */
+    private startChallengeCleanup;
+    /**
+     * P1-2 修复：注销对等方，清理所有相关资源
+     * P1-4 修复：删除共享密钥前先零填充
+     * @param peerId 对等方标识
+     */
+    unregisterPeer(peerId: string): void;
+    /**
+     * P1-1 修复：停止清理定时器，释放资源
+     * P1-4 修复：清理共享密钥前先零填充
+     * R2-1 修复：零填充 privateKey，最敏感的密钥材料
+     */
+    stop(): void;
+    /**
+     * P2-1 修复：实现 Disposable 接口
+     */
+    [Symbol.dispose](): void;
     /**
      * 初始化密钥对
      */
     initialize(): Promise<void>;
     /**
      * 从已有密钥初始化
+     * P1-2: 添加输入验证
      */
     initializeWithKeyPair(privateKey: Uint8Array, publicKey: Uint8Array): void;
     /**
@@ -49,12 +109,21 @@ export declare class E2EECrypto {
     getPublicKey(): string | null;
     /**
      * 注册对等方的公钥
+     * P2-3 修复：使用 Uint8Array.slice() 创建不可变副本
      */
     registerPeerPublicKey(peerId: string, publicKeyBase64: string): void;
     /**
      * 检查是否可以对等方加密通信
      */
     canEncryptTo(peerId: string): boolean;
+    /**
+     * P2-13 修复：提取独立的 IV 生成方法，处理碰撞检测
+     * P1-4 修复：添加最多 10 次尝试的循环逻辑
+     * P2-2 修复：当 ivSet 不存在时，创建并记录 IV，防止重用
+     * @param peerId 对等方标识
+     * @returns 唯一的 IV，如果无法生成则抛出错误
+     */
+    private generateUniqueIV;
     /**
      * 加密消息
      */
@@ -85,6 +154,63 @@ export declare class E2EECrypto {
      * 获取已注册的对等方数量
      */
     getRegisteredPeerCount(): number;
+    /**
+     * P1-2 修复：生成密钥确认挑战
+     * 在密钥交换后，用于验证双方拥有相同的共享密钥
+     * @param peerId 对等方标识
+     * @returns 挑战数据
+     */
+    generateKeyConfirmationChallenge(peerId: string): KeyConfirmationChallenge | null;
+    /**
+     * P1-2 修复：响应密钥确认挑战
+     * 使用共享密钥加密挑战数据作为证明
+     * @param peerId 对等方标识
+     * @param challenge 收到的挑战
+     * @returns 响应数据和反向挑战
+     */
+    respondToKeyConfirmationChallenge(peerId: string, challenge: KeyConfirmationChallenge): KeyConfirmationResponse | null;
+    /**
+     * P2-14 修复：提取公共的挑战响应验证逻辑
+     * @param peerId 对等方标识
+     * @param response 实际收到的响应
+     * @param expectedChallenge 原始挑战数据
+     * @returns 验证结果
+     */
+    private verifyChallengeResponse;
+    /**
+     * P1-2 修复：验证密钥确认响应并响应反向挑战
+     * 完成双向密钥确认
+     * @param peerId 对等方标识
+     * @param response 收到的响应
+     * @param originalChallenge 原始挑战数据
+     * @returns 反向挑战的响应，如果验证失败返回 null
+     */
+    verifyKeyConfirmationResponse(peerId: string, response: KeyConfirmationResponse, originalChallenge: string): {
+        success: boolean;
+        counterChallengeResponse?: string;
+    };
+    /**
+     * P1-2 修复：验证反向挑战的响应
+     * P1-5 修复：使用 HMAC 而非 Hash
+     * @param peerId 对等方标识
+     * @param counterChallengeResponse 反向挑战的响应
+     * @param originalCounterChallenge 原始反向挑战
+     * @returns 验证结果
+     */
+    verifyCounterChallengeResponse(peerId: string, counterChallengeResponse: string, originalCounterChallenge: string): boolean;
+    /**
+     * P1-2 修复：检查与对等方的密钥是否已确认
+     */
+    isKeyConfirmed(peerId: string): boolean;
+    /**
+     * P1-2 修复：执行完整的双向密钥确认流程
+     * 这是一个便捷方法，封装了完整的确认流程
+     * @param peerId 对等方标识
+     * @param sendChallenge 发送挑战的函数
+     * @param receiveResponse 接收响应的函数
+     * @returns 确认是否成功
+     */
+    confirmKeyExchange(peerId: string, sendChallenge: (challenge: KeyConfirmationChallenge) => Promise<KeyConfirmationResponse | null>, receiveCounterResponse?: (counterResponse: string) => Promise<boolean>): Promise<boolean>;
 }
 export declare const defaultE2EECrypto: E2EECrypto;
 //# sourceMappingURL=e2ee-crypto.d.ts.map

package/dist/core/e2ee-crypto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2ee-crypto.d.ts","sourceRoot":"","sources":["../../src/core/e2ee-crypto.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,wBAAwB;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,aAAa,CAAsC;IAC3D,OAAO,CAAC,MAAM,CAAS;;IAMvB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAQjC;;OAEG;IACH,qBAAqB,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;IAI1E;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAK7B;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IAepE;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIrC;;OAEG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAmDjF;;OAEG;IACH,OAAO,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI;IAuCnD;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAWpB;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK/C;;OAEG;IACH,aAAa,IAAI;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAQjE;;OAEG;IACH,sBAAsB,IAAI,MAAM;CAGjC;AAGD,eAAO,MAAM,iBAAiB,YAAmB,CAAC"}
+{"version":3,"file":"e2ee-crypto.d.ts","sourceRoot":"","sources":["../../src/core/e2ee-crypto.ts"],"names":[],"mappings":"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"}