dsh-instruction-memory 1.4.7 → 1.5.0

package/lib/mailer.js

@@ -25,6 +25,7 @@
  */
 
 import { createCipheriv, createDecipheriv, randomBytes, randomUUID, scryptSync } from 'node:crypto'
+import { StringDecoder } from 'node:string_decoder'
 import { connect as netConnect } from 'node:net'
 import { connect as tlsConnect } from 'node:tls'
 import { hostname } from 'node:os'
@@ -253,7 +254,11 @@ function assertSecret(secret) {
  */
 export function encryptRecipient(address, secret) {
   const clean = textOf(address)
-  if (!EMAIL_RE.test(clean)) throw new Error('收件邮箱格式不正确，无法加密')
+  // Same verdict the delivery path uses: encrypting an address that SMTP could
+  // never deliver (non-ASCII without SMTPUTF8) only surfaced the problem at
+  // send time, when the configuration already looked correct.
+  const verdict = mailboxVerdict(clean)
+  if (verdict !== '') throw new Error('收件邮箱' + verdict + '，无法加密')
   const phrase = textOf(secret)
   assertSecret(phrase)
   const salt = randomBytes(SALT_BYTES)
@@ -288,7 +293,8 @@ export function decryptRecipient(payload, secret) {
   } catch {
     throw new Error('无法解密反馈收件邮箱：密钥不匹配或密文已损坏')
   }
-  if (!EMAIL_RE.test(clear)) throw new Error('解密后的反馈收件邮箱格式不正确')
+  const verdict = mailboxVerdict(clear)
+  if (verdict !== '') throw new Error('解密后的反馈收件邮箱' + verdict)
   return clear
 }
 
@@ -600,7 +606,14 @@ export function buildRawMail(options = {}) {
   const from = assertHeaderSafe(textOf(options.from), '发件邮箱')
   const to = assertHeaderSafe(textOf(options.to), '收件邮箱')
   const now = options.now instanceof Date ? options.now : new Date()
-  const messageId = textOf(options.messageId) || (randomUUID() + '@' + messageDomain(from))
+  // Message-ID is the one header this formatter used to interpolate without
+  // validation — and it is exported, so a caller-supplied value could inject
+  // CRLF or angle brackets. Only a syntactically id-shaped value survives;
+  // anything else falls back to a generated id.
+  const candidateId = textOf(options.messageId)
+  const messageId = /^[^\s<>@\r\n]+@[^\s<>@\r\n]+$/.test(candidateId)
+    ? candidateId
+    : randomUUID() + '@' + messageDomain(from)
   const subject = oneLine(options.subject)
   const replyTo = oneLine(options.replyTo)
   const body64 = b64(options.text).replace(/(.{76})/g, '$1\r\n')
@@ -628,6 +641,10 @@ export function buildRawMail(options = {}) {
  */
 function createChannel(socket, timeoutMs) {
   const state = { buffer: '', lines: [], waiters: [], error: null }
+  // Decode across chunk boundaries: `chunk.toString('utf8')` corrupts a
+  // multi-byte character split between two TCP segments, which turns a server's
+  // error text into replacement characters and makes it undiagnosable.
+  const decoder = new StringDecoder('utf8')
 
   const fail = (err) => {
     if (state.error === null) state.error = err
@@ -635,7 +652,7 @@ function createChannel(socket, timeoutMs) {
     for (const waiter of waiters) waiter.reject(state.error)
   }
   const onData = (chunk) => {
-    state.buffer += chunk.toString('utf8')
+    state.buffer += decoder.write(chunk)
     // A peer that keeps sending bytes without CRLF must not be able to grow this
     // buffer without bound; every other read is line-delimited and small.
     if (state.buffer.length > MAX_RESPONSE_BYTES) {
@@ -690,7 +707,7 @@ function createChannel(socket, timeoutMs) {
     const first = await readLine()
     const match = /^(\d{3})([ -])(.*)$/.exec(first)
     if (match === null) throw new Error('SMTP 响应无法解析：' + cutText(first, 120))
-    const code = Number(match[1])
+    let code = Number(match[1])
     const lines = [match[3]]
     if (match[2] === '-') {
       for (;;) {
@@ -698,6 +715,11 @@ function createChannel(socket, timeoutMs) {
         const nextMatch = /^(\d{3})([ -])(.*)$/.exec(next)
         if (nextMatch === null) throw new Error('SMTP 多行响应无法解析：' + cutText(next, 120))
         lines.push(nextMatch[3])
+        // A continuation line carrying a DIFFERENT status code is how some
+        // servers report the real outcome (e.g. `250-...` then `550 ...`).
+        // Keeping the first line's code silently turned a rejection into a
+        // success; the last line is the verdict.
+        code = Number(nextMatch[1])
         if (nextMatch[2] === ' ') break
       }
     }
@@ -732,10 +754,22 @@ async function command(channel, line, codes, what) {
   return expectCode(channel, codes, what)
 }
 
-/** EHLO; returns the capability lines the server advertised. */
+/**
+ * EHLO; returns the capability lines the server advertised.
+ *
+ * RFC 5321 §4.1.1.1: a server that does not implement EHLO answers 500, 502 or
+ * 504 and expects HELO instead. Without the fallback such a server made the
+ * feedback feature unusable with a misleading "EHLO failed (500)" message.
+ */
 async function hello(channel, name) {
-  const response = await command(channel, 'EHLO ' + name, 250, 'EHLO')
-  return response.lines.map((line) => line.trim())
+  await channel.write('EHLO ' + name + '\r\n')
+  const response = await channel.readResponse()
+  if (response.code === 250) return response.lines.map((line) => line.trim())
+  if ([500, 502, 504].includes(response.code)) {
+    const helo = await command(channel, 'HELO ' + name, 250, 'HELO')
+    return helo.lines.map((line) => line.trim())
+  }
+  throw smtpError('EHLO', response)
 }
 
 /**
@@ -759,7 +793,14 @@ async function authenticate(channel, smtp, caps) {
     + cutText(response.lines.join(' '), 300)
     + '。请检查用户名 / 密码；Gmail、QQ 邮箱等服务需要「应用专用密码」，不能用登录密码。')
 
-  if (canLogin || !canPlain) {
+  if (!canLogin && !canPlain) {
+    // Sending AUTH LOGIN to a server that never offered it produced a 504 and
+    // an error pointing at the password, which sent users to the wrong place.
+    throw new Error('SMTP 服务器不支持 LOGIN / PLAIN 认证（服务器声明的机制：'
+      + (mechanisms.length > 0 ? mechanisms.join('、') : '未声明')
+      + '）。请改用支持 LOGIN 或 PLAIN 的服务器')
+  }
+  if (canLogin) {
     await command(channel, 'AUTH LOGIN', 334, 'AUTH LOGIN')
     await command(channel, b64(smtp.user), 334, 'AUTH LOGIN 用户名')
     const done = await (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-instruction-memory",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "description": "User-only instruction memory for DSH: long-term instructions maintained in the settings UI and auto-injected into every conversation — the model has no write access. 指令记忆：只由用户在设置页维护的长期指令，自动注入此后每轮对话；模型没有任何写入口。",
   "license": "MIT",
   "type": "module",