@bumail/smtp 0.9.0 → 0.10.0

package/dist/index.js

@@ -6,8 +6,9 @@ import {
   decodePlain2,
   decodeLoginStep2,
   LineSplitter,
+  decodeXtext,
   Outgoing
-} from "./chunks/index-wc25ywta.js";
+} from "./chunks/index-twt5myrr.js";
 // src/protocol/command.ts
 function parseCommand(line) {
   const space = line.indexOf(" ");
@@ -27,6 +28,7 @@ function parsePathCommand(argument, keyword) {
   if (!path)
     return;
   const parameters = {};
+  const repeated = [];
   for (const item of match[2].trim().split(/\s+/)) {
     if (item === "")
       continue;
@@ -34,9 +36,11 @@ function parsePathCommand(argument, keyword) {
     const key = (equals < 0 ? item : item.slice(0, equals)).toUpperCase();
     if (!/^[A-Z0-9][A-Z0-9-]*$/.test(key))
       return;
+    if (key in parameters)
+      repeated.push(key);
     parameters[key] = equals < 0 ? "" : item.slice(equals + 1);
   }
-  return { path, parameters };
+  return repeated.length > 0 ? { path, parameters, repeated } : { path, parameters };
 }
 // src/protocol/data.ts
 var CR = 13;
@@ -287,10 +291,75 @@ async function continueAuth(connection, line) {
 // src/server/state.ts
 var emptyTransaction = () => ({
   to: [],
+  recipients: [],
   smtputf8: false,
   body: "7BIT"
 });
 
+// src/server/dsn-params.ts
+var MAIL_DSN = new Set(["RET", "ENVID"]);
+var RCPT_DSN = new Set(["NOTIFY", "ORCPT"]);
+var EVENTS = ["SUCCESS", "FAILURE", "DELAY"];
+function envid(value) {
+  const text = value.length <= 100 ? decodeXtext(value) : undefined;
+  return text !== undefined && /^[ -~]+$/.test(text) ? text : undefined;
+}
+function notify(value) {
+  const items = value.toUpperCase().split(",");
+  if (items.length === 1 && items[0] === "NEVER")
+    return "NEVER";
+  const events = [];
+  for (const item of items) {
+    const event = EVENTS.find((candidate) => candidate === item);
+    if (!event || events.includes(event))
+      return;
+    events.push(event);
+  }
+  return events;
+}
+function orcpt(value) {
+  const semicolon = value.indexOf(";");
+  if (semicolon < 1 || value.length > 500)
+    return;
+  const type = value.slice(0, semicolon);
+  const address = decodeXtext(value.slice(semicolon + 1));
+  if (!/^[A-Za-z0-9-]+$/.test(type) || !address)
+    return;
+  return { type, address };
+}
+function readMailDsn(into, key, value, repeated) {
+  if (repeated.includes(key))
+    return `${key} given twice`;
+  if (key === "RET") {
+    const ret = value.toUpperCase();
+    if (ret !== "FULL" && ret !== "HDRS")
+      return "Syntax: RET=FULL or RET=HDRS";
+    into.ret = ret;
+    return;
+  }
+  const id = envid(value);
+  if (id === undefined)
+    return "Syntax: ENVID=<xtext, 1 to 100 characters>";
+  into.envid = id;
+  return;
+}
+function readRcptDsn(into, key, value, repeated) {
+  if (repeated.includes(key))
+    return `${key} given twice`;
+  if (key === "NOTIFY") {
+    const events = notify(value);
+    if (!events)
+      return "Syntax: NOTIFY=NEVER or NOTIFY=SUCCESS,FAILURE,DELAY";
+    into.notify = events;
+    return;
+  }
+  const original = orcpt(value);
+  if (!original)
+    return "Syntax: ORCPT=<addr-type>;<xtext>";
+  into.orcpt = original;
+  return;
+}
+
 // src/server/transaction.ts
 function nonAscii(text) {
   for (let i = 0;i < text.length; i++)
@@ -311,7 +380,8 @@ async function mail(connection, argument) {
   const command = parsePathCommand(argument, "FROM");
   if (!command)
     return connection.fail(reply(501, "5.5.4", "Syntax: MAIL FROM:<address>"));
-  const { path, parameters } = command;
+  const { path, parameters, repeated = [] } = command;
+  const dsn = {};
   let body = "7BIT";
   let smtputf8 = false;
   for (const [key, value] of Object.entries(parameters)) {
@@ -331,7 +401,11 @@ async function mail(connection, argument) {
       body = kind;
     } else if (key === "SMTPUTF8" && value === "") {
       smtputf8 = true;
-    } else if (key === "AUTH") {} else {
+    } else if (key === "AUTH") {} else if (MAIL_DSN.has(key)) {
+      const wrong = readMailDsn(dsn, key, value, repeated);
+      if (wrong)
+        return connection.fail(reply(501, "5.5.4", wrong));
+    } else {
       return connection.fail(reply(555, "5.5.4", `${key} is not supported`));
     }
   }
@@ -342,7 +416,14 @@ async function mail(connection, argument) {
   const refused = options.onMailFrom ? await connection.hook("onMailFrom", () => options.onMailFrom?.(path, connection.session)) : undefined;
   if (refused)
     return connection.send(refused);
-  state.transaction = { from: path.address, to: [], smtputf8, body };
+  state.transaction = {
+    from: path.address,
+    to: [],
+    recipients: [],
+    smtputf8,
+    body,
+    ...dsn
+  };
   connection.send(reply(250, "2.1.0", "OK"));
 }
 async function rcpt(connection, argument) {
@@ -352,9 +433,19 @@ async function rcpt(connection, argument) {
   const command = parsePathCommand(argument, "TO");
   if (!command)
     return connection.fail(reply(501, "5.5.4", "Syntax: RCPT TO:<address>"));
-  const { path, parameters } = command;
-  if (Object.keys(parameters).length > 0) {
-    return connection.fail(reply(555, "5.5.4", `${Object.keys(parameters)[0]} is not supported`));
+  const { path, parameters, repeated = [] } = command;
+  const recipient = {
+    address: path.address
+  };
+  for (const [key, value] of Object.entries(parameters)) {
+    if (!state.esmtp)
+      return connection.fail(reply(555, "5.5.4", `${key} needs EHLO`));
+    if (!RCPT_DSN.has(key)) {
+      return connection.fail(reply(555, "5.5.4", `${key} is not supported`));
+    }
+    const wrong = readRcptDsn(recipient, key, value, repeated);
+    if (wrong)
+      return connection.fail(reply(501, "5.5.4", wrong));
   }
   if (!state.transaction.smtputf8 && nonAscii(path.address)) {
     return connection.fail(reply(553, "5.6.7", "A non-ASCII address needs SMTPUTF8"));
@@ -375,6 +466,7 @@ async function rcpt(connection, argument) {
   if (refused)
     return connection.send(refused);
   state.transaction.to.push(path.address);
+  state.transaction.recipients.push(recipient);
   connection.send(reply(250, "2.1.5", "OK"));
 }
 
@@ -387,6 +479,7 @@ function ehloLines(connection) {
     `SIZE ${settings.maxMessageSize}`,
     "8BITMIME",
     "SMTPUTF8",
+    "DSN",
     "ENHANCEDSTATUSCODES"
   ];
   if (settings.options.tls && !state.secure)
@@ -473,6 +566,19 @@ async function runCommand(connection, line) {
   }
 }
 
+// src/server/envelope.ts
+function envelopeOf(transaction) {
+  return {
+    from: transaction.from ?? "",
+    to: [...transaction.to],
+    smtputf8: transaction.smtputf8,
+    body: transaction.body,
+    ...transaction.ret !== undefined && { ret: transaction.ret },
+    ...transaction.envid !== undefined && { envid: transaction.envid },
+    recipients: [...transaction.recipients]
+  };
+}
+
 // src/server/received.ts
 import { isIPv6 } from "node:net";
 var DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
@@ -592,12 +698,7 @@ class Intake {
     this.#push(new TextEncoder().encode(receivedField(connection, transaction.to, this.id)));
     const message = {
       id: this.id,
-      envelope: {
-        from: transaction.from ?? "",
-        to: [...transaction.to],
-        smtputf8: transaction.smtputf8,
-        body: transaction.body
-      },
+      envelope: envelopeOf(transaction),
       content,
       signal: this.#refusal.signal
     };
@@ -1952,5 +2053,5 @@ export {
   reply
 };
 
-//# debugId=9B356F51DEFD8FA364756E2164756E21
+//# debugId=5D8963483AFC536F64756E2164756E21
 //# sourceMappingURL=index.js.map