@ysgroup/core 0.1.12 → 0.1.13

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@ysgroup/core",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "dependencies": {
+    "@noble/ciphers": "2.4.0",
+    "@noble/curves": "2.4.0",
+    "@noble/hashes": "2.4.0"
+  },
   "peerDependencies": {
     "pinia": ">=2.2",
     "vue": ">=3.5"

package/src/password.ts

@@ -1,4 +1,11 @@
-/* 登录口令密封：X25519 临时密钥 + HKDF-SHA256 + AES-256-GCM，与 Auth/ys_base 对齐。 */
+/* 登录口令密封：X25519 + HKDF-SHA256 + AES-256-GCM。
+   使用 @noble/* 纯 JS，不依赖 Web Crypto SubtleCrypto。
+   HTTP（非安全上下文）与 HTTPS 同一路径，信封格式与 Auth/ys_base 对齐。 */
+
+import { gcm } from "@noble/ciphers/aes.js";
+import { x25519 } from "@noble/curves/ed25519.js";
+import { hkdf } from "@noble/hashes/hkdf.js";
+import { sha256 } from "@noble/hashes/sha2.js";
 
 export interface PasswordWrap {
   password_wrap: string;
@@ -77,76 +84,23 @@ export async function sealPassword(
   const recipientRaw = b64uDecode(publicKeyB64);
   if (recipientRaw.byteLength !== 32) throw new Error("登录公钥长度无效");
 
-  const ephemeral = (await crypto.subtle.generateKey({ name: "X25519" }, true, [
-    "deriveBits",
-  ])) as CryptoKeyPair;
-  const recipient = await crypto.subtle.importKey(
-    "raw",
-    asArrayBuffer(recipientRaw),
-    { name: "X25519" },
-    false,
-    [],
-  );
-  const shared = new Uint8Array(
-    await crypto.subtle.deriveBits(
-      { name: "X25519", public: recipient },
-      ephemeral.privateKey,
-      256,
-    ),
-  );
-  const hkdfKey = await crypto.subtle.importKey(
-    "raw",
-    asArrayBuffer(shared),
-    "HKDF",
-    false,
-    ["deriveBits"],
-  );
-  const aesRaw = await crypto.subtle.deriveBits(
-    {
-      name: "HKDF",
-      hash: "SHA-256",
-      salt: asArrayBuffer(SALT),
-      info: asArrayBuffer(INFO),
-    },
-    hkdfKey,
-    256,
-  );
-  const aesKey = await crypto.subtle.importKey(
-    "raw",
-    aesRaw,
-    { name: "AES-GCM" },
-    false,
-    ["encrypt"],
-  );
+  const ephemeralSecret = x25519.utils.randomSecretKey();
+  const ephemeralPublic = x25519.getPublicKey(ephemeralSecret);
+  const shared = x25519.getSharedSecret(ephemeralSecret, recipientRaw);
+  const aesRaw = hkdf(sha256, shared, SALT, INFO, 32);
   const aad = new TextEncoder().encode(`${PREFIX}${kid}`);
-  const packedCt = new Uint8Array(
-    await crypto.subtle.encrypt(
-      {
-        name: "AES-GCM",
-        iv: asArrayBuffer(NONCE),
-        additionalData: aad,
-        tagLength: 128,
-      },
-      aesKey,
-      new TextEncoder().encode(plaintext),
-    ),
+  const packedCt = gcm(aesRaw, NONCE, aad).encrypt(
+    new TextEncoder().encode(plaintext),
   );
-  const ephPk = new Uint8Array(
-    await crypto.subtle.exportKey("raw", ephemeral.publicKey),
+  const packed = new Uint8Array(
+    ephemeralPublic.byteLength + packedCt.byteLength,
   );
-  const packed = new Uint8Array(ephPk.byteLength + packedCt.byteLength);
-  packed.set(ephPk, 0);
-  packed.set(packedCt, ephPk.byteLength);
+  packed.set(ephemeralPublic, 0);
+  packed.set(packedCt, ephemeralPublic.byteLength);
+  ephemeralSecret.fill(0);
   return `${PREFIX}${kid}.${b64uEncode(packed)}`;
 }
 
-function asArrayBuffer(bytes: Uint8Array): ArrayBuffer {
-  return bytes.buffer.slice(
-    bytes.byteOffset,
-    bytes.byteOffset + bytes.byteLength,
-  ) as ArrayBuffer;
-}
-
 function b64uEncode(raw: Uint8Array): string {
   let bin = "";
   for (const byte of raw) bin += String.fromCharCode(byte);