From eb2643de931f18622ccde81ec76ddb66f8e281d6 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Tue, 10 Feb 2026 22:26:20 +0000 Subject: [PATCH] feat(mailer-smtp): add in-process security pipeline for SMTP delivery (DKIM/SPF/DMARC, content scanning, IP reputation) --- changelog.md | 10 + dist_ts/00_commitinfo_data.js | 2 +- dist_ts/mail/delivery/index.d.ts | 3 +- dist_ts/mail/delivery/index.js | 5 +- .../smtpserver/certificate-utils.d.ts | 45 - .../delivery/smtpserver/certificate-utils.js | 345 ----- .../delivery/smtpserver/command-handler.d.ts | 156 -- .../delivery/smtpserver/command-handler.js | 1163 -------------- .../smtpserver/connection-manager.d.ts | 159 -- .../delivery/smtpserver/connection-manager.js | 918 ----------- .../mail/delivery/smtpserver/constants.d.ts | 130 -- dist_ts/mail/delivery/smtpserver/constants.js | 162 -- .../delivery/smtpserver/create-server.d.ts | 14 - .../mail/delivery/smtpserver/create-server.js | 28 - .../delivery/smtpserver/data-handler.d.ts | 123 -- .../mail/delivery/smtpserver/data-handler.js | 1152 -------------- dist_ts/mail/delivery/smtpserver/index.d.ts | 20 - dist_ts/mail/delivery/smtpserver/index.js | 27 - .../mail/delivery/smtpserver/interfaces.d.ts | 530 ------- .../mail/delivery/smtpserver/interfaces.js | 10 - .../delivery/smtpserver/secure-server.d.ts | 15 - .../mail/delivery/smtpserver/secure-server.js | 79 - .../delivery/smtpserver/security-handler.d.ts | 86 -- .../delivery/smtpserver/security-handler.js | 242 --- .../delivery/smtpserver/session-manager.d.ts | 140 -- .../delivery/smtpserver/session-manager.js | 473 ------ .../mail/delivery/smtpserver/smtp-server.d.ts | 137 -- .../mail/delivery/smtpserver/smtp-server.js | 698 --------- .../delivery/smtpserver/starttls-handler.d.ts | 21 - .../delivery/smtpserver/starttls-handler.js | 207 --- .../mail/delivery/smtpserver/tls-handler.d.ts | 66 - .../mail/delivery/smtpserver/tls-handler.js | 273 ---- .../smtpserver/utils/adaptive-logging.d.ts | 117 -- .../smtpserver/utils/adaptive-logging.js | 413 ----- .../delivery/smtpserver/utils/helpers.d.ts | 78 - .../mail/delivery/smtpserver/utils/helpers.js | 208 --- .../delivery/smtpserver/utils/logging.d.ts | 106 -- .../mail/delivery/smtpserver/utils/logging.js | 181 --- .../delivery/smtpserver/utils/validation.d.ts | 69 - .../delivery/smtpserver/utils/validation.js | 360 ----- .../routing/classes.unified.email.server.d.ts | 11 +- .../routing/classes.unified.email.server.js | 109 +- npmextra.json | 15 +- rust/Cargo.lock | 1 + .../mailer-security/src/content_scanner.rs | 4 +- rust/crates/mailer-smtp/Cargo.toml | 1 + rust/crates/mailer-smtp/src/connection.rs | 289 +++- rust/crates/mailer-smtp/src/server.rs | 23 + test/helpers/server.loader.ts | 275 +--- .../test.cmd-01.ehlo-command.ts | 193 --- .../test.cmd-02.mail-from.ts | 330 ---- .../test.cmd-03.rcpt-to.ts | 296 ---- .../test.cmd-04.data-command.ts | 395 ----- .../test.cmd-05.noop-command.ts | 320 ---- .../test.cmd-06.rset-command.ts | 399 ----- .../test.cmd-07.vrfy-command.ts | 391 ----- .../test.cmd-08.expn-command.ts | 450 ------ .../test.cmd-09.size-extension.ts | 465 ------ .../test.cmd-10.help-command.ts | 454 ------ .../test.cmd-11.command-pipelining.ts | 334 ---- .../test.cmd-12.helo-command.ts | 420 ------ .../test.cmd-13.quit-command.ts | 384 ----- .../test.cm-01.tls-connection.ts | 61 - .../test.cm-02.multiple-connections.ts | 112 -- .../test.cm-03.connection-timeout.ts | 134 -- .../test.cm-04.connection-limits.ts | 374 ----- .../test.cm-05.connection-rejection.ts | 296 ---- .../test.cm-06.starttls-upgrade.ts | 468 ------ .../test.cm-07.abrupt-disconnection.ts | 321 ---- .../test.cm-08.tls-versions.ts | 361 ----- .../test.cm-09.tls-ciphers.ts | 556 ------- .../test.cm-10.plain-connection.ts | 293 ---- .../test.cm-11.keepalive.ts | 382 ----- .../test.edge-01.very-large-email.ts | 239 --- .../test.edge-02.very-small-email.ts | 389 ----- ...test.edge-03.invalid-character-handling.ts | 479 ------ .../test.edge-04.empty-commands.ts | 430 ------ .../test.edge-05.extremely-long-lines.ts | 425 ------ .../test.edge-06.extremely-long-headers.ts | 404 ----- .../test.edge-07.unusual-mime-types.ts | 333 ---- .../test.edge-08.nested-mime-structures.ts | 379 ----- .../test.ep-01.basic-email-sending.ts | 338 ----- .../test.ep-02.invalid-email-addresses.ts | 315 ---- .../test.ep-03.multiple-recipients.ts | 493 ------ .../test.ep-04.large-email.ts | 528 ------- .../test.ep-05.mime-handling.ts | 515 ------- .../test.ep-06.attachment-handling.ts | 629 -------- .../test.ep-07.special-character-handling.ts | 462 ------ .../test.ep-08.email-routing.ts | 527 ------- ...est.ep-09.delivery-status-notifications.ts | 486 ------ .../test.err-01.syntax-errors.ts | 475 ------ .../test.err-02.invalid-sequence.ts | 450 ------ .../test.err-03.temporary-failures.ts | 453 ------ .../test.err-04.permanent-failures.ts | 325 ---- .../test.err-05.resource-exhaustion.ts | 302 ---- .../test.err-06.malformed-mime.ts | 374 ----- .../test.err-07.exception-handling.ts | 333 ---- .../test.err-08.error-logging.ts | 324 ---- .../test.perf-01.throughput.ts | 183 --- .../test.perf-02.concurrency.ts | 388 ----- .../test.perf-03.cpu-utilization.ts | 245 --- .../test.perf-04.memory-usage.ts | 238 --- ...test.perf-05.connection-processing-time.ts | 363 ----- .../test.perf-06.message-processing-time.ts | 252 ---- .../test.perf-07.resource-cleanup.ts | 317 ---- .../test.rel-01.long-running-operation.ts | 344 ----- .../test.rel-02.restart-recovery.ts | 328 ---- .../test.rel-03.resource-leak-detection.ts | 394 ----- .../test.rel-04.error-recovery.ts | 401 ----- .../test.rel-05.dns-resolution-failure.ts | 335 ----- .../test.rel-06.network-interruption.ts | 410 ----- .../test.rfc-01.rfc5321-compliance.ts | 382 ----- .../test.rfc-02.rfc5322-compliance.ts | 428 ------ .../test.rfc-03.rfc7208-spf-compliance.ts | 330 ---- .../test.rfc-04.rfc6376-dkim-compliance.ts | 450 ------ .../test.rfc-05.rfc7489-dmarc-compliance.ts | 408 ----- .../test.rfc-06.rfc8314-tls-compliance.ts | 366 ----- .../test.rfc-07.rfc3461-dsn-compliance.ts | 399 ----- .../test.sec-01.authentication.ts | 218 --- .../test.sec-02.authorization.ts | 286 ---- .../test.sec-03.dkim-processing.ts | 414 ----- .../test.sec-04.spf-checking.ts | 280 ---- .../test.sec-05.dmarc-policy.ts | 374 ----- .../test.sec-06.ip-reputation.ts | 303 ---- .../test.sec-07.content-scanning.ts | 409 ----- .../test.sec-08.rate-limiting.ts | 324 ---- .../test.sec-09.tls-certificate-validation.ts | 312 ---- ...test.sec-10.header-injection-prevention.ts | 332 ---- .../test.sec-11.bounce-management.ts | 363 ----- test/test.smtp.server.ts | 180 --- ts/00_commitinfo_data.ts | 2 +- ts/mail/delivery/index.ts | 3 +- .../delivery/smtpserver/certificate-utils.ts | 398 ----- .../delivery/smtpserver/command-handler.ts | 1340 ----------------- .../delivery/smtpserver/connection-manager.ts | 1061 ------------- ts/mail/delivery/smtpserver/constants.ts | 181 --- ts/mail/delivery/smtpserver/create-server.ts | 31 - ts/mail/delivery/smtpserver/data-handler.ts | 1283 ---------------- ts/mail/delivery/smtpserver/index.ts | 32 - ts/mail/delivery/smtpserver/interfaces.ts | 655 -------- ts/mail/delivery/smtpserver/secure-server.ts | 97 -- .../delivery/smtpserver/security-handler.ts | 345 ----- .../delivery/smtpserver/session-manager.ts | 557 ------- ts/mail/delivery/smtpserver/smtp-server.ts | 804 ---------- .../delivery/smtpserver/starttls-handler.ts | 262 ---- ts/mail/delivery/smtpserver/tls-handler.ts | 346 ----- .../smtpserver/utils/adaptive-logging.ts | 514 ------- ts/mail/delivery/smtpserver/utils/helpers.ts | 246 --- ts/mail/delivery/smtpserver/utils/logging.ts | 246 --- .../delivery/smtpserver/utils/validation.ts | 436 ------ .../routing/classes.unified.email.server.ts | 118 +- 151 files changed, 477 insertions(+), 47531 deletions(-) delete mode 100644 dist_ts/mail/delivery/smtpserver/certificate-utils.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/certificate-utils.js delete mode 100644 dist_ts/mail/delivery/smtpserver/command-handler.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/command-handler.js delete mode 100644 dist_ts/mail/delivery/smtpserver/connection-manager.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/connection-manager.js delete mode 100644 dist_ts/mail/delivery/smtpserver/constants.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/constants.js delete mode 100644 dist_ts/mail/delivery/smtpserver/create-server.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/create-server.js delete mode 100644 dist_ts/mail/delivery/smtpserver/data-handler.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/data-handler.js delete mode 100644 dist_ts/mail/delivery/smtpserver/index.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/index.js delete mode 100644 dist_ts/mail/delivery/smtpserver/interfaces.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/interfaces.js delete mode 100644 dist_ts/mail/delivery/smtpserver/secure-server.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/secure-server.js delete mode 100644 dist_ts/mail/delivery/smtpserver/security-handler.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/security-handler.js delete mode 100644 dist_ts/mail/delivery/smtpserver/session-manager.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/session-manager.js delete mode 100644 dist_ts/mail/delivery/smtpserver/smtp-server.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/smtp-server.js delete mode 100644 dist_ts/mail/delivery/smtpserver/starttls-handler.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/starttls-handler.js delete mode 100644 dist_ts/mail/delivery/smtpserver/tls-handler.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/tls-handler.js delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.js delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/helpers.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/helpers.js delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/logging.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/logging.js delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/validation.d.ts delete mode 100644 dist_ts/mail/delivery/smtpserver/utils/validation.js delete mode 100644 test/suite/smtpserver_commands/test.cmd-01.ehlo-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-02.mail-from.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-03.rcpt-to.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-04.data-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-05.noop-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-06.rset-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-07.vrfy-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-08.expn-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-09.size-extension.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-10.help-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-11.command-pipelining.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-12.helo-command.ts delete mode 100644 test/suite/smtpserver_commands/test.cmd-13.quit-command.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-01.tls-connection.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-02.multiple-connections.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-03.connection-timeout.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-04.connection-limits.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-05.connection-rejection.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-06.starttls-upgrade.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-07.abrupt-disconnection.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-08.tls-versions.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-09.tls-ciphers.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-10.plain-connection.ts delete mode 100644 test/suite/smtpserver_connection/test.cm-11.keepalive.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-01.very-large-email.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-02.very-small-email.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-03.invalid-character-handling.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-04.empty-commands.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-05.extremely-long-lines.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-06.extremely-long-headers.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-07.unusual-mime-types.ts delete mode 100644 test/suite/smtpserver_edge-cases/test.edge-08.nested-mime-structures.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-01.basic-email-sending.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-02.invalid-email-addresses.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-03.multiple-recipients.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-04.large-email.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-05.mime-handling.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-06.attachment-handling.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-07.special-character-handling.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-08.email-routing.ts delete mode 100644 test/suite/smtpserver_email-processing/test.ep-09.delivery-status-notifications.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-01.syntax-errors.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-02.invalid-sequence.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-03.temporary-failures.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-04.permanent-failures.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-05.resource-exhaustion.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-06.malformed-mime.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-07.exception-handling.ts delete mode 100644 test/suite/smtpserver_error-handling/test.err-08.error-logging.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-01.throughput.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-02.concurrency.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-03.cpu-utilization.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-04.memory-usage.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-05.connection-processing-time.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-06.message-processing-time.ts delete mode 100644 test/suite/smtpserver_performance/test.perf-07.resource-cleanup.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-01.long-running-operation.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-02.restart-recovery.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-03.resource-leak-detection.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-04.error-recovery.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-05.dns-resolution-failure.ts delete mode 100644 test/suite/smtpserver_reliability/test.rel-06.network-interruption.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-01.rfc5321-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-02.rfc5322-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-03.rfc7208-spf-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-04.rfc6376-dkim-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-05.rfc7489-dmarc-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-06.rfc8314-tls-compliance.ts delete mode 100644 test/suite/smtpserver_rfc-compliance/test.rfc-07.rfc3461-dsn-compliance.ts delete mode 100644 test/suite/smtpserver_security/test.sec-01.authentication.ts delete mode 100644 test/suite/smtpserver_security/test.sec-02.authorization.ts delete mode 100644 test/suite/smtpserver_security/test.sec-03.dkim-processing.ts delete mode 100644 test/suite/smtpserver_security/test.sec-04.spf-checking.ts delete mode 100644 test/suite/smtpserver_security/test.sec-05.dmarc-policy.ts delete mode 100644 test/suite/smtpserver_security/test.sec-06.ip-reputation.ts delete mode 100644 test/suite/smtpserver_security/test.sec-07.content-scanning.ts delete mode 100644 test/suite/smtpserver_security/test.sec-08.rate-limiting.ts delete mode 100644 test/suite/smtpserver_security/test.sec-09.tls-certificate-validation.ts delete mode 100644 test/suite/smtpserver_security/test.sec-10.header-injection-prevention.ts delete mode 100644 test/suite/smtpserver_security/test.sec-11.bounce-management.ts delete mode 100644 test/test.smtp.server.ts delete mode 100644 ts/mail/delivery/smtpserver/certificate-utils.ts delete mode 100644 ts/mail/delivery/smtpserver/command-handler.ts delete mode 100644 ts/mail/delivery/smtpserver/connection-manager.ts delete mode 100644 ts/mail/delivery/smtpserver/constants.ts delete mode 100644 ts/mail/delivery/smtpserver/create-server.ts delete mode 100644 ts/mail/delivery/smtpserver/data-handler.ts delete mode 100644 ts/mail/delivery/smtpserver/index.ts delete mode 100644 ts/mail/delivery/smtpserver/interfaces.ts delete mode 100644 ts/mail/delivery/smtpserver/secure-server.ts delete mode 100644 ts/mail/delivery/smtpserver/security-handler.ts delete mode 100644 ts/mail/delivery/smtpserver/session-manager.ts delete mode 100644 ts/mail/delivery/smtpserver/smtp-server.ts delete mode 100644 ts/mail/delivery/smtpserver/starttls-handler.ts delete mode 100644 ts/mail/delivery/smtpserver/tls-handler.ts delete mode 100644 ts/mail/delivery/smtpserver/utils/adaptive-logging.ts delete mode 100644 ts/mail/delivery/smtpserver/utils/helpers.ts delete mode 100644 ts/mail/delivery/smtpserver/utils/logging.ts delete mode 100644 ts/mail/delivery/smtpserver/utils/validation.ts diff --git a/changelog.md b/changelog.md index b7f88ab..af61137 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Changelog +## 2026-02-10 - 2.3.0 - feat(mailer-smtp) +add in-process security pipeline for SMTP delivery (DKIM/SPF/DMARC, content scanning, IP reputation) + +- Integrate mailer_security verification (DKIM/SPF/DMARC) and IP reputation checks into the Rust SMTP server; run concurrently and wrapped with a 30s timeout. +- Add MIME parsing using mailparse and an extract_mime_parts helper to extract subject, text/html bodies and attachment filenames for content scanning. +- Wire MessageAuthenticator and TokioResolver into server and connection startup; pass them into the delivery pipeline and connection handlers. +- Run content scanning (mailer_security::content_scanner), combine results (dkim/spf/dmarc, contentScan, ipReputation) into a JSON object and attach as security_results on EmailReceived events. +- Update Rust crates (Cargo.toml/Cargo.lock) to include mailparse and resolver usage and add serde::Deserialize where required; add unit tests for MIME extraction. +- Remove the TypeScript SMTP server implementation and many TS tests; replace test helper (server.loader.ts) with a stub that points tests to use the Rust SMTP server and provide small utilities (getAvailablePort/isPortFree). + ## 2026-02-10 - 2.2.1 - fix(readme) Clarify Rust-powered architecture and mandatory Rust bridge; expand README with Rust workspace details and project structure updates diff --git a/dist_ts/00_commitinfo_data.js b/dist_ts/00_commitinfo_data.js index 47b8c58..5c9a05c 100644 --- a/dist_ts/00_commitinfo_data.js +++ b/dist_ts/00_commitinfo_data.js @@ -3,7 +3,7 @@ */ export const commitinfo = { name: '@push.rocks/smartmta', - version: '2.1.0', + version: '2.2.1', description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.' }; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlIQUF5SDtDQUN2SSxDQUFBIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/index.d.ts b/dist_ts/mail/delivery/index.d.ts index 473fb2a..7faca12 100644 --- a/dist_ts/mail/delivery/index.d.ts +++ b/dist_ts/mail/delivery/index.d.ts @@ -8,5 +8,4 @@ export type { IRateLimitConfig } from './classes.ratelimiter.js'; export * from './classes.unified.rate.limiter.js'; export * from './classes.mta.config.js'; import * as smtpClientMod from './smtpclient/index.js'; -import * as smtpServerMod from './smtpserver/index.js'; -export { smtpClientMod, smtpServerMod }; +export { smtpClientMod }; diff --git a/dist_ts/mail/delivery/index.js b/dist_ts/mail/delivery/index.js index d8037ad..7a2abdf 100644 --- a/dist_ts/mail/delivery/index.js +++ b/dist_ts/mail/delivery/index.js @@ -13,6 +13,5 @@ export * from './classes.unified.rate.limiter.js'; export * from './classes.mta.config.js'; // Import and export SMTP modules as namespaces to avoid conflicts import * as smtpClientMod from './smtpclient/index.js'; -import * as smtpServerMod from './smtpserver/index.js'; -export { smtpClientMod, smtpServerMod }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw4QkFBOEIsQ0FBQztBQUU3Qyx1Q0FBdUM7QUFDdkMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU5RCw2Q0FBNkM7QUFDN0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3ZELHVCQUF1QjtBQUN2QixjQUFjLG1DQUFtQyxDQUFDO0FBRWxELGdDQUFnQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBRXhDLGtFQUFrRTtBQUNsRSxPQUFPLEtBQUssYUFBYSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxhQUFhLE1BQU0sdUJBQXVCLENBQUM7QUFFdkQsT0FBTyxFQUFFLGFBQWEsRUFBRSxhQUFhLEVBQUUsQ0FBQyJ9 \ No newline at end of file +export { smtpClientMod }; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw4QkFBOEIsQ0FBQztBQUU3Qyx1Q0FBdUM7QUFDdkMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU5RCw2Q0FBNkM7QUFDN0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3ZELHVCQUF1QjtBQUN2QixjQUFjLG1DQUFtQyxDQUFDO0FBRWxELGdDQUFnQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBRXhDLGtFQUFrRTtBQUNsRSxPQUFPLEtBQUssYUFBYSxNQUFNLHVCQUF1QixDQUFDO0FBRXZELE9BQU8sRUFBRSxhQUFhLEVBQUUsQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/certificate-utils.d.ts b/dist_ts/mail/delivery/smtpserver/certificate-utils.d.ts deleted file mode 100644 index 669df6e..0000000 --- a/dist_ts/mail/delivery/smtpserver/certificate-utils.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Certificate Utilities for SMTP Server - * Provides utilities for managing TLS certificates - */ -import * as tls from 'tls'; -/** - * Certificate data - */ -export interface ICertificateData { - key: Buffer; - cert: Buffer; - ca?: Buffer; -} -/** - * Load certificates from PEM format strings - * @param options - Certificate options - * @returns Certificate data with Buffer format - */ -export declare function loadCertificatesFromString(options: { - key: string | Buffer; - cert: string | Buffer; - ca?: string | Buffer; -}): ICertificateData; -/** - * Load certificates from files - * @param options - Certificate file paths - * @returns Certificate data with Buffer format - */ -export declare function loadCertificatesFromFiles(options: { - keyPath: string; - certPath: string; - caPath?: string; -}): ICertificateData; -/** - * Generate self-signed certificates for testing - * @returns Certificate data with Buffer format - */ -export declare function generateSelfSignedCertificates(): ICertificateData; -/** - * Create TLS options for secure server or STARTTLS - * @param certificates - Certificate data - * @param isServer - Whether this is for server (true) or client (false) - * @returns TLS options - */ -export declare function createTlsOptions(certificates: ICertificateData, isServer?: boolean): tls.TlsOptions; diff --git a/dist_ts/mail/delivery/smtpserver/certificate-utils.js b/dist_ts/mail/delivery/smtpserver/certificate-utils.js deleted file mode 100644 index fecb3c6..0000000 --- a/dist_ts/mail/delivery/smtpserver/certificate-utils.js +++ /dev/null @@ -1,345 +0,0 @@ -/** - * Certificate Utilities for SMTP Server - * Provides utilities for managing TLS certificates - */ -import * as fs from 'fs'; -import * as tls from 'tls'; -import { SmtpLogger } from './utils/logging.js'; -/** - * Normalize a PEM certificate string - * @param str - Certificate string - * @returns Normalized certificate string - */ -function normalizeCertificate(str) { - // Handle different input types - let inputStr; - if (Buffer.isBuffer(str)) { - // Convert Buffer to string using utf8 encoding - inputStr = str.toString('utf8'); - } - else if (typeof str === 'string') { - inputStr = str; - } - else { - throw new Error('Certificate must be a string or Buffer'); - } - if (!inputStr) { - throw new Error('Empty certificate data'); - } - // Remove any whitespace around the string - let normalizedStr = inputStr.trim(); - // Make sure it has proper PEM format - if (!normalizedStr.includes('-----BEGIN ')) { - throw new Error('Invalid certificate format: Missing BEGIN marker'); - } - if (!normalizedStr.includes('-----END ')) { - throw new Error('Invalid certificate format: Missing END marker'); - } - // Normalize line endings (replace Windows-style \r\n with Unix-style \n) - normalizedStr = normalizedStr.replace(/\r\n/g, '\n'); - // Only normalize if the certificate appears to have formatting issues - // Check if the certificate is already properly formatted - const lines = normalizedStr.split('\n'); - let needsReformatting = false; - // Check for common formatting issues: - // 1. Missing line breaks after header/before footer - // 2. Lines that are too long or too short (except header/footer) - // 3. Multiple consecutive blank lines - for (let i = 0; i < lines.length; i++) { - const line = lines[i].trim(); - if (line.startsWith('-----BEGIN ') || line.startsWith('-----END ')) { - continue; // Skip header/footer lines - } - if (line.length === 0) { - continue; // Skip empty lines - } - // Check if content lines are reasonable length (base64 is typically 64 chars per line) - if (line.length > 76) { // Allow some flexibility beyond standard 64 - needsReformatting = true; - break; - } - } - // Only reformat if necessary - if (needsReformatting) { - const beginMatch = normalizedStr.match(/^(-----BEGIN [^-]+-----)(.*)$/s); - const endMatch = normalizedStr.match(/(.*)(-----END [^-]+-----)$/s); - if (beginMatch && endMatch) { - const header = beginMatch[1]; - const footer = endMatch[2]; - let content = normalizedStr.substring(header.length, normalizedStr.length - footer.length); - // Clean up only line breaks and carriage returns, preserve base64 content - content = content.replace(/[\n\r]/g, '').trim(); - // Add proper line breaks (every 64 characters) - let formattedContent = ''; - for (let i = 0; i < content.length; i += 64) { - formattedContent += content.substring(i, Math.min(i + 64, content.length)) + '\n'; - } - // Reconstruct the certificate - return header + '\n' + formattedContent + footer; - } - } - return normalizedStr; -} -/** - * Load certificates from PEM format strings - * @param options - Certificate options - * @returns Certificate data with Buffer format - */ -export function loadCertificatesFromString(options) { - try { - // First try to use certificates without normalization - try { - let keyStr; - let certStr; - let caStr; - // Convert inputs to strings without aggressive normalization - if (Buffer.isBuffer(options.key)) { - keyStr = options.key.toString('utf8'); - } - else { - keyStr = options.key; - } - if (Buffer.isBuffer(options.cert)) { - certStr = options.cert.toString('utf8'); - } - else { - certStr = options.cert; - } - if (options.ca) { - if (Buffer.isBuffer(options.ca)) { - caStr = options.ca.toString('utf8'); - } - else { - caStr = options.ca; - } - } - // Simple cleanup - only normalize line endings - keyStr = keyStr.trim().replace(/\r\n/g, '\n'); - certStr = certStr.trim().replace(/\r\n/g, '\n'); - if (caStr) { - caStr = caStr.trim().replace(/\r\n/g, '\n'); - } - // Convert to buffers - const keyBuffer = Buffer.from(keyStr, 'utf8'); - const certBuffer = Buffer.from(certStr, 'utf8'); - const caBuffer = caStr ? Buffer.from(caStr, 'utf8') : undefined; - // Test the certificates first - const secureContext = tls.createSecureContext({ - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }); - SmtpLogger.info('Successfully validated certificates without normalization'); - return { - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }; - } - catch (simpleError) { - SmtpLogger.warn(`Simple certificate loading failed, trying normalization: ${simpleError instanceof Error ? simpleError.message : String(simpleError)}`); - // DEBUG: Log certificate details when simple loading fails - SmtpLogger.warn('Certificate loading failure details', { - keyType: typeof options.key, - certType: typeof options.cert, - keyIsBuffer: Buffer.isBuffer(options.key), - certIsBuffer: Buffer.isBuffer(options.cert), - keyLength: options.key ? options.key.length : 0, - certLength: options.cert ? options.cert.length : 0, - keyPreview: options.key ? (typeof options.key === 'string' ? options.key.substring(0, 50) : options.key.toString('utf8').substring(0, 50)) : 'null', - certPreview: options.cert ? (typeof options.cert === 'string' ? options.cert.substring(0, 50) : options.cert.toString('utf8').substring(0, 50)) : 'null' - }); - } - // Fallback: Try to fix and normalize certificates - try { - // Normalize certificates (handles both string and Buffer inputs) - const key = normalizeCertificate(options.key); - const cert = normalizeCertificate(options.cert); - const ca = options.ca ? normalizeCertificate(options.ca) : undefined; - // Convert normalized strings to Buffer with explicit utf8 encoding - const keyBuffer = Buffer.from(key, 'utf8'); - const certBuffer = Buffer.from(cert, 'utf8'); - const caBuffer = ca ? Buffer.from(ca, 'utf8') : undefined; - // Log for debugging - SmtpLogger.debug('Certificate properties', { - keyLength: keyBuffer.length, - certLength: certBuffer.length, - caLength: caBuffer ? caBuffer.length : 0 - }); - // Validate the certificates by attempting to create a secure context - try { - const secureContext = tls.createSecureContext({ - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }); - // If createSecureContext doesn't throw, the certificates are valid - SmtpLogger.info('Successfully validated certificate format'); - } - catch (validationError) { - // Log detailed error information for debugging - SmtpLogger.error(`Certificate validation error: ${validationError instanceof Error ? validationError.message : String(validationError)}`); - SmtpLogger.debug('Certificate validation details', { - keyPreview: keyBuffer.toString('utf8').substring(0, 100) + '...', - certPreview: certBuffer.toString('utf8').substring(0, 100) + '...', - keyLength: keyBuffer.length, - certLength: certBuffer.length - }); - throw validationError; - } - return { - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }; - } - catch (innerError) { - SmtpLogger.warn(`Certificate normalization failed: ${innerError instanceof Error ? innerError.message : String(innerError)}`); - throw innerError; - } - } - catch (error) { - SmtpLogger.error(`Error loading certificates: ${error instanceof Error ? error.message : String(error)}`); - throw error; - } -} -/** - * Load certificates from files - * @param options - Certificate file paths - * @returns Certificate data with Buffer format - */ -export function loadCertificatesFromFiles(options) { - try { - // Read files directly as Buffers - const key = fs.readFileSync(options.keyPath); - const cert = fs.readFileSync(options.certPath); - const ca = options.caPath ? fs.readFileSync(options.caPath) : undefined; - // Log for debugging - SmtpLogger.debug('Certificate file properties', { - keyLength: key.length, - certLength: cert.length, - caLength: ca ? ca.length : 0 - }); - // Validate the certificates by attempting to create a secure context - try { - const secureContext = tls.createSecureContext({ - key, - cert, - ca - }); - // If createSecureContext doesn't throw, the certificates are valid - SmtpLogger.info('Successfully validated certificate files'); - } - catch (validationError) { - SmtpLogger.error(`Certificate file validation error: ${validationError instanceof Error ? validationError.message : String(validationError)}`); - throw validationError; - } - return { - key, - cert, - ca - }; - } - catch (error) { - SmtpLogger.error(`Error loading certificate files: ${error instanceof Error ? error.message : String(error)}`); - throw error; - } -} -/** - * Generate self-signed certificates for testing - * @returns Certificate data with Buffer format - */ -export function generateSelfSignedCertificates() { - // This is for fallback/testing only - log a warning - SmtpLogger.warn('Generating self-signed certificates for testing - DO NOT USE IN PRODUCTION'); - // Create selfsigned certificates using node-forge or similar library - // For now, use hardcoded certificates as a last resort - const key = Buffer.from(`-----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEgJW1HdJPACGB -ifoL3PB+HdAVA2nUmMfq43JbIUPXGTxCtzmQhuV04WjITwFw1loPx3ReHh4KR5yJ -BVdzUDocHuauMmBycHAjv7mImR/VkuK/SwT0Q5G/9/M55o6HUNol0UKt+uZuBy1r -ggFTdTDLw86i9UG5CZbWF/Yb/DTRoAkCr7iLnaZhhhqcdh5BGj7JBylIAV5RIW1y -xQxJVJZQT2KgCeCnHRRvYRQ7tVzUQBcSvtW4zYtqK4C39BgRyLUZQVYB7siGT/uP -YJE7R73u0xEgDMFWR1pItUYcVQXHQJ+YsLVCzqI22Mik7URdwxoSHSXRYKn6wnKg -4JYg65JnAgMBAAECggEAM2LlwRhwP0pnLlLHiPE4jJ3Qdz/NUF0hLnRhcUwW1iJ1 -03jzCQ4QZ3etfL9O2hVJg49J+QUG50FNduLq4SE7GZj1dEJ/YNnlk9PpI8GSpLuA -mGTUKofIEJjNy5gKR0c6/rfgP8UXYSbRnTnZwIXVkUYuAUJLJTBVcJlcvCwJ3/zz -C8789JyOO1CNwF3zEIALdW5X5se8V+sw5iHDrHVxkR2xgsYpBBOylFfBxbMvV5o1 -i+QOD1HaXdmIvjBCnHqrjX5SDnAYwHBSB9y6WbwC+Th76QHkRNcHZH86PJVdLEUi -tBPQmQh+SjDRaZzDJvURnOFks+eEsCPVPZnQ4wgnAQKBgQD8oHwGZIZRUjnXULNc -vJoPcjLpvdHRO0kXTJHtG2au2i9jVzL9SFwH1lHQM0XdXPnR2BK4Gmgc2dRnSB9n -YPPvCgyL2RS0Y7W98yEcgBgwVOJHnPQGRNwxUfCTHgmCQ7lXjQKKG51+dBfOYP3j -w8VYbS2pqxZtzzZ5zhk2BrZJdwKBgQDHDZC+NU80f7rLEr5vpwx9epTArwXre8oj -nGgzZ9/lE14qDnITBuZPUHWc4/7U1CCmP0vVH6nFVvhN9ra9QCTJBzQ5aj0l3JM7 -9j8R5QZIPqOu4+aqf0ZFEgmpBK2SAYqNrJ+YVa2T/zLF44Jlr5WiLkPTUyMxV5+k -P4ZK8QP7wQKBgQCbeLuRWCuVKNYgYjm9TA55BbJL82J+MvhcbXUccpUksJQRxMV3 -98PBUW0Qw38WciJxQF4naSKD/jXYndD+wGzpKMIU+tKU+sEYMnuFnx13++K8XrAe -NQPHDsK1wRgXk5ygOHx78xnZbMmwBXNLwQXIhyO8FJpwJHj2CtYvjb+2xwKBgQCn -KW/RiAHvG6GKjCHCOTlx2qLPxUiXYCk2xwvRnNfY5+2PFoqMI/RZLT/41kTda1fA -TDw+j4Uu/fF2ChPadwRiUjXZzZx/UjcMJXTpQ2kpbGJ11U/cL4+Tk0S6wz+HoS7z -w3vXT9UoDyFxDBjuMQJxJWTjmymaYUtNnz4iMuRqwQKBgH+HKbYHCZaIzXRMEO5S -T3xDMYH59dTEKKXEOA1KJ9Zo5XSD8NE9SQ+9etoOcEq8tdYS45OkHD3VyFQa7THu -58awjTdkpSmMPsw3AElOYDYJgD9oxKtTjwkXHqMjDBQZrXqzOImOAJhEVL+XH3LP -lv6RZ47YRC88T+P6n1yg6BPp ------END PRIVATE KEY-----`, 'utf8'); - const cert = Buffer.from(`-----BEGIN CERTIFICATE----- -MIIDCTCCAfGgAwIBAgIUHxmGQOQoiSbzqh6hIe+7h9xDXIUwDQYJKoZIhvcNAQEL -BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MDUyMTE2MDAzM1oXDTI2MDUy -MTE2MDAzM1owFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAxICVtR3STwAhgYn6C9zwfh3QFQNp1JjH6uNyWyFD1xk8 -Qrc5kIbldOFoyE8BcNZaD8d0Xh4eCkeciwOV3FwHR4brjJgcnRwI7+5iJkf1ZLiv -0sE9EORv/fzOeaOh1DaJdFCrfrmbgdgOUm62WNQOB2hq0kggjh/S1K+TBfF+8QFs -XQyW7y7mHecNgCgK/pI5b1irdajRc7nLvzM/U8qNn4jjrLsRoYqBPpn7aLKIBrmN -pNSIe18q8EYWkdmWBcnsZpAYv75SJG8E0lAYpMv9OEUIwsPh7AYUdkZqKtFxVxV5 -bYlA5ZfnVnWrWEwRXaVdFFRXIjP+EFkGYYWThbvAIb0TPQIDAQABo1MwUTAdBgNV -HQ4EFgQUiW1MoYR8YK9KJTyip5oFoUVJoCgwHwYDVR0jBBgwFoAUiW1MoYR8YK9K -JTyip5oFoUVJoCgwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA -BToM8SbUQXwJ9rTlQB2QI2GJaFwTpCFoQZwGUOCkwGLM3nOPLEbNPMDoIKGPwenB -P1xL8uJEgYRqP6UG/xy3HsxYsLCxuoxGGP2QjuiQKnFl0n85usZ5flCxmLC5IzYx -FLcR6WPTdj6b5JX0tM8Bi6toQ9Pj3u3dSVPZKRLYvJvZKt1PXI8qsHD/LvNa2wGG -Zi1BQFAr2cScNYa+p6IYDJi9TBNxoBIHNTzQPfWaen4MHRJqUNZCzQXcOnU/NW5G -+QqQSEMmk8yGucEHWUMFrEbABVgYuBslICEEtBZALB2jZJYSaJnPOJCcmFrxUv61 -ORWZbz+8rBL0JIeA7eFxEA== ------END CERTIFICATE-----`, 'utf8'); - return { - key, - cert - }; -} -/** - * Create TLS options for secure server or STARTTLS - * @param certificates - Certificate data - * @param isServer - Whether this is for server (true) or client (false) - * @returns TLS options - */ -export function createTlsOptions(certificates, isServer = true) { - const options = { - key: certificates.key, - cert: certificates.cert, - ca: certificates.ca, - // Support a wider range of TLS versions for better compatibility - minVersion: 'TLSv1', // Support older TLS versions (minimum TLS 1.0) - maxVersion: 'TLSv1.3', // Support latest TLS version (1.3) - // Cipher suites for broad compatibility - ciphers: 'HIGH:MEDIUM:!aNULL:!eNULL:!NULL:!ADH:!RC4', - // For testing, allow unauthorized (self-signed certs) - rejectUnauthorized: false, - // Longer handshake timeout for reliability - handshakeTimeout: 30000, - // TLS renegotiation option (removed - not supported in newer Node.js) - // Increase timeout for better reliability under test conditions - sessionTimeout: 600, - // Let the client choose the cipher for better compatibility - honorCipherOrder: false, - // For debugging - enableTrace: true, - // Disable secure options to allow more flexibility - secureOptions: 0 - }; - // Server-specific options - if (isServer) { - options.ALPNProtocols = ['smtp']; // Accept non-ALPN connections (legacy clients) - } - return options; -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate-utils.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/certificate-utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,GAAoB;IAChD,+BAA+B;IAC/B,IAAI,QAAgB,CAAC;IAErB,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,+CAA+C;QAC/C,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;SAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnC,QAAQ,GAAG,GAAG,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,0CAA0C;IAC1C,IAAI,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEpC,qCAAqC;IACrC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,yEAAyE;IACzE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAErD,sEAAsE;IACtE,yDAAyD;IACzD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,sCAAsC;IACtC,oDAAoD;IACpD,iEAAiE;IACjE,sCAAsC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACnE,SAAS,CAAC,2BAA2B;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,SAAS,CAAC,mBAAmB;QAC/B,CAAC;QACD,uFAAuF;QACvF,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC,CAAC,4CAA4C;YAClE,iBAAiB,GAAG,IAAI,CAAC;YACzB,MAAM;QACR,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAEpE,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YAE3F,0EAA0E;YAC1E,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhD,+CAA+C;YAC/C,IAAI,gBAAgB,GAAG,EAAE,CAAC;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5C,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC;YACpF,CAAC;YAED,8BAA8B;YAC9B,OAAO,MAAM,GAAG,IAAI,GAAG,gBAAgB,GAAG,MAAM,CAAC;QACnD,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAI1C;IACC,IAAI,CAAC;QACH,sDAAsD;QACtD,IAAI,CAAC;YACH,IAAI,MAAc,CAAC;YACnB,IAAI,OAAe,CAAC;YACpB,IAAI,KAAyB,CAAC;YAE9B,6DAA6D;YAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YACvB,CAAC;YAED,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YACzB,CAAC;YAED,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;gBACf,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;oBAChC,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;gBACrB,CAAC;YACH,CAAC;YAED,+CAA+C;YAC/C,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9C,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAChD,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC;YAED,qBAAqB;YACrB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEhE,8BAA8B;YAC9B,MAAM,aAAa,GAAG,GAAG,CAAC,mBAAmB,CAAC;gBAC5C,GAAG,EAAE,SAAS;gBACd,IAAI,EAAE,UAAU;gBAChB,EAAE,EAAE,QAAQ;aACb,CAAC,CAAC;YAEH,UAAU,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;YAE7E,OAAO;gBACL,GAAG,EAAE,SAAS;gBACd,IAAI,EAAE,UAAU;gBAChB,EAAE,EAAE,QAAQ;aACb,CAAC;QAEJ,CAAC;QAAC,OAAO,WAAW,EAAE,CAAC;YACrB,UAAU,CAAC,IAAI,CAAC,4DAA4D,WAAW,YAAY,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAExJ,2DAA2D;YAC3D,UAAU,CAAC,IAAI,CAAC,qCAAqC,EAAE;gBACrD,OAAO,EAAE,OAAO,OAAO,CAAC,GAAG;gBAC3B,QAAQ,EAAE,OAAO,OAAO,CAAC,IAAI;gBAC7B,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;gBACzC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/C,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClD,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;gBACnJ,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;aACzJ,CAAC,CAAC;QACL,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC;YACH,iEAAiE;YACjE,MAAM,GAAG,GAAG,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAErE,mEAAmE;YACnE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE1D,oBAAoB;YACpB,UAAU,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBACzC,SAAS,EAAE,SAAS,CAAC,MAAM;gBAC3B,UAAU,EAAE,UAAU,CAAC,MAAM;gBAC7B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACzC,CAAC,CAAC;YAEH,qEAAqE;YACrE,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,GAAG,CAAC,mBAAmB,CAAC;oBAC5C,GAAG,EAAE,SAAS;oBACd,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,QAAQ;iBACb,CAAC,CAAC;gBAEH,mEAAmE;gBACnE,UAAU,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;YAAC,OAAO,eAAe,EAAE,CAAC;gBACzB,+CAA+C;gBAC/C,UAAU,CAAC,KAAK,CAAC,iCAAiC,eAAe,YAAY,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBAC1I,UAAU,CAAC,KAAK,CAAC,gCAAgC,EAAE;oBACjD,UAAU,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK;oBAChE,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK;oBAClE,SAAS,EAAE,SAAS,CAAC,MAAM;oBAC3B,UAAU,EAAE,UAAU,CAAC,MAAM;iBAC9B,CAAC,CAAC;gBACH,MAAM,eAAe,CAAC;YACxB,CAAC;YAED,OAAO;gBACL,GAAG,EAAE,SAAS;gBACd,IAAI,EAAE,UAAU;gBAChB,EAAE,EAAE,QAAQ;aACb,CAAC;QACJ,CAAC;QAAC,OAAO,UAAU,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,qCAAqC,UAAU,YAAY,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC9H,MAAM,UAAU,CAAC;QACnB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,CAAC,KAAK,CAAC,+BAA+B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1G,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAIzC;IACC,IAAI,CAAC;QACH,iCAAiC;QACjC,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,oBAAoB;QACpB,UAAU,CAAC,KAAK,CAAC,6BAA6B,EAAE;YAC9C,SAAS,EAAE,GAAG,CAAC,MAAM;YACrB,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAC7B,CAAC,CAAC;QAEH,qEAAqE;QACrE,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,GAAG,CAAC,mBAAmB,CAAC;gBAC5C,GAAG;gBACH,IAAI;gBACJ,EAAE;aACH,CAAC,CAAC;YAEH,mEAAmE;YACnE,UAAU,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,eAAe,EAAE,CAAC;YACzB,UAAU,CAAC,KAAK,CAAC,sCAAsC,eAAe,YAAY,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAC/I,MAAM,eAAe,CAAC;QACxB,CAAC;QAED,OAAO;YACL,GAAG;YACH,IAAI;YACJ,EAAE;SACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,CAAC,KAAK,CAAC,oCAAoC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/G,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,8BAA8B;IAC5C,oDAAoD;IACpD,UAAU,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;IAE9F,qEAAqE;IACrE,uDAAuD;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA2BA,EAAE,MAAM,CAAC,CAAC;IAElC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;0BAkBD,EAAE,MAAM,CAAC,CAAC;IAElC,OAAO;QACL,GAAG;QACH,IAAI;KACL,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC9B,YAA8B,EAC9B,WAAoB,IAAI;IAExB,MAAM,OAAO,GAAmB;QAC9B,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,EAAE,EAAE,YAAY,CAAC,EAAE;QACnB,iEAAiE;QACjE,UAAU,EAAE,OAAO,EAAG,+CAA+C;QACrE,UAAU,EAAE,SAAS,EAAE,mCAAmC;QAC1D,wCAAwC;QACxC,OAAO,EAAE,2CAA2C;QACpD,sDAAsD;QACtD,kBAAkB,EAAE,KAAK;QACzB,2CAA2C;QAC3C,gBAAgB,EAAE,KAAK;QACvB,sEAAsE;QACtE,gEAAgE;QAChE,cAAc,EAAE,GAAG;QACnB,4DAA4D;QAC5D,gBAAgB,EAAE,KAAK;QACvB,gBAAgB;QAChB,WAAW,EAAE,IAAI;QACjB,mDAAmD;QACnD,aAAa,EAAE,CAAC;KACjB,CAAC;IAEF,0BAA0B;IAC1B,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,+CAA+C;IACnF,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/command-handler.d.ts b/dist_ts/mail/delivery/smtpserver/command-handler.d.ts deleted file mode 100644 index ce658d8..0000000 --- a/dist_ts/mail/delivery/smtpserver/command-handler.d.ts +++ /dev/null @@ -1,156 +0,0 @@ -/** - * SMTP Command Handler - * Responsible for parsing and handling SMTP commands - */ -import * as plugins from '../../../plugins.js'; -import type { ISmtpSession } from './interfaces.js'; -import type { ICommandHandler, ISmtpServer } from './interfaces.js'; -import { SmtpCommand } from './constants.js'; -/** - * Handles SMTP commands and responses - */ -export declare class CommandHandler implements ICommandHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer; - /** - * Creates a new command handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer); - /** - * Process a command from the client - * @param socket - Client socket - * @param commandLine - Command line from client - */ - processCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, commandLine: string): Promise; - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response to send - */ - sendResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, response: string): void; - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - private isRecoverableSocketError; - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - private handleSocketError; - /** - * Handle EHLO command - * @param socket - Client socket - * @param clientHostname - Client hostname from EHLO command - */ - handleEhlo(socket: plugins.net.Socket | plugins.tls.TLSSocket, clientHostname: string): void; - /** - * Handle MAIL FROM command - * @param socket - Client socket - * @param args - Command arguments - */ - handleMailFrom(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void; - /** - * Handle RCPT TO command - * @param socket - Client socket - * @param args - Command arguments - */ - handleRcptTo(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void; - /** - * Handle DATA command - * @param socket - Client socket - */ - handleData(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Handle RSET command - * @param socket - Client socket - */ - handleRset(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Handle NOOP command - * @param socket - Client socket - */ - handleNoop(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Handle QUIT command - * @param socket - Client socket - */ - handleQuit(socket: plugins.net.Socket | plugins.tls.TLSSocket, args?: string): void; - /** - * Handle AUTH command - * @param socket - Client socket - * @param args - Command arguments - */ - private handleAuth; - /** - * Handle AUTH PLAIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - private handleAuthPlain; - /** - * Handle AUTH LOGIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - private handleAuthLogin; - /** - * Handle AUTH LOGIN response - * @param socket - Client socket - * @param session - Session - * @param response - Response from client - */ - private handleAuthLoginResponse; - /** - * Handle HELP command - * @param socket - Client socket - * @param args - Command arguments - */ - private handleHelp; - /** - * Handle VRFY command (Verify user/mailbox) - * RFC 5321 Section 3.5.1: Server MAY respond with 252 to avoid disclosing sensitive information - * @param socket - Client socket - * @param args - Command arguments (username to verify) - */ - private handleVrfy; - /** - * Handle EXPN command (Expand mailing list) - * RFC 5321 Section 3.5.2: Server MAY disable this for security - * @param socket - Client socket - * @param args - Command arguments (mailing list to expand) - */ - private handleExpn; - /** - * Reset session to after-EHLO state - * @param session - SMTP session to reset - */ - private resetSession; - /** - * Validate command sequence based on current state - * @param command - Command to validate - * @param session - Current session - * @returns Whether the command is valid in the current state - */ - private validateCommandSequence; - /** - * Handle an SMTP command (interface requirement) - */ - handleCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, command: SmtpCommand, args: string, session: ISmtpSession): Promise; - /** - * Get supported commands for current session state (interface requirement) - */ - getSupportedCommands(session: ISmtpSession): SmtpCommand[]; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/command-handler.js b/dist_ts/mail/delivery/smtpserver/command-handler.js deleted file mode 100644 index 0bc70a1..0000000 --- a/dist_ts/mail/delivery/smtpserver/command-handler.js +++ /dev/null @@ -1,1163 +0,0 @@ -/** - * SMTP Command Handler - * Responsible for parsing and handling SMTP commands - */ -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import { SmtpCommand, SmtpResponseCode, SMTP_DEFAULTS, SMTP_EXTENSIONS } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { extractCommandName, extractCommandArgs, formatMultilineResponse } from './utils/helpers.js'; -import { validateEhlo, validateMailFrom, validateRcptTo, isValidCommandSequence } from './utils/validation.js'; -/** - * Handles SMTP commands and responses - */ -export class CommandHandler { - /** - * Reference to the SMTP server instance - */ - smtpServer; - /** - * Creates a new command handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer) { - this.smtpServer = smtpServer; - } - /** - * Process a command from the client - * @param socket - Client socket - * @param commandLine - Command line from client - */ - async processCommand(socket, commandLine) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.warn(`No session found for socket from ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - socket.end(); - return; - } - // Check if we're in the middle of an AUTH LOGIN sequence - if (session.authLoginState) { - await this.handleAuthLoginResponse(socket, session, commandLine); - return; - } - // Handle raw data chunks from connection manager during DATA mode - if (commandLine.startsWith('__RAW_DATA__')) { - const rawData = commandLine.substring('__RAW_DATA__'.length); - const dataHandler = this.smtpServer.getDataHandler(); - if (dataHandler) { - // Let the data handler process the raw chunk - dataHandler.handleDataReceived(socket, rawData) - .catch(error => { - SmtpLogger.error(`Error processing raw email data: ${error.message}`, { - sessionId: session.id, - error - }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email data: ${error.message}`); - this.resetSession(session); - }); - } - else { - // No data handler available - SmtpLogger.error('Data handler not available for raw data', { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - data handler not available`); - this.resetSession(session); - } - return; - } - // Handle data state differently - pass to data handler (legacy line-based processing) - if (session.state === SmtpState.DATA_RECEIVING) { - // Check if this looks like an SMTP command - during DATA mode all input should be treated as message content - const looksLikeCommand = /^[A-Z]{4,}( |:)/i.test(commandLine.trim()); - // Special handling for ERR-02 test: handle "MAIL FROM" during DATA mode - // The test expects a 503 response for this case, not treating it as content - if (looksLikeCommand && commandLine.trim().toUpperCase().startsWith('MAIL FROM')) { - // This is the command that ERR-02 test is expecting to fail with 503 - SmtpLogger.debug(`Received MAIL FROM command during DATA mode - responding with sequence error`); - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - const dataHandler = this.smtpServer.getDataHandler(); - if (dataHandler) { - // Let the data handler process the line (legacy mode) - dataHandler.processEmailData(socket, commandLine) - .catch(error => { - SmtpLogger.error(`Error processing email data: ${error.message}`, { - sessionId: session.id, - error - }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email data: ${error.message}`); - this.resetSession(session); - }); - } - else { - // No data handler available - SmtpLogger.error('Data handler not available', { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - data handler not available`); - this.resetSession(session); - } - return; - } - // Handle command pipelining (RFC 2920) - // Multiple commands can be sent in a single TCP packet - if (commandLine.includes('\r\n') || commandLine.includes('\n')) { - // Split the commandLine into individual commands by newline - const commands = commandLine.split(/\r\n|\n/).filter(line => line.trim().length > 0); - if (commands.length > 1) { - SmtpLogger.debug(`Command pipelining detected: ${commands.length} commands`, { - sessionId: session.id, - commandCount: commands.length - }); - // Process each command separately (recursively call processCommand) - for (const cmd of commands) { - await this.processCommand(socket, cmd); - } - return; - } - } - // Log received command using adaptive logger - adaptiveLogger.logCommand(commandLine, socket, session); - // Extract command and arguments - const command = extractCommandName(commandLine); - const args = extractCommandArgs(commandLine); - // For the ERR-01 test, an empty or invalid command is considered a syntax error (500) - if (!command || command.trim().length === 0) { - // Record error for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordError(session.remoteAddress); - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive errors`); - this.sendResponse(socket, `421 Too many errors - connection blocked`); - socket.end(); - } - else { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Command not recognized`); - } - return; - } - // Handle unknown commands - this should happen before sequence validation - // RFC 5321: Use 500 for unrecognized commands, 501 for parameter errors - if (!Object.values(SmtpCommand).includes(command.toUpperCase())) { - // Record error for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordError(session.remoteAddress); - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive errors`); - this.sendResponse(socket, `421 Too many errors - connection blocked`); - socket.end(); - } - else { - // Comply with RFC 5321 section 4.2.4: Use 500 for unrecognized commands - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Command not recognized`); - } - return; - } - // Handle test input "MAIL FROM: missing_brackets@example.com" - specifically check for this case - // This is needed for ERR-01 test to pass - if (command.toUpperCase() === SmtpCommand.MAIL_FROM) { - // Handle "MAIL FROM:" with missing parameter - a special case for ERR-01 test - if (!args || args.trim() === '' || args.trim() === ':') { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing email address`); - return; - } - // Handle email without angle brackets - if (args.includes('@') && !args.includes('<') && !args.includes('>')) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid syntax - angle brackets required`); - return; - } - } - // Special handling for the "MAIL FROM:" missing parameter test (ERR-01 Test 3) - // The test explicitly sends "MAIL FROM:" without any address and expects 501 - // We need to catch this EXACT case before the sequence validation - if (commandLine.trim() === 'MAIL FROM:') { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing email address`); - return; - } - // Validate command sequence - this must happen after validating that it's a recognized command - // The order matters for ERR-01 and ERR-02 test compliance: - // - Syntax errors (501): Invalid command format or arguments - // - Sequence errors (503): Valid command in wrong sequence - if (!this.validateCommandSequence(command, session)) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - // Process the command - switch (command) { - case SmtpCommand.EHLO: - case SmtpCommand.HELO: - this.handleEhlo(socket, args); - break; - case SmtpCommand.MAIL_FROM: - this.handleMailFrom(socket, args); - break; - case SmtpCommand.RCPT_TO: - this.handleRcptTo(socket, args); - break; - case SmtpCommand.DATA: - this.handleData(socket); - break; - case SmtpCommand.RSET: - this.handleRset(socket); - break; - case SmtpCommand.NOOP: - this.handleNoop(socket); - break; - case SmtpCommand.QUIT: - this.handleQuit(socket, args); - break; - case SmtpCommand.STARTTLS: - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled()) { - await tlsHandler.handleStartTls(socket, session); - } - else { - SmtpLogger.warn('STARTTLS requested but TLS is not enabled', { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort - }); - this.sendResponse(socket, `${SmtpResponseCode.TLS_UNAVAILABLE_TEMP} STARTTLS not available at this time`); - } - break; - case SmtpCommand.AUTH: - this.handleAuth(socket, args); - break; - case SmtpCommand.HELP: - this.handleHelp(socket, args); - break; - case SmtpCommand.VRFY: - this.handleVrfy(socket, args); - break; - case SmtpCommand.EXPN: - this.handleExpn(socket, args); - break; - default: - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} Command not implemented`); - break; - } - } - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response to send - */ - sendResponse(socket, response) { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - adaptiveLogger.logResponse(response, socket); - } - catch (error) { - // Attempt to recover from known transient errors - if (this.isRecoverableSocketError(error)) { - this.handleSocketError(socket, error, response); - } - else { - // Log error and destroy socket for non-recoverable errors - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - socket.destroy(); - } - } - } - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - isRecoverableSocketError(error) { - const recoverableErrorCodes = [ - 'EPIPE', // Broken pipe - 'ECONNRESET', // Connection reset by peer - 'ETIMEDOUT', // Connection timed out - 'ECONNABORTED' // Connection aborted - ]; - return (error instanceof Error && - 'code' in error && - typeof error.code === 'string' && - recoverableErrorCodes.includes(error.code)); - } - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - handleSocketError(socket, error, response) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.error(`Session not found when handling socket error`); - socket.destroy(); - return; - } - // Get error details for logging - const errorMessage = error instanceof Error ? error.message : String(error); - const errorCode = error instanceof Error && 'code' in error ? error.code : 'UNKNOWN'; - SmtpLogger.warn(`Recoverable socket error (${errorCode}): ${errorMessage}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Check if socket is already destroyed - if (socket.destroyed) { - SmtpLogger.info(`Socket already destroyed, cannot retry operation`); - return; - } - // Check if socket is writeable - if (!socket.writable) { - SmtpLogger.info(`Socket no longer writable, aborting recovery attempt`); - socket.destroy(); - return; - } - // Attempt to retry the write operation after a short delay - setTimeout(() => { - try { - if (!socket.destroyed && socket.writable) { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.info(`Successfully retried send operation after error`); - } - else { - SmtpLogger.warn(`Socket no longer available for retry`); - if (!socket.destroyed) { - socket.destroy(); - } - } - } - catch (retryError) { - SmtpLogger.error(`Retry attempt failed: ${retryError instanceof Error ? retryError.message : String(retryError)}`); - if (!socket.destroyed) { - socket.destroy(); - } - } - }, 100); // Short delay before retry - } - /** - * Handle EHLO command - * @param socket - Client socket - * @param clientHostname - Client hostname from EHLO command - */ - handleEhlo(socket, clientHostname) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Extract command and arguments from clientHostname - // EHLO/HELO might come with the command itself in the arguments string - let hostname = clientHostname; - if (hostname.toUpperCase().startsWith('EHLO ') || hostname.toUpperCase().startsWith('HELO ')) { - hostname = hostname.substring(5).trim(); - } - // Check for empty hostname - if (!hostname) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing domain name`); - return; - } - // Validate EHLO hostname - const validation = validateEhlo(hostname); - if (!validation.isValid) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - // Update session state and client hostname - session.clientHostname = validation.hostname || hostname; - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - // Get options once for this method - const options = this.smtpServer.getOptions(); - // Set up EHLO response lines - const responseLines = [ - `${options.hostname || SMTP_DEFAULTS.HOSTNAME} greets ${session.clientHostname}`, - SMTP_EXTENSIONS.PIPELINING, - SMTP_EXTENSIONS.formatExtension(SMTP_EXTENSIONS.SIZE, options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE), - SMTP_EXTENSIONS.EIGHTBITMIME, - SMTP_EXTENSIONS.ENHANCEDSTATUSCODES - ]; - // Add TLS extension if available and not already using TLS - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled() && !session.useTLS) { - responseLines.push(SMTP_EXTENSIONS.STARTTLS); - } - // Add AUTH extension if configured - if (options.auth && options.auth.methods && options.auth.methods.length > 0) { - responseLines.push(`${SMTP_EXTENSIONS.AUTH} ${options.auth.methods.join(' ')}`); - } - // Send multiline response - this.sendResponse(socket, formatMultilineResponse(SmtpResponseCode.OK, responseLines)); - } - /** - * Handle MAIL FROM command - * @param socket - Client socket - * @param args - Command arguments - */ - handleMailFrom(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Check if the client has sent EHLO/HELO first - if (session.state === SmtpState.GREETING) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - // For test compatibility - reset state if receiving a new MAIL FROM after previous transaction - if (session.state === SmtpState.MAIL_FROM || session.state === SmtpState.RCPT_TO) { - // Silently reset the transaction state - allow multiple MAIL FROM commands - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - } - // Get options once for this method - const options = this.smtpServer.getOptions(); - // Check if authentication is required but not provided - if (options.auth && options.auth.required && !session.authenticated) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_REQUIRED} Authentication required`); - return; - } - // Get rate limiter for message-level checks - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - // Note: Connection-level rate limiting is already handled in ConnectionManager - // Special handling for commands that include "MAIL FROM:" in the args - let processedArgs = args; - // Handle test formats with or without colons and "FROM" parts - if (args.toUpperCase().startsWith('FROM:')) { - processedArgs = args.substring(5).trim(); // Skip "FROM:" - } - else if (args.toUpperCase().startsWith('FROM')) { - processedArgs = args.substring(4).trim(); // Skip "FROM" - } - else if (args.toUpperCase().includes('MAIL FROM:')) { - // The command was already prepended to the args - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - processedArgs = args.substring(colonIndex + 1).trim(); - } - } - else if (args.toUpperCase().includes('MAIL FROM')) { - // Handle case without colon - const fromIndex = args.toUpperCase().indexOf('FROM'); - if (fromIndex !== -1) { - processedArgs = args.substring(fromIndex + 4).trim(); - } - } - // Validate MAIL FROM syntax - for ERR-01 test compliance, this must be BEFORE sequence validation - const validation = validateMailFrom(processedArgs); - if (!validation.isValid) { - // Return 501 for syntax errors - required for ERR-01 test to pass - // This RFC 5321 compliance is critical - syntax errors must be 501 - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - // Check message rate limits for this sender - const senderAddress = validation.address || ''; - const senderDomain = senderAddress.includes('@') ? senderAddress.split('@')[1] : undefined; - // Check rate limits with domain context if available - const messageResult = rateLimiter.checkMessageLimit(senderAddress, session.remoteAddress, 1, // We don't know recipients yet, check with 1 - undefined, // No pattern matching for now - senderDomain // Pass domain for domain-specific limits - ); - if (!messageResult.allowed) { - SmtpLogger.warn(`Message rate limit exceeded for ${senderAddress} from IP ${session.remoteAddress}: ${messageResult.reason}`); - // Use 421 for temporary rate limiting (client should retry later) - this.sendResponse(socket, `421 ${messageResult.reason} - try again later`); - return; - } - // Enhanced SIZE parameter handling - if (validation.params && validation.params.SIZE) { - const size = parseInt(validation.params.SIZE, 10); - // Check for valid numeric format - if (isNaN(size)) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: not a number`); - return; - } - // Check for negative values - if (size < 0) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: cannot be negative`); - return; - } - // Ensure reasonable minimum size (at least 100 bytes for headers) - if (size < 100) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: too small (minimum 100 bytes)`); - return; - } - // Check against server maximum - const maxSize = options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE; - if (size > maxSize) { - // Generate informative error with the server's limit - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message size exceeds limit of ${Math.floor(maxSize / 1024)} KB`); - return; - } - // Log large messages for monitoring - if (size > maxSize * 0.8) { - SmtpLogger.info(`Large message detected (${Math.floor(size / 1024)} KB)`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - sizeBytes: size, - percentOfMax: Math.floor((size / maxSize) * 100) - }); - } - } - // Reset email data and recipients for new transaction - session.mailFrom = validation.address || ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - // Update envelope information - session.envelope = { - mailFrom: { - address: validation.address || '', - args: validation.params || {} - }, - rcptTo: [] - }; - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.MAIL_FROM); - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - /** - * Handle RCPT TO command - * @param socket - Client socket - * @param args - Command arguments - */ - handleRcptTo(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Check if MAIL FROM was provided first - if (session.state !== SmtpState.MAIL_FROM && session.state !== SmtpState.RCPT_TO) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - // Special handling for commands that include "RCPT TO:" in the args - let processedArgs = args; - if (args.toUpperCase().startsWith('TO:')) { - processedArgs = args; - } - else if (args.toUpperCase().includes('RCPT TO')) { - // The command was already prepended to the args - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - processedArgs = args.substring(colonIndex + 1).trim(); - } - } - // Validate RCPT TO syntax - const validation = validateRcptTo(processedArgs); - if (!validation.isValid) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - // Check if we've reached maximum recipients - const options = this.smtpServer.getOptions(); - const maxRecipients = options.maxRecipients || SMTP_DEFAULTS.MAX_RECIPIENTS; - if (session.rcptTo.length >= maxRecipients) { - this.sendResponse(socket, `${SmtpResponseCode.TRANSACTION_FAILED} Too many recipients`); - return; - } - // Check rate limits for recipients - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const recipientAddress = validation.address || ''; - const recipientDomain = recipientAddress.includes('@') ? recipientAddress.split('@')[1] : undefined; - // Check rate limits with accumulated recipient count - const recipientCount = session.rcptTo.length + 1; // Including this new recipient - const messageResult = rateLimiter.checkMessageLimit(session.mailFrom, session.remoteAddress, recipientCount, undefined, // No pattern matching for now - recipientDomain // Pass recipient domain for domain-specific limits - ); - if (!messageResult.allowed) { - SmtpLogger.warn(`Recipient rate limit exceeded for ${recipientAddress} from IP ${session.remoteAddress}: ${messageResult.reason}`); - // Use 451 for temporary recipient rejection - this.sendResponse(socket, `451 ${messageResult.reason} - try again later`); - return; - } - // Create recipient object - const recipient = { - address: validation.address || '', - args: validation.params || {} - }; - // Add to session data - session.rcptTo.push(validation.address || ''); - session.envelope.rcptTo.push(recipient); - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.RCPT_TO); - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} Recipient ok`); - } - /** - * Handle DATA command - * @param socket - Client socket - */ - handleData(socket) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // For tests, be slightly more permissive - also accept DATA after MAIL FROM - // But ensure we at least have a sender defined - if (session.state !== SmtpState.RCPT_TO && session.state !== SmtpState.MAIL_FROM) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - // Check if we have a sender - if (!session.mailFrom) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} No sender specified`); - return; - } - // Ideally we should have recipients, but for test compatibility, we'll only - // insist on recipients if we're in RCPT_TO state - if (session.state === SmtpState.RCPT_TO && !session.rcptTo.length) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} No recipients specified`); - return; - } - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.DATA_RECEIVING); - // Reset email data storage - session.emailData = ''; - session.emailDataChunks = []; - // Set up timeout for DATA command - const dataTimeout = SMTP_DEFAULTS.DATA_TIMEOUT; - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - session.dataTimeoutId = setTimeout(() => { - if (session.state === SmtpState.DATA_RECEIVING) { - SmtpLogger.warn(`DATA command timeout for session ${session.id}`, { - sessionId: session.id, - timeout: dataTimeout - }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Data timeout`); - this.resetSession(session); - } - }, dataTimeout); - // Send intermediate response to signal start of data - this.sendResponse(socket, `${SmtpResponseCode.START_MAIL_INPUT} Start mail input; end with .`); - } - /** - * Handle RSET command - * @param socket - Client socket - */ - handleRset(socket) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Reset the transaction state - this.resetSession(session); - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - /** - * Handle NOOP command - * @param socket - Client socket - */ - handleNoop(socket) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - /** - * Handle QUIT command - * @param socket - Client socket - */ - handleQuit(socket, args) { - // QUIT command should not have any parameters - if (args && args.trim().length > 0) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Syntax error in parameters`); - return; - } - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - // Send goodbye message - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_CLOSING} ${this.smtpServer.getOptions().hostname} Service closing transmission channel`); - // End the connection - socket.end(); - // Clean up session if we have one - if (session) { - this.smtpServer.getSessionManager().removeSession(socket); - } - } - /** - * Handle AUTH command - * @param socket - Client socket - * @param args - Command arguments - */ - handleAuth(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Check if we have auth config - if (!this.smtpServer.getOptions().auth || !this.smtpServer.getOptions().auth.methods || !this.smtpServer.getOptions().auth.methods.length) { - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} Authentication not supported`); - return; - } - // Check if TLS is required for authentication - if (!session.useTLS) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication requires TLS`); - return; - } - // Parse AUTH command - const parts = args.trim().split(/\s+/); - const method = parts[0]?.toUpperCase(); - const initialResponse = parts[1]; - // Check if method is supported - const supportedMethods = this.smtpServer.getOptions().auth.methods.map(m => m.toUpperCase()); - if (!method || !supportedMethods.includes(method)) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Unsupported authentication method`); - return; - } - // Handle different authentication methods - switch (method) { - case 'PLAIN': - this.handleAuthPlain(socket, session, initialResponse); - break; - case 'LOGIN': - this.handleAuthLogin(socket, session, initialResponse); - break; - default: - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} ${method} authentication not implemented`); - } - } - /** - * Handle AUTH PLAIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - async handleAuthPlain(socket, session, initialResponse) { - try { - let credentials; - if (initialResponse) { - // Credentials provided with AUTH PLAIN command - credentials = initialResponse; - } - else { - // Request credentials - this.sendResponse(socket, '334'); - // Wait for credentials - credentials = await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error('Auth response timeout')); - }, 30000); - socket.once('data', (data) => { - clearTimeout(timeout); - resolve(data.toString().trim()); - }); - }); - } - // Decode PLAIN credentials (base64 encoded: authzid\0authcid\0password) - const decoded = Buffer.from(credentials, 'base64').toString('utf8'); - const parts = decoded.split('\0'); - if (parts.length !== 3) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Invalid credentials format`); - return; - } - const [authzid, authcid, password] = parts; - const username = authcid || authzid; // Use authcid if provided, otherwise authzid - // Authenticate using security handler - const authenticated = await this.smtpServer.getSecurityHandler().authenticate({ - username, - password - }); - if (authenticated) { - session.authenticated = true; - session.username = username; - this.sendResponse(socket, `${SmtpResponseCode.AUTHENTICATION_SUCCESSFUL} Authentication successful`); - } - else { - // Record authentication failure for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordAuthFailure(session.remoteAddress); - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive authentication failures`); - this.sendResponse(socket, `421 Too many authentication failures - connection blocked`); - socket.end(); - } - else { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication failed`); - } - } - } - catch (error) { - SmtpLogger.error(`AUTH PLAIN error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - } - } - /** - * Handle AUTH LOGIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - async handleAuthLogin(socket, session, initialResponse) { - try { - if (initialResponse) { - // Username provided with AUTH LOGIN command - const username = Buffer.from(initialResponse, 'base64').toString('utf8'); - session.authLoginState = 'waiting_password'; - session.authLoginUsername = username; - // Request password - this.sendResponse(socket, '334 UGFzc3dvcmQ6'); // Base64 for "Password:" - } - else { - // Request username - session.authLoginState = 'waiting_username'; - this.sendResponse(socket, '334 VXNlcm5hbWU6'); // Base64 for "Username:" - } - } - catch (error) { - SmtpLogger.error(`AUTH LOGIN error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - delete session.authLoginState; - delete session.authLoginUsername; - } - } - /** - * Handle AUTH LOGIN response - * @param socket - Client socket - * @param session - Session - * @param response - Response from client - */ - async handleAuthLoginResponse(socket, session, response) { - const trimmedResponse = response.trim(); - // Check for cancellation - if (trimmedResponse === '*') { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication cancelled`); - delete session.authLoginState; - delete session.authLoginUsername; - return; - } - try { - if (session.authLoginState === 'waiting_username') { - // We received the username - const username = Buffer.from(trimmedResponse, 'base64').toString('utf8'); - session.authLoginUsername = username; - session.authLoginState = 'waiting_password'; - // Request password - this.sendResponse(socket, '334 UGFzc3dvcmQ6'); // Base64 for "Password:" - } - else if (session.authLoginState === 'waiting_password') { - // We received the password - const password = Buffer.from(trimmedResponse, 'base64').toString('utf8'); - const username = session.authLoginUsername; - // Clear auth state - delete session.authLoginState; - delete session.authLoginUsername; - // Authenticate using security handler - const authenticated = await this.smtpServer.getSecurityHandler().authenticate({ - username, - password - }); - if (authenticated) { - session.authenticated = true; - session.username = username; - this.sendResponse(socket, `${SmtpResponseCode.AUTHENTICATION_SUCCESSFUL} Authentication successful`); - } - else { - // Record authentication failure for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordAuthFailure(session.remoteAddress); - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive authentication failures`); - this.sendResponse(socket, `421 Too many authentication failures - connection blocked`); - socket.end(); - } - else { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication failed`); - } - } - } - } - catch (error) { - SmtpLogger.error(`AUTH LOGIN response error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - delete session.authLoginState; - delete session.authLoginUsername; - } - } - /** - * Handle HELP command - * @param socket - Client socket - * @param args - Command arguments - */ - handleHelp(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - // Provide help information based on arguments - const helpCommand = args.trim().toUpperCase(); - if (!helpCommand) { - // General help - const helpLines = [ - 'Supported commands:', - 'EHLO/HELO domain - Identify yourself to the server', - 'MAIL FROM:
- Start a new mail transaction', - 'RCPT TO:
- Specify recipients for the message', - 'DATA - Start message data input', - 'RSET - Reset the transaction', - 'NOOP - No operation', - 'QUIT - Close the connection', - 'HELP [command] - Show help' - ]; - // Add conditional commands - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled()) { - helpLines.push('STARTTLS - Start TLS negotiation'); - } - if (this.smtpServer.getOptions().auth && this.smtpServer.getOptions().auth.methods.length) { - helpLines.push('AUTH mechanism - Authenticate with the server'); - } - this.sendResponse(socket, formatMultilineResponse(SmtpResponseCode.HELP_MESSAGE, helpLines)); - return; - } - // Command-specific help - let helpText; - switch (helpCommand) { - case 'EHLO': - case 'HELO': - helpText = 'EHLO/HELO domain - Identify yourself to the server'; - break; - case 'MAIL': - helpText = 'MAIL FROM:
[SIZE=size] - Start a new mail transaction'; - break; - case 'RCPT': - helpText = 'RCPT TO:
- Specify a recipient for the message'; - break; - case 'DATA': - helpText = 'DATA - Start message data input, end with .'; - break; - case 'RSET': - helpText = 'RSET - Reset the transaction'; - break; - case 'NOOP': - helpText = 'NOOP - No operation'; - break; - case 'QUIT': - helpText = 'QUIT - Close the connection'; - break; - case 'STARTTLS': - helpText = 'STARTTLS - Start TLS negotiation'; - break; - case 'AUTH': - helpText = `AUTH mechanism - Authenticate with the server. Supported methods: ${this.smtpServer.getOptions().auth?.methods.join(', ')}`; - break; - default: - helpText = `Unknown command: ${helpCommand}`; - break; - } - this.sendResponse(socket, `${SmtpResponseCode.HELP_MESSAGE} ${helpText}`); - } - /** - * Handle VRFY command (Verify user/mailbox) - * RFC 5321 Section 3.5.1: Server MAY respond with 252 to avoid disclosing sensitive information - * @param socket - Client socket - * @param args - Command arguments (username to verify) - */ - handleVrfy(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - const username = args.trim(); - // Security best practice: Do not confirm or deny user existence - // Instead, respond with 252 "Cannot verify, but will attempt delivery" - // This prevents VRFY from being used for user enumeration attacks - if (!username) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} User name required`); - } - else { - // Log the VRFY attempt - SmtpLogger.info(`VRFY command received for user: ${username}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - useTLS: session.useTLS - }); - // Respond with ambiguous response for security - this.sendResponse(socket, `${SmtpResponseCode.CANNOT_VRFY} Cannot VRFY user, but will accept message and attempt delivery`); - } - } - /** - * Handle EXPN command (Expand mailing list) - * RFC 5321 Section 3.5.2: Server MAY disable this for security - * @param socket - Client socket - * @param args - Command arguments (mailing list to expand) - */ - handleExpn(socket, args) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - const listname = args.trim(); - // Log the EXPN attempt - SmtpLogger.info(`EXPN command received for list: ${listname}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - useTLS: session.useTLS - }); - // Disable EXPN for security (best practice - RFC 5321 Section 3.5.2) - // EXPN allows enumeration of list members, which is a privacy concern - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} EXPN command is disabled for security reasons`); - } - /** - * Reset session to after-EHLO state - * @param session - SMTP session to reset - */ - resetSession(session) { - // Clear any data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - // Reset data fields but keep authentication state - session.mailFrom = ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - // Reset state to after EHLO - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - } - /** - * Validate command sequence based on current state - * @param command - Command to validate - * @param session - Current session - * @returns Whether the command is valid in the current state - */ - validateCommandSequence(command, session) { - // Always allow EHLO to reset the transaction at any state - // This makes tests pass where EHLO is used multiple times - if (command.toUpperCase() === 'EHLO' || command.toUpperCase() === 'HELO') { - return true; - } - // Always allow RSET, NOOP, QUIT, and HELP - if (command.toUpperCase() === 'RSET' || - command.toUpperCase() === 'NOOP' || - command.toUpperCase() === 'QUIT' || - command.toUpperCase() === 'HELP') { - return true; - } - // Always allow STARTTLS after EHLO/HELO (but not in DATA state) - if (command.toUpperCase() === 'STARTTLS' && - (session.state === SmtpState.AFTER_EHLO || - session.state === SmtpState.MAIL_FROM || - session.state === SmtpState.RCPT_TO)) { - return true; - } - // During testing, be more permissive with sequence for MAIL and RCPT commands - // This helps pass tests that may send these commands in unexpected order - if (command.toUpperCase() === 'MAIL' && session.state !== SmtpState.DATA_RECEIVING) { - return true; - } - // Handle RCPT TO during tests - be permissive but not in DATA state - if (command.toUpperCase() === 'RCPT' && session.state !== SmtpState.DATA_RECEIVING) { - return true; - } - // Allow DATA command if in MAIL_FROM or RCPT_TO state for test compatibility - if (command.toUpperCase() === 'DATA' && - (session.state === SmtpState.MAIL_FROM || session.state === SmtpState.RCPT_TO)) { - return true; - } - // Check standard command sequence - return isValidCommandSequence(command, session.state); - } - /** - * Handle an SMTP command (interface requirement) - */ - async handleCommand(socket, command, args, session) { - // Delegate to processCommand for now - this.processCommand(socket, `${command} ${args}`.trim()); - } - /** - * Get supported commands for current session state (interface requirement) - */ - getSupportedCommands(session) { - const commands = [SmtpCommand.NOOP, SmtpCommand.QUIT, SmtpCommand.RSET]; - switch (session.state) { - case SmtpState.GREETING: - commands.push(SmtpCommand.EHLO, SmtpCommand.HELO); - break; - case SmtpState.AFTER_EHLO: - commands.push(SmtpCommand.MAIL_FROM, SmtpCommand.STARTTLS); - if (!session.authenticated) { - commands.push(SmtpCommand.AUTH); - } - break; - case SmtpState.MAIL_FROM: - commands.push(SmtpCommand.RCPT_TO); - break; - case SmtpState.RCPT_TO: - commands.push(SmtpCommand.RCPT_TO, SmtpCommand.DATA); - break; - default: - break; - } - return commands; - } - /** - * Clean up resources - */ - destroy() { - // CommandHandler doesn't have timers or event listeners to clean up - SmtpLogger.debug('CommandHandler destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/command-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/connection-manager.d.ts b/dist_ts/mail/delivery/smtpserver/connection-manager.d.ts deleted file mode 100644 index 5bb1c99..0000000 --- a/dist_ts/mail/delivery/smtpserver/connection-manager.d.ts +++ /dev/null @@ -1,159 +0,0 @@ -/** - * SMTP Connection Manager - * Responsible for managing socket connections to the SMTP server - */ -import * as plugins from '../../../plugins.js'; -import type { IConnectionManager, ISmtpServer } from './interfaces.js'; -/** - * Manager for SMTP connections - * Handles connection setup, event listeners, and lifecycle management - * Provides resource management, connection tracking, and monitoring - */ -export declare class ConnectionManager implements IConnectionManager { - /** - * Reference to the SMTP server instance - */ - private smtpServer; - /** - * Set of active socket connections - */ - private activeConnections; - /** - * Connection tracking for resource management - */ - private connectionStats; - /** - * Per-IP connection tracking for rate limiting - */ - private ipConnections; - /** - * Resource monitoring interval - */ - private resourceCheckInterval; - /** - * Track cleanup timers so we can clear them - */ - private cleanupTimers; - /** - * SMTP server options with enhanced resource controls - */ - private options; - /** - * Creates a new connection manager with enhanced resource management - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer); - /** - * Start resource monitoring interval to check resource usage - */ - private startResourceMonitoring; - /** - * Monitor resource usage and log statistics - */ - private monitorResourceUsage; - /** - * Clean up expired IP rate limits and perform additional resource monitoring - */ - private cleanupIpRateLimits; - /** - * Validate and repair resource tracking to prevent leaks - */ - private validateResourceTracking; - /** - * Handle a new connection with resource management - * @param socket - Client socket - */ - handleNewConnection(socket: plugins.net.Socket): Promise; - /** - * Check if an IP has exceeded the rate limit - * @param ip - Client IP address - * @returns True if rate limited - */ - private isIPRateLimited; - /** - * Track a new connection from an IP - * @param ip - Client IP address - */ - private trackIPConnection; - /** - * Check if an IP has reached its connection limit - * @param ip - Client IP address - * @returns True if limit reached - */ - private hasReachedIPConnectionLimit; - /** - * Handle a new secure TLS connection with resource management - * @param socket - Client TLS socket - */ - handleNewSecureConnection(socket: plugins.tls.TLSSocket): Promise; - /** - * Set up event handlers for a socket with enhanced resource management - * @param socket - Client socket - */ - setupSocketEventHandlers(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Get the current connection count - * @returns Number of active connections - */ - getConnectionCount(): number; - /** - * Check if the server has reached the maximum number of connections - * @returns True if max connections reached - */ - hasReachedMaxConnections(): boolean; - /** - * Close all active connections - */ - closeAllConnections(): void; - /** - * Handle socket close event - * @param socket - Client socket - * @param hadError - Whether the socket was closed due to error - */ - private handleSocketClose; - /** - * Handle socket error event - * @param socket - Client socket - * @param error - Error object - */ - private handleSocketError; - /** - * Handle socket timeout event - * @param socket - Client socket - */ - private handleSocketTimeout; - /** - * Reject a connection - * @param socket - Client socket - * @param reason - Reason for rejection - */ - private rejectConnection; - /** - * Send greeting message - * @param socket - Client socket - */ - private sendGreeting; - /** - * Send service closing notification - * @param socket - Client socket - */ - private sendServiceClosing; - /** - * Send response to client - * @param socket - Client socket - * @param response - Response to send - */ - private sendResponse; - /** - * Handle a new connection (interface requirement) - */ - handleConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): Promise; - /** - * Check if accepting new connections (interface requirement) - */ - canAcceptConnection(): boolean; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/connection-manager.js b/dist_ts/mail/delivery/smtpserver/connection-manager.js deleted file mode 100644 index a5b639d..0000000 --- a/dist_ts/mail/delivery/smtpserver/connection-manager.js +++ /dev/null @@ -1,918 +0,0 @@ -/** - * SMTP Connection Manager - * Responsible for managing socket connections to the SMTP server - */ -import * as plugins from '../../../plugins.js'; -import { SmtpResponseCode, SMTP_DEFAULTS, SmtpState } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { getSocketDetails, formatMultilineResponse } from './utils/helpers.js'; -/** - * Manager for SMTP connections - * Handles connection setup, event listeners, and lifecycle management - * Provides resource management, connection tracking, and monitoring - */ -export class ConnectionManager { - /** - * Reference to the SMTP server instance - */ - smtpServer; - /** - * Set of active socket connections - */ - activeConnections = new Set(); - /** - * Connection tracking for resource management - */ - connectionStats = { - totalConnections: 0, - activeConnections: 0, - peakConnections: 0, - rejectedConnections: 0, - closedConnections: 0, - erroredConnections: 0, - timedOutConnections: 0 - }; - /** - * Per-IP connection tracking for rate limiting - */ - ipConnections = new Map(); - /** - * Resource monitoring interval - */ - resourceCheckInterval = null; - /** - * Track cleanup timers so we can clear them - */ - cleanupTimers = new Set(); - /** - * SMTP server options with enhanced resource controls - */ - options; - /** - * Creates a new connection manager with enhanced resource management - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer) { - this.smtpServer = smtpServer; - // Get options from server - const serverOptions = this.smtpServer.getOptions(); - // Default values for resource management - adjusted for production scalability - const DEFAULT_MAX_CONNECTIONS_PER_IP = 50; // Increased to support high-concurrency scenarios - const DEFAULT_CONNECTION_RATE_LIMIT = 200; // Increased for production load handling - const DEFAULT_CONNECTION_RATE_WINDOW = 60 * 1000; // 60 seconds window - const DEFAULT_BUFFER_SIZE_LIMIT = 10 * 1024 * 1024; // 10 MB - const DEFAULT_RESOURCE_CHECK_INTERVAL = 30 * 1000; // 30 seconds - this.options = { - hostname: serverOptions.hostname || SMTP_DEFAULTS.HOSTNAME, - maxConnections: serverOptions.maxConnections || SMTP_DEFAULTS.MAX_CONNECTIONS, - socketTimeout: serverOptions.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - maxConnectionsPerIP: DEFAULT_MAX_CONNECTIONS_PER_IP, - connectionRateLimit: DEFAULT_CONNECTION_RATE_LIMIT, - connectionRateWindow: DEFAULT_CONNECTION_RATE_WINDOW, - bufferSizeLimit: DEFAULT_BUFFER_SIZE_LIMIT, - resourceCheckInterval: DEFAULT_RESOURCE_CHECK_INTERVAL - }; - // Start resource monitoring - this.startResourceMonitoring(); - } - /** - * Start resource monitoring interval to check resource usage - */ - startResourceMonitoring() { - // Clear any existing interval - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - } - // Set up new interval - this.resourceCheckInterval = setInterval(() => { - this.monitorResourceUsage(); - }, this.options.resourceCheckInterval); - } - /** - * Monitor resource usage and log statistics - */ - monitorResourceUsage() { - // Calculate memory usage - const memoryUsage = process.memoryUsage(); - const memoryUsageMB = { - rss: Math.round(memoryUsage.rss / 1024 / 1024), - heapTotal: Math.round(memoryUsage.heapTotal / 1024 / 1024), - heapUsed: Math.round(memoryUsage.heapUsed / 1024 / 1024), - external: Math.round(memoryUsage.external / 1024 / 1024) - }; - // Calculate connection rate metrics - const activeIPs = Array.from(this.ipConnections.entries()) - .filter(([_, data]) => data.count > 0).length; - const highVolumeIPs = Array.from(this.ipConnections.entries()) - .filter(([_, data]) => data.count > this.options.connectionRateLimit / 2).length; - // Log resource usage with more detailed metrics - SmtpLogger.info('Resource usage stats', { - connections: { - active: this.activeConnections.size, - total: this.connectionStats.totalConnections, - peak: this.connectionStats.peakConnections, - rejected: this.connectionStats.rejectedConnections, - closed: this.connectionStats.closedConnections, - errored: this.connectionStats.erroredConnections, - timedOut: this.connectionStats.timedOutConnections - }, - memory: memoryUsageMB, - ipTracking: { - uniqueIPs: this.ipConnections.size, - activeIPs: activeIPs, - highVolumeIPs: highVolumeIPs - }, - resourceLimits: { - maxConnections: this.options.maxConnections, - maxConnectionsPerIP: this.options.maxConnectionsPerIP, - connectionRateLimit: this.options.connectionRateLimit, - bufferSizeLimit: Math.round(this.options.bufferSizeLimit / 1024 / 1024) + 'MB' - } - }); - // Check for potential DoS conditions - if (highVolumeIPs > 3) { - SmtpLogger.warn(`Potential DoS detected: ${highVolumeIPs} IPs with high connection rates`); - } - // Assess memory usage trends - if (memoryUsageMB.heapUsed > 500) { // Over 500MB heap used - SmtpLogger.warn(`High memory usage detected: ${memoryUsageMB.heapUsed}MB heap used`); - } - // Clean up expired IP rate limits and validate resource tracking - this.cleanupIpRateLimits(); - } - /** - * Clean up expired IP rate limits and perform additional resource monitoring - */ - cleanupIpRateLimits() { - const now = Date.now(); - const windowThreshold = now - this.options.connectionRateWindow; - let activeIps = 0; - let removedEntries = 0; - // Iterate through IP connections and manage entries - for (const [ip, data] of this.ipConnections.entries()) { - // If the last connection was before the window threshold + one extra window, remove the entry - if (data.lastConnection < windowThreshold - this.options.connectionRateWindow) { - // Remove stale entries to prevent memory growth - this.ipConnections.delete(ip); - removedEntries++; - } - // If last connection was before the window threshold, reset the count - else if (data.lastConnection < windowThreshold) { - if (data.count > 0) { - // Reset but keep the IP in the map with a zero count - this.ipConnections.set(ip, { - count: 0, - firstConnection: now, - lastConnection: now - }); - } - } - else { - // This IP is still active within the current window - activeIps++; - } - } - // Log cleanup activity if significant changes occurred - if (removedEntries > 0) { - SmtpLogger.debug(`IP rate limit cleanup: removed ${removedEntries} stale entries, ${this.ipConnections.size} remaining, ${activeIps} active in current window`); - } - // Check for memory leaks in connection tracking - if (this.activeConnections.size > 0 && this.connectionStats.activeConnections !== this.activeConnections.size) { - SmtpLogger.warn(`Connection tracking inconsistency detected: stats.active=${this.connectionStats.activeConnections}, actual=${this.activeConnections.size}`); - // Fix the inconsistency - this.connectionStats.activeConnections = this.activeConnections.size; - } - // Validate and clean leaked resources if needed - this.validateResourceTracking(); - } - /** - * Validate and repair resource tracking to prevent leaks - */ - validateResourceTracking() { - // Prepare a detailed report if inconsistencies are found - const inconsistenciesFound = []; - // 1. Check active connections count matches activeConnections set size - if (this.connectionStats.activeConnections !== this.activeConnections.size) { - inconsistenciesFound.push({ - issue: 'Active connection count mismatch', - stats: this.connectionStats.activeConnections, - actual: this.activeConnections.size, - action: 'Auto-corrected' - }); - this.connectionStats.activeConnections = this.activeConnections.size; - } - // 2. Check for destroyed sockets in active connections - let destroyedSocketsCount = 0; - const socketsToRemove = []; - for (const socket of this.activeConnections) { - if (socket.destroyed) { - destroyedSocketsCount++; - socketsToRemove.push(socket); - } - } - // Remove destroyed sockets from tracking - for (const socket of socketsToRemove) { - this.activeConnections.delete(socket); - // Also ensure all listeners are removed - try { - socket.removeAllListeners(); - } - catch { - // Ignore errors from removeAllListeners - } - } - if (destroyedSocketsCount > 0) { - inconsistenciesFound.push({ - issue: 'Destroyed sockets in active list', - count: destroyedSocketsCount, - action: 'Removed from tracking' - }); - // Update active connections count after cleanup - this.connectionStats.activeConnections = this.activeConnections.size; - } - // 3. Check for sessions without corresponding active connections - const sessionCount = this.smtpServer.getSessionManager().getSessionCount(); - if (sessionCount > this.activeConnections.size) { - inconsistenciesFound.push({ - issue: 'Orphaned sessions', - sessions: sessionCount, - connections: this.activeConnections.size, - action: 'Session cleanup recommended' - }); - } - // If any inconsistencies found, log a detailed report - if (inconsistenciesFound.length > 0) { - SmtpLogger.warn('Resource tracking inconsistencies detected and repaired', { inconsistencies: inconsistenciesFound }); - } - } - /** - * Handle a new connection with resource management - * @param socket - Client socket - */ - async handleNewConnection(socket) { - // Update connection stats - this.connectionStats.totalConnections++; - this.connectionStats.activeConnections = this.activeConnections.size + 1; - if (this.connectionStats.activeConnections > this.connectionStats.peakConnections) { - this.connectionStats.peakConnections = this.connectionStats.activeConnections; - } - // Get client IP - const remoteAddress = socket.remoteAddress || '0.0.0.0'; - // Use UnifiedRateLimiter for connection rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - // Check connection limit with UnifiedRateLimiter - const connectionResult = rateLimiter.recordConnection(remoteAddress); - if (!connectionResult.allowed) { - this.rejectConnection(socket, connectionResult.reason || 'Rate limit exceeded'); - this.connectionStats.rejectedConnections++; - return; - } - // Still track IP connections locally for cleanup purposes - this.trackIPConnection(remoteAddress); - // Check if maximum global connections reached - if (this.hasReachedMaxConnections()) { - this.rejectConnection(socket, 'Too many connections'); - this.connectionStats.rejectedConnections++; - return; - } - // Add socket to active connections - this.activeConnections.add(socket); - // Set up socket options - socket.setKeepAlive(true); - socket.setTimeout(this.options.socketTimeout); - // Explicitly set socket buffer sizes to prevent memory issues - socket.setNoDelay(true); // Disable Nagle's algorithm for better responsiveness - // Set limits on socket buffer size if supported by Node.js version - try { - // Here we set reasonable buffer limits to prevent memory exhaustion attacks - const highWaterMark = 64 * 1024; // 64 KB - // Note: Socket high water mark methods can't be set directly in newer Node.js versions - // These would need to be set during socket creation or with a different API - } - catch (error) { - // Ignore errors from older Node.js versions that don't support these methods - SmtpLogger.debug(`Could not set socket buffer limits: ${error instanceof Error ? error.message : String(error)}`); - } - // Set up event handlers - this.setupSocketEventHandlers(socket); - // Create a session for this connection - this.smtpServer.getSessionManager().createSession(socket, false); - // Log the new connection using adaptive logger - const socketDetails = getSocketDetails(socket); - adaptiveLogger.logConnection(socket, 'connect'); - // Update adaptive logger with current connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - // Send greeting - this.sendGreeting(socket); - } - /** - * Check if an IP has exceeded the rate limit - * @param ip - Client IP address - * @returns True if rate limited - */ - isIPRateLimited(ip) { - const now = Date.now(); - const ipData = this.ipConnections.get(ip); - if (!ipData) { - return false; // No previous connections - } - // Check if we're within the rate window - const isWithinWindow = now - ipData.firstConnection <= this.options.connectionRateWindow; - // If within window and count exceeds limit, rate limit is applied - if (isWithinWindow && ipData.count >= this.options.connectionRateLimit) { - SmtpLogger.warn(`Rate limit exceeded for IP ${ip}: ${ipData.count} connections in ${Math.round((now - ipData.firstConnection) / 1000)}s`); - return true; - } - return false; - } - /** - * Track a new connection from an IP - * @param ip - Client IP address - */ - trackIPConnection(ip) { - const now = Date.now(); - const ipData = this.ipConnections.get(ip); - if (!ipData) { - // First connection from this IP - this.ipConnections.set(ip, { - count: 1, - firstConnection: now, - lastConnection: now - }); - } - else { - // Check if we need to reset the window - if (now - ipData.lastConnection > this.options.connectionRateWindow) { - // Reset the window - this.ipConnections.set(ip, { - count: 1, - firstConnection: now, - lastConnection: now - }); - } - else { - // Increment within the current window - this.ipConnections.set(ip, { - count: ipData.count + 1, - firstConnection: ipData.firstConnection, - lastConnection: now - }); - } - } - } - /** - * Check if an IP has reached its connection limit - * @param ip - Client IP address - * @returns True if limit reached - */ - hasReachedIPConnectionLimit(ip) { - let ipConnectionCount = 0; - // Count active connections from this IP - for (const socket of this.activeConnections) { - if (socket.remoteAddress === ip) { - ipConnectionCount++; - } - } - return ipConnectionCount >= this.options.maxConnectionsPerIP; - } - /** - * Handle a new secure TLS connection with resource management - * @param socket - Client TLS socket - */ - async handleNewSecureConnection(socket) { - // Update connection stats - this.connectionStats.totalConnections++; - this.connectionStats.activeConnections = this.activeConnections.size + 1; - if (this.connectionStats.activeConnections > this.connectionStats.peakConnections) { - this.connectionStats.peakConnections = this.connectionStats.activeConnections; - } - // Get client IP - const remoteAddress = socket.remoteAddress || '0.0.0.0'; - // Use UnifiedRateLimiter for connection rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - // Check connection limit with UnifiedRateLimiter - const connectionResult = rateLimiter.recordConnection(remoteAddress); - if (!connectionResult.allowed) { - this.rejectConnection(socket, connectionResult.reason || 'Rate limit exceeded'); - this.connectionStats.rejectedConnections++; - return; - } - // Still track IP connections locally for cleanup purposes - this.trackIPConnection(remoteAddress); - // Check if maximum global connections reached - if (this.hasReachedMaxConnections()) { - this.rejectConnection(socket, 'Too many connections'); - this.connectionStats.rejectedConnections++; - return; - } - // Add socket to active connections - this.activeConnections.add(socket); - // Set up socket options - socket.setKeepAlive(true); - socket.setTimeout(this.options.socketTimeout); - // Explicitly set socket buffer sizes to prevent memory issues - socket.setNoDelay(true); // Disable Nagle's algorithm for better responsiveness - // Set limits on socket buffer size if supported by Node.js version - try { - // Here we set reasonable buffer limits to prevent memory exhaustion attacks - const highWaterMark = 64 * 1024; // 64 KB - // Note: Socket high water mark methods can't be set directly in newer Node.js versions - // These would need to be set during socket creation or with a different API - } - catch (error) { - // Ignore errors from older Node.js versions that don't support these methods - SmtpLogger.debug(`Could not set socket buffer limits: ${error instanceof Error ? error.message : String(error)}`); - } - // Set up event handlers - this.setupSocketEventHandlers(socket); - // Create a session for this connection - this.smtpServer.getSessionManager().createSession(socket, true); - // Log the new secure connection using adaptive logger - adaptiveLogger.logConnection(socket, 'connect'); - // Update adaptive logger with current connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - // Send greeting - this.sendGreeting(socket); - } - /** - * Set up event handlers for a socket with enhanced resource management - * @param socket - Client socket - */ - setupSocketEventHandlers(socket) { - // Store existing socket event handlers before adding new ones - const existingDataHandler = socket.listeners('data')[0]; - const existingCloseHandler = socket.listeners('close')[0]; - const existingErrorHandler = socket.listeners('error')[0]; - const existingTimeoutHandler = socket.listeners('timeout')[0]; - // Remove existing event handlers if they exist - if (existingDataHandler) - socket.removeListener('data', existingDataHandler); - if (existingCloseHandler) - socket.removeListener('close', existingCloseHandler); - if (existingErrorHandler) - socket.removeListener('error', existingErrorHandler); - if (existingTimeoutHandler) - socket.removeListener('timeout', existingTimeoutHandler); - // Data event - process incoming data from the client with resource limits - let buffer = ''; - let totalBytesReceived = 0; - socket.on('data', async (data) => { - try { - // Get current session and update activity timestamp - const session = this.smtpServer.getSessionManager().getSession(socket); - if (session) { - this.smtpServer.getSessionManager().updateSessionActivity(session); - } - // Check if we're in DATA receiving mode - handle differently - if (session && session.state === SmtpState.DATA_RECEIVING) { - // In DATA mode, pass raw chunks directly to command handler with special marker - // Don't line-buffer large email content - try { - const dataString = data.toString('utf8'); - // Use a special prefix to indicate this is raw data, not a command line - // CRITICAL FIX: Must await to prevent async pile-up - await this.smtpServer.getCommandHandler().processCommand(socket, `__RAW_DATA__${dataString}`); - return; - } - catch (dataError) { - SmtpLogger.error(`Data handler error during DATA mode: ${dataError instanceof Error ? dataError.message : String(dataError)}`); - socket.destroy(); - return; - } - } - // For command mode, continue with line-buffered processing - // Check buffer size limits to prevent memory attacks - totalBytesReceived += data.length; - if (buffer.length > this.options.bufferSizeLimit) { - // Buffer is too large, reject the connection - SmtpLogger.warn(`Buffer size limit exceeded: ${buffer.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message too large, disconnecting`); - socket.destroy(); - return; - } - // Impose a total transfer limit to prevent DoS - if (totalBytesReceived > this.options.bufferSizeLimit * 2) { - SmtpLogger.warn(`Total transfer limit exceeded: ${totalBytesReceived} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Transfer limit exceeded, disconnecting`); - socket.destroy(); - return; - } - // Convert buffer to string safely with explicit encoding - const dataString = data.toString('utf8'); - // Buffer incoming data - buffer += dataString; - // Process complete lines - let lineEndPos; - while ((lineEndPos = buffer.indexOf(SMTP_DEFAULTS.CRLF)) !== -1) { - // Extract a complete line - const line = buffer.substring(0, lineEndPos); - buffer = buffer.substring(lineEndPos + 2); // +2 to skip CRLF - // Check line length to prevent extremely long lines - if (line.length > 4096) { // 4KB line limit is reasonable for SMTP - SmtpLogger.warn(`Line length limit exceeded: ${line.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Line too long, disconnecting`); - socket.destroy(); - return; - } - // Process non-empty lines - if (line.length > 0) { - try { - // CRITICAL FIX: Must await processCommand to prevent async pile-up - // This was causing the busy loop with high CPU usage when many empty lines were processed - await this.smtpServer.getCommandHandler().processCommand(socket, line); - } - catch (error) { - // Handle any errors in command processing - SmtpLogger.error(`Command handler error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error`); - // If there's a severe error, close the connection - if (error instanceof Error && - (error.message.includes('fatal') || error.message.includes('critical'))) { - socket.destroy(); - return; - } - } - } - } - // If buffer is getting too large without CRLF, it might be a DoS attempt - if (buffer.length > 10240) { // 10KB is a reasonable limit for a line without CRLF - SmtpLogger.warn(`Incomplete line too large: ${buffer.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Incomplete line too large, disconnecting`); - socket.destroy(); - } - } - catch (error) { - // Handle any unexpected errors during data processing - SmtpLogger.error(`Data handler error: ${error instanceof Error ? error.message : String(error)}`); - socket.destroy(); - } - }); - // Add drain event handler to manage flow control - socket.on('drain', () => { - // Socket buffer has been emptied, resume data flow if needed - if (socket.isPaused()) { - socket.resume(); - SmtpLogger.debug(`Resumed socket for ${socket.remoteAddress} after drain`); - } - }); - // Close event - clean up when connection is closed - socket.on('close', (hadError) => { - this.handleSocketClose(socket, hadError); - }); - // Error event - handle socket errors - socket.on('error', (err) => { - this.handleSocketError(socket, err); - }); - // Timeout event - handle socket timeouts - socket.on('timeout', () => { - this.handleSocketTimeout(socket); - }); - } - /** - * Get the current connection count - * @returns Number of active connections - */ - getConnectionCount() { - return this.activeConnections.size; - } - /** - * Check if the server has reached the maximum number of connections - * @returns True if max connections reached - */ - hasReachedMaxConnections() { - return this.activeConnections.size >= this.options.maxConnections; - } - /** - * Close all active connections - */ - closeAllConnections() { - const connectionCount = this.activeConnections.size; - if (connectionCount === 0) { - return; - } - SmtpLogger.info(`Closing all connections (count: ${connectionCount})`); - for (const socket of this.activeConnections) { - try { - // Send service closing notification - this.sendServiceClosing(socket); - // End the socket gracefully - socket.end(); - // Force destroy after a short delay if not already destroyed - const destroyTimer = setTimeout(() => { - if (!socket.destroyed) { - socket.destroy(); - } - this.cleanupTimers.delete(destroyTimer); - }, 100); - this.cleanupTimers.add(destroyTimer); - } - catch (error) { - SmtpLogger.error(`Error closing connection: ${error instanceof Error ? error.message : String(error)}`); - // Force destroy on error - try { - socket.destroy(); - } - catch (e) { - // Ignore destroy errors - } - } - } - // Clear active connections - this.activeConnections.clear(); - // Stop resource monitoring to prevent hanging timers - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - this.resourceCheckInterval = null; - } - } - /** - * Handle socket close event - * @param socket - Client socket - * @param hadError - Whether the socket was closed due to error - */ - handleSocketClose(socket, hadError) { - try { - // Update connection statistics - this.connectionStats.closedConnections++; - this.connectionStats.activeConnections = this.activeConnections.size - 1; - // Get socket details for logging - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - // Log with appropriate level based on whether there was an error - if (hadError) { - SmtpLogger.warn(`Socket closed with error: ${socketId}`); - } - else { - SmtpLogger.debug(`Socket closed normally: ${socketId}`); - } - // Get the session before removing it - const session = this.smtpServer.getSessionManager().getSession(socket); - // Remove from active connections - this.activeConnections.delete(socket); - // Remove from session manager - this.smtpServer.getSessionManager().removeSession(socket); - // Cancel any timeout ID stored in the session - if (session?.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - // Remove all event listeners to prevent memory leaks - socket.removeAllListeners(); - // Log connection close with session details if available - adaptiveLogger.logConnection(socket, 'close', session); - // Update adaptive logger with new connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - } - catch (error) { - // Handle any unexpected errors during cleanup - SmtpLogger.error(`Error in handleSocketClose: ${error instanceof Error ? error.message : String(error)}`); - // Ensure socket is removed from active connections even if an error occurs - this.activeConnections.delete(socket); - // Always try to remove all listeners even on error - try { - socket.removeAllListeners(); - } - catch { - // Ignore errors from removeAllListeners - } - } - } - /** - * Handle socket error event - * @param socket - Client socket - * @param error - Error object - */ - handleSocketError(socket, error) { - try { - // Update connection statistics - this.connectionStats.erroredConnections++; - // Get socket details for context - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - // Detailed error logging with context information - SmtpLogger.error(`Socket error for ${socketId}: ${error.message}`, { - errorCode: error.code, - errorStack: error.stack, - sessionId: session?.id, - sessionState: session?.state, - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - // Log the error for connection tracking using adaptive logger - adaptiveLogger.logConnection(socket, 'error', session, error); - // Cancel any timeout ID stored in the session - if (session?.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - // Close the socket if not already closed - if (!socket.destroyed) { - socket.destroy(); - } - // Remove from active connections (cleanup after error) - this.activeConnections.delete(socket); - // Remove from session manager - this.smtpServer.getSessionManager().removeSession(socket); - } - catch (handlerError) { - // Meta-error handling (errors in the error handler) - SmtpLogger.error(`Error in handleSocketError: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`); - // Ensure socket is destroyed and removed from active connections - if (!socket.destroyed) { - socket.destroy(); - } - this.activeConnections.delete(socket); - } - } - /** - * Handle socket timeout event - * @param socket - Client socket - */ - handleSocketTimeout(socket) { - try { - // Update connection statistics - this.connectionStats.timedOutConnections++; - // Get socket details for context - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - // Get timing information for better debugging - const now = Date.now(); - const idleTime = session?.lastActivity ? now - session.lastActivity : 'unknown'; - if (session) { - // Log the timeout with extended details - SmtpLogger.warn(`Socket timeout from ${session.remoteAddress}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - state: session.state, - timeout: this.options.socketTimeout, - idleTime: idleTime, - emailState: session.envelope?.mailFrom ? 'has-sender' : 'no-sender', - recipientCount: session.envelope?.rcptTo?.length || 0 - }); - // Cancel any timeout ID stored in the session - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - // Send timeout notification to client - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_NOT_AVAILABLE} Connection timeout - closing connection`); - } - else { - // Log timeout without session context - SmtpLogger.warn(`Socket timeout without session from ${socketId}`); - } - // Close the socket gracefully - try { - socket.end(); - // Set a forced close timeout in case socket.end() doesn't close the connection - const timeoutDestroyTimer = setTimeout(() => { - if (!socket.destroyed) { - SmtpLogger.warn(`Forcing destroy of timed out socket: ${socketId}`); - socket.destroy(); - } - this.cleanupTimers.delete(timeoutDestroyTimer); - }, 5000); // 5 second grace period for socket to end properly - this.cleanupTimers.add(timeoutDestroyTimer); - } - catch (error) { - SmtpLogger.error(`Error ending timed out socket: ${error instanceof Error ? error.message : String(error)}`); - // Ensure socket is destroyed even if end() fails - if (!socket.destroyed) { - socket.destroy(); - } - } - // Clean up resources - this.activeConnections.delete(socket); - this.smtpServer.getSessionManager().removeSession(socket); - } - catch (handlerError) { - // Handle any unexpected errors during timeout handling - SmtpLogger.error(`Error in handleSocketTimeout: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`); - // Ensure socket is destroyed and removed from tracking - if (!socket.destroyed) { - socket.destroy(); - } - this.activeConnections.delete(socket); - } - } - /** - * Reject a connection - * @param socket - Client socket - * @param reason - Reason for rejection - */ - rejectConnection(socket, reason) { - // Log the rejection - const socketDetails = getSocketDetails(socket); - SmtpLogger.warn(`Connection rejected from ${socketDetails.remoteAddress}:${socketDetails.remotePort}: ${reason}`); - // Send rejection message - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_NOT_AVAILABLE} ${this.options.hostname} Service temporarily unavailable - ${reason}`); - // Close the socket - try { - socket.end(); - } - catch (error) { - SmtpLogger.error(`Error ending rejected socket: ${error instanceof Error ? error.message : String(error)}`); - } - } - /** - * Send greeting message - * @param socket - Client socket - */ - sendGreeting(socket) { - const greeting = `${SmtpResponseCode.SERVICE_READY} ${this.options.hostname} ESMTP service ready`; - this.sendResponse(socket, greeting); - } - /** - * Send service closing notification - * @param socket - Client socket - */ - sendServiceClosing(socket) { - const message = `${SmtpResponseCode.SERVICE_CLOSING} ${this.options.hostname} Service closing transmission channel`; - this.sendResponse(socket, message); - } - /** - * Send response to client - * @param socket - Client socket - * @param response - Response to send - */ - sendResponse(socket, response) { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - adaptiveLogger.logResponse(response, socket); - } - catch (error) { - // Log error and destroy socket - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - socket.destroy(); - } - } - /** - * Handle a new connection (interface requirement) - */ - async handleConnection(socket, secure) { - if (secure) { - this.handleNewSecureConnection(socket); - } - else { - this.handleNewConnection(socket); - } - } - /** - * Check if accepting new connections (interface requirement) - */ - canAcceptConnection() { - return !this.hasReachedMaxConnections(); - } - /** - * Clean up resources - */ - destroy() { - // Clear resource monitoring interval - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - this.resourceCheckInterval = null; - } - // Clear all cleanup timers - for (const timer of this.cleanupTimers) { - clearTimeout(timer); - } - this.cleanupTimers.clear(); - // Close all active connections - this.closeAllConnections(); - // Clear maps - this.activeConnections.clear(); - this.ipConnections.clear(); - // Reset connection stats - this.connectionStats = { - totalConnections: 0, - activeConnections: 0, - peakConnections: 0, - rejectedConnections: 0, - closedConnections: 0, - erroredConnections: 0, - timedOutConnections: 0 - }; - SmtpLogger.debug('ConnectionManager destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/connection-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/constants.d.ts b/dist_ts/mail/delivery/smtpserver/constants.d.ts deleted file mode 100644 index 7afec92..0000000 --- a/dist_ts/mail/delivery/smtpserver/constants.d.ts +++ /dev/null @@ -1,130 +0,0 @@ -/** - * SMTP Server Constants - * This file contains all constants and enums used by the SMTP server - */ -import { SmtpState } from '../interfaces.js'; -export { SmtpState }; -/** - * SMTP Response Codes - * Based on RFC 5321 and common SMTP practice - */ -export declare enum SmtpResponseCode { - SUCCESS = 250,// Requested mail action okay, completed - SYSTEM_STATUS = 211,// System status, or system help reply - HELP_MESSAGE = 214,// Help message - SERVICE_READY = 220,// Service ready - SERVICE_CLOSING = 221,// Service closing transmission channel - AUTHENTICATION_SUCCESSFUL = 235,// Authentication successful - OK = 250,// Requested mail action okay, completed - FORWARD = 251,// User not local; will forward to - CANNOT_VRFY = 252,// Cannot VRFY user, but will accept message and attempt delivery - MORE_INFO_NEEDED = 334,// Server challenge for authentication - START_MAIL_INPUT = 354,// Start mail input; end with . - SERVICE_NOT_AVAILABLE = 421,// Service not available, closing transmission channel - MAILBOX_TEMPORARILY_UNAVAILABLE = 450,// Requested mail action not taken: mailbox unavailable - LOCAL_ERROR = 451,// Requested action aborted: local error in processing - INSUFFICIENT_STORAGE = 452,// Requested action not taken: insufficient system storage - TLS_UNAVAILABLE_TEMP = 454,// TLS not available due to temporary reason - SYNTAX_ERROR = 500,// Syntax error, command unrecognized - SYNTAX_ERROR_PARAMETERS = 501,// Syntax error in parameters or arguments - COMMAND_NOT_IMPLEMENTED = 502,// Command not implemented - BAD_SEQUENCE = 503,// Bad sequence of commands - COMMAND_PARAMETER_NOT_IMPLEMENTED = 504,// Command parameter not implemented - AUTH_REQUIRED = 530,// Authentication required - AUTH_FAILED = 535,// Authentication credentials invalid - MAILBOX_UNAVAILABLE = 550,// Requested action not taken: mailbox unavailable - USER_NOT_LOCAL = 551,// User not local; please try - EXCEEDED_STORAGE = 552,// Requested mail action aborted: exceeded storage allocation - MAILBOX_NAME_INVALID = 553,// Requested action not taken: mailbox name not allowed - TRANSACTION_FAILED = 554,// Transaction failed - MAIL_RCPT_PARAMETERS_INVALID = 555 -} -/** - * SMTP Command Types - */ -export declare enum SmtpCommand { - HELO = "HELO", - EHLO = "EHLO", - MAIL_FROM = "MAIL", - RCPT_TO = "RCPT", - DATA = "DATA", - RSET = "RSET", - NOOP = "NOOP", - QUIT = "QUIT", - STARTTLS = "STARTTLS", - AUTH = "AUTH", - HELP = "HELP", - VRFY = "VRFY", - EXPN = "EXPN" -} -/** - * Security log event types - */ -export declare enum SecurityEventType { - CONNECTION = "connection", - AUTHENTICATION = "authentication", - COMMAND = "command", - DATA = "data", - IP_REPUTATION = "ip_reputation", - TLS_NEGOTIATION = "tls_negotiation", - DKIM = "dkim", - SPF = "spf", - DMARC = "dmarc", - EMAIL_VALIDATION = "email_validation", - SPAM = "spam", - ACCESS_CONTROL = "access_control" -} -/** - * Security log levels - */ -export declare enum SecurityLogLevel { - DEBUG = "debug", - INFO = "info", - WARN = "warn", - ERROR = "error" -} -/** - * SMTP Server Defaults - */ -export declare const SMTP_DEFAULTS: { - CONNECTION_TIMEOUT: number; - SOCKET_TIMEOUT: number; - DATA_TIMEOUT: number; - CLEANUP_INTERVAL: number; - MAX_CONNECTIONS: number; - MAX_RECIPIENTS: number; - MAX_MESSAGE_SIZE: number; - SMTP_PORT: number; - SUBMISSION_PORT: number; - SECURE_PORT: number; - HOSTNAME: string; - CRLF: string; -}; -/** - * SMTP Command Patterns - * Regular expressions for parsing SMTP commands - */ -export declare const SMTP_PATTERNS: { - EHLO: RegExp; - MAIL_FROM: RegExp; - RCPT_TO: RegExp; - PARAM: RegExp; - EMAIL: RegExp; - END_DATA: RegExp; -}; -/** - * SMTP Extension List - * These extensions are advertised in the EHLO response - */ -export declare const SMTP_EXTENSIONS: { - PIPELINING: string; - SIZE: string; - EIGHTBITMIME: string; - STARTTLS: string; - AUTH: string; - ENHANCEDSTATUSCODES: string; - HELP: string; - CHUNKING: string; - DSN: string; - formatExtension(name: string, parameter?: string | number): string; -}; diff --git a/dist_ts/mail/delivery/smtpserver/constants.js b/dist_ts/mail/delivery/smtpserver/constants.js deleted file mode 100644 index 1266db7..0000000 --- a/dist_ts/mail/delivery/smtpserver/constants.js +++ /dev/null @@ -1,162 +0,0 @@ -/** - * SMTP Server Constants - * This file contains all constants and enums used by the SMTP server - */ -import { SmtpState } from '../interfaces.js'; -// Re-export SmtpState enum from the main interfaces file -export { SmtpState }; -/** - * SMTP Response Codes - * Based on RFC 5321 and common SMTP practice - */ -export var SmtpResponseCode; -(function (SmtpResponseCode) { - // Success codes (2xx) - SmtpResponseCode[SmtpResponseCode["SUCCESS"] = 250] = "SUCCESS"; - SmtpResponseCode[SmtpResponseCode["SYSTEM_STATUS"] = 211] = "SYSTEM_STATUS"; - SmtpResponseCode[SmtpResponseCode["HELP_MESSAGE"] = 214] = "HELP_MESSAGE"; - SmtpResponseCode[SmtpResponseCode["SERVICE_READY"] = 220] = "SERVICE_READY"; - SmtpResponseCode[SmtpResponseCode["SERVICE_CLOSING"] = 221] = "SERVICE_CLOSING"; - SmtpResponseCode[SmtpResponseCode["AUTHENTICATION_SUCCESSFUL"] = 235] = "AUTHENTICATION_SUCCESSFUL"; - SmtpResponseCode[SmtpResponseCode["OK"] = 250] = "OK"; - SmtpResponseCode[SmtpResponseCode["FORWARD"] = 251] = "FORWARD"; - SmtpResponseCode[SmtpResponseCode["CANNOT_VRFY"] = 252] = "CANNOT_VRFY"; - // Intermediate codes (3xx) - SmtpResponseCode[SmtpResponseCode["MORE_INFO_NEEDED"] = 334] = "MORE_INFO_NEEDED"; - SmtpResponseCode[SmtpResponseCode["START_MAIL_INPUT"] = 354] = "START_MAIL_INPUT"; - // Temporary error codes (4xx) - SmtpResponseCode[SmtpResponseCode["SERVICE_NOT_AVAILABLE"] = 421] = "SERVICE_NOT_AVAILABLE"; - SmtpResponseCode[SmtpResponseCode["MAILBOX_TEMPORARILY_UNAVAILABLE"] = 450] = "MAILBOX_TEMPORARILY_UNAVAILABLE"; - SmtpResponseCode[SmtpResponseCode["LOCAL_ERROR"] = 451] = "LOCAL_ERROR"; - SmtpResponseCode[SmtpResponseCode["INSUFFICIENT_STORAGE"] = 452] = "INSUFFICIENT_STORAGE"; - SmtpResponseCode[SmtpResponseCode["TLS_UNAVAILABLE_TEMP"] = 454] = "TLS_UNAVAILABLE_TEMP"; - // Permanent error codes (5xx) - SmtpResponseCode[SmtpResponseCode["SYNTAX_ERROR"] = 500] = "SYNTAX_ERROR"; - SmtpResponseCode[SmtpResponseCode["SYNTAX_ERROR_PARAMETERS"] = 501] = "SYNTAX_ERROR_PARAMETERS"; - SmtpResponseCode[SmtpResponseCode["COMMAND_NOT_IMPLEMENTED"] = 502] = "COMMAND_NOT_IMPLEMENTED"; - SmtpResponseCode[SmtpResponseCode["BAD_SEQUENCE"] = 503] = "BAD_SEQUENCE"; - SmtpResponseCode[SmtpResponseCode["COMMAND_PARAMETER_NOT_IMPLEMENTED"] = 504] = "COMMAND_PARAMETER_NOT_IMPLEMENTED"; - SmtpResponseCode[SmtpResponseCode["AUTH_REQUIRED"] = 530] = "AUTH_REQUIRED"; - SmtpResponseCode[SmtpResponseCode["AUTH_FAILED"] = 535] = "AUTH_FAILED"; - SmtpResponseCode[SmtpResponseCode["MAILBOX_UNAVAILABLE"] = 550] = "MAILBOX_UNAVAILABLE"; - SmtpResponseCode[SmtpResponseCode["USER_NOT_LOCAL"] = 551] = "USER_NOT_LOCAL"; - SmtpResponseCode[SmtpResponseCode["EXCEEDED_STORAGE"] = 552] = "EXCEEDED_STORAGE"; - SmtpResponseCode[SmtpResponseCode["MAILBOX_NAME_INVALID"] = 553] = "MAILBOX_NAME_INVALID"; - SmtpResponseCode[SmtpResponseCode["TRANSACTION_FAILED"] = 554] = "TRANSACTION_FAILED"; - SmtpResponseCode[SmtpResponseCode["MAIL_RCPT_PARAMETERS_INVALID"] = 555] = "MAIL_RCPT_PARAMETERS_INVALID"; -})(SmtpResponseCode || (SmtpResponseCode = {})); -/** - * SMTP Command Types - */ -export var SmtpCommand; -(function (SmtpCommand) { - SmtpCommand["HELO"] = "HELO"; - SmtpCommand["EHLO"] = "EHLO"; - SmtpCommand["MAIL_FROM"] = "MAIL"; - SmtpCommand["RCPT_TO"] = "RCPT"; - SmtpCommand["DATA"] = "DATA"; - SmtpCommand["RSET"] = "RSET"; - SmtpCommand["NOOP"] = "NOOP"; - SmtpCommand["QUIT"] = "QUIT"; - SmtpCommand["STARTTLS"] = "STARTTLS"; - SmtpCommand["AUTH"] = "AUTH"; - SmtpCommand["HELP"] = "HELP"; - SmtpCommand["VRFY"] = "VRFY"; - SmtpCommand["EXPN"] = "EXPN"; -})(SmtpCommand || (SmtpCommand = {})); -/** - * Security log event types - */ -export var SecurityEventType; -(function (SecurityEventType) { - SecurityEventType["CONNECTION"] = "connection"; - SecurityEventType["AUTHENTICATION"] = "authentication"; - SecurityEventType["COMMAND"] = "command"; - SecurityEventType["DATA"] = "data"; - SecurityEventType["IP_REPUTATION"] = "ip_reputation"; - SecurityEventType["TLS_NEGOTIATION"] = "tls_negotiation"; - SecurityEventType["DKIM"] = "dkim"; - SecurityEventType["SPF"] = "spf"; - SecurityEventType["DMARC"] = "dmarc"; - SecurityEventType["EMAIL_VALIDATION"] = "email_validation"; - SecurityEventType["SPAM"] = "spam"; - SecurityEventType["ACCESS_CONTROL"] = "access_control"; -})(SecurityEventType || (SecurityEventType = {})); -/** - * Security log levels - */ -export var SecurityLogLevel; -(function (SecurityLogLevel) { - SecurityLogLevel["DEBUG"] = "debug"; - SecurityLogLevel["INFO"] = "info"; - SecurityLogLevel["WARN"] = "warn"; - SecurityLogLevel["ERROR"] = "error"; -})(SecurityLogLevel || (SecurityLogLevel = {})); -/** - * SMTP Server Defaults - */ -export const SMTP_DEFAULTS = { - // Default timeouts in milliseconds - CONNECTION_TIMEOUT: 30000, // 30 seconds - SOCKET_TIMEOUT: 300000, // 5 minutes - DATA_TIMEOUT: 60000, // 1 minute - CLEANUP_INTERVAL: 5000, // 5 seconds - // Default limits - MAX_CONNECTIONS: 100, - MAX_RECIPIENTS: 100, - MAX_MESSAGE_SIZE: 10485760, // 10MB - // Default ports - SMTP_PORT: 25, - SUBMISSION_PORT: 587, - SECURE_PORT: 465, - // Default hostname - HOSTNAME: 'mail.lossless.one', - // CRLF line ending required by SMTP protocol - CRLF: '\r\n', -}; -/** - * SMTP Command Patterns - * Regular expressions for parsing SMTP commands - */ -export const SMTP_PATTERNS = { - // Match EHLO/HELO command: "EHLO example.com" - // Made very permissive to handle various client implementations - EHLO: /^(?:EHLO|HELO)\s+(.+)$/i, - // Match MAIL FROM command: "MAIL FROM: [PARAM=VALUE]" - // Made more permissive with whitespace and parameter formats - MAIL_FROM: /^MAIL\s+FROM\s*:\s*<([^>]*)>((?:\s+[a-zA-Z0-9][a-zA-Z0-9\-]*(?:=[^\s]+)?)*)$/i, - // Match RCPT TO command: "RCPT TO: [PARAM=VALUE]" - // Made more permissive with whitespace and parameter formats - RCPT_TO: /^RCPT\s+TO\s*:\s*<([^>]*)>((?:\s+[a-zA-Z0-9][a-zA-Z0-9\-]*(?:=[^\s]+)?)*)$/i, - // Match parameter format: "PARAM=VALUE" - PARAM: /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g, - // Match email address format - basic validation - // This pattern rejects common invalid formats while being permissive for edge cases - // Checks: no spaces, has @, has domain with dot, no double dots, proper domain format - EMAIL: /^[^\s@]+@[^\s@]+\.[^\s@]+$/, - // Match end of DATA marker: \r\n.\r\n or just .\r\n at the start of a line (to handle various client implementations) - END_DATA: /(\r\n\.\r\n$)|(\n\.\r\n$)|(\r\n\.\n$)|(\n\.\n$)|^\.(\r\n|\n)$/, -}; -/** - * SMTP Extension List - * These extensions are advertised in the EHLO response - */ -export const SMTP_EXTENSIONS = { - // Basic extensions (RFC 1869) - PIPELINING: 'PIPELINING', - SIZE: 'SIZE', - EIGHTBITMIME: '8BITMIME', - // Security extensions - STARTTLS: 'STARTTLS', - AUTH: 'AUTH', - // Additional extensions - ENHANCEDSTATUSCODES: 'ENHANCEDSTATUSCODES', - HELP: 'HELP', - CHUNKING: 'CHUNKING', - DSN: 'DSN', - // Format an extension with a parameter - formatExtension(name, parameter) { - return parameter !== undefined ? `${name} ${parameter}` : name; - } -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbWFpbC9kZWxpdmVyeS9zbXRwc2VydmVyL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFFSCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFN0MseURBQXlEO0FBQ3pELE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxNQUFNLENBQU4sSUFBWSxnQkFxQ1g7QUFyQ0QsV0FBWSxnQkFBZ0I7SUFDMUIsc0JBQXNCO0lBQ3RCLCtEQUFhLENBQUE7SUFDYiwyRUFBbUIsQ0FBQTtJQUNuQix5RUFBa0IsQ0FBQTtJQUNsQiwyRUFBbUIsQ0FBQTtJQUNuQiwrRUFBcUIsQ0FBQTtJQUNyQixtR0FBK0IsQ0FBQTtJQUMvQixxREFBUSxDQUFBO0lBQ1IsK0RBQWEsQ0FBQTtJQUNiLHVFQUFpQixDQUFBO0lBRWpCLDJCQUEyQjtJQUMzQixpRkFBc0IsQ0FBQTtJQUN0QixpRkFBc0IsQ0FBQTtJQUV0Qiw4QkFBOEI7SUFDOUIsMkZBQTJCLENBQUE7SUFDM0IsK0dBQXFDLENBQUE7SUFDckMsdUVBQWlCLENBQUE7SUFDakIseUZBQTBCLENBQUE7SUFDMUIseUZBQTBCLENBQUE7SUFFMUIsOEJBQThCO0lBQzlCLHlFQUFrQixDQUFBO0lBQ2xCLCtGQUE2QixDQUFBO0lBQzdCLCtGQUE2QixDQUFBO0lBQzdCLHlFQUFrQixDQUFBO0lBQ2xCLG1IQUF1QyxDQUFBO0lBQ3ZDLDJFQUFtQixDQUFBO0lBQ25CLHVFQUFpQixDQUFBO0lBQ2pCLHVGQUF5QixDQUFBO0lBQ3pCLDZFQUFvQixDQUFBO0lBQ3BCLGlGQUFzQixDQUFBO0lBQ3RCLHlGQUEwQixDQUFBO0lBQzFCLHFGQUF3QixDQUFBO0lBQ3hCLHlHQUFrQyxDQUFBO0FBQ3BDLENBQUMsRUFyQ1csZ0JBQWdCLEtBQWhCLGdCQUFn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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/create-server.d.ts b/dist_ts/mail/delivery/smtpserver/create-server.d.ts deleted file mode 100644 index e3c1912..0000000 --- a/dist_ts/mail/delivery/smtpserver/create-server.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * SMTP Server Creation Factory - * Provides a simple way to create a complete SMTP server - */ -import { SmtpServer } from './smtp-server.js'; -import type { ISmtpServerOptions } from './interfaces.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; -/** - * Create a complete SMTP server with all components - * @param emailServer - Email server reference - * @param options - SMTP server options - * @returns Configured SMTP server instance - */ -export declare function createSmtpServer(emailServer: UnifiedEmailServer, options: ISmtpServerOptions): SmtpServer; diff --git a/dist_ts/mail/delivery/smtpserver/create-server.js b/dist_ts/mail/delivery/smtpserver/create-server.js deleted file mode 100644 index bd29837..0000000 --- a/dist_ts/mail/delivery/smtpserver/create-server.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * SMTP Server Creation Factory - * Provides a simple way to create a complete SMTP server - */ -import { SmtpServer } from './smtp-server.js'; -import { SessionManager } from './session-manager.js'; -import { ConnectionManager } from './connection-manager.js'; -import { CommandHandler } from './command-handler.js'; -import { DataHandler } from './data-handler.js'; -import { TlsHandler } from './tls-handler.js'; -import { SecurityHandler } from './security-handler.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; -/** - * Create a complete SMTP server with all components - * @param emailServer - Email server reference - * @param options - SMTP server options - * @returns Configured SMTP server instance - */ -export function createSmtpServer(emailServer, options) { - // First create the SMTP server instance - const smtpServer = new SmtpServer({ - emailServer, - options - }); - // Return the configured server - return smtpServer; -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cHNlcnZlci9jcmVhdGUtc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRW5GOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQixDQUFDLFdBQStCLEVBQUUsT0FBMkI7SUFDM0Ysd0NBQXdDO0lBQ3hDLE1BQU0sVUFBVSxHQUFHLElBQUksVUFBVSxDQUFDO1FBQ2hDLFdBQVc7UUFDWCxPQUFPO0tBQ1IsQ0FBQyxDQUFDO0lBRUgsK0JBQStCO0lBQy9CLE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMifQ== \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/data-handler.d.ts b/dist_ts/mail/delivery/smtpserver/data-handler.d.ts deleted file mode 100644 index 418f228..0000000 --- a/dist_ts/mail/delivery/smtpserver/data-handler.d.ts +++ /dev/null @@ -1,123 +0,0 @@ -/** - * SMTP Data Handler - * Responsible for processing email data during and after DATA command - */ -import * as plugins from '../../../plugins.js'; -import type { ISmtpSession, ISmtpTransactionResult } from './interfaces.js'; -import type { IDataHandler, ISmtpServer } from './interfaces.js'; -import { Email } from '../../core/classes.email.js'; -/** - * Handles SMTP DATA command and email data processing - */ -export declare class DataHandler implements IDataHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer; - /** - * Creates a new data handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer); - /** - * Process incoming email data - * @param socket - Client socket - * @param data - Data chunk - * @returns Promise that resolves when the data is processed - */ - processEmailData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; - /** - * Handle raw data chunks during DATA mode (optimized for large messages) - * @param socket - Client socket - * @param data - Raw data chunk - */ - handleDataReceived(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; - /** - * Process email data chunks efficiently for large messages - * @param chunks - Array of email data chunks - * @returns Processed email data string - */ - private processEmailDataStreaming; - /** - * Process a complete email - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Promise that resolves with the Email object - */ - processEmail(rawData: string, session: ISmtpSession): Promise; - /** - * Parse email from raw data - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Email object - */ - private parseEmailFromData; - /** - * Process a complete email (legacy method) - * @param session - SMTP session - * @returns Promise that resolves with the result of the transaction - */ - processEmailLegacy(session: ISmtpSession): Promise; - /** - * Save an email to disk - * @param session - SMTP session - */ - saveEmail(session: ISmtpSession): void; - /** - * Parse an email into an Email object - * @param session - SMTP session - * @returns Promise that resolves with the parsed Email object - */ - parseEmail(session: ISmtpSession): Promise; - /** - * Basic fallback method for parsing emails - * @param session - SMTP session - * @returns The parsed Email object - */ - private parseEmailBasic; - /** - * Handle multipart content parsing - * @param email - Email object to update - * @param bodyText - Body text to parse - * @param boundary - MIME boundary - */ - private handleMultipartContent; - /** - * Handle end of data marker received - * @param socket - Client socket - * @param session - SMTP session - */ - private handleEndOfData; - /** - * Reset session after email processing - * @param session - SMTP session - */ - private resetSession; - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - private sendResponse; - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - private isRecoverableSocketError; - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - private handleSocketError; - /** - * Handle email data (interface requirement) - */ - handleData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string, session: ISmtpSession): Promise; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/data-handler.js b/dist_ts/mail/delivery/smtpserver/data-handler.js deleted file mode 100644 index 4bd17de..0000000 --- a/dist_ts/mail/delivery/smtpserver/data-handler.js +++ /dev/null @@ -1,1152 +0,0 @@ -/** - * SMTP Data Handler - * Responsible for processing email data during and after DATA command - */ -import * as plugins from '../../../plugins.js'; -import * as fs from 'fs'; -import * as path from 'path'; -import { SmtpState } from './interfaces.js'; -import { SmtpResponseCode, SMTP_PATTERNS, SMTP_DEFAULTS } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { detectHeaderInjection } from './utils/validation.js'; -import { Email } from '../../core/classes.email.js'; -/** - * Handles SMTP DATA command and email data processing - */ -export class DataHandler { - /** - * Reference to the SMTP server instance - */ - smtpServer; - /** - * Creates a new data handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer) { - this.smtpServer = smtpServer; - } - /** - * Process incoming email data - * @param socket - Client socket - * @param data - Data chunk - * @returns Promise that resolves when the data is processed - */ - async processEmailData(socket, data) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Clear any existing timeout and set a new one - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - session.dataTimeoutId = setTimeout(() => { - if (session.state === SmtpState.DATA_RECEIVING) { - SmtpLogger.warn(`DATA timeout for session ${session.id}`, { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Data timeout`); - this.resetSession(session); - } - }, SMTP_DEFAULTS.DATA_TIMEOUT); - // Update activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - // Store data in chunks for better memory efficiency - if (!session.emailDataChunks) { - session.emailDataChunks = []; - session.emailDataSize = 0; // Track size incrementally - } - session.emailDataChunks.push(data); - session.emailDataSize = (session.emailDataSize || 0) + data.length; - // Check if we've reached the max size (using incremental tracking) - const options = this.smtpServer.getOptions(); - const maxSize = options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE; - if (session.emailDataSize > maxSize) { - SmtpLogger.warn(`Message size exceeds limit for session ${session.id}`, { - sessionId: session.id, - size: session.emailDataSize, - limit: maxSize - }); - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message too big, size limit is ${maxSize} bytes`); - this.resetSession(session); - return; - } - // Check for end of data marker efficiently without combining all chunks - // Only check the current chunk and the last chunk for the marker - let hasEndMarker = false; - // Check if current chunk contains end marker - if (data === '.\r\n' || data === '.') { - hasEndMarker = true; - } - else { - // For efficiency with large messages, only check the last few chunks - // Get the last 2 chunks to check for split markers - const lastChunks = session.emailDataChunks.slice(-2).join(''); - hasEndMarker = lastChunks.endsWith('\r\n.\r\n') || - lastChunks.endsWith('\n.\r\n') || - lastChunks.endsWith('\r\n.\n') || - lastChunks.endsWith('\n.\n'); - } - if (hasEndMarker) { - SmtpLogger.debug(`End of data marker found for session ${session.id}`, { sessionId: session.id }); - // End of data marker found - await this.handleEndOfData(socket, session); - } - } - /** - * Handle raw data chunks during DATA mode (optimized for large messages) - * @param socket - Client socket - * @param data - Raw data chunk - */ - async handleDataReceived(socket, data) { - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - // Special handling for ERR-02 test: detect MAIL FROM command during DATA mode - // This needs to work for both raw data chunks and line-based data - const trimmedData = data.trim(); - const looksLikeCommand = /^[A-Z]{4,}( |:)/i.test(trimmedData); - if (looksLikeCommand && trimmedData.toUpperCase().startsWith('MAIL FROM')) { - // This is the command that ERR-02 test is expecting to fail with 503 - SmtpLogger.debug(`Received MAIL FROM command during DATA mode - responding with sequence error`); - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - // For all other data, process normally - return this.processEmailData(socket, data); - } - /** - * Process email data chunks efficiently for large messages - * @param chunks - Array of email data chunks - * @returns Processed email data string - */ - processEmailDataStreaming(chunks) { - // For very large messages, use a more memory-efficient approach - const CHUNK_SIZE = 50; // Process 50 chunks at a time - let result = ''; - // Process chunks in batches to reduce memory pressure - for (let batchStart = 0; batchStart < chunks.length; batchStart += CHUNK_SIZE) { - const batchEnd = Math.min(batchStart + CHUNK_SIZE, chunks.length); - const batchChunks = chunks.slice(batchStart, batchEnd); - // Join this batch - let batchData = batchChunks.join(''); - // Clear references to help GC - for (let i = 0; i < batchChunks.length; i++) { - batchChunks[i] = ''; - } - result += batchData; - batchData = ''; // Clear reference - // Force garbage collection hint (if available) - if (global.gc && batchStart % 200 === 0) { - global.gc(); - } - } - // Remove trailing end-of-data marker: various formats - result = result - .replace(/\r\n\.\r\n$/, '') - .replace(/\n\.\r\n$/, '') - .replace(/\r\n\.\n$/, '') - .replace(/\n\.\n$/, '') - .replace(/^\.$/, ''); // Handle ONLY a lone dot as the entire content (not trailing dots) - // Remove dot-stuffing (RFC 5321, section 4.5.2) - result = result.replace(/\r\n\.\./g, '\r\n.'); - return result; - } - /** - * Process a complete email - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Promise that resolves with the Email object - */ - async processEmail(rawData, session) { - // Clean up the raw email data - let cleanedData = rawData; - // Remove trailing end-of-data marker: various formats - cleanedData = cleanedData - .replace(/\r\n\.\r\n$/, '') - .replace(/\n\.\r\n$/, '') - .replace(/\r\n\.\n$/, '') - .replace(/\n\.\n$/, '') - .replace(/^\.$/, ''); // Handle ONLY a lone dot as the entire content (not trailing dots) - // Remove dot-stuffing (RFC 5321, section 4.5.2) - cleanedData = cleanedData.replace(/\r\n\.\./g, '\r\n.'); - try { - // Parse email into Email object using cleaned data - const email = await this.parseEmailFromData(cleanedData, session); - // Return the parsed email - return email; - } - catch (error) { - SmtpLogger.error(`Failed to parse email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Create a minimal email object on error - const fallbackEmail = new Email({ - from: 'unknown@localhost', - to: 'unknown@localhost', - subject: 'Parse Error', - text: cleanedData - }); - return fallbackEmail; - } - } - /** - * Parse email from raw data - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Email object - */ - async parseEmailFromData(rawData, session) { - // Parse the raw email data to extract headers and body - const lines = rawData.split('\r\n'); - let headerEnd = -1; - // Find where headers end - for (let i = 0; i < lines.length; i++) { - if (lines[i].trim() === '') { - headerEnd = i; - break; - } - } - // Extract headers - let subject = 'No Subject'; - const headers = {}; - if (headerEnd > -1) { - for (let i = 0; i < headerEnd; i++) { - const line = lines[i]; - const colonIndex = line.indexOf(':'); - if (colonIndex > 0) { - const headerName = line.substring(0, colonIndex).trim().toLowerCase(); - const headerValue = line.substring(colonIndex + 1).trim(); - if (headerName === 'subject') { - subject = headerValue; - } - else { - headers[headerName] = headerValue; - } - } - } - } - // Extract body - const body = headerEnd > -1 ? lines.slice(headerEnd + 1).join('\r\n') : rawData; - // Create email with session information - const email = new Email({ - from: session.mailFrom || 'unknown@localhost', - to: session.rcptTo || ['unknown@localhost'], - subject, - text: body, - headers - }); - return email; - } - /** - * Process a complete email (legacy method) - * @param session - SMTP session - * @returns Promise that resolves with the result of the transaction - */ - async processEmailLegacy(session) { - try { - // Use the email data from session - const email = await this.parseEmailFromData(session.emailData || '', session); - // Process the email based on the processing mode - const processingMode = session.processingMode || 'mta'; - let result = { - success: false, - error: 'Email processing failed' - }; - switch (processingMode) { - case 'mta': - // Process through the MTA system - try { - SmtpLogger.debug(`Processing email in MTA mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - // Generate a message ID since queueEmail is not available - const options = this.smtpServer.getOptions(); - const hostname = options.hostname || SMTP_DEFAULTS.HOSTNAME; - const messageId = `${Date.now()}-${Math.floor(Math.random() * 1000000)}@${hostname}`; - // Process the email through the emailServer - try { - // Process the email via the UnifiedEmailServer - // Pass the email object, session data, and specify the mode (mta, forward, or process) - // This connects SMTP reception to the overall email system - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session); - SmtpLogger.info(`Email processed through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - result = { - success: true, - messageId, - email - }; - } - catch (emailError) { - SmtpLogger.error(`Failed to process email through UnifiedEmailServer: ${emailError instanceof Error ? emailError.message : String(emailError)}`, { - sessionId: session.id, - error: emailError instanceof Error ? emailError : new Error(String(emailError)), - messageId - }); - // Default to success for now to pass tests, but log the error - result = { - success: true, - messageId, - email - }; - } - } - catch (error) { - SmtpLogger.error(`Failed to queue email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - result = { - success: false, - error: `Failed to queue email: ${error instanceof Error ? error.message : String(error)}` - }; - } - break; - case 'forward': - // Forward email to another server - SmtpLogger.debug(`Processing email in FORWARD mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - // Process the email via the UnifiedEmailServer in forward mode - try { - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session); - SmtpLogger.info(`Email forwarded through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - catch (forwardError) { - SmtpLogger.error(`Failed to forward email: ${forwardError instanceof Error ? forwardError.message : String(forwardError)}`, { - sessionId: session.id, - error: forwardError instanceof Error ? forwardError : new Error(String(forwardError)), - messageId: email.getMessageId() - }); - // For testing, still return success - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - break; - case 'process': - // Process the email immediately - SmtpLogger.debug(`Processing email in PROCESS mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - // Process the email via the UnifiedEmailServer in process mode - try { - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session); - SmtpLogger.info(`Email processed directly through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - catch (processError) { - SmtpLogger.error(`Failed to process email directly: ${processError instanceof Error ? processError.message : String(processError)}`, { - sessionId: session.id, - error: processError instanceof Error ? processError : new Error(String(processError)), - messageId: email.getMessageId() - }); - // For testing, still return success - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - break; - default: - SmtpLogger.warn(`Unknown processing mode: ${processingMode}`, { sessionId: session.id }); - result = { - success: false, - error: `Unknown processing mode: ${processingMode}` - }; - } - return result; - } - catch (error) { - SmtpLogger.error(`Failed to parse email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - return { - success: false, - error: `Failed to parse email: ${error instanceof Error ? error.message : String(error)}` - }; - } - } - /** - * Save an email to disk - * @param session - SMTP session - */ - saveEmail(session) { - // Email saving to disk is currently disabled in the refactored architecture - // This functionality can be re-enabled by adding a tempDir option to ISmtpServerOptions - SmtpLogger.debug(`Email saving to disk is disabled`, { - sessionId: session.id - }); - } - /** - * Parse an email into an Email object - * @param session - SMTP session - * @returns Promise that resolves with the parsed Email object - */ - async parseEmail(session) { - try { - // Store raw data for testing and debugging - const rawData = session.emailData; - // Try to parse with mailparser for better MIME support - const parsed = await plugins.mailparser.simpleParser(rawData); - // Extract headers - const headers = {}; - // Add all headers from the parsed email - if (parsed.headers) { - // Convert headers to a standard object format - for (const [key, value] of parsed.headers.entries()) { - if (typeof value === 'string') { - headers[key.toLowerCase()] = value; - } - else if (Array.isArray(value)) { - headers[key.toLowerCase()] = value.join(', '); - } - } - } - // Get message ID or generate one - const messageId = parsed.messageId || - headers['message-id'] || - `<${Date.now()}.${Math.random().toString(36).substring(2)}@${this.smtpServer.getOptions().hostname}>`; - // Get From, To, and Subject from parsed email or envelope - const from = parsed.from?.value?.[0]?.address || - session.envelope.mailFrom.address; - // Handle multiple recipients appropriately - let to = []; - // Try to get recipients from parsed email - if (parsed.to) { - // Handle both array and single object cases - if (Array.isArray(parsed.to)) { - to = parsed.to.map(addr => typeof addr === 'object' && addr !== null && 'address' in addr ? String(addr.address) : ''); - } - else if (typeof parsed.to === 'object' && parsed.to !== null) { - // Handle object with value property (array or single address object) - if ('value' in parsed.to && Array.isArray(parsed.to.value)) { - to = parsed.to.value.map(addr => typeof addr === 'object' && addr !== null && 'address' in addr ? String(addr.address) : ''); - } - else if ('address' in parsed.to) { - to = [String(parsed.to.address)]; - } - } - // Filter out empty strings - to = to.filter(Boolean); - } - // If no recipients found, fall back to envelope - if (to.length === 0) { - to = session.envelope.rcptTo.map(r => r.address); - } - // Handle subject with special care for character encoding - const subject = parsed.subject || headers['subject'] || 'No Subject'; - SmtpLogger.debug(`Parsed email subject: ${subject}`, { subject }); - // Create email object using the parsed content - const email = new Email({ - from: from, - to: to, - subject: subject, - text: parsed.text || '', - html: parsed.html || undefined, - // Include original envelope data as headers for accurate routing - headers: { - 'X-Original-Mail-From': session.envelope.mailFrom.address, - 'X-Original-Rcpt-To': session.envelope.rcptTo.map(r => r.address).join(', '), - 'Message-Id': messageId - } - }); - // Add attachments if any - if (parsed.attachments && parsed.attachments.length > 0) { - SmtpLogger.debug(`Found ${parsed.attachments.length} attachments in email`, { - sessionId: session.id, - attachmentCount: parsed.attachments.length - }); - for (const attachment of parsed.attachments) { - // Enhanced attachment logging for debugging - SmtpLogger.debug(`Processing attachment: ${attachment.filename}`, { - filename: attachment.filename, - contentType: attachment.contentType, - size: attachment.content?.length, - contentId: attachment.contentId || 'none', - contentDisposition: attachment.contentDisposition || 'none' - }); - // Ensure we have valid content - if (!attachment.content || !Buffer.isBuffer(attachment.content)) { - SmtpLogger.warn(`Attachment ${attachment.filename} has invalid content, skipping`); - continue; - } - // Fix up content type if missing but can be inferred from filename - let contentType = attachment.contentType || 'application/octet-stream'; - const filename = attachment.filename || 'attachment'; - if (!contentType || contentType === 'application/octet-stream') { - if (filename.endsWith('.pdf')) { - contentType = 'application/pdf'; - } - else if (filename.endsWith('.jpg') || filename.endsWith('.jpeg')) { - contentType = 'image/jpeg'; - } - else if (filename.endsWith('.png')) { - contentType = 'image/png'; - } - else if (filename.endsWith('.gif')) { - contentType = 'image/gif'; - } - else if (filename.endsWith('.txt')) { - contentType = 'text/plain'; - } - } - email.attachments.push({ - filename: filename, - content: attachment.content, - contentType: contentType, - contentId: attachment.contentId - }); - SmtpLogger.debug(`Added attachment to email: ${filename}, type: ${contentType}, size: ${attachment.content.length} bytes`); - } - } - else { - SmtpLogger.debug(`No attachments found in email via parser`, { sessionId: session.id }); - // Additional check for attachments that might be missed by the parser - // Look for Content-Disposition headers in the raw data - const rawData = session.emailData; - const hasAttachmentDisposition = rawData.includes('Content-Disposition: attachment'); - if (hasAttachmentDisposition) { - SmtpLogger.debug(`Found potential attachments in raw data, will handle in multipart processing`, { - sessionId: session.id - }); - } - } - // Add received header - const timestamp = new Date().toUTCString(); - const receivedHeader = `from ${session.clientHostname || 'unknown'} (${session.remoteAddress}) by ${this.smtpServer.getOptions().hostname} with ESMTP id ${session.id}; ${timestamp}`; - email.addHeader('Received', receivedHeader); - // Add all original headers - for (const [name, value] of Object.entries(headers)) { - if (!['from', 'to', 'subject', 'message-id'].includes(name)) { - email.addHeader(name, value); - } - } - // Store raw data for testing and debugging - email.rawData = rawData; - SmtpLogger.debug(`Email parsed successfully: ${messageId}`, { - sessionId: session.id, - messageId, - hasHtml: !!parsed.html, - attachmentCount: parsed.attachments?.length || 0 - }); - return email; - } - catch (error) { - // If parsing fails, fall back to basic parsing - SmtpLogger.warn(`Advanced email parsing failed, falling back to basic parsing: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - return this.parseEmailBasic(session); - } - } - /** - * Basic fallback method for parsing emails - * @param session - SMTP session - * @returns The parsed Email object - */ - parseEmailBasic(session) { - // Parse raw email text to extract headers - const rawData = session.emailData; - const headerEndIndex = rawData.indexOf('\r\n\r\n'); - if (headerEndIndex === -1) { - // No headers/body separation, create basic email - const email = new Email({ - from: session.envelope.mailFrom.address, - to: session.envelope.rcptTo.map(r => r.address), - subject: 'Received via SMTP', - text: rawData - }); - // Store raw data for testing - email.rawData = rawData; - return email; - } - // Extract headers and body - const headersText = rawData.substring(0, headerEndIndex); - const bodyText = rawData.substring(headerEndIndex + 4); // Skip the \r\n\r\n separator - // Parse headers with enhanced injection detection - const headers = {}; - const headerLines = headersText.split('\r\n'); - let currentHeader = ''; - const criticalHeaders = new Set(); // Track critical headers for duplication detection - for (const line of headerLines) { - // Check if this is a continuation of a previous header - if (line.startsWith(' ') || line.startsWith('\t')) { - if (currentHeader) { - headers[currentHeader] += ' ' + line.trim(); - } - continue; - } - // This is a new header - const separatorIndex = line.indexOf(':'); - if (separatorIndex !== -1) { - const name = line.substring(0, separatorIndex).trim().toLowerCase(); - const value = line.substring(separatorIndex + 1).trim(); - // Check for header injection attempts in header values - if (detectHeaderInjection(value, 'email-header')) { - SmtpLogger.warn('Header injection attempt detected in email header', { - headerName: name, - headerValue: value.substring(0, 100) + (value.length > 100 ? '...' : ''), - sessionId: session.id - }); - // Throw error to reject the email completely - throw new Error(`Header injection attempt detected in ${name} header`); - } - // Enhanced security: Check for duplicate critical headers (potential injection) - const criticalHeaderNames = ['from', 'to', 'subject', 'date', 'message-id']; - if (criticalHeaderNames.includes(name)) { - if (criticalHeaders.has(name)) { - SmtpLogger.warn('Duplicate critical header detected - potential header injection', { - headerName: name, - existingValue: headers[name]?.substring(0, 50) + '...', - newValue: value.substring(0, 50) + '...', - sessionId: session.id - }); - // Throw error for duplicate critical headers - throw new Error(`Duplicate ${name} header detected - potential header injection`); - } - criticalHeaders.add(name); - } - // Enhanced security: Check for envelope mismatch (spoofing attempt) - if (name === 'from' && session.envelope?.mailFrom?.address) { - const emailFromHeader = value.match(/<([^>]+)>/)?.[1] || value.trim(); - const envelopeFrom = session.envelope.mailFrom.address; - // Allow some flexibility but detect obvious spoofing attempts - if (emailFromHeader && envelopeFrom && - !emailFromHeader.toLowerCase().includes(envelopeFrom.toLowerCase()) && - !envelopeFrom.toLowerCase().includes(emailFromHeader.toLowerCase())) { - SmtpLogger.warn('Potential sender spoofing detected', { - envelopeFrom: envelopeFrom, - headerFrom: emailFromHeader, - sessionId: session.id - }); - // Note: This is logged but not blocked as legitimate use cases exist - } - } - // Special handling for MIME-encoded headers (especially Subject) - if (name === 'subject' && value.includes('=?')) { - try { - // Use plugins.mailparser to decode the MIME-encoded subject - // This is a simplified approach - in a real system, you'd use a full MIME decoder - // For now, just log it for debugging - SmtpLogger.debug(`Found encoded subject: ${value}`, { encodedSubject: value }); - } - catch (error) { - SmtpLogger.warn(`Failed to decode MIME-encoded subject: ${error instanceof Error ? error.message : String(error)}`); - } - } - headers[name] = value; - currentHeader = name; - } - } - // Look for multipart content - let isMultipart = false; - let boundary = ''; - let contentType = headers['content-type'] || ''; - // Check for multipart content - if (contentType.includes('multipart/')) { - isMultipart = true; - // Extract boundary - const boundaryMatch = contentType.match(/boundary="?([^";\r\n]+)"?/i); - if (boundaryMatch && boundaryMatch[1]) { - boundary = boundaryMatch[1]; - } - } - // Extract common headers - const subject = headers['subject'] || 'No Subject'; - const from = headers['from'] || session.envelope.mailFrom.address; - const to = headers['to'] || session.envelope.rcptTo.map(r => r.address).join(', '); - const messageId = headers['message-id'] || `<${Date.now()}.${Math.random().toString(36).substring(2)}@${this.smtpServer.getOptions().hostname}>`; - // Create email object - const email = new Email({ - from: from, - to: to.split(',').map(addr => addr.trim()), - subject: subject, - text: bodyText, - // Add original session envelope data for accurate routing as headers - headers: { - 'X-Original-Mail-From': session.envelope.mailFrom.address, - 'X-Original-Rcpt-To': session.envelope.rcptTo.map(r => r.address).join(', '), - 'Message-Id': messageId - } - }); - // Handle multipart content if needed - if (isMultipart && boundary) { - this.handleMultipartContent(email, bodyText, boundary); - } - // Add received header - const timestamp = new Date().toUTCString(); - const receivedHeader = `from ${session.clientHostname || 'unknown'} (${session.remoteAddress}) by ${this.smtpServer.getOptions().hostname} with ESMTP id ${session.id}; ${timestamp}`; - email.addHeader('Received', receivedHeader); - // Add all original headers - for (const [name, value] of Object.entries(headers)) { - if (!['from', 'to', 'subject', 'message-id'].includes(name)) { - email.addHeader(name, value); - } - } - // Store raw data for testing - email.rawData = rawData; - return email; - } - /** - * Handle multipart content parsing - * @param email - Email object to update - * @param bodyText - Body text to parse - * @param boundary - MIME boundary - */ - handleMultipartContent(email, bodyText, boundary) { - // Split the body by boundary - const parts = bodyText.split(`--${boundary}`); - SmtpLogger.debug(`Handling multipart content with ${parts.length - 1} parts (boundary: ${boundary})`); - // Process each part - for (let i = 1; i < parts.length; i++) { - const part = parts[i]; - // Skip the end boundary marker - if (part.startsWith('--')) { - SmtpLogger.debug(`Found end boundary marker in part ${i}`); - continue; - } - // Find the headers and content - const partHeaderEndIndex = part.indexOf('\r\n\r\n'); - if (partHeaderEndIndex === -1) { - SmtpLogger.debug(`No header/body separator found in part ${i}`); - continue; - } - const partHeadersText = part.substring(0, partHeaderEndIndex); - const partContent = part.substring(partHeaderEndIndex + 4); - // Parse part headers - const partHeaders = {}; - const partHeaderLines = partHeadersText.split('\r\n'); - let currentHeader = ''; - for (const line of partHeaderLines) { - // Check if this is a continuation of a previous header - if (line.startsWith(' ') || line.startsWith('\t')) { - if (currentHeader) { - partHeaders[currentHeader] += ' ' + line.trim(); - } - continue; - } - // This is a new header - const separatorIndex = line.indexOf(':'); - if (separatorIndex !== -1) { - const name = line.substring(0, separatorIndex).trim().toLowerCase(); - const value = line.substring(separatorIndex + 1).trim(); - partHeaders[name] = value; - currentHeader = name; - } - } - // Get content type - const contentType = partHeaders['content-type'] || ''; - // Get encoding - const encoding = partHeaders['content-transfer-encoding'] || '7bit'; - // Get disposition - const disposition = partHeaders['content-disposition'] || ''; - // Log part information - SmtpLogger.debug(`Processing MIME part ${i}: type=${contentType}, encoding=${encoding}, disposition=${disposition}`); - // Handle text/plain parts - if (contentType.includes('text/plain')) { - try { - // Decode content based on encoding - let decodedContent = partContent; - if (encoding.toLowerCase() === 'base64') { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - try { - decodedContent = Buffer.from(cleanBase64, 'base64').toString('utf8'); - } - catch (error) { - SmtpLogger.warn(`Failed to decode base64 text content: ${error instanceof Error ? error.message : String(error)}`); - } - } - else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - } - catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable content: ${error instanceof Error ? error.message : String(error)}`); - } - } - email.text = decodedContent.trim(); - } - catch (error) { - SmtpLogger.warn(`Error processing text/plain part: ${error instanceof Error ? error.message : String(error)}`); - email.text = partContent.trim(); - } - } - // Handle text/html parts - if (contentType.includes('text/html')) { - try { - // Decode content based on encoding - let decodedContent = partContent; - if (encoding.toLowerCase() === 'base64') { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - try { - decodedContent = Buffer.from(cleanBase64, 'base64').toString('utf8'); - } - catch (error) { - SmtpLogger.warn(`Failed to decode base64 HTML content: ${error instanceof Error ? error.message : String(error)}`); - } - } - else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - } - catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable HTML content: ${error instanceof Error ? error.message : String(error)}`); - } - } - email.html = decodedContent.trim(); - } - catch (error) { - SmtpLogger.warn(`Error processing text/html part: ${error instanceof Error ? error.message : String(error)}`); - email.html = partContent.trim(); - } - } - // Handle attachments - detect attachments by content disposition or by content-type - const isAttachment = (disposition && disposition.toLowerCase().includes('attachment')) || - (!contentType.includes('text/plain') && !contentType.includes('text/html')); - if (isAttachment) { - try { - // Extract filename from Content-Disposition or generate one based on content type - let filename = 'attachment'; - if (disposition) { - const filenameMatch = disposition.match(/filename="?([^";\r\n]+)"?/i); - if (filenameMatch && filenameMatch[1]) { - filename = filenameMatch[1].trim(); - } - } - else if (contentType) { - // If no filename but we have content type, generate a name with appropriate extension - const mainType = contentType.split(';')[0].trim().toLowerCase(); - if (mainType === 'application/pdf') { - filename = `attachment_${Date.now()}.pdf`; - } - else if (mainType === 'image/jpeg' || mainType === 'image/jpg') { - filename = `image_${Date.now()}.jpg`; - } - else if (mainType === 'image/png') { - filename = `image_${Date.now()}.png`; - } - else if (mainType === 'image/gif') { - filename = `image_${Date.now()}.gif`; - } - else { - filename = `attachment_${Date.now()}.bin`; - } - } - // Decode content based on encoding - let content; - if (encoding.toLowerCase() === 'base64') { - try { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - content = Buffer.from(cleanBase64, 'base64'); - SmtpLogger.debug(`Successfully decoded base64 attachment: ${filename}, size: ${content.length} bytes`); - } - catch (error) { - SmtpLogger.warn(`Failed to decode base64 attachment: ${error instanceof Error ? error.message : String(error)}`); - content = Buffer.from(partContent); - } - } - else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - const decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - content = Buffer.from(decodedContent); - } - catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable attachment: ${error instanceof Error ? error.message : String(error)}`); - content = Buffer.from(partContent); - } - } - else { - // Default for 7bit, 8bit, or binary encoding - no decoding needed - content = Buffer.from(partContent); - } - // Determine content type - use the one from headers or infer from filename - let finalContentType = contentType; - if (!finalContentType || finalContentType === 'application/octet-stream') { - if (filename.endsWith('.pdf')) { - finalContentType = 'application/pdf'; - } - else if (filename.endsWith('.jpg') || filename.endsWith('.jpeg')) { - finalContentType = 'image/jpeg'; - } - else if (filename.endsWith('.png')) { - finalContentType = 'image/png'; - } - else if (filename.endsWith('.gif')) { - finalContentType = 'image/gif'; - } - else if (filename.endsWith('.txt')) { - finalContentType = 'text/plain'; - } - else if (filename.endsWith('.html')) { - finalContentType = 'text/html'; - } - } - // Add attachment to email - email.attachments.push({ - filename, - content, - contentType: finalContentType || 'application/octet-stream' - }); - SmtpLogger.debug(`Added attachment: ${filename}, type: ${finalContentType}, size: ${content.length} bytes`); - } - catch (error) { - SmtpLogger.error(`Failed to process attachment: ${error instanceof Error ? error.message : String(error)}`); - } - } - // Check for nested multipart content - if (contentType.includes('multipart/')) { - try { - // Extract boundary - const nestedBoundaryMatch = contentType.match(/boundary="?([^";\r\n]+)"?/i); - if (nestedBoundaryMatch && nestedBoundaryMatch[1]) { - const nestedBoundary = nestedBoundaryMatch[1].trim(); - SmtpLogger.debug(`Found nested multipart content with boundary: ${nestedBoundary}`); - // Process nested multipart - this.handleMultipartContent(email, partContent, nestedBoundary); - } - } - catch (error) { - SmtpLogger.warn(`Error processing nested multipart content: ${error instanceof Error ? error.message : String(error)}`); - } - } - } - } - /** - * Handle end of data marker received - * @param socket - Client socket - * @param session - SMTP session - */ - async handleEndOfData(socket, session) { - // Clear the data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - try { - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.FINISHED); - // Optionally save email to disk - this.saveEmail(session); - // Process the email using legacy method - const result = await this.processEmailLegacy(session); - if (result.success) { - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK message queued as ${result.messageId}`); - } - else { - // Send error response - this.sendResponse(socket, `${SmtpResponseCode.TRANSACTION_FAILED} Failed to process email: ${result.error}`); - } - // Reset session for new transaction - this.resetSession(session); - } - catch (error) { - SmtpLogger.error(`Error processing email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email: ${error instanceof Error ? error.message : String(error)}`); - this.resetSession(session); - } - } - /** - * Reset session after email processing - * @param session - SMTP session - */ - resetSession(session) { - // Clear any data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - // Reset data fields but keep authentication state - session.mailFrom = ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.emailDataSize = 0; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - // Reset state to after EHLO - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - } - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - sendResponse(socket, response) { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.logResponse(response, socket); - } - catch (error) { - // Attempt to recover from specific transient errors - if (this.isRecoverableSocketError(error)) { - this.handleSocketError(socket, error, response); - } - else { - // Log error for non-recoverable errors - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - } - } - } - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - isRecoverableSocketError(error) { - const recoverableErrorCodes = [ - 'EPIPE', // Broken pipe - 'ECONNRESET', // Connection reset by peer - 'ETIMEDOUT', // Connection timed out - 'ECONNABORTED' // Connection aborted - ]; - return (error instanceof Error && - 'code' in error && - typeof error.code === 'string' && - recoverableErrorCodes.includes(error.code)); - } - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - handleSocketError(socket, error, response) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.error(`Session not found when handling socket error`); - if (!socket.destroyed) { - socket.destroy(); - } - return; - } - // Get error details for logging - const errorMessage = error instanceof Error ? error.message : String(error); - const errorCode = error instanceof Error && 'code' in error ? error.code : 'UNKNOWN'; - SmtpLogger.warn(`Recoverable socket error during data handling (${errorCode}): ${errorMessage}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Check if socket is already destroyed - if (socket.destroyed) { - SmtpLogger.info(`Socket already destroyed, cannot retry data operation`); - return; - } - // Check if socket is writeable - if (!socket.writable) { - SmtpLogger.info(`Socket no longer writable, aborting data recovery attempt`); - if (!socket.destroyed) { - socket.destroy(); - } - return; - } - // Attempt to retry the write operation after a short delay - setTimeout(() => { - try { - if (!socket.destroyed && socket.writable) { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.info(`Successfully retried data send operation after error`); - } - else { - SmtpLogger.warn(`Socket no longer available for data retry`); - if (!socket.destroyed) { - socket.destroy(); - } - } - } - catch (retryError) { - SmtpLogger.error(`Data retry attempt failed: ${retryError instanceof Error ? retryError.message : String(retryError)}`); - if (!socket.destroyed) { - socket.destroy(); - } - } - }, 100); // Short delay before retry - } - /** - * Handle email data (interface requirement) - */ - async handleData(socket, data, session) { - // Delegate to existing method - await this.handleDataReceived(socket, data); - } - /** - * Clean up resources - */ - destroy() { - // DataHandler doesn't have timers or event listeners to clean up - SmtpLogger.debug('DataHandler destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/data-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/index.d.ts b/dist_ts/mail/delivery/smtpserver/index.d.ts deleted file mode 100644 index 9030c5b..0000000 --- a/dist_ts/mail/delivery/smtpserver/index.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -/** - * SMTP Server Module Exports - * This file exports all components of the refactored SMTP server - */ -export * from './interfaces.js'; -export { SmtpServer } from './smtp-server.js'; -export { SessionManager } from './session-manager.js'; -export { ConnectionManager } from './connection-manager.js'; -export { CommandHandler } from './command-handler.js'; -export { DataHandler } from './data-handler.js'; -export { TlsHandler } from './tls-handler.js'; -export { SecurityHandler } from './security-handler.js'; -export * from './constants.js'; -export { SmtpLogger } from './utils/logging.js'; -export * from './utils/validation.js'; -export * from './utils/helpers.js'; -export * from './certificate-utils.js'; -export * from './secure-server.js'; -export * from './starttls-handler.js'; -export { createSmtpServer } from './create-server.js'; diff --git a/dist_ts/mail/delivery/smtpserver/index.js b/dist_ts/mail/delivery/smtpserver/index.js deleted file mode 100644 index ee544bd..0000000 --- a/dist_ts/mail/delivery/smtpserver/index.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * SMTP Server Module Exports - * This file exports all components of the refactored SMTP server - */ -// Export interfaces -export * from './interfaces.js'; -// Export server classes -export { SmtpServer } from './smtp-server.js'; -export { SessionManager } from './session-manager.js'; -export { ConnectionManager } from './connection-manager.js'; -export { CommandHandler } from './command-handler.js'; -export { DataHandler } from './data-handler.js'; -export { TlsHandler } from './tls-handler.js'; -export { SecurityHandler } from './security-handler.js'; -// Export constants -export * from './constants.js'; -// Export utilities -export { SmtpLogger } from './utils/logging.js'; -export * from './utils/validation.js'; -export * from './utils/helpers.js'; -// Export TLS and certificate utilities -export * from './certificate-utils.js'; -export * from './secure-server.js'; -export * from './starttls-handler.js'; -// Factory function to create a complete SMTP server with default components -export { createSmtpServer } from './create-server.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L3NtdHBzZXJ2ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztHQUdHO0FBRUgsb0JBQW9CO0FBQ3BCLGNBQWMsaUJBQWlCLENBQUM7QUFFaEMsd0JBQXdCO0FBQ3hCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELG1CQUFtQjtBQUNuQixjQUFjLGdCQUFnQixDQUFDO0FBRS9CLG1CQUFtQjtBQUNuQixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLG9CQUFvQixDQUFDO0FBRW5DLHVDQUF1QztBQUN2QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx1QkFBdUIsQ0FBQztBQUV0Qyw0RUFBNEU7QUFDNUUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ== \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/interfaces.d.ts b/dist_ts/mail/delivery/smtpserver/interfaces.d.ts deleted file mode 100644 index d451e41..0000000 --- a/dist_ts/mail/delivery/smtpserver/interfaces.d.ts +++ /dev/null @@ -1,530 +0,0 @@ -/** - * SMTP Server Interfaces - * Defines all the interfaces used by the SMTP server implementation - */ -import * as plugins from '../../../plugins.js'; -import type { Email } from '../../core/classes.email.js'; -import type { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; -import { SmtpState } from '../interfaces.js'; -import { SmtpCommand } from './constants.js'; -export { SmtpState, SmtpCommand }; -export type { IEnvelopeRecipient } from '../interfaces.js'; -/** - * Interface for components that need cleanup - */ -export interface IDestroyable { - /** - * Clean up all resources (timers, listeners, etc) - */ - destroy(): void | Promise; -} -/** - * SMTP authentication credentials - */ -export interface ISmtpAuth { - /** - * Username for authentication - */ - username: string; - /** - * Password for authentication - */ - password: string; -} -/** - * SMTP envelope (sender and recipients) - */ -export interface ISmtpEnvelope { - /** - * Mail from address - */ - mailFrom: { - address: string; - args?: Record; - }; - /** - * Recipients list - */ - rcptTo: Array<{ - address: string; - args?: Record; - }>; -} -/** - * SMTP session representing a client connection - */ -export interface ISmtpSession { - /** - * Unique session identifier - */ - id: string; - /** - * Current state of the SMTP session - */ - state: SmtpState; - /** - * Client's hostname from EHLO/HELO - */ - clientHostname: string | null; - /** - * Whether TLS is active for this session - */ - secure: boolean; - /** - * Authentication status - */ - authenticated: boolean; - /** - * Authentication username if authenticated - */ - username?: string; - /** - * Transaction envelope - */ - envelope: ISmtpEnvelope; - /** - * When the session was created - */ - createdAt: Date; - /** - * Last activity timestamp - */ - lastActivity: number; - /** - * Client's IP address - */ - remoteAddress: string; - /** - * Client's port - */ - remotePort: number; - /** - * Additional session data - */ - data?: Record; - /** - * Message size if SIZE extension is used - */ - messageSize?: number; - /** - * Server capabilities advertised to client - */ - capabilities?: string[]; - /** - * Buffer for incomplete data - */ - dataBuffer?: string; - /** - * Flag to track if we're currently receiving DATA - */ - receivingData?: boolean; - /** - * The raw email data being received - */ - rawData?: string; - /** - * Greeting sent to client - */ - greeting?: string; - /** - * Whether EHLO has been sent - */ - ehloSent?: boolean; - /** - * Whether HELO has been sent - */ - heloSent?: boolean; - /** - * TLS options for this session - */ - tlsOptions?: any; - /** - * Whether TLS is being used - */ - useTLS?: boolean; - /** - * Mail from address for this transaction - */ - mailFrom?: string; - /** - * Recipients for this transaction - */ - rcptTo?: string[]; - /** - * Email data being received - */ - emailData?: string; - /** - * Chunks of email data - */ - emailDataChunks?: string[]; - /** - * Timeout ID for data reception - */ - dataTimeoutId?: NodeJS.Timeout; - /** - * Whether connection has ended - */ - connectionEnded?: boolean; - /** - * Size of email data being received - */ - emailDataSize?: number; - /** - * Processing mode for this session - */ - processingMode?: string; -} -/** - * Session manager interface - */ -export interface ISessionManager extends IDestroyable { - /** - * Create a new session for a socket - */ - createSession(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure?: boolean): ISmtpSession; - /** - * Get session by socket - */ - getSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): ISmtpSession | undefined; - /** - * Update session state - */ - updateSessionState(session: ISmtpSession, newState: SmtpState): void; - /** - * Remove a session - */ - removeSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Clear all sessions - */ - clearAllSessions(): void; - /** - * Get all active sessions - */ - getAllSessions(): ISmtpSession[]; - /** - * Get session count - */ - getSessionCount(): number; - /** - * Update last activity for a session - */ - updateLastActivity(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Check for timed out sessions - */ - checkTimeouts(timeoutMs: number): ISmtpSession[]; - /** - * Update session activity timestamp - */ - updateSessionActivity(session: ISmtpSession): void; - /** - * Replace socket in session (for TLS upgrade) - */ - replaceSocket(oldSocket: plugins.net.Socket | plugins.tls.TLSSocket, newSocket: plugins.net.Socket | plugins.tls.TLSSocket): boolean; -} -/** - * Connection manager interface - */ -export interface IConnectionManager extends IDestroyable { - /** - * Handle a new connection - */ - handleConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): Promise; - /** - * Close all active connections - */ - closeAllConnections(): void; - /** - * Get active connection count - */ - getConnectionCount(): number; - /** - * Check if accepting new connections - */ - canAcceptConnection(): boolean; - /** - * Handle new connection (legacy method name) - */ - handleNewConnection(socket: plugins.net.Socket): Promise; - /** - * Handle new secure connection (legacy method name) - */ - handleNewSecureConnection(socket: plugins.tls.TLSSocket): Promise; - /** - * Setup socket event handlers - */ - setupSocketEventHandlers(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; -} -/** - * Command handler interface - */ -export interface ICommandHandler extends IDestroyable { - /** - * Handle an SMTP command - */ - handleCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, command: SmtpCommand, args: string, session: ISmtpSession): Promise; - /** - * Get supported commands for current session state - */ - getSupportedCommands(session: ISmtpSession): SmtpCommand[]; - /** - * Process command (legacy method name) - */ - processCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, command: string): Promise; -} -/** - * Data handler interface - */ -export interface IDataHandler extends IDestroyable { - /** - * Handle email data - */ - handleData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string, session: ISmtpSession): Promise; - /** - * Process a complete email - */ - processEmail(rawData: string, session: ISmtpSession): Promise; - /** - * Handle data received (legacy method name) - */ - handleDataReceived(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; - /** - * Process email data (legacy method name) - */ - processEmailData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; -} -/** - * TLS handler interface - */ -export interface ITlsHandler extends IDestroyable { - /** - * Handle STARTTLS command - */ - handleStartTls(socket: plugins.net.Socket, session: ISmtpSession): Promise; - /** - * Check if TLS is available - */ - isTlsAvailable(): boolean; - /** - * Get TLS options - */ - getTlsOptions(): plugins.tls.TlsOptions; - /** - * Check if TLS is enabled - */ - isTlsEnabled(): boolean; -} -/** - * Security handler interface - */ -export interface ISecurityHandler extends IDestroyable { - /** - * Check IP reputation - */ - checkIpReputation(socket: plugins.net.Socket | plugins.tls.TLSSocket): Promise; - /** - * Validate email address - */ - isValidEmail(email: string): boolean; - /** - * Authenticate user - */ - authenticate(auth: ISmtpAuth): Promise; -} -/** - * SMTP server options - */ -export interface ISmtpServerOptions { - /** - * Port to listen on - */ - port: number; - /** - * Hostname of the server - */ - hostname: string; - /** - * Host to bind to (optional, defaults to 0.0.0.0) - */ - host?: string; - /** - * Secure port for TLS connections - */ - securePort?: number; - /** - * TLS/SSL private key (PEM format) - */ - key?: string; - /** - * TLS/SSL certificate (PEM format) - */ - cert?: string; - /** - * CA certificates for TLS (PEM format) - */ - ca?: string; - /** - * Maximum size of messages in bytes - */ - maxSize?: number; - /** - * Maximum number of concurrent connections - */ - maxConnections?: number; - /** - * Authentication options - */ - auth?: { - /** - * Whether authentication is required - */ - required: boolean; - /** - * Allowed authentication methods - */ - methods: ('PLAIN' | 'LOGIN' | 'OAUTH2')[]; - }; - /** - * Socket timeout in milliseconds (default: 5 minutes / 300000ms) - */ - socketTimeout?: number; - /** - * Initial connection timeout in milliseconds (default: 30 seconds / 30000ms) - */ - connectionTimeout?: number; - /** - * Interval for checking idle sessions in milliseconds (default: 5 seconds / 5000ms) - * For testing, can be set lower (e.g. 1000ms) to detect timeouts more quickly - */ - cleanupInterval?: number; - /** - * Maximum number of recipients allowed per message (default: 100) - */ - maxRecipients?: number; - /** - * Maximum message size in bytes (default: 10MB / 10485760 bytes) - * This is advertised in the EHLO SIZE extension - */ - size?: number; - /** - * Timeout for the DATA command in milliseconds (default: 60000ms / 1 minute) - * This controls how long to wait for the complete email data - */ - dataTimeout?: number; -} -/** - * Result of SMTP transaction - */ -export interface ISmtpTransactionResult { - /** - * Whether the transaction was successful - */ - success: boolean; - /** - * Error message if failed - */ - error?: string; - /** - * Message ID if successful - */ - messageId?: string; - /** - * Resulting email if successful - */ - email?: Email; -} -/** - * Interface for SMTP session events - * These events are emitted by the session manager - */ -export interface ISessionEvents { - created: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - stateChanged: (session: ISmtpSession, previousState: SmtpState, newState: SmtpState) => void; - timeout: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - completed: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - error: (session: ISmtpSession, error: Error) => void; -} -/** - * SMTP Server interface - */ -export interface ISmtpServer extends IDestroyable { - /** - * Start the SMTP server - */ - listen(): Promise; - /** - * Stop the SMTP server - */ - close(): Promise; - /** - * Get the session manager - */ - getSessionManager(): ISessionManager; - /** - * Get the connection manager - */ - getConnectionManager(): IConnectionManager; - /** - * Get the command handler - */ - getCommandHandler(): ICommandHandler; - /** - * Get the data handler - */ - getDataHandler(): IDataHandler; - /** - * Get the TLS handler - */ - getTlsHandler(): ITlsHandler; - /** - * Get the security handler - */ - getSecurityHandler(): ISecurityHandler; - /** - * Get the server options - */ - getOptions(): ISmtpServerOptions; - /** - * Get the email server reference - */ - getEmailServer(): UnifiedEmailServer; -} -/** - * Configuration for creating SMTP server - */ -export interface ISmtpServerConfig { - /** - * Email server instance - */ - emailServer: UnifiedEmailServer; - /** - * Server options - */ - options: ISmtpServerOptions; - /** - * Optional custom session manager - */ - sessionManager?: ISessionManager; - /** - * Optional custom connection manager - */ - connectionManager?: IConnectionManager; - /** - * Optional custom command handler - */ - commandHandler?: ICommandHandler; - /** - * Optional custom data handler - */ - dataHandler?: IDataHandler; - /** - * Optional custom TLS handler - */ - tlsHandler?: ITlsHandler; - /** - * Optional custom security handler - */ - securityHandler?: ISecurityHandler; -} diff --git a/dist_ts/mail/delivery/smtpserver/interfaces.js b/dist_ts/mail/delivery/smtpserver/interfaces.js deleted file mode 100644 index 9fba0bf..0000000 --- a/dist_ts/mail/delivery/smtpserver/interfaces.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * SMTP Server Interfaces - * Defines all the interfaces used by the SMTP server implementation - */ -import * as plugins from '../../../plugins.js'; -// Re-export types from other modules -import { SmtpState } from '../interfaces.js'; -import { SmtpCommand } from './constants.js'; -export { SmtpState, SmtpCommand }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cHNlcnZlci9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFJL0MsdUNBQXVDO0FBQ3ZDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM3QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0MsT0FBTyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/secure-server.d.ts b/dist_ts/mail/delivery/smtpserver/secure-server.d.ts deleted file mode 100644 index d2b16ce..0000000 --- a/dist_ts/mail/delivery/smtpserver/secure-server.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Secure SMTP Server Utility Functions - * Provides helper functions for creating and managing secure TLS server - */ -import * as plugins from '../../../plugins.js'; -/** - * Create a secure TLS server for direct TLS connections - * @param options - TLS certificate options - * @returns A configured TLS server or undefined if TLS is not available - */ -export declare function createSecureTlsServer(options: { - key: string; - cert: string; - ca?: string; -}): plugins.tls.Server | undefined; diff --git a/dist_ts/mail/delivery/smtpserver/secure-server.js b/dist_ts/mail/delivery/smtpserver/secure-server.js deleted file mode 100644 index 0d0952e..0000000 --- a/dist_ts/mail/delivery/smtpserver/secure-server.js +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Secure SMTP Server Utility Functions - * Provides helper functions for creating and managing secure TLS server - */ -import * as plugins from '../../../plugins.js'; -import { loadCertificatesFromString, generateSelfSignedCertificates, createTlsOptions } from './certificate-utils.js'; -import { SmtpLogger } from './utils/logging.js'; -/** - * Create a secure TLS server for direct TLS connections - * @param options - TLS certificate options - * @returns A configured TLS server or undefined if TLS is not available - */ -export function createSecureTlsServer(options) { - try { - // Log the creation attempt - SmtpLogger.info('Creating secure TLS server for direct connections'); - // Load certificates from strings - let certificates; - try { - certificates = loadCertificatesFromString({ - key: options.key, - cert: options.cert, - ca: options.ca - }); - SmtpLogger.info('Successfully loaded TLS certificates for secure server'); - } - catch (certificateError) { - SmtpLogger.warn(`Failed to load certificates, using self-signed: ${certificateError instanceof Error ? certificateError.message : String(certificateError)}`); - certificates = generateSelfSignedCertificates(); - } - // Create server-side TLS options - const tlsOptions = createTlsOptions(certificates, true); - // Log details for debugging - SmtpLogger.debug('Creating secure server with options', { - certificates: { - keyLength: certificates.key.length, - certLength: certificates.cert.length, - caLength: certificates.ca ? certificates.ca.length : 0 - }, - tlsOptions: { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - ciphers: tlsOptions.ciphers?.substring(0, 50) + '...' // Truncate long cipher list - } - }); - // Create the TLS server - const server = new plugins.tls.Server(tlsOptions); - // Set up error handlers - server.on('error', (err) => { - SmtpLogger.error(`Secure server error: ${err.message}`, { - component: 'secure-server', - error: err, - stack: err.stack - }); - }); - // Log secure connections - server.on('secureConnection', (socket) => { - const protocol = socket.getProtocol(); - const cipher = socket.getCipher(); - SmtpLogger.info('New direct TLS connection established', { - component: 'secure-server', - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - protocol: protocol || 'unknown', - cipher: cipher?.name || 'unknown' - }); - }); - return server; - } - catch (error) { - SmtpLogger.error(`Failed to create secure TLS server: ${error instanceof Error ? error.message : String(error)}`, { - component: 'secure-server', - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - return undefined; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjdXJlLXNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cHNlcnZlci9zZWN1cmUtc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxFQUNMLDBCQUEwQixFQUMxQiw4QkFBOEIsRUFDOUIsZ0JBQWdCLEVBRWpCLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWhEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUscUJBQXFCLENBQUMsT0FJckM7SUFDQyxJQUFJLENBQUM7UUFDSCwyQkFBMkI7UUFDM0IsVUFBVSxDQUFDLElBQUksQ0FBQyxtREFBbUQsQ0FBQyxDQUFDO1FBRXJFLGlDQUFpQztRQUNqQyxJQUFJLFlBQThCLENBQUM7UUFDbkMsSUFBSSxDQUFDO1lBQ0gsWUFBWSxHQUFHLDBCQUEwQixDQUFDO2dCQUN4QyxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUc7Z0JBQ2hCLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtnQkFDbEIsRUFBRSxFQUFFLE9BQU8sQ0FBQyxFQUFFO2FBQ2YsQ0FBQyxDQUFDO1lBRUgsVUFBVSxDQUFDLElBQUksQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO1FBQzVFLENBQUM7UUFBQyxPQUFPLGdCQUFnQixFQUFFLENBQUM7WUFDMUIsVUFBVSxDQUFDLElBQUksQ0FBQyxtREFBbUQsZ0JBQWdCLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUM5SixZQUFZLEdBQUcsOEJBQThCLEVBQUUsQ0FBQztRQUNsRCxDQUFDO1FBRUQsaUNBQWlDO1FBQ2pDLE1BQU0sVUFBVSxHQUFHLGdCQUFnQixDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV4RCw0QkFBNEI7UUFDNUIsVUFBVSxDQUFDLEtBQUssQ0FBQyxxQ0FBcUMsRUFBRTtZQUN0RCxZQUFZLEVBQUU7Z0JBQ1osU0FBUyxFQUFFLFlBQVksQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDbEMsVUFBVSxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDcEMsUUFBUSxFQUFFLFlBQVksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3ZEO1lBQ0QsVUFBVSxFQUFFO2dCQUNWLFVBQVUsRUFBRSxVQUFVLENBQUMsVUFBVTtnQkFDakMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxVQUFVO2dCQUNqQyxPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyw0QkFBNEI7YUFDbkY7U0FDRixDQUFDLENBQUM7UUFFSCx3QkFBd0I7UUFDeEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUVsRCx3QkFBd0I7UUFDeEIsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUN6QixVQUFVLENBQUMsS0FBSyxDQUFDLHdCQUF3QixHQUFHLENBQUMsT0FBTyxFQUFFLEVBQUU7Z0JBQ3RELFNBQVMsRUFBRSxlQUFlO2dCQUMxQixLQUFLLEVBQUUsR0FBRztnQkFDVixLQUFLLEVBQUUsR0FBRyxDQUFDLEtBQUs7YUFDakIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCx5QkFBeUI7UUFDekIsTUFBTSxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFO1lBQ3ZDLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUM7WUFFbEMsVUFBVSxDQUFDLElBQUksQ0FBQyx1Q0FBdUMsRUFBRTtnQkFDdkQsU0FBUyxFQUFFLGVBQWU7Z0JBQzFCLGFBQWEsRUFBRSxNQUFNLENBQUMsYUFBYTtnQkFDbkMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxVQUFVO2dCQUM3QixRQUFRLEVBQUUsUUFBUSxJQUFJLFNBQVM7Z0JBQy9CLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxJQUFJLFNBQVM7YUFDbEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLFVBQVUsQ0FBQyxLQUFLLENBQUMsdUNBQXVDLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFO1lBQ2hILFNBQVMsRUFBRSxlQUFlO1lBQzFCLEtBQUssRUFBRSxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNoRSxLQUFLLEVBQUUsS0FBSyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsMEJBQTBCO1NBQ3pFLENBQUMsQ0FBQztRQUVILE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7QUFDSCxDQUFDIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/security-handler.d.ts b/dist_ts/mail/delivery/smtpserver/security-handler.d.ts deleted file mode 100644 index fb85dda..0000000 --- a/dist_ts/mail/delivery/smtpserver/security-handler.d.ts +++ /dev/null @@ -1,86 +0,0 @@ -/** - * SMTP Security Handler - * Responsible for security aspects including IP reputation checking, - * email validation, and authentication - */ -import * as plugins from '../../../plugins.js'; -import type { ISmtpAuth } from './interfaces.js'; -import type { ISecurityHandler, ISmtpServer } from './interfaces.js'; -/** - * Handles security aspects for SMTP server - */ -export declare class SecurityHandler implements ISecurityHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer; - /** - * IP reputation checker service - */ - private ipReputationService; - /** - * Simple in-memory IP denylist - */ - private ipDenylist; - /** - * Cleanup interval timer - */ - private cleanupInterval; - /** - * Creates a new security handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer); - /** - * Check IP reputation for a connection - * @param socket - Client socket - * @returns Promise that resolves to true if IP is allowed, false if blocked - */ - checkIpReputation(socket: plugins.net.Socket | plugins.tls.TLSSocket): Promise; - /** - * Validate an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ - isValidEmail(email: string): boolean; - /** - * Validate authentication credentials - * @param auth - Authentication credentials - * @returns Promise that resolves to true if authenticated - */ - authenticate(auth: ISmtpAuth): Promise; - /** - * Log a security event - * @param event - Event type - * @param level - Log level - * @param details - Event details - */ - logSecurityEvent(event: string, level: string, message: string, details: Record): void; - /** - * Add an IP to the denylist - * @param ip - IP address - * @param reason - Reason for denylisting - * @param duration - Duration in milliseconds (optional, indefinite if not specified) - */ - private addToDenylist; - /** - * Check if an IP is denylisted - * @param ip - IP address - * @returns Whether the IP is denylisted - */ - private isIpDenylisted; - /** - * Get the reason an IP was denylisted - * @param ip - IP address - * @returns Reason for denylisting or undefined if not denylisted - */ - private getDenylistReason; - /** - * Clean expired denylist entries - */ - private cleanExpiredDenylistEntries; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/security-handler.js b/dist_ts/mail/delivery/smtpserver/security-handler.js deleted file mode 100644 index a6e6f9d..0000000 --- a/dist_ts/mail/delivery/smtpserver/security-handler.js +++ /dev/null @@ -1,242 +0,0 @@ -/** - * SMTP Security Handler - * Responsible for security aspects including IP reputation checking, - * email validation, and authentication - */ -import * as plugins from '../../../plugins.js'; -import { SmtpLogger } from './utils/logging.js'; -import { SecurityEventType, SecurityLogLevel } from './constants.js'; -import { isValidEmail } from './utils/validation.js'; -import { getSocketDetails, getTlsDetails } from './utils/helpers.js'; -import { IPReputationChecker } from '../../../security/classes.ipreputationchecker.js'; -/** - * Handles security aspects for SMTP server - */ -export class SecurityHandler { - /** - * Reference to the SMTP server instance - */ - smtpServer; - /** - * IP reputation checker service - */ - ipReputationService; - /** - * Simple in-memory IP denylist - */ - ipDenylist = []; - /** - * Cleanup interval timer - */ - cleanupInterval = null; - /** - * Creates a new security handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer) { - this.smtpServer = smtpServer; - // Initialize IP reputation checker - this.ipReputationService = new IPReputationChecker(); - // Clean expired denylist entries periodically - this.cleanupInterval = setInterval(() => this.cleanExpiredDenylistEntries(), 60000); // Every minute - } - /** - * Check IP reputation for a connection - * @param socket - Client socket - * @returns Promise that resolves to true if IP is allowed, false if blocked - */ - async checkIpReputation(socket) { - const socketDetails = getSocketDetails(socket); - const ip = socketDetails.remoteAddress; - // Check local denylist first - if (this.isIpDenylisted(ip)) { - // Log the blocked connection - this.logSecurityEvent(SecurityEventType.IP_REPUTATION, SecurityLogLevel.WARN, `Connection blocked from denylisted IP: ${ip}`, { reason: this.getDenylistReason(ip) }); - return false; - } - // Check with IP reputation service - if (!this.ipReputationService) { - return true; - } - try { - // Check with IP reputation service - const reputationResult = await this.ipReputationService.checkReputation(ip); - // Block if score is below HIGH_RISK threshold (20) or if it's spam/proxy/tor/vpn - const isBlocked = reputationResult.score < 20 || - reputationResult.isSpam || - reputationResult.isTor || - reputationResult.isProxy; - if (isBlocked) { - // Add to local denylist temporarily - const reason = reputationResult.isSpam ? 'spam' : - reputationResult.isTor ? 'tor' : - reputationResult.isProxy ? 'proxy' : - `low reputation score: ${reputationResult.score}`; - this.addToDenylist(ip, reason, 3600000); // 1 hour - // Log the blocked connection - this.logSecurityEvent(SecurityEventType.IP_REPUTATION, SecurityLogLevel.WARN, `Connection blocked by reputation service: ${ip}`, { - reason, - score: reputationResult.score, - isSpam: reputationResult.isSpam, - isTor: reputationResult.isTor, - isProxy: reputationResult.isProxy, - isVPN: reputationResult.isVPN - }); - return false; - } - // Log the allowed connection - this.logSecurityEvent(SecurityEventType.IP_REPUTATION, SecurityLogLevel.INFO, `IP reputation check passed: ${ip}`, { - score: reputationResult.score, - country: reputationResult.country, - org: reputationResult.org - }); - return true; - } - catch (error) { - // Log the error - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - ip, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Allow the connection on error (fail open) - return true; - } - } - /** - * Validate an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ - isValidEmail(email) { - return isValidEmail(email); - } - /** - * Validate authentication credentials - * @param auth - Authentication credentials - * @returns Promise that resolves to true if authenticated - */ - async authenticate(auth) { - const { username, password } = auth; - // Get auth options from server - const options = this.smtpServer.getOptions(); - const authOptions = options.auth; - // Check if authentication is enabled - if (!authOptions) { - this.logSecurityEvent(SecurityEventType.AUTHENTICATION, SecurityLogLevel.WARN, 'Authentication attempt when auth is disabled', { username }); - return false; - } - // Note: Method validation and TLS requirement checks would need to be done - // at the caller level since the interface doesn't include session/method info - try { - let authenticated = false; - // Use custom validation function if provided - if (authOptions.validateUser) { - authenticated = await authOptions.validateUser(username, password); - } - else { - // Default behavior - no authentication - authenticated = false; - } - // Log the authentication result - this.logSecurityEvent(SecurityEventType.AUTHENTICATION, authenticated ? SecurityLogLevel.INFO : SecurityLogLevel.WARN, authenticated ? 'Authentication successful' : 'Authentication failed', { username }); - return authenticated; - } - catch (error) { - // Log authentication error - this.logSecurityEvent(SecurityEventType.AUTHENTICATION, SecurityLogLevel.ERROR, `Authentication error: ${error instanceof Error ? error.message : String(error)}`, { username, error: error instanceof Error ? error.message : String(error) }); - return false; - } - } - /** - * Log a security event - * @param event - Event type - * @param level - Log level - * @param details - Event details - */ - logSecurityEvent(event, level, message, details) { - SmtpLogger.logSecurityEvent(level, event, message, details, details.ip, details.domain, details.success); - } - /** - * Add an IP to the denylist - * @param ip - IP address - * @param reason - Reason for denylisting - * @param duration - Duration in milliseconds (optional, indefinite if not specified) - */ - addToDenylist(ip, reason, duration) { - // Remove existing entry if present - this.ipDenylist = this.ipDenylist.filter(entry => entry.ip !== ip); - // Create new entry - const entry = { - ip, - reason, - expiresAt: duration ? Date.now() + duration : undefined - }; - // Add to denylist - this.ipDenylist.push(entry); - // Log the action - this.logSecurityEvent(SecurityEventType.ACCESS_CONTROL, SecurityLogLevel.INFO, `Added IP to denylist: ${ip}`, { - ip, - reason, - duration: duration ? `${duration / 1000} seconds` : 'indefinite' - }); - } - /** - * Check if an IP is denylisted - * @param ip - IP address - * @returns Whether the IP is denylisted - */ - isIpDenylisted(ip) { - const entry = this.ipDenylist.find(e => e.ip === ip); - if (!entry) { - return false; - } - // Check if entry has expired - if (entry.expiresAt && entry.expiresAt < Date.now()) { - // Remove expired entry - this.ipDenylist = this.ipDenylist.filter(e => e !== entry); - return false; - } - return true; - } - /** - * Get the reason an IP was denylisted - * @param ip - IP address - * @returns Reason for denylisting or undefined if not denylisted - */ - getDenylistReason(ip) { - const entry = this.ipDenylist.find(e => e.ip === ip); - return entry?.reason; - } - /** - * Clean expired denylist entries - */ - cleanExpiredDenylistEntries() { - const now = Date.now(); - const initialCount = this.ipDenylist.length; - this.ipDenylist = this.ipDenylist.filter(entry => { - return !entry.expiresAt || entry.expiresAt > now; - }); - const removedCount = initialCount - this.ipDenylist.length; - if (removedCount > 0) { - this.logSecurityEvent(SecurityEventType.ACCESS_CONTROL, SecurityLogLevel.INFO, `Cleaned up ${removedCount} expired denylist entries`, { remainingCount: this.ipDenylist.length }); - } - } - /** - * Clean up resources - */ - destroy() { - // Clear the cleanup interval - if (this.cleanupInterval) { - clearInterval(this.cleanupInterval); - this.cleanupInterval = null; - } - // Clear the denylist - this.ipDenylist = []; - // Clean up IP reputation service if it has a destroy method - if (this.ipReputationService && typeof this.ipReputationService.destroy === 'function') { - this.ipReputationService.destroy(); - } - SmtpLogger.debug('SecurityHandler destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"security-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/security-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/session-manager.d.ts b/dist_ts/mail/delivery/smtpserver/session-manager.d.ts deleted file mode 100644 index 4629a23..0000000 --- a/dist_ts/mail/delivery/smtpserver/session-manager.d.ts +++ /dev/null @@ -1,140 +0,0 @@ -/** - * SMTP Session Manager - * Responsible for creating, managing, and cleaning up SMTP sessions - */ -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import type { ISmtpSession } from './interfaces.js'; -import type { ISessionManager, ISessionEvents } from './interfaces.js'; -/** - * Manager for SMTP sessions - * Handles session creation, tracking, timeout management, and cleanup - */ -export declare class SessionManager implements ISessionManager { - /** - * Map of socket ID to session - */ - private sessions; - /** - * Map of socket to socket ID - */ - private socketIds; - /** - * SMTP server options - */ - private options; - /** - * Event listeners - */ - private eventListeners; - /** - * Timer for cleanup interval - */ - private cleanupTimer; - /** - * Creates a new session manager - * @param options - Session manager options - */ - constructor(options?: { - socketTimeout?: number; - connectionTimeout?: number; - cleanupInterval?: number; - }); - /** - * Creates a new session for a socket connection - * @param socket - Client socket - * @param secure - Whether the connection is secure (TLS) - * @returns New SMTP session - */ - createSession(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): ISmtpSession; - /** - * Updates the session state - * @param session - SMTP session - * @param newState - New state - */ - updateSessionState(session: ISmtpSession, newState: SmtpState): void; - /** - * Updates the session's last activity timestamp - * @param session - SMTP session - */ - updateSessionActivity(session: ISmtpSession): void; - /** - * Removes a session - * @param socket - Client socket - */ - removeSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Gets a session for a socket - * @param socket - Client socket - * @returns SMTP session or undefined if not found - */ - getSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): ISmtpSession | undefined; - /** - * Cleans up idle sessions - */ - cleanupIdleSessions(): void; - /** - * Gets the current number of active sessions - * @returns Number of active sessions - */ - getSessionCount(): number; - /** - * Clears all sessions (used when shutting down) - */ - clearAllSessions(): void; - /** - * Register an event listener - * @param event - Event name - * @param listener - Event listener function - */ - on(event: K, listener: ISessionEvents[K]): void; - /** - * Remove an event listener - * @param event - Event name - * @param listener - Event listener function - */ - off(event: K, listener: ISessionEvents[K]): void; - /** - * Emit an event to registered listeners - * @param event - Event name - * @param args - Event arguments - */ - private emitEvent; - /** - * Start the cleanup timer - */ - private startCleanupTimer; - /** - * Stop the cleanup timer - */ - private stopCleanupTimer; - /** - * Replace socket mapping for STARTTLS upgrades - * @param oldSocket - Original plain socket - * @param newSocket - New TLS socket - * @returns Whether the replacement was successful - */ - replaceSocket(oldSocket: plugins.net.Socket | plugins.tls.TLSSocket, newSocket: plugins.net.Socket | plugins.tls.TLSSocket): boolean; - /** - * Gets a unique key for a socket - * @param socket - Client socket - * @returns Socket key - */ - private getSocketKey; - /** - * Get all active sessions - */ - getAllSessions(): ISmtpSession[]; - /** - * Update last activity for a session by socket - */ - updateLastActivity(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Check for timed out sessions - */ - checkTimeouts(timeoutMs: number): ISmtpSession[]; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/session-manager.js b/dist_ts/mail/delivery/smtpserver/session-manager.js deleted file mode 100644 index eea9bd8..0000000 --- a/dist_ts/mail/delivery/smtpserver/session-manager.js +++ /dev/null @@ -1,473 +0,0 @@ -/** - * SMTP Session Manager - * Responsible for creating, managing, and cleaning up SMTP sessions - */ -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import { SMTP_DEFAULTS } from './constants.js'; -import { generateSessionId, getSocketDetails } from './utils/helpers.js'; -import { SmtpLogger } from './utils/logging.js'; -/** - * Manager for SMTP sessions - * Handles session creation, tracking, timeout management, and cleanup - */ -export class SessionManager { - /** - * Map of socket ID to session - */ - sessions = new Map(); - /** - * Map of socket to socket ID - */ - socketIds = new Map(); - /** - * SMTP server options - */ - options; - /** - * Event listeners - */ - eventListeners = {}; - /** - * Timer for cleanup interval - */ - cleanupTimer = null; - /** - * Creates a new session manager - * @param options - Session manager options - */ - constructor(options = {}) { - this.options = { - socketTimeout: options.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - connectionTimeout: options.connectionTimeout || SMTP_DEFAULTS.CONNECTION_TIMEOUT, - cleanupInterval: options.cleanupInterval || SMTP_DEFAULTS.CLEANUP_INTERVAL - }; - // Start the cleanup timer - this.startCleanupTimer(); - } - /** - * Creates a new session for a socket connection - * @param socket - Client socket - * @param secure - Whether the connection is secure (TLS) - * @returns New SMTP session - */ - createSession(socket, secure) { - const sessionId = generateSessionId(); - const socketDetails = getSocketDetails(socket); - // Create a new session - const session = { - id: sessionId, - state: SmtpState.GREETING, - clientHostname: '', - mailFrom: '', - rcptTo: [], - emailData: '', - emailDataChunks: [], - emailDataSize: 0, - useTLS: secure || false, - connectionEnded: false, - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - createdAt: new Date(), - secure: secure || false, - authenticated: false, - envelope: { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }, - lastActivity: Date.now() - }; - // Store session with unique ID - const socketKey = this.getSocketKey(socket); - this.socketIds.set(socket, socketKey); - this.sessions.set(socketKey, session); - // Set socket timeout - socket.setTimeout(this.options.socketTimeout); - // Emit session created event - this.emitEvent('created', session, socket); - // Log session creation - SmtpLogger.info(`Created SMTP session ${sessionId}`, { - sessionId, - remoteAddress: session.remoteAddress, - remotePort: socketDetails.remotePort, - secure: session.secure - }); - return session; - } - /** - * Updates the session state - * @param session - SMTP session - * @param newState - New state - */ - updateSessionState(session, newState) { - if (session.state === newState) { - return; - } - const previousState = session.state; - session.state = newState; - // Update activity timestamp - this.updateSessionActivity(session); - // Emit state changed event - this.emitEvent('stateChanged', session, previousState, newState); - // Log state change - SmtpLogger.debug(`Session ${session.id} state changed from ${previousState} to ${newState}`, { - sessionId: session.id, - previousState, - newState, - remoteAddress: session.remoteAddress - }); - } - /** - * Updates the session's last activity timestamp - * @param session - SMTP session - */ - updateSessionActivity(session) { - session.lastActivity = Date.now(); - } - /** - * Removes a session - * @param socket - Client socket - */ - removeSession(socket) { - const socketKey = this.socketIds.get(socket); - if (!socketKey) { - return; - } - const session = this.sessions.get(socketKey); - if (session) { - // Mark the session as ended - session.connectionEnded = true; - // Clear any data timeout if it exists - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - // Emit session completed event - this.emitEvent('completed', session, socket); - // Log session removal - SmtpLogger.info(`Removed SMTP session ${session.id}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - finalState: session.state - }); - } - // Remove from maps - this.sessions.delete(socketKey); - this.socketIds.delete(socket); - } - /** - * Gets a session for a socket - * @param socket - Client socket - * @returns SMTP session or undefined if not found - */ - getSession(socket) { - const socketKey = this.socketIds.get(socket); - if (!socketKey) { - return undefined; - } - return this.sessions.get(socketKey); - } - /** - * Cleans up idle sessions - */ - cleanupIdleSessions() { - const now = Date.now(); - let timedOutCount = 0; - for (const [socketKey, session] of this.sessions.entries()) { - if (session.connectionEnded) { - // Session already marked as ended, but still in map - this.sessions.delete(socketKey); - continue; - } - // Calculate how long the session has been idle - const lastActivity = session.lastActivity || 0; - const idleTime = now - lastActivity; - // Use appropriate timeout based on session state - const timeout = session.state === SmtpState.DATA_RECEIVING - ? this.options.socketTimeout * 2 // Double timeout for data receiving - : session.state === SmtpState.GREETING - ? this.options.connectionTimeout // Initial connection timeout - : this.options.socketTimeout; // Standard timeout for other states - // Check if session has timed out - if (idleTime > timeout) { - // Find the socket for this session - let timedOutSocket; - for (const [socket, key] of this.socketIds.entries()) { - if (key === socketKey) { - timedOutSocket = socket; - break; - } - } - if (timedOutSocket) { - // Emit timeout event - this.emitEvent('timeout', session, timedOutSocket); - // Log timeout - SmtpLogger.warn(`Session ${session.id} timed out after ${Math.round(idleTime / 1000)}s of inactivity`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - state: session.state, - idleTime - }); - // End the socket connection - try { - timedOutSocket.end(); - } - catch (error) { - SmtpLogger.error(`Error ending timed out socket: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - } - // Remove from maps - this.sessions.delete(socketKey); - this.socketIds.delete(timedOutSocket); - timedOutCount++; - } - } - } - if (timedOutCount > 0) { - SmtpLogger.info(`Cleaned up ${timedOutCount} timed out sessions`, { - totalSessions: this.sessions.size - }); - } - } - /** - * Gets the current number of active sessions - * @returns Number of active sessions - */ - getSessionCount() { - return this.sessions.size; - } - /** - * Clears all sessions (used when shutting down) - */ - clearAllSessions() { - // Log the action - SmtpLogger.info(`Clearing all sessions (count: ${this.sessions.size})`); - // Clear the sessions and socket IDs maps - this.sessions.clear(); - this.socketIds.clear(); - // Stop the cleanup timer - this.stopCleanupTimer(); - } - /** - * Register an event listener - * @param event - Event name - * @param listener - Event listener function - */ - on(event, listener) { - switch (event) { - case 'created': - if (!this.eventListeners.created) { - this.eventListeners.created = new Set(); - } - this.eventListeners.created.add(listener); - break; - case 'stateChanged': - if (!this.eventListeners.stateChanged) { - this.eventListeners.stateChanged = new Set(); - } - this.eventListeners.stateChanged.add(listener); - break; - case 'timeout': - if (!this.eventListeners.timeout) { - this.eventListeners.timeout = new Set(); - } - this.eventListeners.timeout.add(listener); - break; - case 'completed': - if (!this.eventListeners.completed) { - this.eventListeners.completed = new Set(); - } - this.eventListeners.completed.add(listener); - break; - case 'error': - if (!this.eventListeners.error) { - this.eventListeners.error = new Set(); - } - this.eventListeners.error.add(listener); - break; - } - } - /** - * Remove an event listener - * @param event - Event name - * @param listener - Event listener function - */ - off(event, listener) { - switch (event) { - case 'created': - if (this.eventListeners.created) { - this.eventListeners.created.delete(listener); - } - break; - case 'stateChanged': - if (this.eventListeners.stateChanged) { - this.eventListeners.stateChanged.delete(listener); - } - break; - case 'timeout': - if (this.eventListeners.timeout) { - this.eventListeners.timeout.delete(listener); - } - break; - case 'completed': - if (this.eventListeners.completed) { - this.eventListeners.completed.delete(listener); - } - break; - case 'error': - if (this.eventListeners.error) { - this.eventListeners.error.delete(listener); - } - break; - } - } - /** - * Emit an event to registered listeners - * @param event - Event name - * @param args - Event arguments - */ - emitEvent(event, ...args) { - let listeners; - switch (event) { - case 'created': - listeners = this.eventListeners.created; - break; - case 'stateChanged': - listeners = this.eventListeners.stateChanged; - break; - case 'timeout': - listeners = this.eventListeners.timeout; - break; - case 'completed': - listeners = this.eventListeners.completed; - break; - case 'error': - listeners = this.eventListeners.error; - break; - } - if (!listeners) { - return; - } - for (const listener of listeners) { - try { - listener(...args); - } - catch (error) { - SmtpLogger.error(`Error in session event listener for ${String(event)}: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - } - } - } - /** - * Start the cleanup timer - */ - startCleanupTimer() { - if (this.cleanupTimer) { - return; - } - this.cleanupTimer = setInterval(() => { - this.cleanupIdleSessions(); - }, this.options.cleanupInterval); - // Prevent the timer from keeping the process alive - if (this.cleanupTimer.unref) { - this.cleanupTimer.unref(); - } - } - /** - * Stop the cleanup timer - */ - stopCleanupTimer() { - if (this.cleanupTimer) { - clearInterval(this.cleanupTimer); - this.cleanupTimer = null; - } - } - /** - * Replace socket mapping for STARTTLS upgrades - * @param oldSocket - Original plain socket - * @param newSocket - New TLS socket - * @returns Whether the replacement was successful - */ - replaceSocket(oldSocket, newSocket) { - const socketKey = this.socketIds.get(oldSocket); - if (!socketKey) { - SmtpLogger.warn('Cannot replace socket - original socket not found in session manager'); - return false; - } - const session = this.sessions.get(socketKey); - if (!session) { - SmtpLogger.warn('Cannot replace socket - session not found for socket key'); - return false; - } - // Remove old socket mapping - this.socketIds.delete(oldSocket); - // Add new socket mapping - this.socketIds.set(newSocket, socketKey); - // Set socket timeout for new socket - newSocket.setTimeout(this.options.socketTimeout); - SmtpLogger.info(`Socket replaced for session ${session.id} (STARTTLS upgrade)`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - oldSocketType: oldSocket.constructor.name, - newSocketType: newSocket.constructor.name - }); - return true; - } - /** - * Gets a unique key for a socket - * @param socket - Client socket - * @returns Socket key - */ - getSocketKey(socket) { - const details = getSocketDetails(socket); - return `${details.remoteAddress}:${details.remotePort}-${Date.now()}`; - } - /** - * Get all active sessions - */ - getAllSessions() { - return Array.from(this.sessions.values()); - } - /** - * Update last activity for a session by socket - */ - updateLastActivity(socket) { - const session = this.getSession(socket); - if (session) { - this.updateSessionActivity(session); - } - } - /** - * Check for timed out sessions - */ - checkTimeouts(timeoutMs) { - const now = Date.now(); - const timedOutSessions = []; - for (const session of this.sessions.values()) { - if (now - session.lastActivity > timeoutMs) { - timedOutSessions.push(session); - } - } - return timedOutSessions; - } - /** - * Clean up resources - */ - destroy() { - // Clear the cleanup timer - if (this.cleanupTimer) { - clearInterval(this.cleanupTimer); - this.cleanupTimer = null; - } - // Clear all sessions - this.clearAllSessions(); - // Clear event listeners - this.eventListeners = {}; - SmtpLogger.debug('SessionManager destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/session-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/smtp-server.d.ts b/dist_ts/mail/delivery/smtpserver/smtp-server.d.ts deleted file mode 100644 index 45effce..0000000 --- a/dist_ts/mail/delivery/smtpserver/smtp-server.d.ts +++ /dev/null @@ -1,137 +0,0 @@ -/** - * SMTP Server - * Core implementation for the refactored SMTP server - */ -import type { ISmtpServerOptions } from './interfaces.js'; -import type { ISmtpServer, ISmtpServerConfig, ISessionManager, IConnectionManager, ICommandHandler, IDataHandler, ITlsHandler, ISecurityHandler } from './interfaces.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; -/** - * SMTP Server implementation - * The main server class that coordinates all components - */ -export declare class SmtpServer implements ISmtpServer { - /** - * Email server reference - */ - private emailServer; - /** - * Session manager - */ - private sessionManager; - /** - * Connection manager - */ - private connectionManager; - /** - * Command handler - */ - private commandHandler; - /** - * Data handler - */ - private dataHandler; - /** - * TLS handler - */ - private tlsHandler; - /** - * Security handler - */ - private securityHandler; - /** - * SMTP server options - */ - private options; - /** - * Net server instance - */ - private server; - /** - * Secure server instance - */ - private secureServer; - /** - * Whether the server is running - */ - private running; - /** - * Server recovery state - */ - private recoveryState; - /** - * Creates a new SMTP server - * @param config - Server configuration - */ - constructor(config: ISmtpServerConfig); - /** - * Start the SMTP server - * @returns Promise that resolves when server is started - */ - listen(): Promise; - /** - * Stop the SMTP server - * @returns Promise that resolves when server is stopped - */ - close(): Promise; - /** - * Get the session manager - * @returns Session manager instance - */ - getSessionManager(): ISessionManager; - /** - * Get the connection manager - * @returns Connection manager instance - */ - getConnectionManager(): IConnectionManager; - /** - * Get the command handler - * @returns Command handler instance - */ - getCommandHandler(): ICommandHandler; - /** - * Get the data handler - * @returns Data handler instance - */ - getDataHandler(): IDataHandler; - /** - * Get the TLS handler - * @returns TLS handler instance - */ - getTlsHandler(): ITlsHandler; - /** - * Get the security handler - * @returns Security handler instance - */ - getSecurityHandler(): ISecurityHandler; - /** - * Get the server options - * @returns SMTP server options - */ - getOptions(): ISmtpServerOptions; - /** - * Get the email server reference - * @returns Email server instance - */ - getEmailServer(): UnifiedEmailServer; - /** - * Check if the server is running - * @returns Whether the server is running - */ - isRunning(): boolean; - /** - * Check if we should attempt to recover from an error - * @param error - The error that occurred - * @returns Whether recovery should be attempted - */ - private shouldAttemptRecovery; - /** - * Attempt to recover the server after a critical error - * @param serverType - The type of server to recover ('standard' or 'secure') - * @param error - The error that triggered recovery - */ - private attemptServerRecovery; - /** - * Clean up all component resources - */ - destroy(): Promise; -} diff --git a/dist_ts/mail/delivery/smtpserver/smtp-server.js b/dist_ts/mail/delivery/smtpserver/smtp-server.js deleted file mode 100644 index 2a1e484..0000000 --- a/dist_ts/mail/delivery/smtpserver/smtp-server.js +++ /dev/null @@ -1,698 +0,0 @@ -/** - * SMTP Server - * Core implementation for the refactored SMTP server - */ -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import { SessionManager } from './session-manager.js'; -import { ConnectionManager } from './connection-manager.js'; -import { CommandHandler } from './command-handler.js'; -import { DataHandler } from './data-handler.js'; -import { TlsHandler } from './tls-handler.js'; -import { SecurityHandler } from './security-handler.js'; -import { SMTP_DEFAULTS } from './constants.js'; -import { mergeWithDefaults } from './utils/helpers.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; -/** - * SMTP Server implementation - * The main server class that coordinates all components - */ -export class SmtpServer { - /** - * Email server reference - */ - emailServer; - /** - * Session manager - */ - sessionManager; - /** - * Connection manager - */ - connectionManager; - /** - * Command handler - */ - commandHandler; - /** - * Data handler - */ - dataHandler; - /** - * TLS handler - */ - tlsHandler; - /** - * Security handler - */ - securityHandler; - /** - * SMTP server options - */ - options; - /** - * Net server instance - */ - server = null; - /** - * Secure server instance - */ - secureServer = null; - /** - * Whether the server is running - */ - running = false; - /** - * Server recovery state - */ - recoveryState = { - /** - * Whether recovery is in progress - */ - recovering: false, - /** - * Number of consecutive connection failures - */ - connectionFailures: 0, - /** - * Last recovery attempt timestamp - */ - lastRecoveryAttempt: 0, - /** - * Recovery cooldown in milliseconds - */ - recoveryCooldown: 5000, - /** - * Maximum recovery attempts before giving up - */ - maxRecoveryAttempts: 3, - /** - * Current recovery attempt - */ - currentRecoveryAttempt: 0 - }; - /** - * Creates a new SMTP server - * @param config - Server configuration - */ - constructor(config) { - this.emailServer = config.emailServer; - this.options = mergeWithDefaults(config.options); - // Create components - all components now receive the SMTP server instance - this.sessionManager = config.sessionManager || new SessionManager({ - socketTimeout: this.options.socketTimeout, - connectionTimeout: this.options.connectionTimeout, - cleanupInterval: this.options.cleanupInterval - }); - this.securityHandler = config.securityHandler || new SecurityHandler(this); - this.tlsHandler = config.tlsHandler || new TlsHandler(this); - this.dataHandler = config.dataHandler || new DataHandler(this); - this.commandHandler = config.commandHandler || new CommandHandler(this); - this.connectionManager = config.connectionManager || new ConnectionManager(this); - } - /** - * Start the SMTP server - * @returns Promise that resolves when server is started - */ - async listen() { - if (this.running) { - throw new Error('SMTP server is already running'); - } - try { - // Create the server - this.server = plugins.net.createServer((socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - this.connectionManager.handleNewConnection(socket); - } - else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Allow connection on error (fail open) - this.connectionManager.handleNewConnection(socket); - }); - }); - // Set up error handling with recovery - this.server.on('error', (err) => { - SmtpLogger.error(`SMTP server error: ${err.message}`, { error: err }); - // Try to recover from specific errors - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('standard', err); - } - }); - // Start listening - await new Promise((resolve, reject) => { - if (!this.server) { - reject(new Error('Server not initialized')); - return; - } - this.server.listen(this.options.port, this.options.host, () => { - SmtpLogger.info(`SMTP server listening on ${this.options.host || '0.0.0.0'}:${this.options.port}`); - resolve(); - }); - this.server.on('error', reject); - }); - // Start secure server if configured - if (this.options.securePort && this.tlsHandler.isTlsEnabled()) { - try { - // Import the secure server creation utility from our new module - // This gives us better certificate handling and error resilience - const { createSecureTlsServer } = await import('./secure-server.js'); - // Create secure server with the certificates - // This uses a more robust approach to certificate loading and validation - this.secureServer = createSecureTlsServer({ - key: this.options.key, - cert: this.options.cert, - ca: this.options.ca - }); - SmtpLogger.info(`Created secure TLS server for port ${this.options.securePort}`); - if (this.secureServer) { - // Use explicit error handling for secure connections - this.secureServer.on('tlsClientError', (err, tlsSocket) => { - SmtpLogger.error(`TLS client error: ${err.message}`, { - error: err, - remoteAddress: tlsSocket.remoteAddress, - remotePort: tlsSocket.remotePort, - stack: err.stack - }); - // No need to destroy, the error event will handle that - }); - // Register the secure connection handler - this.secureServer.on('secureConnection', (socket) => { - SmtpLogger.info(`New secure connection from ${socket.remoteAddress}:${socket.remotePort}`, { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name - }); - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - // Pass the connection to the connection manager - this.connectionManager.handleNewSecureConnection(socket); - } - else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - // Allow connection on error (fail open) - this.connectionManager.handleNewSecureConnection(socket); - }); - }); - // Global error handler for the secure server with recovery - this.secureServer.on('error', (err) => { - SmtpLogger.error(`SMTP secure server error: ${err.message}`, { - error: err, - stack: err.stack - }); - // Try to recover from specific errors - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('secure', err); - } - }); - // Start listening on secure port - await new Promise((resolve, reject) => { - if (!this.secureServer) { - reject(new Error('Secure server not initialized')); - return; - } - this.secureServer.listen(this.options.securePort, this.options.host, () => { - SmtpLogger.info(`SMTP secure server listening on ${this.options.host || '0.0.0.0'}:${this.options.securePort}`); - resolve(); - }); - // Only use error event for startup issues - this.secureServer.once('error', reject); - }); - } - else { - SmtpLogger.warn('Failed to create secure server, TLS may not be properly configured'); - } - } - catch (error) { - SmtpLogger.error(`Error setting up secure server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - } - } - this.running = true; - } - catch (error) { - SmtpLogger.error(`Failed to start SMTP server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - // Clean up on error - this.close(); - throw error; - } - } - /** - * Stop the SMTP server - * @returns Promise that resolves when server is stopped - */ - async close() { - if (!this.running) { - return; - } - SmtpLogger.info('Stopping SMTP server'); - try { - // Close all active connections - this.connectionManager.closeAllConnections(); - // Clear all sessions - this.sessionManager.clearAllSessions(); - // Clean up adaptive logger to prevent hanging timers - adaptiveLogger.destroy(); - // Destroy all components to clean up their resources - await this.destroy(); - // Close servers - const closePromises = []; - if (this.server) { - closePromises.push(new Promise((resolve, reject) => { - if (!this.server) { - resolve(); - return; - } - this.server.close((err) => { - if (err) { - reject(err); - } - else { - resolve(); - } - }); - })); - } - if (this.secureServer) { - closePromises.push(new Promise((resolve, reject) => { - if (!this.secureServer) { - resolve(); - return; - } - this.secureServer.close((err) => { - if (err) { - reject(err); - } - else { - resolve(); - } - }); - })); - } - // Add timeout to prevent hanging on close - await Promise.race([ - Promise.all(closePromises), - new Promise((resolve) => { - setTimeout(() => { - SmtpLogger.warn('Server close timed out after 3 seconds, forcing shutdown'); - resolve(); - }, 3000); - }) - ]); - this.server = null; - this.secureServer = null; - this.running = false; - SmtpLogger.info('SMTP server stopped'); - } - catch (error) { - SmtpLogger.error(`Error stopping SMTP server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - throw error; - } - } - /** - * Get the session manager - * @returns Session manager instance - */ - getSessionManager() { - return this.sessionManager; - } - /** - * Get the connection manager - * @returns Connection manager instance - */ - getConnectionManager() { - return this.connectionManager; - } - /** - * Get the command handler - * @returns Command handler instance - */ - getCommandHandler() { - return this.commandHandler; - } - /** - * Get the data handler - * @returns Data handler instance - */ - getDataHandler() { - return this.dataHandler; - } - /** - * Get the TLS handler - * @returns TLS handler instance - */ - getTlsHandler() { - return this.tlsHandler; - } - /** - * Get the security handler - * @returns Security handler instance - */ - getSecurityHandler() { - return this.securityHandler; - } - /** - * Get the server options - * @returns SMTP server options - */ - getOptions() { - return this.options; - } - /** - * Get the email server reference - * @returns Email server instance - */ - getEmailServer() { - return this.emailServer; - } - /** - * Check if the server is running - * @returns Whether the server is running - */ - isRunning() { - return this.running; - } - /** - * Check if we should attempt to recover from an error - * @param error - The error that occurred - * @returns Whether recovery should be attempted - */ - shouldAttemptRecovery(error) { - // Skip recovery if we're already in recovery mode - if (this.recoveryState.recovering) { - return false; - } - // Check if we've reached the maximum number of recovery attempts - if (this.recoveryState.currentRecoveryAttempt >= this.recoveryState.maxRecoveryAttempts) { - SmtpLogger.warn('Maximum recovery attempts reached, not attempting further recovery'); - return false; - } - // Check if enough time has passed since the last recovery attempt - const now = Date.now(); - if (now - this.recoveryState.lastRecoveryAttempt < this.recoveryState.recoveryCooldown) { - SmtpLogger.warn('Recovery cooldown period not elapsed, skipping recovery attempt'); - return false; - } - // Recoverable errors include: - // - EADDRINUSE: Address already in use (port conflict) - // - ECONNRESET: Connection reset by peer - // - EPIPE: Broken pipe - // - ETIMEDOUT: Connection timed out - const recoverableErrors = [ - 'EADDRINUSE', - 'ECONNRESET', - 'EPIPE', - 'ETIMEDOUT', - 'ECONNABORTED', - 'EPROTO', - 'EMFILE' // Too many open files - ]; - // Check if this is a recoverable error - const errorCode = error.code; - return recoverableErrors.includes(errorCode); - } - /** - * Attempt to recover the server after a critical error - * @param serverType - The type of server to recover ('standard' or 'secure') - * @param error - The error that triggered recovery - */ - async attemptServerRecovery(serverType, error) { - // Set recovery flag to prevent multiple simultaneous recovery attempts - if (this.recoveryState.recovering) { - SmtpLogger.warn('Recovery already in progress, skipping new recovery attempt'); - return; - } - this.recoveryState.recovering = true; - this.recoveryState.lastRecoveryAttempt = Date.now(); - this.recoveryState.currentRecoveryAttempt++; - SmtpLogger.info(`Attempting server recovery for ${serverType} server after error: ${error.message}`, { - attempt: this.recoveryState.currentRecoveryAttempt, - maxAttempts: this.recoveryState.maxRecoveryAttempts, - errorCode: error.code - }); - try { - // Determine which server to restart - const isStandardServer = serverType === 'standard'; - // Close the affected server - if (isStandardServer && this.server) { - await new Promise((resolve) => { - if (!this.server) { - resolve(); - return; - } - // First try a clean shutdown - this.server.close((err) => { - if (err) { - SmtpLogger.warn(`Error during server close in recovery: ${err.message}`); - } - resolve(); - }); - // Set a timeout to force close - setTimeout(() => { - resolve(); - }, 3000); - }); - this.server = null; - } - else if (!isStandardServer && this.secureServer) { - await new Promise((resolve) => { - if (!this.secureServer) { - resolve(); - return; - } - // First try a clean shutdown - this.secureServer.close((err) => { - if (err) { - SmtpLogger.warn(`Error during secure server close in recovery: ${err.message}`); - } - resolve(); - }); - // Set a timeout to force close - setTimeout(() => { - resolve(); - }, 3000); - }); - this.secureServer = null; - } - // Short delay before restarting - await new Promise((resolve) => setTimeout(resolve, 1000)); - // Clean up any lingering connections - this.connectionManager.closeAllConnections(); - this.sessionManager.clearAllSessions(); - // Restart the affected server - if (isStandardServer) { - // Create and start the standard server - this.server = plugins.net.createServer((socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - this.connectionManager.handleNewConnection(socket); - } - else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Allow connection on error (fail open) - this.connectionManager.handleNewConnection(socket); - }); - }); - // Set up error handling with recovery - this.server.on('error', (err) => { - SmtpLogger.error(`SMTP server error after recovery: ${err.message}`, { error: err }); - // Try to recover again if needed - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('standard', err); - } - }); - // Start listening again - await new Promise((resolve, reject) => { - if (!this.server) { - reject(new Error('Server not initialized during recovery')); - return; - } - this.server.listen(this.options.port, this.options.host, () => { - SmtpLogger.info(`SMTP server recovered and listening on ${this.options.host || '0.0.0.0'}:${this.options.port}`); - resolve(); - }); - // Only use error event for startup issues during recovery - this.server.once('error', (err) => { - SmtpLogger.error(`Failed to restart server during recovery: ${err.message}`); - reject(err); - }); - }); - } - else if (this.options.securePort && this.tlsHandler.isTlsEnabled()) { - // Try to recreate the secure server - try { - // Import the secure server creation utility - const { createSecureTlsServer } = await import('./secure-server.js'); - // Create secure server with the certificates - this.secureServer = createSecureTlsServer({ - key: this.options.key, - cert: this.options.cert, - ca: this.options.ca - }); - if (this.secureServer) { - SmtpLogger.info(`Created secure TLS server for port ${this.options.securePort} during recovery`); - // Use explicit error handling for secure connections - this.secureServer.on('tlsClientError', (err, tlsSocket) => { - SmtpLogger.error(`TLS client error after recovery: ${err.message}`, { - error: err, - remoteAddress: tlsSocket.remoteAddress, - remotePort: tlsSocket.remotePort, - stack: err.stack - }); - }); - // Register the secure connection handler - this.secureServer.on('secureConnection', (socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - // Pass the connection to the connection manager - this.connectionManager.handleNewSecureConnection(socket); - } - else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error after recovery: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Allow connection on error (fail open) - this.connectionManager.handleNewSecureConnection(socket); - }); - }); - // Global error handler for the secure server with recovery - this.secureServer.on('error', (err) => { - SmtpLogger.error(`SMTP secure server error after recovery: ${err.message}`, { - error: err, - stack: err.stack - }); - // Try to recover again if needed - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('secure', err); - } - }); - // Start listening on secure port again - await new Promise((resolve, reject) => { - if (!this.secureServer) { - reject(new Error('Secure server not initialized during recovery')); - return; - } - this.secureServer.listen(this.options.securePort, this.options.host, () => { - SmtpLogger.info(`SMTP secure server recovered and listening on ${this.options.host || '0.0.0.0'}:${this.options.securePort}`); - resolve(); - }); - // Only use error event for startup issues during recovery - this.secureServer.once('error', (err) => { - SmtpLogger.error(`Failed to restart secure server during recovery: ${err.message}`); - reject(err); - }); - }); - } - else { - SmtpLogger.warn('Failed to create secure server during recovery'); - } - } - catch (error) { - SmtpLogger.error(`Error setting up secure server during recovery: ${error instanceof Error ? error.message : String(error)}`); - } - } - // Recovery successful - SmtpLogger.info('Server recovery completed successfully'); - } - catch (recoveryError) { - SmtpLogger.error(`Server recovery failed: ${recoveryError instanceof Error ? recoveryError.message : String(recoveryError)}`, { - error: recoveryError instanceof Error ? recoveryError : new Error(String(recoveryError)), - attempt: this.recoveryState.currentRecoveryAttempt, - maxAttempts: this.recoveryState.maxRecoveryAttempts - }); - } - finally { - // Reset recovery flag - this.recoveryState.recovering = false; - } - } - /** - * Clean up all component resources - */ - async destroy() { - SmtpLogger.info('Destroying SMTP server components'); - // Destroy all components in parallel - const destroyPromises = []; - if (this.sessionManager && typeof this.sessionManager.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.sessionManager.destroy())); - } - if (this.connectionManager && typeof this.connectionManager.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.connectionManager.destroy())); - } - if (this.commandHandler && typeof this.commandHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.commandHandler.destroy())); - } - if (this.dataHandler && typeof this.dataHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.dataHandler.destroy())); - } - if (this.tlsHandler && typeof this.tlsHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.tlsHandler.destroy())); - } - if (this.securityHandler && typeof this.securityHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.securityHandler.destroy())); - } - await Promise.all(destroyPromises); - // Destroy the adaptive logger singleton to clean up its timer - const { adaptiveLogger } = await import('./utils/adaptive-logging.js'); - if (adaptiveLogger && typeof adaptiveLogger.destroy === 'function') { - adaptiveLogger.destroy(); - } - // Clear recovery state - this.recoveryState = { - recovering: false, - connectionFailures: 0, - lastRecoveryAttempt: 0, - recoveryCooldown: 5000, - maxRecoveryAttempts: 3, - currentRecoveryAttempt: 0 - }; - SmtpLogger.info('All SMTP server components destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smtp-server.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/smtp-server.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/starttls-handler.d.ts b/dist_ts/mail/delivery/smtpserver/starttls-handler.d.ts deleted file mode 100644 index 6dd99ee..0000000 --- a/dist_ts/mail/delivery/smtpserver/starttls-handler.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * STARTTLS Implementation - * Provides an improved implementation for STARTTLS upgrades - */ -import * as plugins from '../../../plugins.js'; -import type { ISmtpSession, ISessionManager, IConnectionManager } from './interfaces.js'; -import { SmtpState } from '../interfaces.js'; -/** - * Enhanced STARTTLS handler for more reliable TLS upgrades - */ -export declare function performStartTLS(socket: plugins.net.Socket, options: { - key: string; - cert: string; - ca?: string; - session?: ISmtpSession; - sessionManager?: ISessionManager; - connectionManager?: IConnectionManager; - onSuccess?: (tlsSocket: plugins.tls.TLSSocket) => void; - onFailure?: (error: Error) => void; - updateSessionState?: (session: ISmtpSession, state: SmtpState) => void; -}): Promise; diff --git a/dist_ts/mail/delivery/smtpserver/starttls-handler.js b/dist_ts/mail/delivery/smtpserver/starttls-handler.js deleted file mode 100644 index 712b1ce..0000000 --- a/dist_ts/mail/delivery/smtpserver/starttls-handler.js +++ /dev/null @@ -1,207 +0,0 @@ -/** - * STARTTLS Implementation - * Provides an improved implementation for STARTTLS upgrades - */ -import * as plugins from '../../../plugins.js'; -import { SmtpLogger } from './utils/logging.js'; -import { loadCertificatesFromString, createTlsOptions } from './certificate-utils.js'; -import { getSocketDetails } from './utils/helpers.js'; -import { SmtpState } from '../interfaces.js'; -/** - * Enhanced STARTTLS handler for more reliable TLS upgrades - */ -export async function performStartTLS(socket, options) { - return new Promise((resolve) => { - try { - const socketDetails = getSocketDetails(socket); - SmtpLogger.info('Starting enhanced STARTTLS upgrade process', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - // Create a proper socket cleanup function - const cleanupSocket = () => { - // Remove all listeners to prevent memory leaks - socket.removeAllListeners('data'); - socket.removeAllListeners('error'); - socket.removeAllListeners('close'); - socket.removeAllListeners('end'); - socket.removeAllListeners('drain'); - }; - // Prepare the socket for TLS upgrade - socket.setNoDelay(true); - // Critical: make sure there's no pending data before TLS handshake - socket.pause(); - // Add error handling for the base socket - const handleSocketError = (err) => { - SmtpLogger.error(`Socket error during STARTTLS preparation: ${err.message}`, { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: err, - stack: err.stack - }); - if (options.onFailure) { - options.onFailure(err); - } - // Resolve with undefined to indicate failure - resolve(undefined); - }; - socket.once('error', handleSocketError); - // Load certificates - let certificates; - try { - certificates = loadCertificatesFromString({ - key: options.key, - cert: options.cert, - ca: options.ca - }); - } - catch (certError) { - SmtpLogger.error(`Certificate error during STARTTLS: ${certError instanceof Error ? certError.message : String(certError)}`); - if (options.onFailure) { - options.onFailure(certError instanceof Error ? certError : new Error(String(certError))); - } - resolve(undefined); - return; - } - // Create TLS options optimized for STARTTLS - const tlsOptions = createTlsOptions(certificates, true); - // Create secure context - let secureContext; - try { - secureContext = plugins.tls.createSecureContext(tlsOptions); - } - catch (contextError) { - SmtpLogger.error(`Failed to create secure context: ${contextError instanceof Error ? contextError.message : String(contextError)}`); - if (options.onFailure) { - options.onFailure(contextError instanceof Error ? contextError : new Error(String(contextError))); - } - resolve(undefined); - return; - } - // Log STARTTLS upgrade attempt - SmtpLogger.debug('Attempting TLS socket upgrade with options', { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - handshakeTimeout: tlsOptions.handshakeTimeout - }); - // Use a safer approach to create the TLS socket - const handshakeTimeout = 30000; // 30 seconds timeout for TLS handshake - let handshakeTimeoutId; - // Create the TLS socket using a conservative approach for STARTTLS - const tlsSocket = new plugins.tls.TLSSocket(socket, { - isServer: true, - secureContext, - // Server-side options (simpler is more reliable for STARTTLS) - requestCert: false, - rejectUnauthorized: false - }); - // Set up error handling for the TLS socket - tlsSocket.once('error', (err) => { - if (handshakeTimeoutId) { - clearTimeout(handshakeTimeoutId); - } - SmtpLogger.error(`TLS error during STARTTLS: ${err.message}`, { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: err, - stack: err.stack - }); - // Clean up socket listeners - cleanupSocket(); - if (options.onFailure) { - options.onFailure(err); - } - // Destroy the socket to ensure we don't have hanging connections - tlsSocket.destroy(); - resolve(undefined); - }); - // Set up handshake timeout manually for extra safety - handshakeTimeoutId = setTimeout(() => { - SmtpLogger.error('TLS handshake timed out', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - // Clean up socket listeners - cleanupSocket(); - if (options.onFailure) { - options.onFailure(new Error('TLS handshake timed out')); - } - // Destroy the socket to ensure we don't have hanging connections - tlsSocket.destroy(); - resolve(undefined); - }, handshakeTimeout); - // Set up handler for successful TLS negotiation - tlsSocket.once('secure', () => { - if (handshakeTimeoutId) { - clearTimeout(handshakeTimeoutId); - } - const protocol = tlsSocket.getProtocol(); - const cipher = tlsSocket.getCipher(); - SmtpLogger.info('TLS upgrade successful via STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - protocol: protocol || 'unknown', - cipher: cipher?.name || 'unknown' - }); - // Update socket mapping in session manager - if (options.sessionManager) { - const socketReplaced = options.sessionManager.replaceSocket(socket, tlsSocket); - if (!socketReplaced) { - SmtpLogger.error('Failed to replace socket in session manager after STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - } - } - // Re-attach event handlers from connection manager - if (options.connectionManager) { - try { - options.connectionManager.setupSocketEventHandlers(tlsSocket); - SmtpLogger.debug('Successfully re-attached connection manager event handlers to TLS socket', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - } - catch (handlerError) { - SmtpLogger.error('Failed to re-attach event handlers to TLS socket after STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: handlerError instanceof Error ? handlerError : new Error(String(handlerError)) - }); - } - } - // Update session if provided - if (options.session) { - // Update session properties to indicate TLS is active - options.session.useTLS = true; - options.session.secure = true; - // Reset session state as required by RFC 3207 - // After STARTTLS, client must issue a new EHLO - if (options.updateSessionState) { - options.updateSessionState(options.session, SmtpState.GREETING); - } - } - // Call success callback if provided - if (options.onSuccess) { - options.onSuccess(tlsSocket); - } - // Success - return the TLS socket - resolve(tlsSocket); - }); - // Resume the socket after we've set up all handlers - // This allows the TLS handshake to proceed - socket.resume(); - } - catch (error) { - SmtpLogger.error(`Unexpected error in STARTTLS: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - if (options.onFailure) { - options.onFailure(error instanceof Error ? error : new Error(String(error))); - } - resolve(undefined); - } - }); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"starttls-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/starttls-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/tls-handler.d.ts b/dist_ts/mail/delivery/smtpserver/tls-handler.d.ts deleted file mode 100644 index cd73516..0000000 --- a/dist_ts/mail/delivery/smtpserver/tls-handler.d.ts +++ /dev/null @@ -1,66 +0,0 @@ -/** - * SMTP TLS Handler - * Responsible for handling TLS-related SMTP functionality - */ -import * as plugins from '../../../plugins.js'; -import type { ITlsHandler, ISmtpServer, ISmtpSession } from './interfaces.js'; -/** - * Handles TLS functionality for SMTP server - */ -export declare class TlsHandler implements ITlsHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer; - /** - * Certificate data - */ - private certificates; - /** - * TLS options - */ - private options; - /** - * Creates a new TLS handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer); - /** - * Handle STARTTLS command - * @param socket - Client socket - */ - handleStartTls(socket: plugins.net.Socket, session: ISmtpSession): Promise; - /** - * Upgrade a connection to TLS - * @param socket - Client socket - */ - startTLS(socket: plugins.net.Socket): Promise; - /** - * Create a secure server - * @returns TLS server instance or undefined if TLS is not enabled - */ - createSecureServer(): plugins.tls.Server | undefined; - /** - * Check if TLS is enabled - * @returns Whether TLS is enabled - */ - isTlsEnabled(): boolean; - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - private sendResponse; - /** - * Check if TLS is available (interface requirement) - */ - isTlsAvailable(): boolean; - /** - * Get TLS options (interface requirement) - */ - getTlsOptions(): plugins.tls.TlsOptions; - /** - * Clean up resources - */ - destroy(): void; -} diff --git a/dist_ts/mail/delivery/smtpserver/tls-handler.js b/dist_ts/mail/delivery/smtpserver/tls-handler.js deleted file mode 100644 index 164c9fb..0000000 --- a/dist_ts/mail/delivery/smtpserver/tls-handler.js +++ /dev/null @@ -1,273 +0,0 @@ -/** - * SMTP TLS Handler - * Responsible for handling TLS-related SMTP functionality - */ -import * as plugins from '../../../plugins.js'; -import { SmtpResponseCode, SecurityEventType, SecurityLogLevel } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { getSocketDetails, getTlsDetails } from './utils/helpers.js'; -import { loadCertificatesFromString, generateSelfSignedCertificates, createTlsOptions } from './certificate-utils.js'; -import { SmtpState } from '../interfaces.js'; -/** - * Handles TLS functionality for SMTP server - */ -export class TlsHandler { - /** - * Reference to the SMTP server instance - */ - smtpServer; - /** - * Certificate data - */ - certificates; - /** - * TLS options - */ - options; - /** - * Creates a new TLS handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer) { - this.smtpServer = smtpServer; - // Initialize certificates - const serverOptions = this.smtpServer.getOptions(); - try { - // Try to load certificates from provided options - this.certificates = loadCertificatesFromString({ - key: serverOptions.key, - cert: serverOptions.cert, - ca: serverOptions.ca - }); - SmtpLogger.info('Successfully loaded TLS certificates'); - } - catch (error) { - SmtpLogger.warn(`Failed to load certificates from options, using self-signed: ${error instanceof Error ? error.message : String(error)}`); - // Fall back to self-signed certificates for testing - this.certificates = generateSelfSignedCertificates(); - } - // Initialize TLS options - this.options = createTlsOptions(this.certificates); - } - /** - * Handle STARTTLS command - * @param socket - Client socket - */ - async handleStartTls(socket, session) { - // Check if already using TLS - if (session.useTLS) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} TLS already active`); - return null; - } - // Check if we have the necessary TLS certificates - if (!this.isTlsEnabled()) { - this.sendResponse(socket, `${SmtpResponseCode.TLS_UNAVAILABLE_TEMP} TLS not available`); - return null; - } - // Send ready for TLS response - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_READY} Ready to start TLS`); - // Upgrade the connection to TLS - try { - const tlsSocket = await this.startTLS(socket); - return tlsSocket; - } - catch (error) { - SmtpLogger.error(`STARTTLS negotiation failed: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - // Log security event - SmtpLogger.logSecurityEvent(SecurityLogLevel.ERROR, SecurityEventType.TLS_NEGOTIATION, 'STARTTLS negotiation failed', { error: error instanceof Error ? error.message : String(error) }, session.remoteAddress); - return null; - } - } - /** - * Upgrade a connection to TLS - * @param socket - Client socket - */ - async startTLS(socket) { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - try { - // Import the enhanced STARTTLS handler - // This uses a more robust approach to TLS upgrades - const { performStartTLS } = await import('./starttls-handler.js'); - SmtpLogger.info('Using enhanced STARTTLS implementation'); - // Use the enhanced STARTTLS handler with better error handling and socket management - const serverOptions = this.smtpServer.getOptions(); - const tlsSocket = await performStartTLS(socket, { - key: serverOptions.key, - cert: serverOptions.cert, - ca: serverOptions.ca, - session: session, - sessionManager: this.smtpServer.getSessionManager(), - connectionManager: this.smtpServer.getConnectionManager(), - // Callback for successful upgrade - onSuccess: (secureSocket) => { - SmtpLogger.info('TLS connection successfully established via enhanced STARTTLS', { - remoteAddress: secureSocket.remoteAddress, - remotePort: secureSocket.remotePort, - protocol: secureSocket.getProtocol() || 'unknown', - cipher: secureSocket.getCipher()?.name || 'unknown' - }); - // Log security event - SmtpLogger.logSecurityEvent(SecurityLogLevel.INFO, SecurityEventType.TLS_NEGOTIATION, 'STARTTLS successful with enhanced implementation', { - protocol: secureSocket.getProtocol(), - cipher: secureSocket.getCipher()?.name - }, secureSocket.remoteAddress, undefined, true); - }, - // Callback for failed upgrade - onFailure: (error) => { - SmtpLogger.error(`Enhanced STARTTLS failed: ${error.message}`, { - sessionId: session?.id, - remoteAddress: socket.remoteAddress, - error - }); - // Log security event - SmtpLogger.logSecurityEvent(SecurityLogLevel.ERROR, SecurityEventType.TLS_NEGOTIATION, 'Enhanced STARTTLS failed', { error: error.message }, socket.remoteAddress, undefined, false); - }, - // Function to update session state - updateSessionState: this.smtpServer.getSessionManager().updateSessionState?.bind(this.smtpServer.getSessionManager()) - }); - // If STARTTLS failed with the enhanced implementation, log the error - if (!tlsSocket) { - SmtpLogger.warn('Enhanced STARTTLS implementation failed to create TLS socket', { - sessionId: session?.id, - remoteAddress: socket.remoteAddress - }); - throw new Error('Failed to create TLS socket'); - } - return tlsSocket; - } - catch (error) { - // Log STARTTLS failure - SmtpLogger.error(`Failed to upgrade connection to TLS: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - // Log security event - SmtpLogger.logSecurityEvent(SecurityLogLevel.ERROR, SecurityEventType.TLS_NEGOTIATION, 'Failed to upgrade connection to TLS', { - error: error instanceof Error ? error.message : String(error), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }, socket.remoteAddress, undefined, false); - // Destroy the socket on error - socket.destroy(); - throw error; - } - } - /** - * Create a secure server - * @returns TLS server instance or undefined if TLS is not enabled - */ - createSecureServer() { - if (!this.isTlsEnabled()) { - return undefined; - } - try { - SmtpLogger.info('Creating secure TLS server'); - // Log certificate info - SmtpLogger.debug('Using certificates for secure server', { - keyLength: this.certificates.key.length, - certLength: this.certificates.cert.length, - caLength: this.certificates.ca ? this.certificates.ca.length : 0 - }); - // Create TLS options using our certificate utilities - // This ensures proper PEM format handling and protocol negotiation - const tlsOptions = createTlsOptions(this.certificates, true); // Use server options - SmtpLogger.info('Creating TLS server with options', { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - handshakeTimeout: tlsOptions.handshakeTimeout - }); - // Create a server with wider TLS compatibility - const server = new plugins.tls.Server(tlsOptions); - // Add error handling - server.on('error', (err) => { - SmtpLogger.error(`TLS server error: ${err.message}`, { - error: err, - stack: err.stack - }); - }); - // Log TLS details for each connection - server.on('secureConnection', (socket) => { - SmtpLogger.info('New secure connection established', { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort - }); - }); - return server; - } - catch (error) { - SmtpLogger.error(`Failed to create secure server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - return undefined; - } - } - /** - * Check if TLS is enabled - * @returns Whether TLS is enabled - */ - isTlsEnabled() { - const options = this.smtpServer.getOptions(); - return !!(options.key && options.cert); - } - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - sendResponse(socket, response) { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - try { - socket.write(`${response}\r\n`); - SmtpLogger.logResponse(response, socket); - } - catch (error) { - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - socket.destroy(); - } - } - /** - * Check if TLS is available (interface requirement) - */ - isTlsAvailable() { - return this.isTlsEnabled(); - } - /** - * Get TLS options (interface requirement) - */ - getTlsOptions() { - return this.options; - } - /** - * Clean up resources - */ - destroy() { - // Clear any cached certificates or TLS contexts - // TlsHandler doesn't have timers but may have cached resources - SmtpLogger.debug('TlsHandler destroyed'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tls-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpserver/tls-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.d.ts b/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.d.ts deleted file mode 100644 index e773035..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.d.ts +++ /dev/null @@ -1,117 +0,0 @@ -/** - * Adaptive SMTP Logging System - * Automatically switches between logging modes based on server load (active connections) - * to maintain performance during high-concurrency scenarios - */ -import * as plugins from '../../../../plugins.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -import type { ISmtpSession } from '../interfaces.js'; -import type { LogLevel, ISmtpLogOptions } from './logging.js'; -/** - * Log modes based on server load - */ -export declare enum LogMode { - VERBOSE = "VERBOSE",// < 20 connections: Full detailed logging - REDUCED = "REDUCED",// 20-40 connections: Limited command/response logging, full error logging - MINIMAL = "MINIMAL" -} -/** - * Configuration for adaptive logging thresholds - */ -export interface IAdaptiveLogConfig { - verboseThreshold: number; - reducedThreshold: number; - aggregationInterval: number; - maxAggregatedEntries: number; -} -/** - * Connection metadata for aggregation tracking - */ -interface IConnectionTracker { - activeConnections: number; - peakConnections: number; - totalConnections: number; - connectionsPerSecond: number; - lastConnectionTime: number; -} -/** - * Adaptive SMTP Logger that scales logging based on server load - */ -export declare class AdaptiveSmtpLogger { - private static instance; - private currentMode; - private config; - private aggregatedEntries; - private aggregationTimer; - private connectionTracker; - private constructor(); - /** - * Get singleton instance - */ - static getInstance(config?: Partial): AdaptiveSmtpLogger; - /** - * Update active connection count and adjust log mode if needed - */ - updateConnectionCount(activeConnections: number): void; - /** - * Track new connection for rate calculation - */ - trackConnection(): void; - /** - * Get current logging mode - */ - getCurrentMode(): LogMode; - /** - * Get connection statistics - */ - getConnectionStats(): IConnectionTracker; - /** - * Log a message with adaptive behavior - */ - log(level: LogLevel, message: string, options?: ISmtpLogOptions): void; - /** - * Log command with adaptive behavior - */ - logCommand(command: string, socket: plugins.net.Socket | plugins.tls.TLSSocket, session?: ISmtpSession): void; - /** - * Log response with adaptive behavior - */ - logResponse(response: string, socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Log connection event with adaptive behavior - */ - logConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, eventType: 'connect' | 'close' | 'error', session?: ISmtpSession, error?: Error): void; - /** - * Log security event (always logged regardless of mode) - */ - logSecurityEvent(level: SecurityLogLevel, type: SecurityEventType, message: string, details: Record, ipAddress?: string, domain?: string, success?: boolean): void; - /** - * Determine appropriate log mode based on connection count - */ - private determineLogMode; - /** - * Switch to a new log mode - */ - private switchLogMode; - /** - * Add entry to aggregation buffer - */ - private aggregateEntry; - /** - * Start the aggregation timer - */ - private startAggregationTimer; - /** - * Flush aggregated entries to logs - */ - private flushAggregatedEntries; - /** - * Cleanup resources - */ - destroy(): void; -} -/** - * Default instance for easy access - */ -export declare const adaptiveLogger: AdaptiveSmtpLogger; -export {}; diff --git a/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.js b/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.js deleted file mode 100644 index 90077df..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/adaptive-logging.js +++ /dev/null @@ -1,413 +0,0 @@ -/** - * Adaptive SMTP Logging System - * Automatically switches between logging modes based on server load (active connections) - * to maintain performance during high-concurrency scenarios - */ -import * as plugins from '../../../../plugins.js'; -import { logger } from '../../../../logger.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -/** - * Log modes based on server load - */ -export var LogMode; -(function (LogMode) { - LogMode["VERBOSE"] = "VERBOSE"; - LogMode["REDUCED"] = "REDUCED"; - LogMode["MINIMAL"] = "MINIMAL"; // 40+ connections: Aggregated logging only, critical errors only -})(LogMode || (LogMode = {})); -/** - * Adaptive SMTP Logger that scales logging based on server load - */ -export class AdaptiveSmtpLogger { - static instance; - currentMode = LogMode.VERBOSE; - config; - aggregatedEntries = new Map(); - aggregationTimer = null; - connectionTracker = { - activeConnections: 0, - peakConnections: 0, - totalConnections: 0, - connectionsPerSecond: 0, - lastConnectionTime: Date.now() - }; - constructor(config) { - this.config = { - verboseThreshold: 20, - reducedThreshold: 40, - aggregationInterval: 30000, // 30 seconds - maxAggregatedEntries: 100, - ...config - }; - this.startAggregationTimer(); - } - /** - * Get singleton instance - */ - static getInstance(config) { - if (!AdaptiveSmtpLogger.instance) { - AdaptiveSmtpLogger.instance = new AdaptiveSmtpLogger(config); - } - return AdaptiveSmtpLogger.instance; - } - /** - * Update active connection count and adjust log mode if needed - */ - updateConnectionCount(activeConnections) { - this.connectionTracker.activeConnections = activeConnections; - this.connectionTracker.peakConnections = Math.max(this.connectionTracker.peakConnections, activeConnections); - const newMode = this.determineLogMode(activeConnections); - if (newMode !== this.currentMode) { - this.switchLogMode(newMode); - } - } - /** - * Track new connection for rate calculation - */ - trackConnection() { - this.connectionTracker.totalConnections++; - const now = Date.now(); - const timeDiff = (now - this.connectionTracker.lastConnectionTime) / 1000; - if (timeDiff > 0) { - this.connectionTracker.connectionsPerSecond = 1 / timeDiff; - } - this.connectionTracker.lastConnectionTime = now; - } - /** - * Get current logging mode - */ - getCurrentMode() { - return this.currentMode; - } - /** - * Get connection statistics - */ - getConnectionStats() { - return { ...this.connectionTracker }; - } - /** - * Log a message with adaptive behavior - */ - log(level, message, options = {}) { - // Always log structured data - const errorInfo = options.error ? { - errorMessage: options.error.message, - errorStack: options.error.stack, - errorName: options.error.name - } : {}; - const logData = { - component: 'smtp-server', - logMode: this.currentMode, - activeConnections: this.connectionTracker.activeConnections, - ...options, - ...errorInfo - }; - if (logData.error) { - delete logData.error; - } - logger.log(level, message, logData); - // Adaptive console logging based on mode - switch (this.currentMode) { - case LogMode.VERBOSE: - // Full console logging - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - break; - case LogMode.REDUCED: - // Only errors and warnings to console - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - break; - case LogMode.MINIMAL: - // Only critical errors to console - if (level === 'error' && (message.includes('critical') || message.includes('security') || message.includes('crash'))) { - console[level](`[SMTP] ${message}`, logData); - } - break; - } - } - /** - * Log command with adaptive behavior - */ - logCommand(command, socket, session) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - switch (this.currentMode) { - case LogMode.VERBOSE: - this.log('info', `Command received: ${command}`, { - ...clientInfo, - command: command.split(' ')[0]?.toUpperCase() - }); - console.log(`← ${command}`); - break; - case LogMode.REDUCED: - // Aggregate commands instead of logging each one - this.aggregateEntry('command', 'info', `Command: ${command.split(' ')[0]?.toUpperCase()}`, clientInfo); - // Only show error commands - if (command.toUpperCase().startsWith('QUIT') || command.includes('error')) { - console.log(`← ${command}`); - } - break; - case LogMode.MINIMAL: - // Only aggregate, no console output unless it's an error command - this.aggregateEntry('command', 'info', `Command: ${command.split(' ')[0]?.toUpperCase()}`, clientInfo); - break; - } - } - /** - * Log response with adaptive behavior - */ - logResponse(response, socket) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket - }; - const responseCode = response.substring(0, 3); - const isError = responseCode.startsWith('4') || responseCode.startsWith('5'); - switch (this.currentMode) { - case LogMode.VERBOSE: - if (responseCode.startsWith('2') || responseCode.startsWith('3')) { - this.log('debug', `Response sent: ${response}`, clientInfo); - } - else if (responseCode.startsWith('4')) { - this.log('warn', `Temporary error response: ${response}`, clientInfo); - } - else if (responseCode.startsWith('5')) { - this.log('error', `Permanent error response: ${response}`, clientInfo); - } - console.log(`→ ${response}`); - break; - case LogMode.REDUCED: - // Log errors normally, aggregate success responses - if (isError) { - if (responseCode.startsWith('4')) { - this.log('warn', `Temporary error response: ${response}`, clientInfo); - } - else { - this.log('error', `Permanent error response: ${response}`, clientInfo); - } - console.log(`→ ${response}`); - } - else { - this.aggregateEntry('response', 'debug', `Response: ${responseCode}xx`, clientInfo); - } - break; - case LogMode.MINIMAL: - // Only log critical errors - if (responseCode.startsWith('5')) { - this.log('error', `Permanent error response: ${response}`, clientInfo); - console.log(`→ ${response}`); - } - else { - this.aggregateEntry('response', 'debug', `Response: ${responseCode}xx`, clientInfo); - } - break; - } - } - /** - * Log connection event with adaptive behavior - */ - logConnection(socket, eventType, session, error) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - if (eventType === 'connect') { - this.trackConnection(); - } - switch (this.currentMode) { - case LogMode.VERBOSE: - // Full connection logging - switch (eventType) { - case 'connect': - this.log('info', `New ${clientInfo.secure ? 'secure ' : ''}connection from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'close': - this.log('info', `Connection closed from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'error': - this.log('error', `Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - break; - } - break; - case LogMode.REDUCED: - // Aggregate normal connections, log errors - if (eventType === 'error') { - this.log('error', `Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - } - else { - this.aggregateEntry('connection', 'info', `Connection ${eventType}`, clientInfo); - } - break; - case LogMode.MINIMAL: - // Only aggregate, except for critical errors - if (eventType === 'error' && error && (error.message.includes('security') || error.message.includes('critical'))) { - this.log('error', `Critical connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - } - else { - this.aggregateEntry('connection', 'info', `Connection ${eventType}`, clientInfo); - } - break; - } - } - /** - * Log security event (always logged regardless of mode) - */ - logSecurityEvent(level, type, message, details, ipAddress, domain, success) { - const logLevel = level === SecurityLogLevel.DEBUG ? 'debug' : - level === SecurityLogLevel.INFO ? 'info' : - level === SecurityLogLevel.WARN ? 'warn' : 'error'; - // Security events are always logged in full detail - this.log(logLevel, message, { - component: 'smtp-security', - eventType: type, - success, - ipAddress, - domain, - ...details - }); - } - /** - * Determine appropriate log mode based on connection count - */ - determineLogMode(activeConnections) { - if (activeConnections >= this.config.reducedThreshold) { - return LogMode.MINIMAL; - } - else if (activeConnections >= this.config.verboseThreshold) { - return LogMode.REDUCED; - } - else { - return LogMode.VERBOSE; - } - } - /** - * Switch to a new log mode - */ - switchLogMode(newMode) { - const oldMode = this.currentMode; - this.currentMode = newMode; - // Log the mode switch - console.log(`[SMTP] Adaptive logging switched from ${oldMode} to ${newMode} (${this.connectionTracker.activeConnections} active connections)`); - this.log('info', `Adaptive logging mode changed to ${newMode}`, { - oldMode, - newMode, - activeConnections: this.connectionTracker.activeConnections, - peakConnections: this.connectionTracker.peakConnections, - totalConnections: this.connectionTracker.totalConnections - }); - // If switching to more verbose mode, flush aggregated entries - if ((oldMode === LogMode.MINIMAL && newMode !== LogMode.MINIMAL) || - (oldMode === LogMode.REDUCED && newMode === LogMode.VERBOSE)) { - this.flushAggregatedEntries(); - } - } - /** - * Add entry to aggregation buffer - */ - aggregateEntry(type, level, message, options) { - const key = `${type}:${message}`; - const now = Date.now(); - if (this.aggregatedEntries.has(key)) { - const entry = this.aggregatedEntries.get(key); - entry.count++; - entry.lastSeen = now; - } - else { - this.aggregatedEntries.set(key, { - type, - count: 1, - firstSeen: now, - lastSeen: now, - sample: { message, level, options } - }); - } - // Force flush if we have too many entries - if (this.aggregatedEntries.size >= this.config.maxAggregatedEntries) { - this.flushAggregatedEntries(); - } - } - /** - * Start the aggregation timer - */ - startAggregationTimer() { - if (this.aggregationTimer) { - clearInterval(this.aggregationTimer); - } - this.aggregationTimer = setInterval(() => { - this.flushAggregatedEntries(); - }, this.config.aggregationInterval); - // Unref the timer so it doesn't keep the process alive - if (this.aggregationTimer && typeof this.aggregationTimer.unref === 'function') { - this.aggregationTimer.unref(); - } - } - /** - * Flush aggregated entries to logs - */ - flushAggregatedEntries() { - if (this.aggregatedEntries.size === 0) { - return; - } - const summary = {}; - let totalAggregated = 0; - for (const [key, entry] of this.aggregatedEntries.entries()) { - summary[entry.type] = (summary[entry.type] || 0) + entry.count; - totalAggregated += entry.count; - // Log a sample of high-frequency entries - if (entry.count >= 10) { - this.log(entry.sample.level, `${entry.sample.message} (aggregated: ${entry.count} occurrences)`, { - ...entry.sample.options, - aggregated: true, - occurrences: entry.count, - timeSpan: entry.lastSeen - entry.firstSeen - }); - } - } - // Log aggregation summary - console.log(`[SMTP] Aggregated ${totalAggregated} log entries: ${JSON.stringify(summary)}`); - this.log('info', 'Aggregated log summary', { - totalEntries: totalAggregated, - breakdown: summary, - logMode: this.currentMode, - activeConnections: this.connectionTracker.activeConnections - }); - // Clear aggregated entries - this.aggregatedEntries.clear(); - } - /** - * Cleanup resources - */ - destroy() { - if (this.aggregationTimer) { - clearInterval(this.aggregationTimer); - this.aggregationTimer = null; - } - this.flushAggregatedEntries(); - } -} -/** - * Default instance for easy access - */ -export const adaptiveLogger = AdaptiveSmtpLogger.getInstance(); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"adaptive-logging.js","sourceRoot":"","sources":["../../../../../ts/mail/delivery/smtpserver/utils/adaptive-logging.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/utils/helpers.d.ts b/dist_ts/mail/delivery/smtpserver/utils/helpers.d.ts deleted file mode 100644 index ec21f65..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/helpers.d.ts +++ /dev/null @@ -1,78 +0,0 @@ -/** - * SMTP Helper Functions - * Provides utility functions for SMTP server implementation - */ -import * as plugins from '../../../../plugins.js'; -import type { ISmtpServerOptions } from '../interfaces.js'; -/** - * Formats a multi-line SMTP response according to RFC 5321 - * @param code - Response code - * @param lines - Response lines - * @returns Formatted SMTP response - */ -export declare function formatMultilineResponse(code: number, lines: string[]): string; -/** - * Generates a unique session ID - * @returns Unique session ID - */ -export declare function generateSessionId(): string; -/** - * Safely parses an integer from string with a default value - * @param value - String value to parse - * @param defaultValue - Default value if parsing fails - * @returns Parsed integer or default value - */ -export declare function safeParseInt(value: string | undefined, defaultValue: number): number; -/** - * Safely gets the socket details - * @param socket - Socket to get details from - * @returns Socket details object - */ -export declare function getSocketDetails(socket: plugins.net.Socket | plugins.tls.TLSSocket): { - remoteAddress: string; - remotePort: number; - remoteFamily: string; - localAddress: string; - localPort: number; - encrypted: boolean; -}; -/** - * Gets TLS details if socket is TLS - * @param socket - Socket to get TLS details from - * @returns TLS details or undefined if not TLS - */ -export declare function getTlsDetails(socket: plugins.net.Socket | plugins.tls.TLSSocket): { - protocol?: string; - cipher?: string; - authorized?: boolean; -} | undefined; -/** - * Merges default options with provided options - * @param options - User provided options - * @returns Merged options with defaults - */ -export declare function mergeWithDefaults(options: Partial): ISmtpServerOptions; -/** - * Creates a text response formatter for the SMTP server - * @param socket - Socket to send responses to - * @returns Function to send formatted response - */ -export declare function createResponseFormatter(socket: plugins.net.Socket | plugins.tls.TLSSocket): (response: string) => void; -/** - * Extracts SMTP command name from a command line - * @param commandLine - Full command line - * @returns Command name in uppercase - */ -export declare function extractCommandName(commandLine: string): string; -/** - * Extracts SMTP command arguments from a command line - * @param commandLine - Full command line - * @returns Arguments string - */ -export declare function extractCommandArgs(commandLine: string): string; -/** - * Sanitizes data for logging (hides sensitive info) - * @param data - Data to sanitize - * @returns Sanitized data - */ -export declare function sanitizeForLogging(data: any): any; diff --git a/dist_ts/mail/delivery/smtpserver/utils/helpers.js b/dist_ts/mail/delivery/smtpserver/utils/helpers.js deleted file mode 100644 index 973fe28..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/helpers.js +++ /dev/null @@ -1,208 +0,0 @@ -/** - * SMTP Helper Functions - * Provides utility functions for SMTP server implementation - */ -import * as plugins from '../../../../plugins.js'; -import { SMTP_DEFAULTS } from '../constants.js'; -/** - * Formats a multi-line SMTP response according to RFC 5321 - * @param code - Response code - * @param lines - Response lines - * @returns Formatted SMTP response - */ -export function formatMultilineResponse(code, lines) { - if (!lines || lines.length === 0) { - return `${code} `; - } - if (lines.length === 1) { - return `${code} ${lines[0]}`; - } - let response = ''; - for (let i = 0; i < lines.length - 1; i++) { - response += `${code}-${lines[i]}${SMTP_DEFAULTS.CRLF}`; - } - response += `${code} ${lines[lines.length - 1]}`; - return response; -} -/** - * Generates a unique session ID - * @returns Unique session ID - */ -export function generateSessionId() { - return `${Date.now()}-${Math.floor(Math.random() * 10000)}`; -} -/** - * Safely parses an integer from string with a default value - * @param value - String value to parse - * @param defaultValue - Default value if parsing fails - * @returns Parsed integer or default value - */ -export function safeParseInt(value, defaultValue) { - if (!value) { - return defaultValue; - } - const parsed = parseInt(value, 10); - return isNaN(parsed) ? defaultValue : parsed; -} -/** - * Safely gets the socket details - * @param socket - Socket to get details from - * @returns Socket details object - */ -export function getSocketDetails(socket) { - return { - remoteAddress: socket.remoteAddress || 'unknown', - remotePort: socket.remotePort || 0, - remoteFamily: socket.remoteFamily || 'unknown', - localAddress: socket.localAddress || 'unknown', - localPort: socket.localPort || 0, - encrypted: socket instanceof plugins.tls.TLSSocket - }; -} -/** - * Gets TLS details if socket is TLS - * @param socket - Socket to get TLS details from - * @returns TLS details or undefined if not TLS - */ -export function getTlsDetails(socket) { - if (!(socket instanceof plugins.tls.TLSSocket)) { - return undefined; - } - return { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name, - authorized: socket.authorized - }; -} -/** - * Merges default options with provided options - * @param options - User provided options - * @returns Merged options with defaults - */ -export function mergeWithDefaults(options) { - return { - port: options.port || SMTP_DEFAULTS.SMTP_PORT, - key: options.key || '', - cert: options.cert || '', - hostname: options.hostname || SMTP_DEFAULTS.HOSTNAME, - host: options.host, - securePort: options.securePort, - ca: options.ca, - maxSize: options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE, - maxConnections: options.maxConnections || SMTP_DEFAULTS.MAX_CONNECTIONS, - socketTimeout: options.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - connectionTimeout: options.connectionTimeout || SMTP_DEFAULTS.CONNECTION_TIMEOUT, - cleanupInterval: options.cleanupInterval || SMTP_DEFAULTS.CLEANUP_INTERVAL, - maxRecipients: options.maxRecipients || SMTP_DEFAULTS.MAX_RECIPIENTS, - size: options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE, - dataTimeout: options.dataTimeout || SMTP_DEFAULTS.DATA_TIMEOUT, - auth: options.auth, - }; -} -/** - * Creates a text response formatter for the SMTP server - * @param socket - Socket to send responses to - * @returns Function to send formatted response - */ -export function createResponseFormatter(socket) { - return (response) => { - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - console.log(`→ ${response}`); - } - catch (error) { - console.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`); - socket.destroy(); - } - }; -} -/** - * Extracts SMTP command name from a command line - * @param commandLine - Full command line - * @returns Command name in uppercase - */ -export function extractCommandName(commandLine) { - if (!commandLine || typeof commandLine !== 'string') { - return ''; - } - // Handle specific command patterns first - const ehloMatch = commandLine.match(/^(EHLO|HELO)\b/i); - if (ehloMatch) { - return ehloMatch[1].toUpperCase(); - } - const mailMatch = commandLine.match(/^MAIL\b/i); - if (mailMatch) { - return 'MAIL'; - } - const rcptMatch = commandLine.match(/^RCPT\b/i); - if (rcptMatch) { - return 'RCPT'; - } - // Default handling - const parts = commandLine.trim().split(/\s+/); - return (parts[0] || '').toUpperCase(); -} -/** - * Extracts SMTP command arguments from a command line - * @param commandLine - Full command line - * @returns Arguments string - */ -export function extractCommandArgs(commandLine) { - if (!commandLine || typeof commandLine !== 'string') { - return ''; - } - const command = extractCommandName(commandLine); - if (!command) { - return commandLine.trim(); - } - // Special handling for specific commands - if (command === 'EHLO' || command === 'HELO') { - const match = commandLine.match(/^(?:EHLO|HELO)\s+(.+)$/i); - return match ? match[1].trim() : ''; - } - if (command === 'MAIL') { - return commandLine.replace(/^MAIL\s+/i, ''); - } - if (command === 'RCPT') { - return commandLine.replace(/^RCPT\s+/i, ''); - } - // Default extraction - const firstSpace = commandLine.indexOf(' '); - if (firstSpace === -1) { - return ''; - } - return commandLine.substring(firstSpace + 1).trim(); -} -/** - * Sanitizes data for logging (hides sensitive info) - * @param data - Data to sanitize - * @returns Sanitized data - */ -export function sanitizeForLogging(data) { - if (!data) { - return data; - } - if (typeof data !== 'object') { - return data; - } - const result = Array.isArray(data) ? [] : {}; - for (const key in data) { - if (Object.prototype.hasOwnProperty.call(data, key)) { - // Sanitize sensitive fields - if (key.toLowerCase().includes('password') || - key.toLowerCase().includes('token') || - key.toLowerCase().includes('secret') || - key.toLowerCase().includes('credential')) { - result[key] = '********'; - } - else if (typeof data[key] === 'object' && data[key] !== null) { - result[key] = sanitizeForLogging(data[key]); - } - else { - result[key] = data[key]; - } - } - } - return result; -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cHNlcnZlci91dGlscy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sS0FBSyxPQUFPLE1BQU0sd0JBQXdCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBR2hEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFDLElBQVksRUFBRSxLQUFlO0lBQ25FLElBQUksQ0FBQyxLQUFLLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNqQyxPQUFPLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDcEIsQ0FBQztJQUVELElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUN2QixPQUFPLEdBQUcsSUFBSSxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJLFFBQVEsR0FBRyxFQUFFLENBQUM7SUFDbEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDMUMsUUFBUSxJQUFJLEdBQUcsSUFBSSxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsR0FBRyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekQsQ0FBQztJQUNELFFBQVEsSUFBSSxHQUFHLElBQUksSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRWpELE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsaUJBQWlCO0lBQy9CLE9BQU8sR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQztBQUM5RCxDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFDLEtBQXlCLEVBQUUsWUFBb0I7SUFDMUUsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1gsT0FBTyxZQUFZLENBQUM7SUFDdEIsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkMsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQy9DLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE1BQWtEO0lBUWpGLE9BQU87UUFDTCxhQUFhLEVBQUUsTUFBTSxDQUFDLGFBQWEsSUFBSSxTQUFTO1FBQ2hELFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVSxJQUFJLENBQUM7UUFDbEMsWUFBWSxFQUFFLE1BQU0sQ0FBQyxZQUFZLElBQUksU0FBUztRQUM5QyxZQUFZLEVBQUUsTUFBTSxDQUFDLFlBQVksSUFBSSxTQUFTO1FBQzlDLFNBQVMsRUFBRSxNQUFNLENBQUMsU0FBUyxJQUFJLENBQUM7UUFDaEMsU0FBUyxFQUFFLE1BQU0sWUFBWSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVM7S0FDbkQsQ0FBQztBQUNKLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBQyxNQUFrRDtJQUs5RSxJQUFJLENBQUMsQ0FBQyxNQUFNLFlBQVksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBQy9DLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxPQUFPO1FBQ0wsUUFBUSxFQUFFLE1BQU0sQ0FBQyxXQUFXLEVBQUU7UUFDOUIsTUFBTSxFQUFFLE1BQU0sQ0FBQyxTQUFTLEVBQUUsRUFBRSxJQUFJO1FBQ2hDLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVTtLQUM5QixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsT0FBb0M7SUFDcEUsT0FBTztRQUNMLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLGFBQWEsQ0FBQyxTQUFTO1FBQzdDLEdBQUcsRUFBRSxPQUFPLENBQUMsR0FBRyxJQUFJLEVBQUU7UUFDdEIsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRTtRQUN4QixRQUFRLEVBQUUsT0FBTyxDQUFDLFFBQVEsSUFBSSxhQUFhLENBQUMsUUFBUTtRQUNwRCxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDbEIsVUFBVSxFQUFFLE9BQU8sQ0FBQyxVQUFVO1FBQzlCLEVBQUUsRUFBRSxPQUFPLENBQUMsRUFBRTtRQUNkLE9BQU8sRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLGFBQWEsQ0FBQyxnQkFBZ0I7UUFDdkQsY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjLElBQUksYUFBYSxDQUFDLGVBQWU7UUFDdkUsYUFBYSxFQUFFLE9BQU8sQ0FBQyxhQUFhLElBQUksYUFBYSxDQUFDLGNBQWM7UUFDcEUsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLGlCQUFpQixJQUFJLGFBQWEsQ0FBQyxrQkFBa0I7UUFDaEYsZUFBZSxFQUFFLE9BQU8sQ0FBQyxlQUFlLElBQUksYUFBYSxDQUFDLGdCQUFnQjtRQUMxRSxhQUFhLEVBQUUsT0FBTyxDQUFDLGFBQWEsSUFBSSxhQUFhLENBQUMsY0FBYztRQUNwRSxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksSUFBSSxhQUFhLENBQUMsZ0JBQWdCO1FBQ3BELFdBQVcsRUFBRSxPQUFPLENBQUMsV0FBVyxJQUFJLGFBQWEsQ0FBQyxZQUFZO1FBQzlELElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtLQUNuQixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsTUFBa0Q7SUFDeEYsT0FBTyxDQUFDLFFBQWdCLEVBQVEsRUFBRTtRQUNoQyxJQUFJLENBQUM7WUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsUUFBUSxHQUFHLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLENBQUM7UUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1lBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQywyQkFBMkIsS0FBSyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNuRyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQztJQUNILENBQUMsQ0FBQztBQUNKLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGtCQUFrQixDQUFDLFdBQW1CO0lBQ3BELElBQUksQ0FBQyxXQUFXLElBQUksT0FBTyxXQUFXLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDcEQsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0lBRUQseUNBQXlDO0lBQ3pDLE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUN2RCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDcEMsQ0FBQztJQUVELE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDaEQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxNQUFNLFNBQVMsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ2hELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsbUJBQW1CO0lBQ25CLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDOUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztBQUN4QyxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxXQUFtQjtJQUNwRCxJQUFJLENBQUMsV0FBVyxJQUFJLE9BQU8sV0FBVyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ3BELE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ2hELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNiLE9BQU8sV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzVCLENBQUM7SUFFRCx5Q0FBeUM7SUFDekMsSUFBSSxPQUFPLEtBQUssTUFBTSxJQUFJLE9BQU8sS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUM3QyxNQUFNLEtBQUssR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLHlCQUF5QixDQUFDLENBQUM7UUFDM0QsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ3RDLENBQUM7SUFFRCxJQUFJLE9BQU8sS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUN2QixPQUFPLFdBQVcsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxJQUFJLE9BQU8sS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUN2QixPQUFPLFdBQVcsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxxQkFBcUI7SUFDckIsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1QyxJQUFJLFVBQVUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3RCLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELE9BQU8sV0FBVyxDQUFDLFNBQVMsQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFDdEQsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsSUFBUztJQUMxQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDVixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJLE9BQU8sSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzdCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFRLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRWxELEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7UUFDdkIsSUFBSSxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDcEQsNEJBQTRCO1lBQzVCLElBQUksR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUM7Z0JBQ3RDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDO2dCQUNuQyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztnQkFDcEMsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO2dCQUM3QyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDO1lBQzNCLENBQUM7aUJBQU0sSUFBSSxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO2dCQUMvRCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDOUMsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDMUIsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/utils/logging.d.ts b/dist_ts/mail/delivery/smtpserver/utils/logging.d.ts deleted file mode 100644 index 5f06cfb..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/logging.d.ts +++ /dev/null @@ -1,106 +0,0 @@ -/** - * SMTP Logging Utilities - * Provides structured logging for SMTP server components - */ -import * as plugins from '../../../../plugins.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -import type { ISmtpSession } from '../interfaces.js'; -/** - * SMTP connection metadata to include in logs - */ -export interface IConnectionMetadata { - remoteAddress?: string; - remotePort?: number; - socketId?: string; - secure?: boolean; - sessionId?: string; -} -/** - * Log levels for SMTP server - */ -export type LogLevel = 'debug' | 'info' | 'warn' | 'error'; -/** - * Options for SMTP log - */ -export interface ISmtpLogOptions { - level?: LogLevel; - sessionId?: string; - sessionState?: string; - remoteAddress?: string; - remotePort?: number; - command?: string; - error?: Error; - [key: string]: any; -} -/** - * SMTP logger - provides structured logging for SMTP server - */ -export declare class SmtpLogger { - /** - * Log a message with context - * @param level - Log level - * @param message - Log message - * @param options - Additional log options - */ - static log(level: LogLevel, message: string, options?: ISmtpLogOptions): void; - /** - * Log debug level message - * @param message - Log message - * @param options - Additional log options - */ - static debug(message: string, options?: ISmtpLogOptions): void; - /** - * Log info level message - * @param message - Log message - * @param options - Additional log options - */ - static info(message: string, options?: ISmtpLogOptions): void; - /** - * Log warning level message - * @param message - Log message - * @param options - Additional log options - */ - static warn(message: string, options?: ISmtpLogOptions): void; - /** - * Log error level message - * @param message - Log message - * @param options - Additional log options - */ - static error(message: string, options?: ISmtpLogOptions): void; - /** - * Log command received from client - * @param command - The command string - * @param socket - The client socket - * @param session - The SMTP session - */ - static logCommand(command: string, socket: plugins.net.Socket | plugins.tls.TLSSocket, session?: ISmtpSession): void; - /** - * Log response sent to client - * @param response - The response string - * @param socket - The client socket - */ - static logResponse(response: string, socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - /** - * Log client connection event - * @param socket - The client socket - * @param eventType - Type of connection event (connect, close, error) - * @param session - The SMTP session - * @param error - Optional error object for error events - */ - static logConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, eventType: 'connect' | 'close' | 'error', session?: ISmtpSession, error?: Error): void; - /** - * Log security event - * @param level - Security log level - * @param type - Security event type - * @param message - Log message - * @param details - Event details - * @param ipAddress - Client IP address - * @param domain - Optional domain involved - * @param success - Whether the security check was successful - */ - static logSecurityEvent(level: SecurityLogLevel, type: SecurityEventType, message: string, details: Record, ipAddress?: string, domain?: string, success?: boolean): void; -} -/** - * Default instance for backward compatibility - */ -export declare const smtpLogger: typeof SmtpLogger; diff --git a/dist_ts/mail/delivery/smtpserver/utils/logging.js b/dist_ts/mail/delivery/smtpserver/utils/logging.js deleted file mode 100644 index b12d97b..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/logging.js +++ /dev/null @@ -1,181 +0,0 @@ -/** - * SMTP Logging Utilities - * Provides structured logging for SMTP server components - */ -import * as plugins from '../../../../plugins.js'; -import { logger } from '../../../../logger.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -/** - * SMTP logger - provides structured logging for SMTP server - */ -export class SmtpLogger { - /** - * Log a message with context - * @param level - Log level - * @param message - Log message - * @param options - Additional log options - */ - static log(level, message, options = {}) { - // Extract error information if provided - const errorInfo = options.error ? { - errorMessage: options.error.message, - errorStack: options.error.stack, - errorName: options.error.name - } : {}; - // Structure log data - const logData = { - component: 'smtp-server', - ...options, - ...errorInfo - }; - // Remove error from log data to avoid duplication - if (logData.error) { - delete logData.error; - } - // Log through the main logger - logger.log(level, message, logData); - // Also console log for immediate visibility during development - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - } - /** - * Log debug level message - * @param message - Log message - * @param options - Additional log options - */ - static debug(message, options = {}) { - this.log('debug', message, options); - } - /** - * Log info level message - * @param message - Log message - * @param options - Additional log options - */ - static info(message, options = {}) { - this.log('info', message, options); - } - /** - * Log warning level message - * @param message - Log message - * @param options - Additional log options - */ - static warn(message, options = {}) { - this.log('warn', message, options); - } - /** - * Log error level message - * @param message - Log message - * @param options - Additional log options - */ - static error(message, options = {}) { - this.log('error', message, options); - } - /** - * Log command received from client - * @param command - The command string - * @param socket - The client socket - * @param session - The SMTP session - */ - static logCommand(command, socket, session) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - this.info(`Command received: ${command}`, { - ...clientInfo, - command: command.split(' ')[0]?.toUpperCase() - }); - // Also log to console for easy debugging - console.log(`← ${command}`); - } - /** - * Log response sent to client - * @param response - The response string - * @param socket - The client socket - */ - static logResponse(response, socket) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket - }; - // Get the response code from the beginning of the response - const responseCode = response.substring(0, 3); - // Log different levels based on response code - if (responseCode.startsWith('2') || responseCode.startsWith('3')) { - this.debug(`Response sent: ${response}`, clientInfo); - } - else if (responseCode.startsWith('4')) { - this.warn(`Temporary error response: ${response}`, clientInfo); - } - else if (responseCode.startsWith('5')) { - this.error(`Permanent error response: ${response}`, clientInfo); - } - // Also log to console for easy debugging - console.log(`→ ${response}`); - } - /** - * Log client connection event - * @param socket - The client socket - * @param eventType - Type of connection event (connect, close, error) - * @param session - The SMTP session - * @param error - Optional error object for error events - */ - static logConnection(socket, eventType, session, error) { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - switch (eventType) { - case 'connect': - this.info(`New ${clientInfo.secure ? 'secure ' : ''}connection from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'close': - this.info(`Connection closed from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'error': - this.error(`Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - break; - } - } - /** - * Log security event - * @param level - Security log level - * @param type - Security event type - * @param message - Log message - * @param details - Event details - * @param ipAddress - Client IP address - * @param domain - Optional domain involved - * @param success - Whether the security check was successful - */ - static logSecurityEvent(level, type, message, details, ipAddress, domain, success) { - // Map security log level to system log level - const logLevel = level === SecurityLogLevel.DEBUG ? 'debug' : - level === SecurityLogLevel.INFO ? 'info' : - level === SecurityLogLevel.WARN ? 'warn' : 'error'; - // Log the security event - this.log(logLevel, message, { - component: 'smtp-security', - eventType: type, - success, - ipAddress, - domain, - ...details - }); - } -} -/** - * Default instance for backward compatibility - */ -export const smtpLogger = SmtpLogger; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2luZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cHNlcnZlci91dGlscy9sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sS0FBSyxPQUFPLE1BQU0sd0JBQXdCLENBQUM7QUFDbEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQy9DLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBaUN0RTs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBQ3JCOzs7OztPQUtHO0lBQ0ksTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFlLEVBQUUsT0FBZSxFQUFFLFVBQTJCLEVBQUU7UUFDL0Usd0NBQXdDO1FBQ3hDLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQ2hDLFlBQVksRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU87WUFDbkMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSztZQUMvQixTQUFTLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJO1NBQzlCLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUVQLHFCQUFxQjtRQUNyQixNQUFNLE9BQU8sR0FBRztZQUNkLFNBQVMsRUFBRSxhQUFhO1lBQ3hCLEdBQUcsT0FBTztZQUNWLEdBQUcsU0FBUztTQUNiLENBQUM7UUFFRixrREFBa0Q7UUFDbEQsSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDbEIsT0FBTyxPQUFPLENBQUMsS0FBSyxDQUFDO1FBQ3ZCLENBQUM7UUFFRCw4QkFBOEI7UUFDOUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBRXBDLCtEQUErRDtRQUMvRCxJQUFJLEtB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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpserver/utils/validation.d.ts b/dist_ts/mail/delivery/smtpserver/utils/validation.d.ts deleted file mode 100644 index 9f74002..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/validation.d.ts +++ /dev/null @@ -1,69 +0,0 @@ -/** - * SMTP Validation Utilities - * Provides validation functions for SMTP server - */ -import { SmtpState } from '../interfaces.js'; -/** - * Detects header injection attempts in input strings - * @param input - The input string to check - * @param context - The context where this input is being used ('smtp-command' or 'email-header') - * @returns true if header injection is detected, false otherwise - */ -export declare function detectHeaderInjection(input: string, context?: 'smtp-command' | 'email-header'): boolean; -/** - * Sanitizes input by removing or escaping potentially dangerous characters - * @param input - The input string to sanitize - * @returns Sanitized string - */ -export declare function sanitizeInput(input: string): string; -/** - * Validates an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ -export declare function isValidEmail(email: string): boolean; -/** - * Validates the MAIL FROM command syntax - * @param args - Arguments string from the MAIL FROM command - * @returns Object with validation result and extracted data - */ -export declare function validateMailFrom(args: string): { - isValid: boolean; - address?: string; - params?: Record; - errorMessage?: string; -}; -/** - * Validates the RCPT TO command syntax - * @param args - Arguments string from the RCPT TO command - * @returns Object with validation result and extracted data - */ -export declare function validateRcptTo(args: string): { - isValid: boolean; - address?: string; - params?: Record; - errorMessage?: string; -}; -/** - * Validates the EHLO command syntax - * @param args - Arguments string from the EHLO command - * @returns Object with validation result and extracted data - */ -export declare function validateEhlo(args: string): { - isValid: boolean; - hostname?: string; - errorMessage?: string; -}; -/** - * Validates command in the current SMTP state - * @param command - SMTP command - * @param currentState - Current SMTP state - * @returns Whether the command is valid in the current state - */ -export declare function isValidCommandSequence(command: string, currentState: SmtpState): boolean; -/** - * Validates if a hostname is valid according to RFC 5321 - * @param hostname - Hostname to validate - * @returns Whether the hostname is valid - */ -export declare function isValidHostname(hostname: string): boolean; diff --git a/dist_ts/mail/delivery/smtpserver/utils/validation.js b/dist_ts/mail/delivery/smtpserver/utils/validation.js deleted file mode 100644 index e9ab70e..0000000 --- a/dist_ts/mail/delivery/smtpserver/utils/validation.js +++ /dev/null @@ -1,360 +0,0 @@ -/** - * SMTP Validation Utilities - * Provides validation functions for SMTP server - */ -import { SmtpState } from '../interfaces.js'; -import { SMTP_PATTERNS } from '../constants.js'; -/** - * Header injection patterns to detect malicious input - * These patterns detect common header injection attempts - */ -const HEADER_INJECTION_PATTERNS = [ - /\r\n/, // CRLF sequence - /\n/, // LF alone - /\r/, // CR alone - /\x00/, // Null byte - /\x0A/, // Line feed hex - /\x0D/, // Carriage return hex - /%0A/i, // URL encoded LF - /%0D/i, // URL encoded CR - /%0a/i, // URL encoded LF lowercase - /%0d/i, // URL encoded CR lowercase - /\\\n/, // Escaped newline - /\\\r/, // Escaped carriage return - /(?:subject|from|to|cc|bcc|reply-to|return-path|received|delivered-to|x-.*?):/i // Email headers -]; -/** - * Detects header injection attempts in input strings - * @param input - The input string to check - * @param context - The context where this input is being used ('smtp-command' or 'email-header') - * @returns true if header injection is detected, false otherwise - */ -export function detectHeaderInjection(input, context = 'smtp-command') { - if (!input || typeof input !== 'string') { - return false; - } - // Check for control characters and CRLF sequences (always dangerous) - const controlCharPatterns = [ - /\r\n/, // CRLF sequence - /\n/, // LF alone - /\r/, // CR alone - /\x00/, // Null byte - /\x0A/, // Line feed hex - /\x0D/, // Carriage return hex - /%0A/i, // URL encoded LF - /%0D/i, // URL encoded CR - /%0a/i, // URL encoded LF lowercase - /%0d/i, // URL encoded CR lowercase - /\\\n/, // Escaped newline - /\\\r/, // Escaped carriage return - ]; - // Check control characters (always dangerous in any context) - if (controlCharPatterns.some(pattern => pattern.test(input))) { - return true; - } - // For email headers, also check for header injection patterns - if (context === 'email-header') { - const headerPatterns = [ - /(?:subject|from|to|cc|bcc|reply-to|return-path|received|delivered-to|x-.*?):/i // Email headers - ]; - return headerPatterns.some(pattern => pattern.test(input)); - } - // For SMTP commands, don't flag normal command syntax like "TO:" as header injection - return false; -} -/** - * Sanitizes input by removing or escaping potentially dangerous characters - * @param input - The input string to sanitize - * @returns Sanitized string - */ -export function sanitizeInput(input) { - if (!input || typeof input !== 'string') { - return ''; - } - // Remove control characters and potential injection sequences - return input - .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '') // Remove control chars except \t, \n, \r - .replace(/\r\n/g, ' ') // Replace CRLF with space - .replace(/[\r\n]/g, ' ') // Replace individual CR/LF with space - .replace(/%0[aAdD]/gi, '') // Remove URL encoded CRLF - .trim(); -} -import { SmtpLogger } from './logging.js'; -/** - * Validates an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ -export function isValidEmail(email) { - if (!email || typeof email !== 'string') { - return false; - } - // Basic pattern check - if (!SMTP_PATTERNS.EMAIL.test(email)) { - return false; - } - // Additional validation for common invalid patterns - const [localPart, domain] = email.split('@'); - // Check for double dots - if (email.includes('..')) { - return false; - } - // Check domain doesn't start or end with dot - if (domain && (domain.startsWith('.') || domain.endsWith('.'))) { - return false; - } - // Check local part length (max 64 chars per RFC) - if (localPart && localPart.length > 64) { - return false; - } - // Check domain length (max 253 chars per RFC - accounting for trailing dot) - if (domain && domain.length > 253) { - return false; - } - return true; -} -/** - * Validates the MAIL FROM command syntax - * @param args - Arguments string from the MAIL FROM command - * @returns Object with validation result and extracted data - */ -export function validateMailFrom(args) { - if (!args) { - return { isValid: false, errorMessage: 'Missing arguments' }; - } - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in MAIL FROM command', { args }); - return { isValid: false, errorMessage: 'Invalid syntax - illegal characters detected' }; - } - // Handle "MAIL FROM:" already in the args - let cleanArgs = args; - if (args.toUpperCase().startsWith('MAIL FROM')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } - else if (args.toUpperCase().startsWith('FROM:')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } - // Handle empty sender case '<>' - if (cleanArgs === '<>') { - return { isValid: true, address: '', params: {} }; - } - // According to test expectations, validate that the address is enclosed in angle brackets - // Check for angle brackets and RFC-compliance - if (cleanArgs.includes('<') && cleanArgs.includes('>')) { - const startBracket = cleanArgs.indexOf('<'); - const endBracket = cleanArgs.indexOf('>', startBracket); - if (startBracket !== -1 && endBracket !== -1 && startBracket < endBracket) { - const emailPart = cleanArgs.substring(startBracket + 1, endBracket).trim(); - const paramsString = cleanArgs.substring(endBracket + 1).trim(); - // Handle empty sender case '<>' again - if (emailPart === '') { - return { isValid: true, address: '', params: {} }; - } - // During testing, we should validate the email format - // Check for basic email format (something@somewhere) - if (!isValidEmail(emailPart)) { - return { isValid: false, errorMessage: 'Invalid email address format' }; - } - // Parse parameters if they exist - const params = {}; - if (paramsString) { - const paramRegex = /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g; - let match; - while ((match = paramRegex.exec(paramsString)) !== null) { - const name = match[1].toUpperCase(); - const value = match[2] || ''; - params[name] = value; - } - } - return { isValid: true, address: emailPart, params }; - } - } - // If no angle brackets, the format is invalid for MAIL FROM - // Tests expect us to reject formats without angle brackets - // For better compliance with tests, check if the argument might contain an email without brackets - if (isValidEmail(cleanArgs)) { - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; - } - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; -} -/** - * Validates the RCPT TO command syntax - * @param args - Arguments string from the RCPT TO command - * @returns Object with validation result and extracted data - */ -export function validateRcptTo(args) { - if (!args) { - return { isValid: false, errorMessage: 'Missing arguments' }; - } - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in RCPT TO command', { args }); - return { isValid: false, errorMessage: 'Invalid syntax - illegal characters detected' }; - } - // Handle "RCPT TO:" already in the args - let cleanArgs = args; - if (args.toUpperCase().startsWith('RCPT TO')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } - else if (args.toUpperCase().startsWith('TO:')) { - cleanArgs = args.substring(3).trim(); - } - // According to test expectations, validate that the address is enclosed in angle brackets - // Check for angle brackets and RFC-compliance - if (cleanArgs.includes('<') && cleanArgs.includes('>')) { - const startBracket = cleanArgs.indexOf('<'); - const endBracket = cleanArgs.indexOf('>', startBracket); - if (startBracket !== -1 && endBracket !== -1 && startBracket < endBracket) { - const emailPart = cleanArgs.substring(startBracket + 1, endBracket).trim(); - const paramsString = cleanArgs.substring(endBracket + 1).trim(); - // During testing, we should validate the email format - // Check for basic email format (something@somewhere) - if (!isValidEmail(emailPart)) { - return { isValid: false, errorMessage: 'Invalid email address format' }; - } - // Parse parameters if they exist - const params = {}; - if (paramsString) { - const paramRegex = /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g; - let match; - while ((match = paramRegex.exec(paramsString)) !== null) { - const name = match[1].toUpperCase(); - const value = match[2] || ''; - params[name] = value; - } - } - return { isValid: true, address: emailPart, params }; - } - } - // If no angle brackets, the format is invalid for RCPT TO - // Tests expect us to reject formats without angle brackets - // For better compliance with tests, check if the argument might contain an email without brackets - if (isValidEmail(cleanArgs)) { - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; - } - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; -} -/** - * Validates the EHLO command syntax - * @param args - Arguments string from the EHLO command - * @returns Object with validation result and extracted data - */ -export function validateEhlo(args) { - if (!args) { - return { isValid: false, errorMessage: 'Missing domain name' }; - } - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in EHLO command', { args }); - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - // Extract hostname from EHLO command if present in args - let hostname = args; - const match = args.match(/^(?:EHLO|HELO)\s+([^\s]+)$/i); - if (match) { - hostname = match[1]; - } - // Check for empty hostname - if (!hostname || hostname.trim() === '') { - return { isValid: false, errorMessage: 'Missing domain name' }; - } - // Basic validation - Be very permissive with domain names to handle various client implementations - // RFC 5321 allows a broad range of clients to connect, so validation should be lenient - // Only check for characters that would definitely cause issues - const invalidChars = ['<', '>', '"', '\'', '\\', '\n', '\r']; - if (invalidChars.some(char => hostname.includes(char))) { - // During automated testing, we check for invalid character validation - // For production we could consider accepting these with proper cleanup - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - // Support IP addresses in square brackets (e.g., [127.0.0.1] or [IPv6:2001:db8::1]) - if (hostname.startsWith('[') && hostname.endsWith(']')) { - // Be permissive with IP literals - many clients use non-standard formats - // Just check for closing bracket and basic format - return { isValid: true, hostname }; - } - // RFC 5321 states we should accept anything as a domain name for EHLO - // Clients may send domain literals, IP addresses, or any other identification - // As long as it follows the basic format and doesn't have clearly invalid characters - // we should accept it to be compatible with a wide range of clients - // The test expects us to reject 'invalid@domain', but RFC doesn't strictly require this - // For testing purposes, we'll include a basic check to validate email-like formats - if (hostname.includes('@')) { - // Reject email-like formats for EHLO/HELO command - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - // Special handling for test with special characters - // The test "EHLO spec!al@#$chars" is expected to pass with either response: - // 1. Accept it (since RFC doesn't prohibit special chars in domain names) - // 2. Reject it with a 501 error (for implementations with stricter validation) - if (/[!@#$%^&*()+=\[\]{}|;:',<>?~`]/.test(hostname)) { - // For test compatibility, let's be permissive and accept special characters - // RFC 5321 doesn't explicitly prohibit these characters, and some implementations accept them - SmtpLogger.debug(`Allowing hostname with special characters for test: ${hostname}`); - return { isValid: true, hostname }; - } - // Hostname validation can be very tricky - many clients don't follow RFCs exactly - // Better to be permissive than to reject valid clients - return { isValid: true, hostname }; -} -/** - * Validates command in the current SMTP state - * @param command - SMTP command - * @param currentState - Current SMTP state - * @returns Whether the command is valid in the current state - */ -export function isValidCommandSequence(command, currentState) { - const upperCommand = command.toUpperCase(); - // Some commands are valid in any state - if (upperCommand === 'QUIT' || upperCommand === 'RSET' || upperCommand === 'NOOP' || upperCommand === 'HELP') { - return true; - } - // State-specific validation - switch (currentState) { - case SmtpState.GREETING: - return upperCommand === 'EHLO' || upperCommand === 'HELO'; - case SmtpState.AFTER_EHLO: - return upperCommand === 'MAIL' || upperCommand === 'STARTTLS' || upperCommand === 'AUTH' || upperCommand === 'EHLO' || upperCommand === 'HELO'; - case SmtpState.MAIL_FROM: - case SmtpState.RCPT_TO: - if (upperCommand === 'RCPT') { - return true; - } - return currentState === SmtpState.RCPT_TO && upperCommand === 'DATA'; - case SmtpState.DATA: - // In DATA state, only the data content is accepted, not commands - return false; - case SmtpState.DATA_RECEIVING: - // In DATA_RECEIVING state, only the data content is accepted, not commands - return false; - case SmtpState.FINISHED: - // After data is received, only new transactions or session end - return upperCommand === 'MAIL' || upperCommand === 'QUIT' || upperCommand === 'RSET'; - default: - return false; - } -} -/** - * Validates if a hostname is valid according to RFC 5321 - * @param hostname - Hostname to validate - * @returns Whether the hostname is valid - */ -export function isValidHostname(hostname) { - if (!hostname || typeof hostname !== 'string') { - return false; - } - // Basic hostname validation - // This is a simplified check, full RFC compliance would be more complex - return /^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$/.test(hostname); -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../ts/mail/delivery/smtpserver/utils/validation.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.unified.email.server.d.ts b/dist_ts/mail/routing/classes.unified.email.server.d.ts index 5144ff9..2db93bb 100644 --- a/dist_ts/mail/routing/classes.unified.email.server.d.ts +++ b/dist_ts/mail/routing/classes.unified.email.server.d.ts @@ -1,4 +1,3 @@ -import * as plugins from '../../plugins.js'; import { EventEmitter } from 'events'; import { DKIMCreator } from '../security/classes.dkimcreator.js'; interface IIPWarmupConfig { @@ -154,12 +153,6 @@ export declare class UnifiedEmailServer extends EventEmitter { * Start the unified email server */ start(): Promise; - /** - * Handle a socket from smartproxy in socket-handler mode - * @param socket The socket to handle - * @param port The port this connection is for (25, 587, 465) - */ - handleSocket(socket: plugins.net.Socket | plugins.tls.TLSSocket, port: number): Promise; /** * Stop the unified email server */ @@ -176,8 +169,8 @@ export declare class UnifiedEmailServer extends EventEmitter { */ private handleRustAuthRequest; /** - * Verify inbound email security (DKIM/SPF/DMARC) using the Rust bridge. - * Falls back gracefully if the bridge is not running. + * Verify inbound email security (DKIM/SPF/DMARC) using pre-computed Rust results + * or falling back to IPC call if no pre-computed results are available. */ private verifyInboundSecurity; /** diff --git a/dist_ts/mail/routing/classes.unified.email.server.js b/dist_ts/mail/routing/classes.unified.email.server.js index 4b0a574..0da1147 100644 --- a/dist_ts/mail/routing/classes.unified.email.server.js +++ b/dist_ts/mail/routing/classes.unified.email.server.js @@ -11,7 +11,6 @@ import { Email } from '../core/classes.email.js'; import { DomainRegistry } from './classes.domain.registry.js'; import { DnsManager } from './classes.dns.manager.js'; import { BounceManager, BounceType, BounceCategory } from '../core/classes.bouncemanager.js'; -import { createSmtpServer } from '../delivery/smtpserver/index.js'; import { createPooledSmtpClient } from '../delivery/smtpclient/create-client.js'; import { MultiModeDeliverySystem } from '../delivery/classes.delivery.system.js'; import { UnifiedDeliveryQueue } from '../delivery/classes.delivery.queue.js'; @@ -195,12 +194,6 @@ export class UnifiedEmailServer extends EventEmitter { // Check and rotate DKIM keys if needed await this.checkAndRotateDkimKeys(); logger.log('info', 'DKIM key rotation check completed'); - // Skip server creation in socket-handler mode - if (this.options.useSocketHandler) { - logger.log('info', 'UnifiedEmailServer started in socket-handler mode (no port listening)'); - this.emit('started'); - return; - } // Ensure we have the necessary TLS options const hasTlsConfig = this.options.tls?.keyPath && this.options.tls?.certPath; // Prepare the certificate and key if available @@ -283,47 +276,6 @@ export class UnifiedEmailServer extends EventEmitter { throw error; } } - /** - * Handle a socket from smartproxy in socket-handler mode - * @param socket The socket to handle - * @param port The port this connection is for (25, 587, 465) - */ - async handleSocket(socket, port) { - if (!this.options.useSocketHandler) { - logger.log('error', 'handleSocket called but useSocketHandler is not enabled'); - socket.destroy(); - return; - } - logger.log('info', `Handling socket for port ${port}`); - // Create a temporary SMTP server instance for this connection - // We need a full server instance because the SMTP protocol handler needs all components - const smtpServerOptions = { - port, - hostname: this.options.hostname, - key: this.options.tls?.keyPath ? plugins.fs.readFileSync(this.options.tls.keyPath, 'utf8') : undefined, - cert: this.options.tls?.certPath ? plugins.fs.readFileSync(this.options.tls.certPath, 'utf8') : undefined - }; - // Create the SMTP server instance - const smtpServer = createSmtpServer(this, smtpServerOptions); - // Get the connection manager from the server - const connectionManager = smtpServer.connectionManager; - if (!connectionManager) { - logger.log('error', 'Could not get connection manager from SMTP server'); - socket.destroy(); - return; - } - // Determine if this is a secure connection - // Port 465 uses implicit TLS, so the socket is already secure - const isSecure = port === 465 || socket instanceof plugins.tls.TLSSocket; - // Pass the socket to the connection manager - try { - await connectionManager.handleConnection(socket, isSecure); - } - catch (error) { - logger.log('error', `Error handling socket connection: ${error.message}`); - socket.destroy(); - } - } /** * Stop the unified email server */ @@ -422,6 +374,10 @@ export class UnifiedEmailServer extends EventEmitter { if (authenticatedUser) { session.user = { username: authenticatedUser }; } + // Attach pre-computed security results from Rust in-process pipeline + if (data.securityResults) { + session._precomputedSecurityResults = data.securityResults; + } // Process the email through the routing system await this.processEmailByMode(rawMessageBuffer, session); // Send acceptance back to Rust @@ -468,23 +424,33 @@ export class UnifiedEmailServer extends EventEmitter { } } /** - * Verify inbound email security (DKIM/SPF/DMARC) using the Rust bridge. - * Falls back gracefully if the bridge is not running. + * Verify inbound email security (DKIM/SPF/DMARC) using pre-computed Rust results + * or falling back to IPC call if no pre-computed results are available. */ async verifyInboundSecurity(email, session) { try { - const rawMessage = session.emailData || email.toRFC822String(); - const result = await this.rustBridge.verifyEmail({ - rawMessage, - ip: session.remoteAddress, - heloDomain: session.clientHostname || '', - hostname: this.options.hostname, - mailFrom: session.envelope?.mailFrom?.address || session.mailFrom || '', - }); + // Check for pre-computed results from Rust in-process security pipeline + const precomputed = session._precomputedSecurityResults; + let result; + if (precomputed) { + logger.log('info', 'Using pre-computed security results from Rust in-process pipeline'); + result = precomputed; + } + else { + // Fallback: IPC round-trip to Rust (for backward compat / handleSocket mode) + const rawMessage = session.emailData || email.toRFC822String(); + result = await this.rustBridge.verifyEmail({ + rawMessage, + ip: session.remoteAddress, + heloDomain: session.clientHostname || '', + hostname: this.options.hostname, + mailFrom: session.envelope?.mailFrom?.address || session.mailFrom || '', + }); + } // Apply DKIM result headers if (result.dkim && result.dkim.length > 0) { const dkimSummary = result.dkim - .map(d => `${d.status}${d.domain ? ` (${d.domain})` : ''}`) + .map((d) => `${d.status}${d.domain ? ` (${d.domain})` : ''}`) .join(', '); email.addHeader('X-DKIM-Result', dkimSummary); } @@ -509,6 +475,29 @@ export class UnifiedEmailServer extends EventEmitter { logger.log('info', `DMARC quarantine for domain ${result.dmarc.domain} — marking as potential spam`); } } + // Apply content scan results (from pre-computed pipeline) + if (result.contentScan) { + const scan = result.contentScan; + if (scan.threatScore > 0) { + email.addHeader('X-Spam-Score', String(scan.threatScore)); + if (scan.threatType) { + email.addHeader('X-Spam-Type', scan.threatType); + } + if (scan.threatScore >= 50) { + email.mightBeSpam = true; + logger.log('warn', `Content scan threat score ${scan.threatScore} (${scan.threatType}) — marking as potential spam`); + } + } + } + // Apply IP reputation results (from pre-computed pipeline) + if (result.ipReputation) { + const rep = result.ipReputation; + email.addHeader('X-IP-Reputation-Score', String(rep.score)); + if (rep.is_spam) { + email.mightBeSpam = true; + logger.log('warn', `IP ${rep.ip} flagged by reputation check (score=${rep.score}) — marking as potential spam`); + } + } logger.log('info', `Inbound security verified for email from ${session.remoteAddress}: DKIM=${result.dkim?.[0]?.status ?? 'none'}, SPF=${result.spf?.result ?? 'none'}, DMARC=${result.dmarc?.action ?? 'none'}`); } catch (err) { @@ -1563,4 +1552,4 @@ export class UnifiedEmailServer extends EventEmitter { return this.rateLimiter; } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.unified.email.server.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.unified.email.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AA+BlF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAkC,MAAM,wCAAwC,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAsB,MAAM,uCAAuC,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAgC,MAAM,6CAA6C,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAiItD;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAC1C,QAAQ,CAAW;IACnB,OAAO,CAA6B;IACpC,WAAW,CAAc;IAC1B,cAAc,CAAiB;IAC9B,OAAO,GAAU,EAAE,CAAC;IACpB,KAAK,CAAe;IAE5B,wDAAwD;IACjD,WAAW,CAAc;IACxB,UAAU,CAAqB;IAC/B,mBAAmB,CAAsB;IACzC,aAAa,CAAgB;IAC7B,eAAe,CAAyB;IACxC,uBAAuB,CAAiC;IACzD,aAAa,CAAuB;IACpC,cAAc,CAA0B;IACvC,WAAW,CAAqB,CAAC,wDAAwD;IACzF,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC,CAAC,wBAAwB;IACnE,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC,CAAC,sBAAsB;IAEhF,YAAY,QAAkB,EAAE,OAAmC;QACjE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,sBAAsB;QACtB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,2BAA2B;YACxE,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO;YACnE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,GAAG;YACrC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;YAC9C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,KAAK,EAAE,WAAW;YAClE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW;SAC1D,CAAC;QAEF,8CAA8C;QAC9C,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAEnD,+CAA+C;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE3E,wDAAwD;QACxD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,WAAW,CAAC;YACzD,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;SACnB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE5B,iDAAiD;QACjD,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC;YACrC,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU;YAC9C,cAAc,EAAE,QAAQ,CAAC,cAAc;SACxC,CAAC,CAAC;QAEH,+DAA+D;QAC/D,uEAAuE;QACvE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAEpC,6BAA6B;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE5E,0DAA0D;QAC1D,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE;YACvD,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,0BAA0B;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAkB,CAAC,OAAO,CAAC,UAAU,IAAI;YAC9D,MAAM,EAAE;gBACN,mBAAmB,EAAE,EAAE;gBACvB,oBAAoB,EAAE,GAAG;gBACzB,uBAAuB,EAAE,EAAE;gBAC3B,cAAc,EAAE,EAAE;gBAClB,oBAAoB,EAAE,CAAC;gBACvB,aAAa,EAAE,MAAM,CAAC,YAAY;aACnC;SACF,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,YAAY,GAAkB;YAClC,WAAW,EAAE,QAAQ,EAAE,4BAA4B;YACnD,UAAU,EAAE,CAAC;YACb,cAAc,EAAE,MAAM,EAAE,YAAY;YACpC,aAAa,EAAE,OAAO,CAAC,SAAS;SACjC,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAE5D,MAAM,eAAe,GAA8B;YACjD,eAAe,EAAE,GAAG,EAAE,mCAAmC;YACzD,oBAAoB,EAAE,EAAE;YACxB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE;gBACb,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;aACvD;YACD,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACzC,0DAA0D;gBAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAyB,CAAC;gBAC7C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE;wBACvC,IAAI,EAAE,WAAW;wBACjB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM;qBACvB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAE7F,wBAAwB;QACxB,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,WAAW,EAAE;gBACX,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;gBACZ,MAAM,EAAE,CAAC;aACV;YACD,cAAc,EAAE;gBACd,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;aACP;SACF,CAAC;QAEF,0DAA0D;IAC5D,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,IAAY,EAAE,OAAe,EAAE;QAClD,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;QAEpC,yDAAyD;QACzD,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,GAAG,sBAAsB,CAAC;gBAC9B,IAAI;gBACJ,IAAI;gBACJ,MAAM,EAAE,IAAI,KAAK,GAAG;gBACpB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,IAAI,KAAK;gBACpE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,IAAI,MAAM;gBAC7D,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,IAAI,EAAE;gBAC3D,WAAW,EAAE,IAAI,EAAE,2CAA2C;gBAC9D,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAA0C,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE3G,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;YAEvD,4BAA4B;YAC5B,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;YAEpD,oEAAoE;YACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,0GAA0G,CAAC,CAAC;YAC9H,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qEAAqE,CAAC,CAAC;YAE1F,8BAA8B;YAC9B,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAC;YAEnE,4DAA4D;YAC5D,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACzF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAC;YAErE,+BAA+B;YAC/B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;YAExD,uCAAuC;YACvC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;YAExD,8CAA8C;YAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uEAAuE,CAAC,CAAC;gBAC5F,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;YAED,2CAA2C;YAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC;YAE7E,+CAA+C;YAC/C,IAAI,UAA8B,CAAC;YACnC,IAAI,SAA6B,CAAC;YAElC,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC;oBACH,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAQ,EAAE,MAAM,CAAC,CAAC;oBACvE,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAS,EAAE,MAAM,CAAC,CAAC;oBACzE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;gBAC7D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAED,iCAAiC;YACjC,uDAAuD;YACvD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC7C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAyC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtF,8BAA8B;oBAC9B,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;wBAC9C,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,QAAQ,EAAE,KAAK;wBACf,QAAQ,EAAE,GAAG;wBACb,WAAW,EAAE,2BAA2B;qBACzC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC3C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBACzC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,uCAAwC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;oBACrF,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;wBACnC,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,OAAO,EAAE,KAAK;wBACd,OAAO,EAAE,qBAAqB;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,kEAAkE;YAClE,MAAM,SAAS,GAAI,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1E,MAAM,UAAU,GAAI,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;gBACpD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,UAAU;gBACtB,UAAU;gBACV,SAAS;gBACT,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI;gBAC/D,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG;gBAC7E,aAAa,EAAE,GAAG;gBAClB,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC9G,eAAe,EAAE,EAAE;gBACnB,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC;gBAClF,eAAe,EAAE,CAAC;gBAClB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;gBACnG,qBAAqB,EAAE,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;oBACpC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,IAAI,EAAE;oBAC9E,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,IAAI,GAAG;oBACjF,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,IAAI,CAAC;oBAC/E,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wCAAwC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChI,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,uCAAuC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,MAAkD,EAAE,IAAY;QACxF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC;YAC/E,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,IAAI,EAAE,CAAC,CAAC;QAEvD,8DAA8D;QAC9D,wFAAwF;QACxF,MAAM,iBAAiB,GAAG;YACxB,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;YACtG,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;SAC1G,CAAC;QAEF,kCAAkC;QAClC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAE7D,6CAA6C;QAC7C,MAAM,iBAAiB,GAAI,UAAkB,CAAC,iBAAiB,CAAC;QAEhE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mDAAmD,CAAC,CAAC;YACzE,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,2CAA2C;QAC3C,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,IAAI,KAAK,GAAG,IAAI,MAAM,YAAY,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAEzE,4CAA4C;QAC5C,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1E,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;QAElD,IAAI,CAAC;YACH,kCAAkC;YAClC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;gBACvC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAqC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACnF,CAAC;YAED,8DAA8D;YAC9D,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YAElB,4BAA4B;YAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAE7B,2BAA2B;YAC3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;YACtD,CAAC;YAED,+BAA+B;YAC/B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACpC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YACvD,CAAC;YAED,oCAAoC;YACpC,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnD,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,SAAS,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAEzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAsC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,0EAA0E;IAC1E,kCAAkC;IAClC,0EAA0E;IAE1E;;;;OAIG;IACK,KAAK,CAAC,uBAAuB,CAAC,IAAyB;QAC7D,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;QAExG,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,QAAQ,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;QAE5G,IAAI,CAAC;YACH,wBAAwB;YACxB,IAAI,gBAAwB,CAAC;YAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpD,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC7D,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvD,gBAAgB,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3D,qBAAqB;gBACrB,IAAI,CAAC;oBACH,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,CAAC;gBAAC,MAAM,CAAC;oBACP,wBAAwB;gBAC1B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YAED,qDAAqD;YACrD,MAAM,OAAO,GAAyB;gBACpC,EAAE,EAAE,IAAI,CAAC,SAAS,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACvE,KAAK,EAAE,SAAS,CAAC,QAAQ;gBACzB,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,MAAM;gBACd,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC5C,MAAM,EAAE,MAAM;gBACd,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE,UAAU;gBACzB,cAAc,EAAE,cAAc,IAAI,EAAE;gBACpC,MAAM,EAAE,MAAM;gBACd,aAAa,EAAE,CAAC,CAAC,iBAAiB;gBAClC,QAAQ,EAAE;oBACR,QAAQ,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;oBACzC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;iBAC1D;aACF,CAAC;YAEF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;YACjD,CAAC;YAED,+CAA+C;YAC/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAEzD,+BAA+B;YAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAC9C,aAAa;gBACb,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,GAAG;gBACb,WAAW,EAAE,qCAAqC;aACnD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2CAA4C,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAC9C,aAAa;gBACb,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,GAAG;gBACb,WAAW,EAAE,4BAA6B,GAAa,CAAC,OAAO,EAAE;aAClE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,IAAuB;QACzD,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAE/D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,QAAQ,SAAS,UAAU,EAAE,CAAC,CAAC;QAErF,iCAAiC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CACxD,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;gBACnC,aAAa;gBACb,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,QAAQ,SAAS,UAAU,EAAE,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;gBACnC,aAAa;gBACb,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,qBAAqB;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,KAAY,EAAE,OAA6B;QAC7E,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAC/C,UAAU;gBACV,EAAE,EAAE,OAAO,CAAC,aAAa;gBACzB,UAAU,EAAE,OAAO,CAAC,cAAc,IAAI,EAAE;gBACxC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,EAAE;aACxE,CAAC,CAAC;YAEH,4BAA4B;YAC5B,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI;qBAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;qBAC1D,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAChD,CAAC;YAED,0BAA0B;YAC1B,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,aAAa,MAAM,CAAC,GAAG,CAAC,MAAM,SAAS,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;gBAE7G,gCAAgC;gBAChC,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACjC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,OAAO,CAAC,aAAa,8BAA8B,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC;YAED,uCAAuC;YACvC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,KAAK,CAAC,SAAS,CAAC,gBAAgB,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,UAAU,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;gBAE9J,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBACrC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,MAAM,CAAC,KAAK,CAAC,MAAM,oBAAoB,CAAC,CAAC;gBACzF,CAAC;qBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBAChD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,MAAM,CAAC,KAAK,CAAC,MAAM,8BAA8B,CAAC,CAAC;gBACvG,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,OAAO,CAAC,aAAa,UAAU,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,MAAM,SAAS,MAAM,CAAC,GAAG,EAAE,MAAM,IAAI,MAAM,WAAW,MAAM,CAAC,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QACpN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAA0C,GAAa,CAAC,OAAO,oBAAoB,CAAC,CAAC;QAC1G,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,kBAAkB,CAAC,SAAyB,EAAE,OAA6B;QACtF,oCAAoC;QACpC,IAAI,KAAY,CAAC;QACjB,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,mDAAmD;YACnD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAChE,KAAK,GAAG,IAAI,KAAK,CAAC;oBAChB,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO;oBACzE,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE;oBAC7C,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;oBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS;oBAC9B,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC3C,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE;wBAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,WAAW,EAAE,GAAG,CAAC,WAAW;qBAC7B,CAAC,CAAC,IAAI,EAAE;iBACV,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;QAED,qEAAqE;QACrE,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;YACnE,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,qDAAqD;QACrD,uDAAuD;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,kHAAkH,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtJ,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,OAAO,GAAG,CAAC,CAAC;YAEtF,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAE7D,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4EAA4E,CAAC,CAAC;gBACjG,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qEAAqE,CAAC,CAAC;QAC5F,CAAC;QAED,sBAAsB;QACtB,MAAM,OAAO,GAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,6BAA6B;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,iCAAiC;QACjC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;QAE7B,gCAAgC;QAChC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAEvD,6BAA6B;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,aAAa,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QACpF,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,QAAQ;gBACX,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACtD,MAAM;YAER;gBACE,MAAM,IAAI,KAAK,CAAC,wBAAyB,MAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAqB,EAAE,KAAY,EAAE,OAAsB;QAC3F,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAE9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QAE1D,yBAAyB;QACzB,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS,CAAC;QAC9E,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE7D,kBAAkB;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC;YACH,aAAa;YACb,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAEtE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,8BAA8B;gBACvC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;gBACxC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;oBAC7C,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,KAAK,CAAC,EAAE;iBACrB;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,yBAAyB;gBAClC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;gBACxC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;oBAC7C,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,mBAAmB;YACnB,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBACjD,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE;oBACpE,MAAM,EAAE,KAAK,CAAC,IAAI;oBAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY,CAAW;iBACvD,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QAC1F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;QAE3D,8BAA8B;QAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;YACzB,+BAA+B;YAC/B,iDAAiD;YACjD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;QACnD,CAAC;QAED,mFAAmF;QAEnF,qBAAqB;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,QAAQ,CAAC;QAChD,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,CAAC;QAElF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,KAAK,QAAQ,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAqB,EAAE,KAAY,EAAE,OAAsB;QAC3F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;QAE/C,2BAA2B;QAC3B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,CAAC;QAE9E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QACzF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,IAAI,kBAAkB,CAAC;QAE7D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;QAEpE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;YACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;YAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;YACxC,OAAO,EAAE,gCAAgC;YACzC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;YACxC,OAAO,EAAE;gBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;gBAC7C,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,OAAO;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;aACb;YACD,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAChC,KAAa,CAAC,YAAY,GAAG,IAAI,CAAC;QACnC,MAAM,KAAK,CAAC;IACd,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc,CAAC,KAAY,EAAE,OAA6B;QACtE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0CAA0C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3E,IAAI,CAAC;YACH,qCAAqC;YACrC,IAAI,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;gBAE/D,gCAAgC;gBAChC,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC;oBAClD,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,IAAI,KAAK,CAAC;oBAC9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAC;oBACvE,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAED,2CAA2C;YAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,OAAO,UAAU,EAAE,CAAC,CAAC;YAE1E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,OAAO;oBACP,UAAU;iBACX;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAwC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAE7E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,uBAAuB;gBAChC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAAC,KAAY,EAAE,OAA6B;QAC1E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8CAA8C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAE/E,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;YAEnC,oCAAoC;YACpC,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;gBAElD,qBAAqB;gBACrB,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACpD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;wBACrB,KAAK,MAAM;4BACT,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;4BAChD,0BAA0B;4BAC1B,MAAM;wBAER,KAAK,OAAO;4BACV,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;4BACjD,2BAA2B;4BAC3B,MAAM;wBAER,KAAK,YAAY;4BACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;4BAE3C,+BAA+B;4BAC/B,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCACtE,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;oCAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oCACvD,IAAI,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wCAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;4CAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;wCACrD,CAAC;6CAAM,CAAC,CAAC,MAAM;4CACb,KAAK,CAAC,SAAS,CAAC,sBAAsB,EAAE,kCAAkC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;wCACnG,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,MAAM;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YAED,mCAAmC;YACnC,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;gBAErD,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;oBAC7D,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;wBACvB,KAAK,WAAW;4BACd,IAAI,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gCACxC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;4BACrD,CAAC;4BACD,MAAM;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;YAE7E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,4BAA4B;gBACrC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,SAAS;oBAClC,eAAe,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK;oBAChE,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,yBAAyB;gBAClC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,QAAgB;QACvC,OAAO,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC;IAID;;OAEG;IACK,KAAK,CAAC,mBAAmB;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;YAE1D,IAAI,CAAC;gBACH,mDAAmD;gBACnD,IAAI,OAAkD,CAAC;gBAEvD,IAAI,CAAC;oBACH,4BAA4B;oBAC5B,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACtD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wCAAwC,MAAM,EAAE,CAAC,CAAC;gBACvE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,wCAAwC;oBACxC,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;oBAClD,4BAA4B;oBAC5B,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;oBACtD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,MAAM,EAAE,CAAC,CAAC;gBACtE,CAAC;gBAED,oCAAoC;gBACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBAE9C,mDAAmD;gBACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,MAAM,mBAAmB,QAAQ,EAAE,CAAC,CAAC;YAC1F,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oCAAoC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;IACH,CAAC;IAGD;;OAEG;IACK,qBAAqB;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;gBACnC,MAAM,eAAe,GAAQ,EAAE,CAAC;gBAEhC,mFAAmF;gBACnF,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACrC,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;wBACvD,eAAe,CAAC,oBAAoB,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;oBAC5F,CAAC;oBACD,gGAAgG;gBAClG,CAAC;gBAED,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;oBACpC,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;wBACtD,eAAe,CAAC,oBAAoB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC;oBAC3F,CAAC;oBACD,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;wBACrD,eAAe,CAAC,mBAAmB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC;oBACzF,CAAC;oBACD,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;wBACzD,eAAe,CAAC,uBAAuB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAC;oBACjG,CAAC;gBACH,CAAC;gBAED,uCAAuC;gBACvC,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBAC5D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,MAAM,GAAG,EAAE,eAAe,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,sBAAsB;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;YAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,EAAE,UAAU,IAAI,KAAK,CAAC;YAC1D,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,EAAE,gBAAgB,IAAI,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC;YAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,MAAM,EAAE,CAAC,CAAC;gBAChE,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,8BAA8B;gBAC9B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAE/F,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,MAAM,eAAe,QAAQ,GAAG,CAAC,CAAC;oBAEpF,kBAAkB;oBAClB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAErF,6CAA6C;oBAC7C,YAAY,CAAC,IAAI,GAAG;wBAClB,GAAG,YAAY,CAAC,IAAI;wBACpB,QAAQ,EAAE,WAAW;qBACtB,CAAC;oBAEF,gEAAgE;oBAChE,IAAI,YAAY,CAAC,OAAO,KAAK,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACvE,qBAAqB;wBACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;wBACpF,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS;6BACtC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC;6BAC1C,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC;6BACxC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBAEtB,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC;wBAEpD,wBAAwB;wBACxB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CACrC,GAAG,WAAW,eAAe,MAAM,EAAE,EACrC,CAAC,KAAK,CAAC,EACP,GAAG,EAAE,CAAC,CAAC;4BACL,IAAI,EAAE,GAAG,WAAW,eAAe,MAAM,EAAE;4BAC3C,IAAI,EAAE,KAAK;4BACX,KAAK,EAAE,IAAI;4BACX,GAAG,EAAE,GAAG;4BACR,IAAI,EAAE,qBAAqB,eAAe,EAAE;yBAC7C,CAAC,CACH,CAAC;wBAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iDAAiD,WAAW,eAAe,MAAM,EAAE,CAAC,CAAC;wBAExG,0CAA0C;wBAC1C,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CACpC,eAAe,MAAM,aAAa,EAClC,OAAO,CAAC,SAAS,CAClB,CAAC;oBACJ,CAAC;oBAED,2DAA2D;oBAC3D,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;wBACxD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxF,CAAC,CAAC,CAAC;gBAEL,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,MAAM,iBAAiB,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAwC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAGD;;OAEG;IACI,mBAAmB,CAAC,WAAoC;QAC7D,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,kBAAkB,GAAG;YACzB,EAAE,EAAE,KAAK;YACT,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;SACX,CAAC;QAEF,MAAM,iBAAiB,GAAG,WAAW,IAAI,kBAAkB,CAAC;QAE5D,2CAA2C;QAC3C,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC9C,MAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,KAAK,CAAC;YAE7E,IAAI,SAAS,GAAG,aAAa,CAAC;YAC9B,IAAI,OAAO,GAAG,aAAa,CAAC;YAE5B,0BAA0B;YAC1B,QAAQ,YAAY,EAAE,CAAC;gBACrB,KAAK,EAAE;oBACL,SAAS,GAAG,YAAY,CAAC;oBACzB,OAAO,GAAG,aAAa,CAAC,CAAC,WAAW;oBACpC,MAAM;gBACR,KAAK,GAAG;oBACN,SAAS,GAAG,kBAAkB,CAAC;oBAC/B,OAAO,GAAG,aAAa,CAAC,CAAC,WAAW;oBACpC,MAAM;gBACR,KAAK,GAAG;oBACN,SAAS,GAAG,aAAa,CAAC;oBAC1B,OAAO,GAAG,WAAW,CAAC,CAAC,eAAe;oBACtC,MAAM;gBACR;oBACE,SAAS,GAAG,cAAc,YAAY,QAAQ,CAAC;YACnD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE;oBACL,KAAK,EAAE,CAAC,YAAY,CAAC;iBACtB;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE;wBACN,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,YAAY;qBACnB;oBACD,GAAG,EAAE;wBACH,IAAI,EAAE,OAAO;qBACd;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,OAA4C;QAC/D,oCAAoC;QACpC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK;YAChC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK;gBACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAEzE,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBACpB,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;gBAC/C,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;YAE/C,4CAA4C;YAC5C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvG,CAAC;YAED,wCAAwC;YACxC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,MAAqB;QAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,MAAqB;QACvC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,SAAS,CACpB,KAAY,EACZ,OAA4B,KAAK,EACjC,KAAmB,EACnB,OAIC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,CAAC,OAAO,OAAO,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEhF,IAAI,CAAC;YACH,qBAAqB;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YAED,kFAAkF;YAClF,IAAI,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC;gBACnC,MAAM,oBAAoB,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;gBAE7F,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpC,mCAAmC;oBACnC,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC;oBACtC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBACtD,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBAChD,OAAO;4BACL,KAAK,EAAE,SAAS;4BAChB,MAAM,EAAE,IAAI,EAAE,MAAM,IAAI,SAAS;4BACjC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW;yBAC9E,CAAC;oBACJ,CAAC,CAAC,CAAC;oBAEH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,oBAAoB,CAAC,MAAM,0BAA0B,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;oBAE3G,mDAAmD;oBACnD,IAAI,oBAAoB,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBAClD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;oBAChE,CAAC;oBAED,sEAAsE;oBACtE,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC9E,CAAC;YACH,CAAC;YAED,qBAAqB;YACrB,IAAI,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;YAEnC,4EAA4E;YAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAExC,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC;oBACnC,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,MAAM;oBACN,eAAe,EAAE,OAAO,EAAE,eAAe;iBAC1C,CAAC,CAAC;gBAEH,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,SAAS,qCAAqC,CAAC,CAAC;gBACpF,CAAC;YACH,CAAC;YAED,yEAAyE;YACzE,IAAI,SAAS,EAAE,CAAC;gBACd,sCAAsC;gBACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,SAAS,+EAA+E,CAAC,CAAC;gBACrH,CAAC;gBAED,0CAA0C;gBAC1C,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,SAAS,gFAAgF,CAAC,CAAC;gBACtH,CAAC;gBAED,yCAAyC;gBACzC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAE7B,6BAA6B;gBAC7B,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7C,CAAC;YAED,wEAAwE;YACxE,IAAI,IAAI,KAAK,KAAK,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;gBAClE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,IAAI,KAAK,CAAC,CAAC;YACjH,CAAC;YAED,sCAAsC;YACtC,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAE7B,+BAA+B;YAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAErD,uDAAuD;YACvD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE;oBACvC,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM;iBACvB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;YAClD,OAAO,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAAC,KAAY,EAAE,MAAc,EAAE,QAAgB;QAC5E,IAAI,CAAC;YACH,2CAA2C;YAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAEvD,sBAAsB;YACtB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEnE,0CAA0C;YAC1C,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;YAExC,iCAAiC;YACjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAChD,UAAU,EAAE,QAAQ;gBACpB,MAAM;gBACN,QAAQ;gBACR,UAAU;aACX,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,KAAK,CAAC,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,MAAM,EAAE,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,qDAAqD;QACvD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,yBAAyB,CAAC,WAAkB;QACvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,kEAAkE;YAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE9E,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,YAAY,CAAC,SAAS,EAAE,EAAE;oBAC7F,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;iBAC5C,CAAC,CAAC;gBAEH,mDAAmD;gBACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;gBAE3C,qDAAqD;gBACrD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;oBACxB,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;wBAC9C,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE,YAAY,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;wBAC/D,eAAe,EAAE,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;qBACtD,CAAC,CAAC;gBACL,CAAC;gBAED,qBAAqB;gBACrB,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;oBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;oBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;oBACxC,OAAO,EAAE,6CAA6C;oBACtD,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,OAAO,EAAE;wBACP,SAAS,EAAE,YAAY,CAAC,SAAS;wBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;wBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;qBAC5C;oBACD,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+CAA+C,CAAC,CAAC;gBACpE,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yCAAyC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAE9E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,uCAAuC;gBAChD,OAAO,EAAE;oBACP,KAAK,EAAE,KAAK,CAAC,OAAO;oBACpB,OAAO,EAAE,WAAW,CAAC,OAAO;iBAC7B;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,SAAiB,EACjB,YAAoB,EACpB,UAKI,EAAE;QAEN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,SAAS,KAAK,YAAY,EAAE,CAAC,CAAC;QAEhF,IAAI,CAAC;YACH,sDAAsD;YACtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9D,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAC;YAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2CAA2C,SAAS,OAAO,YAAY,CAAC,cAAc,SAAS,EAAE;gBAClH,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC;YAEH,mDAAmD;YACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YAE3C,qDAAqD;YACrD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;oBAC9C,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,YAAY,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;oBAC/D,eAAe,EAAE,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACtD,CAAC,CAAC;YACL,CAAC;YAED,qBAAqB;YACrB,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,sCAAsC;gBAC/C,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,OAAO,EAAE;oBACP,SAAS,EAAE,YAAY,CAAC,SAAS;oBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;oBAC3C,YAAY;iBACb;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEvE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,gCAAgC;gBACzC,OAAO,EAAE;oBACP,SAAS;oBACT,YAAY;oBACZ,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,KAAa;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,KAAa;QAKrC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,KAAa;QAMnC,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,kBAAkB;QACvB,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,OAAO,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;IACtD,CAAC;IAED;;;;;OAKG;IACI,oBAAoB,CAAC,KAAa,EAAE,MAAc,EAAE,SAAkB;QAC3E,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,KAAK,yBAAyB,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,KAAa;QAC5C,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,wBAAwB,CAAC,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,SAAkB;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,SAAiB;QACpC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,SAAiB;QACzC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAC1B,SAAiB,EACjB,OAA2E;QAE3E,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,SAAiB;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,SAAiB;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACI,mBAAmB,CAAC,SAK1B;QACC,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,UAAkB;QAC7C,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,SAAiB;QACnC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACI,uBAAuB,CAAC,MAAc;QAC3C,OAAO,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACI,oBAAoB;QACzB,OAAO,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,MAAc;QACzC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,0BAA0B,CAAC,MAAc;QAC9C,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,MAAc,EAAE,KAK5C;QACC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACI,UAAU,CAAC,MAAc;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACI,cAAc,CAAC,MAAc;QAClC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;YACjC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,MAAc,EAAE,eAAuB,EAAE,UAA2B,EAAE,MAAc;QACtG,kCAAkC;QAClC,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,UAAU,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YACxE,SAAS,EAAE,QAAQ,eAAe,EAAE;YACpC,MAAM,EAAE,QAAQ,MAAM,EAAE;YACxB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB;YAC/F,cAAc,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI;YACjF,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,YAAY,EAAE,MAAM;YACpB,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YACjD,SAAS,EAAE,KAAK;SACjB,CAAC;QAEF,qBAAqB;QACrB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAE/C,0BAA0B;QAC1B,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;YACjC,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,UAAU,KAAK,MAAM;YACjC,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.unified.email.server.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.unified.email.server.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/npmextra.json b/npmextra.json index c574154..6fc225e 100644 --- a/npmextra.json +++ b/npmextra.json @@ -1,5 +1,16 @@ { "@git.zone/tsrust": { - "targets": ["linux_amd64", "linux_arm64"] + "targets": [ + "linux_amd64", + "linux_arm64" + ] + }, + "@git.zone/cli": { + "release": { + "registries": [ + "https://verdaccio.lossless.digital" + ], + "accessLevel": "public" + } } -} +} \ No newline at end of file diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 42b669c..5ce0e55 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1075,6 +1075,7 @@ dependencies = [ "hickory-resolver 0.25.2", "mailer-core", "mailer-security", + "mailparse", "regex", "rustls", "rustls-pemfile", diff --git a/rust/crates/mailer-security/src/content_scanner.rs b/rust/crates/mailer-security/src/content_scanner.rs index bf542e1..f20c771 100644 --- a/rust/crates/mailer-security/src/content_scanner.rs +++ b/rust/crates/mailer-security/src/content_scanner.rs @@ -5,14 +5,14 @@ //! script injection, and sensitive data patterns. use regex::Regex; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use std::sync::LazyLock; // --------------------------------------------------------------------------- // Result types // --------------------------------------------------------------------------- -#[derive(Debug, Clone, Serialize)] +#[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct ContentScanResult { pub threat_score: u32, diff --git a/rust/crates/mailer-smtp/Cargo.toml b/rust/crates/mailer-smtp/Cargo.toml index 9ad39c7..2a7ca6b 100644 --- a/rust/crates/mailer-smtp/Cargo.toml +++ b/rust/crates/mailer-smtp/Cargo.toml @@ -22,3 +22,4 @@ base64.workspace = true rustls-pki-types.workspace = true rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] } rustls-pemfile = "2" +mailparse.workspace = true diff --git a/rust/crates/mailer-smtp/src/connection.rs b/rust/crates/mailer-smtp/src/connection.rs index af9ec33..e17090e 100644 --- a/rust/crates/mailer-smtp/src/connection.rs +++ b/rust/crates/mailer-smtp/src/connection.rs @@ -14,7 +14,10 @@ use crate::validation; use base64::Engine; use base64::engine::general_purpose::STANDARD as BASE64; +use hickory_resolver::TokioResolver; +use mailer_security::MessageAuthenticator; use serde::{Deserialize, Serialize}; +use std::net::IpAddr; use std::sync::Arc; use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; use tokio::net::TcpStream; @@ -152,6 +155,8 @@ pub async fn handle_connection( tls_acceptor: Option>, remote_addr: String, is_secure: bool, + authenticator: Arc, + resolver: Arc, ) { let mut session = SmtpSession::new(remote_addr.clone(), is_secure); @@ -217,6 +222,8 @@ pub async fn handle_connection( &event_tx, callback_register.as_ref(), &tls_acceptor, + &authenticator, + &resolver, ) .await; @@ -327,6 +334,8 @@ async fn process_line( event_tx: &mpsc::Sender, callback_registry: &dyn CallbackRegistry, tls_acceptor: &Option>, + authenticator: &Arc, + resolver: &Arc, ) -> LineResult { // Handle AUTH intermediate states (waiting for username/password) match &session.auth_state { @@ -375,7 +384,7 @@ async fn process_line( } SmtpCommand::Data => { - handle_data(session, stream, config, event_tx, callback_registry).await + handle_data(session, stream, config, event_tx, callback_registry, authenticator, resolver).await } SmtpCommand::Rset => { @@ -558,6 +567,8 @@ async fn handle_data( config: &SmtpServerConfig, event_tx: &mpsc::Sender, callback_registry: &dyn CallbackRegistry, + authenticator: &Arc, + resolver: &Arc, ) -> LineResult { if !session.state.can_data() { return LineResult::Response(SmtpResponse::bad_sequence( @@ -622,6 +633,18 @@ async fn handle_data( let raw_message = accumulator.into_message().unwrap_or_default(); let correlation_id = uuid::Uuid::new_v4().to_string(); + // --- In-process security pipeline (30s timeout) --- + let security_results = run_security_pipeline( + &raw_message, + &session.remote_addr, + session.client_hostname.as_deref().unwrap_or("unknown"), + &config.hostname, + &session.envelope.mail_from, + authenticator, + resolver, + ) + .await; + // Determine transport: inline base64 or temp file let email_data = if raw_message.len() <= 256 * 1024 { EmailData::Inline { @@ -656,7 +679,7 @@ async fn handle_data( client_hostname: session.client_hostname.clone(), secure: session.secure, authenticated_user: session.authenticated_user().map(|s| s.to_string()), - security_results: None, // Will be populated by server.rs when in-process security is added + security_results }; if event_tx.send(event).await.is_err() { @@ -991,6 +1014,166 @@ async fn validate_credentials( } } +/// Extract MIME parts from a raw email message for content scanning. +/// +/// Returns `(subject, text_body, html_body, attachment_filenames)`. +fn extract_mime_parts(raw_message: &[u8]) -> (Option, Option, Option, Vec) { + let parsed = match mailparse::parse_mail(raw_message) { + Ok(p) => p, + Err(e) => { + debug!(error = %e, "Failed to parse MIME for content scanning"); + return (None, None, None, Vec::new()); + } + }; + + // Extract Subject header + let subject = parsed + .headers + .iter() + .find(|h| h.get_key().eq_ignore_ascii_case("subject")) + .map(|h| h.get_value()); + + let mut text_body: Option = None; + let mut html_body: Option = None; + let mut attachments: Vec = Vec::new(); + + // Walk the MIME tree + fn walk_parts( + part: &mailparse::ParsedMail<'_>, + text_body: &mut Option, + html_body: &mut Option, + attachments: &mut Vec, + ) { + let content_type = part.ctype.mimetype.to_lowercase(); + let disposition = part.get_content_disposition(); + + // Check if this is an attachment + if disposition.disposition == mailparse::DispositionType::Attachment { + if let Some(filename) = disposition.params.get("filename") { + attachments.push(filename.clone()); + } + } else if content_type == "text/plain" && text_body.is_none() { + if let Ok(body) = part.get_body() { + *text_body = Some(body); + } + } else if content_type == "text/html" && html_body.is_none() { + if let Ok(body) = part.get_body() { + *html_body = Some(body); + } + } + + // Recurse into subparts + for sub in &part.subparts { + walk_parts(sub, text_body, html_body, attachments); + } + } + + walk_parts(&parsed, &mut text_body, &mut html_body, &mut attachments); + + (subject, text_body, html_body, attachments) +} + +/// Run the full security pipeline: DKIM/SPF/DMARC + content scan + IP reputation. +/// +/// Returns `Some(json_value)` on success or `None` if the pipeline fails or times out. +async fn run_security_pipeline( + raw_message: &[u8], + remote_addr: &str, + helo_domain: &str, + hostname: &str, + mail_from: &str, + authenticator: &Arc, + resolver: &Arc, +) -> Option { + let security_timeout = Duration::from_secs(30); + + match timeout(security_timeout, run_security_pipeline_inner( + raw_message, remote_addr, helo_domain, hostname, mail_from, authenticator, resolver, + )).await { + Ok(Ok(value)) => { + debug!("In-process security pipeline completed"); + Some(value) + } + Ok(Err(e)) => { + warn!(error = %e, "Security pipeline error — emitting event without results"); + None + } + Err(_) => { + warn!("Security pipeline timed out (30s) — emitting event without results"); + None + } + } +} + +/// Inner implementation of the security pipeline (no timeout wrapper). +async fn run_security_pipeline_inner( + raw_message: &[u8], + remote_addr: &str, + helo_domain: &str, + hostname: &str, + mail_from: &str, + authenticator: &Arc, + resolver: &Arc, +) -> std::result::Result> { + // Parse the remote IP address + let ip: IpAddr = remote_addr.parse().unwrap_or(IpAddr::V4(std::net::Ipv4Addr::LOCALHOST)); + + // Run DKIM/SPF/DMARC and IP reputation concurrently + let (email_security, reputation) = tokio::join!( + mailer_security::verify_email_security( + raw_message, ip, helo_domain, hostname, mail_from, authenticator, + ), + mailer_security::check_reputation( + ip, mailer_security::DEFAULT_DNSBL_SERVERS, resolver, + ), + ); + + // Extract MIME parts for content scanning (synchronous) + let (subject, text_body, html_body, attachment_names) = extract_mime_parts(raw_message); + + // Run content scan (synchronous) + let content_scan = mailer_security::content_scanner::scan_content( + subject.as_deref(), + text_body.as_deref(), + html_body.as_deref(), + &attachment_names, + ); + + // Build the combined results JSON + let mut results = serde_json::Map::new(); + + // DKIM/SPF/DMARC + match email_security { + Ok(sec) => { + results.insert("dkim".into(), serde_json::to_value(&sec.dkim)?); + results.insert("spf".into(), serde_json::to_value(&sec.spf)?); + results.insert("dmarc".into(), serde_json::to_value(&sec.dmarc)?); + } + Err(e) => { + warn!(error = %e, "Email security verification failed"); + results.insert("dkim".into(), serde_json::Value::Array(vec![])); + results.insert("spf".into(), serde_json::Value::Null); + results.insert("dmarc".into(), serde_json::Value::Null); + } + } + + // Content scan + results.insert("contentScan".into(), serde_json::to_value(&content_scan)?); + + // IP reputation + match reputation { + Ok(rep) => { + results.insert("ipReputation".into(), serde_json::to_value(&rep)?); + } + Err(e) => { + warn!(error = %e, "IP reputation check failed"); + results.insert("ipReputation".into(), serde_json::Value::Null); + } + } + + Ok(serde_json::Value::Object(results)) +} + #[cfg(test)] mod tests { use super::*; @@ -1020,4 +1203,106 @@ mod tests { let json = serde_json::to_string(&result).unwrap(); assert!(json.contains("accepted")); } + + #[test] + fn test_extract_mime_parts_simple() { + let raw = b"From: sender@example.com\r\n\ + To: rcpt@example.com\r\n\ + Subject: Test Subject\r\n\ + Content-Type: text/plain\r\n\ + \r\n\ + Hello, this is a test body.\r\n"; + + let (subject, text, html, attachments) = extract_mime_parts(raw); + assert_eq!(subject.as_deref(), Some("Test Subject")); + assert!(text.is_some()); + assert!(text.unwrap().contains("Hello, this is a test body.")); + assert!(html.is_none()); + assert!(attachments.is_empty()); + } + + #[test] + fn test_extract_mime_parts_multipart() { + let raw = b"From: sender@example.com\r\n\ + To: rcpt@example.com\r\n\ + Subject: Multipart Test\r\n\ + Content-Type: multipart/mixed; boundary=\"boundary123\"\r\n\ + \r\n\ + --boundary123\r\n\ + Content-Type: text/plain\r\n\ + \r\n\ + Plain text body\r\n\ + --boundary123\r\n\ + Content-Type: text/html\r\n\ + \r\n\ + HTML body\r\n\ + --boundary123\r\n\ + Content-Type: application/octet-stream\r\n\ + Content-Disposition: attachment; filename=\"report.pdf\"\r\n\ + \r\n\ + binary data here\r\n\ + --boundary123--\r\n"; + + let (subject, text, html, attachments) = extract_mime_parts(raw); + assert_eq!(subject.as_deref(), Some("Multipart Test")); + assert!(text.is_some()); + assert!(text.unwrap().contains("Plain text body")); + assert!(html.is_some()); + assert!(html.unwrap().contains("HTML body")); + assert_eq!(attachments.len(), 1); + assert_eq!(attachments[0], "report.pdf"); + } + + #[test] + fn test_extract_mime_parts_no_subject() { + let raw = b"From: sender@example.com\r\n\ + To: rcpt@example.com\r\n\ + Content-Type: text/plain\r\n\ + \r\n\ + Body without subject\r\n"; + + let (subject, text, _html, _attachments) = extract_mime_parts(raw); + assert!(subject.is_none()); + assert!(text.is_some()); + } + + #[test] + fn test_extract_mime_parts_invalid() { + let raw = b"this is not a valid email"; + let (subject, text, html, attachments) = extract_mime_parts(raw); + // Should not panic, may or may not parse partially + // The key property is that it doesn't crash + let _ = (subject, text, html, attachments); + } + + #[test] + fn test_extract_mime_parts_multiple_attachments() { + let raw = b"From: sender@example.com\r\n\ + To: rcpt@example.com\r\n\ + Subject: Attachments\r\n\ + Content-Type: multipart/mixed; boundary=\"bound\"\r\n\ + \r\n\ + --bound\r\n\ + Content-Type: text/plain\r\n\ + \r\n\ + See attached\r\n\ + --bound\r\n\ + Content-Type: application/pdf\r\n\ + Content-Disposition: attachment; filename=\"doc1.pdf\"\r\n\ + \r\n\ + pdf data\r\n\ + --bound\r\n\ + Content-Type: application/vnd.ms-excel\r\n\ + Content-Disposition: attachment; filename=\"data.xlsx\"\r\n\ + \r\n\ + excel data\r\n\ + --bound--\r\n"; + + let (subject, text, _html, attachments) = extract_mime_parts(raw); + assert_eq!(subject.as_deref(), Some("Attachments")); + assert!(text.is_some()); + assert_eq!(attachments.len(), 2); + assert!(attachments.contains(&"doc1.pdf".to_string())); + assert!(attachments.contains(&"data.xlsx".to_string())); + } } diff --git a/rust/crates/mailer-smtp/src/server.rs b/rust/crates/mailer-smtp/src/server.rs index d5d3d32..bc2b0d4 100644 --- a/rust/crates/mailer-smtp/src/server.rs +++ b/rust/crates/mailer-smtp/src/server.rs @@ -9,6 +9,8 @@ use crate::connection::{ }; use crate::rate_limiter::{RateLimitConfig, RateLimiter}; +use hickory_resolver::TokioResolver; +use mailer_security::MessageAuthenticator; use rustls_pki_types::{CertificateDer, PrivateKeyDer}; use std::io::BufReader; use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; @@ -63,6 +65,17 @@ pub async fn start_server( let (event_tx, event_rx) = mpsc::channel::(1024); + // Create shared security resources for in-process email verification + let authenticator: Arc = Arc::new( + mailer_security::default_authenticator() + .map_err(|e| format!("Failed to create MessageAuthenticator: {e}"))? + ); + let resolver: Arc = Arc::new( + TokioResolver::builder_tokio() + .map(|b| b.build()) + .map_err(|e| format!("Failed to create TokioResolver: {e}"))? + ); + // Build TLS acceptor if configured let tls_acceptor = if config.has_tls() { Some(Arc::new(build_tls_acceptor(&config)?)) @@ -87,6 +100,8 @@ pub async fn start_server( callback_registry.clone(), tls_acceptor.clone(), false, // not implicit TLS + authenticator.clone(), + resolver.clone(), )); handles.push(handle); } @@ -108,6 +123,8 @@ pub async fn start_server( callback_registry.clone(), tls_acceptor.clone(), true, // implicit TLS + authenticator.clone(), + resolver.clone(), )); handles.push(handle); } else { @@ -153,6 +170,8 @@ async fn accept_loop( callback_registry: Arc, tls_acceptor: Option>, implicit_tls: bool, + authenticator: Arc, + resolver: Arc, ) { loop { if shutdown.load(Ordering::SeqCst) { @@ -194,6 +213,8 @@ async fn accept_loop( let callback_registry = callback_registry.clone(); let tls_acceptor = tls_acceptor.clone(); let active_connections = active_connections.clone(); + let authenticator = authenticator.clone(); + let resolver = resolver.clone(); active_connections.fetch_add(1, Ordering::SeqCst); @@ -232,6 +253,8 @@ async fn accept_loop( tls_acceptor, remote_addr, implicit_tls, + authenticator, + resolver, ) .await; diff --git a/test/helpers/server.loader.ts b/test/helpers/server.loader.ts index 3931f20..c66fdb5 100644 --- a/test/helpers/server.loader.ts +++ b/test/helpers/server.loader.ts @@ -1,8 +1,4 @@ import * as plugins from '../../ts/plugins.js'; -import { UnifiedEmailServer } from '../../ts/mail/routing/classes.unified.email.server.js'; -import { createSmtpServer } from '../../ts/mail/delivery/smtpserver/index.js'; -import type { ISmtpServerOptions } from '../../ts/mail/delivery/smtpserver/interfaces.js'; -import type { net } from '../../ts/plugins.js'; export interface ITestServerConfig { port: number; @@ -27,165 +23,18 @@ export interface ITestServer { } /** - * Starts a test SMTP server with the given configuration + * Starts a test SMTP server with the given configuration. + * + * NOTE: The TS SMTP server implementation was removed in Phase 7B + * (replaced by the Rust SMTP server). This stub preserves the interface + * for smtpclient tests that import it, but those tests require `node-forge` + * which is not installed (pre-existing issue). */ -export async function startTestServer(config: ITestServerConfig): Promise { - // Find a free port if one wasn't specified - // Using smartnetwork to find an available port in the range 10000-60000 - let port = config.port; - if (port === undefined || port === 0) { - const network = new plugins.smartnetwork.Network(); - port = await network.findFreePort(10000, 60000, { randomize: true }); - if (!port) { - throw new Error('No free ports available in range 10000-60000'); - } - } - - const serverConfig = { - port: port, // Use the found free port - hostname: config.hostname || 'localhost', - tlsEnabled: config.tlsEnabled || false, - authRequired: config.authRequired || false, - timeout: config.timeout || 30000, - maxConnections: config.maxConnections || 100, - size: config.size || 10 * 1024 * 1024, // 10MB default - maxRecipients: config.maxRecipients || 100 - }; - - // Create a mock email server for testing - const mockEmailServer = { - processEmailByMode: async (emailData: any) => { - console.log(`📧 [Test Server] Processing email:`, emailData.subject || 'No subject'); - return emailData; - }, - getRateLimiter: () => { - // Return a mock rate limiter for testing - return { - recordConnection: (_ip: string) => ({ allowed: true, remaining: 100 }), - checkConnectionLimit: async (_ip: string) => ({ allowed: true, remaining: 100 }), - checkMessageLimit: (_senderAddress: string, _ip: string, _recipientCount?: number, _pattern?: string, _domain?: string) => ({ allowed: true, remaining: 1000 }), - checkRecipientLimit: async (_session: any) => ({ allowed: true, remaining: 50 }), - recordAuthenticationFailure: async (_ip: string) => {}, - recordSyntaxError: async (_ip: string) => {}, - recordCommandError: async (_ip: string) => {}, - recordError: (_key: string) => false, // Return false to not block during tests - isBlocked: async (_ip: string) => false, - cleanup: async () => {} - }; - } - } as any; - - // Load test certificates - let key: string; - let cert: string; - - if (serverConfig.tlsEnabled) { - try { - const certPath = config.testCertPath || './test/fixtures/test-cert.pem'; - const keyPath = config.testKeyPath || './test/fixtures/test-key.pem'; - - cert = await plugins.fs.promises.readFile(certPath, 'utf8'); - key = await plugins.fs.promises.readFile(keyPath, 'utf8'); - } catch (error) { - console.warn('⚠️ Failed to load TLS certificates, falling back to self-signed'); - // Generate self-signed certificate for testing - const forge = await import('node-forge'); - const pki = forge.default.pki; - - // Generate key pair - const keys = pki.rsa.generateKeyPair(2048); - - // Create certificate - const certificate = pki.createCertificate(); - certificate.publicKey = keys.publicKey; - certificate.serialNumber = '01'; - certificate.validity.notBefore = new Date(); - certificate.validity.notAfter = new Date(); - certificate.validity.notAfter.setFullYear(certificate.validity.notBefore.getFullYear() + 1); - - const attrs = [{ - name: 'commonName', - value: serverConfig.hostname - }]; - certificate.setSubject(attrs); - certificate.setIssuer(attrs); - certificate.sign(keys.privateKey); - - // Convert to PEM - cert = pki.certificateToPem(certificate); - key = pki.privateKeyToPem(keys.privateKey); - } - } else { - // Always provide a self-signed certificate for non-TLS servers - // This is required by the interface - const forge = await import('node-forge'); - const pki = forge.default.pki; - - // Generate key pair - const keys = pki.rsa.generateKeyPair(2048); - - // Create certificate - const certificate = pki.createCertificate(); - certificate.publicKey = keys.publicKey; - certificate.serialNumber = '01'; - certificate.validity.notBefore = new Date(); - certificate.validity.notAfter = new Date(); - certificate.validity.notAfter.setFullYear(certificate.validity.notBefore.getFullYear() + 1); - - const attrs = [{ - name: 'commonName', - value: serverConfig.hostname - }]; - certificate.setSubject(attrs); - certificate.setIssuer(attrs); - certificate.sign(keys.privateKey); - - // Convert to PEM - cert = pki.certificateToPem(certificate); - key = pki.privateKeyToPem(keys.privateKey); - } - - // SMTP server options - const smtpOptions: ISmtpServerOptions = { - port: serverConfig.port, - hostname: serverConfig.hostname, - key: key, - cert: cert, - maxConnections: serverConfig.maxConnections, - size: serverConfig.size, - maxRecipients: serverConfig.maxRecipients, - socketTimeout: serverConfig.timeout, - connectionTimeout: serverConfig.timeout * 2, - cleanupInterval: 300000, - auth: serverConfig.authRequired ? ({ - required: true, - methods: ['PLAIN', 'LOGIN'] as ('PLAIN' | 'LOGIN' | 'OAUTH2')[], - validateUser: async (username: string, password: string) => { - // Test server accepts these credentials - return username === 'testuser' && password === 'testpass'; - } - } as any) : undefined - }; - - // Create SMTP server - const smtpServer = await createSmtpServer(mockEmailServer, smtpOptions); - - // Start the server - await smtpServer.listen(); - - // Wait for server to be ready - await waitForServerReady(serverConfig.hostname, serverConfig.port); - - console.log(`✅ Test SMTP server started on ${serverConfig.hostname}:${serverConfig.port}`); - - return { - server: mockEmailServer, - smtpServer: smtpServer, - port: serverConfig.port, // Return the port we already know - hostname: serverConfig.hostname, - config: serverConfig, - startTime: Date.now() - }; +export async function startTestServer(_config: ITestServerConfig): Promise { + throw new Error( + 'startTestServer is no longer available — the TS SMTP server was removed in Phase 7B. ' + + 'Use the Rust SMTP server (via UnifiedEmailServer) for integration testing.' + ); } /** @@ -193,94 +42,19 @@ export async function startTestServer(config: ITestServerConfig): Promise { if (!testServer || !testServer.smtpServer) { - console.warn('⚠️ No test server to stop'); return; } - + try { - console.log(`🛑 Stopping test SMTP server on ${testServer.hostname}:${testServer.port}`); - - // Stop the SMTP server if (testServer.smtpServer.close && typeof testServer.smtpServer.close === 'function') { await testServer.smtpServer.close(); } - - // Wait for port to be free - await waitForPortFree(testServer.port); - - console.log(`✅ Test SMTP server stopped`); } catch (error) { - console.error('❌ Error stopping test server:', error); + console.error('Error stopping test server:', error); throw error; } } -/** - * Wait for server to be ready to accept connections - */ -async function waitForServerReady(hostname: string, port: number, timeout: number = 10000): Promise { - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - try { - await new Promise((resolve, reject) => { - const socket = plugins.net.createConnection({ port, host: hostname }); - - socket.on('connect', () => { - socket.end(); - resolve(); - }); - - socket.on('error', reject); - - setTimeout(() => { - socket.destroy(); - reject(new Error('Connection timeout')); - }, 1000); - }); - - return; // Server is ready - } catch { - // Server not ready yet, wait and retry - await new Promise(resolve => setTimeout(resolve, 100)); - } - } - - throw new Error(`Server did not become ready within ${timeout}ms`); -} - -/** - * Wait for port to be free - */ -async function waitForPortFree(port: number, timeout: number = 5000): Promise { - const startTime = Date.now(); - - while (Date.now() - startTime < timeout) { - const isFree = await isPortFree(port); - if (isFree) { - return; - } - await new Promise(resolve => setTimeout(resolve, 100)); - } - - console.warn(`⚠️ Port ${port} still in use after ${timeout}ms`); -} - -/** - * Check if a port is free - */ -async function isPortFree(port: number): Promise { - return new Promise((resolve) => { - const server = plugins.net.createServer(); - - server.listen(port, () => { - server.close(() => resolve(true)); - }); - - server.on('error', () => resolve(false)); - }); -} - /** * Get an available port for testing */ @@ -293,6 +67,21 @@ export async function getAvailablePort(startPort: number = 25000): Promise { + return new Promise((resolve) => { + const server = plugins.net.createServer(); + + server.listen(port, () => { + server.close(() => resolve(true)); + }); + + server.on('error', () => resolve(false)); + }); +} + /** * Create test email data */ @@ -332,7 +121,7 @@ export async function createTestServer(options: { }): Promise { const hostname = options.hostname || 'localhost'; const port = options.port || await getAvailablePort(); - + const server = plugins.net.createServer((socket) => { if (options.onConnection) { const result = options.onConnection(socket); @@ -344,7 +133,7 @@ export async function createTestServer(options: { } } }); - + return new Promise((resolve, reject) => { server.listen(port, hostname, () => { resolve({ @@ -353,7 +142,7 @@ export async function createTestServer(options: { port }); }); - + server.on('error', reject); }); -} \ No newline at end of file +} diff --git a/test/suite/smtpserver_commands/test.cmd-01.ehlo-command.ts b/test/suite/smtpserver_commands/test.cmd-01.ehlo-command.ts deleted file mode 100644 index 6b8395b..0000000 --- a/test/suite/smtpserver_commands/test.cmd-01.ehlo-command.ts +++ /dev/null @@ -1,193 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('CMD-01: EHLO Command - server responds with proper capabilities', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; // Clear buffer - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - // Parse response - only lines that start with 250 - const lines = receivedData.split('\r\n') - .filter(line => line.startsWith('250')) - .filter(line => line.length > 0); - - // Check for required ESMTP extensions - const capabilities = lines.map(line => line.substring(4).trim()); - console.log('📋 Server capabilities:', capabilities); - - // Verify essential capabilities - expect(capabilities.some(cap => cap.includes('SIZE'))).toBeTruthy(); - expect(capabilities.some(cap => cap.includes('8BITMIME'))).toBeTruthy(); - - // The last line should be "250 " (without hyphen) - const lastLine = lines[lines.length - 1]; - expect(lastLine.startsWith('250 ')).toBeTruthy(); - - currentStep = 'quit'; - receivedData = ''; // Clear buffer - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - socket.destroy(); - done.resolve(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-01: EHLO with invalid hostname - server handles gracefully', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let testIndex = 0; - - const invalidHostnames = [ - '', // Empty hostname - ' ', // Whitespace only - 'invalid..hostname', // Double dots - '.invalid', // Leading dot - 'invalid.', // Trailing dot - 'very-long-hostname-that-exceeds-reasonable-limits-' + 'x'.repeat(200) - ]; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'testing'; - receivedData = ''; // Clear buffer - console.log(`Testing invalid hostname: "${invalidHostnames[testIndex]}"`); - socket.write(`EHLO ${invalidHostnames[testIndex]}\r\n`); - } else if (currentStep === 'testing' && (receivedData.includes('250') || receivedData.includes('5'))) { - // Server should either accept with warning or reject with 5xx - expect(receivedData).toMatch(/^(250|5\d\d)/); - - testIndex++; - if (testIndex < invalidHostnames.length) { - currentStep = 'reset'; - receivedData = ''; // Clear buffer - socket.write('RSET\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } else if (currentStep === 'reset' && receivedData.includes('250')) { - currentStep = 'testing'; - receivedData = ''; // Clear buffer - console.log(`Testing invalid hostname: "${invalidHostnames[testIndex]}"`); - socket.write(`EHLO ${invalidHostnames[testIndex]}\r\n`); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-01: EHLO command pipelining - multiple EHLO commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'first_ehlo'; - receivedData = ''; // Clear buffer - socket.write('EHLO first.example.com\r\n'); - } else if (currentStep === 'first_ehlo' && receivedData.includes('250 ')) { - currentStep = 'second_ehlo'; - receivedData = ''; // Clear buffer - // Second EHLO (should reset session) - socket.write('EHLO second.example.com\r\n'); - } else if (currentStep === 'second_ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; // Clear buffer - // Verify session was reset by trying MAIL FROM - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-02.mail-from.ts b/test/suite/smtpserver_commands/test.cmd-02.mail-from.ts deleted file mode 100644 index 3e59dc3..0000000 --- a/test/suite/smtpserver_commands/test.cmd-02.mail-from.ts +++ /dev/null @@ -1,330 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('CMD-02: MAIL FROM - accepts valid sender addresses', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let testIndex = 0; - - const validAddresses = [ - 'sender@example.com', - 'test.user+tag@example.com', - 'user@[192.168.1.1]', // IP literal - 'user@subdomain.example.com', - 'user@very-long-domain-name-that-is-still-valid.example.com', - 'test_user@example.com' // underscore in local part - ]; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - console.log(`Testing valid address: ${validAddresses[testIndex]}`); - socket.write(`MAIL FROM:<${validAddresses[testIndex]}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - testIndex++; - if (testIndex < validAddresses.length) { - currentStep = 'rset'; - receivedData = ''; - socket.write('RSET\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from'; - receivedData = ''; - console.log(`Testing valid address: ${validAddresses[testIndex]}`); - socket.write(`MAIL FROM:<${validAddresses[testIndex]}>\r\n`); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-02: MAIL FROM - rejects invalid sender addresses', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let testIndex = 0; - - const invalidAddresses = [ - 'notanemail', // No @ symbol - '@example.com', // Missing local part - 'user@', // Missing domain - 'user@.com', // Invalid domain - 'user@domain..com', // Double dot - 'user with spaces@example.com', // Unquoted spaces - 'user@', // Invalid characters - 'user@@example.com', // Double @ - 'user@localhost' // localhost not valid domain - ]; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - console.log(`Testing invalid address: "${invalidAddresses[testIndex]}"`); - socket.write(`MAIL FROM:<${invalidAddresses[testIndex]}>\r\n`); - } else if (currentStep === 'mail_from' && (receivedData.includes('250') || receivedData.includes('5'))) { - // Server might accept some addresses or reject with 5xx error - // For this test, we just verify the server responds appropriately - console.log(` Response: ${receivedData.trim()}`); - - testIndex++; - if (testIndex < invalidAddresses.length) { - currentStep = 'rset'; - receivedData = ''; - socket.write('RSET\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from'; - receivedData = ''; - console.log(`Testing invalid address: "${invalidAddresses[testIndex]}"`); - socket.write(`MAIL FROM:<${invalidAddresses[testIndex]}>\r\n`); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-02: MAIL FROM with SIZE parameter', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from_small'; - receivedData = ''; - // Test small size - socket.write('MAIL FROM: SIZE=1024\r\n'); - } else if (currentStep === 'mail_from_small' && receivedData.includes('250')) { - currentStep = 'rset'; - receivedData = ''; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from_large'; - receivedData = ''; - // Test large size (should be rejected if exceeds limit) - socket.write('MAIL FROM: SIZE=99999999\r\n'); - } else if (currentStep === 'mail_from_large') { - // Should get either 250 (accepted) or 552 (message size exceeds limit) - expect(receivedData).toMatch(/^(250|552)/); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-02: MAIL FROM with parameters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from_8bitmime'; - receivedData = ''; - // Test BODY=8BITMIME - socket.write('MAIL FROM: BODY=8BITMIME\r\n'); - } else if (currentStep === 'mail_from_8bitmime' && receivedData.includes('250')) { - currentStep = 'rset'; - receivedData = ''; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from_unknown'; - receivedData = ''; - // Test unknown parameter (should be ignored or rejected) - socket.write('MAIL FROM: UNKNOWN=value\r\n'); - } else if (currentStep === 'mail_from_unknown') { - // Should get either 250 (ignored) or 555 (parameter not recognized) - expect(receivedData).toMatch(/^(250|555|501)/); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('CMD-02: MAIL FROM sequence violations', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'mail_without_ehlo'; - receivedData = ''; - // Try MAIL FROM without EHLO/HELO first - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_without_ehlo' && receivedData.includes('503')) { - // Should get 503 (bad sequence) - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'first_mail'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'first_mail' && receivedData.includes('250')) { - currentStep = 'second_mail'; - receivedData = ''; - // Try second MAIL FROM without RSET - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'second_mail' && (receivedData.includes('503') || receivedData.includes('250'))) { - // Server might accept or reject the second MAIL FROM - // Some servers allow resetting the sender, others require RSET - console.log(`Second MAIL FROM response: ${receivedData.trim()}`); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-03.rcpt-to.ts b/test/suite/smtpserver_commands/test.cmd-03.rcpt-to.ts deleted file mode 100644 index 27132f1..0000000 --- a/test/suite/smtpserver_commands/test.cmd-03.rcpt-to.ts +++ /dev/null @@ -1,296 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('RCPT TO - should accept valid recipient after MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - expect(receivedData).toInclude('250'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('RCPT TO - should reject without MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'rcpt_to_without_mail'; - receivedData = ''; - // Try RCPT TO without MAIL FROM - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to_without_mail' && receivedData.includes('503')) { - // Should get 503 (bad sequence) - expect(receivedData).toInclude('503'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('RCPT TO - should accept multiple recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - const maxRecipients = 3; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write(`RCPT TO:\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - recipientCount++; - receivedData = ''; - - if (recipientCount < maxRecipients) { - socket.write(`RCPT TO:\r\n`); - } else { - expect(recipientCount).toEqual(maxRecipients); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('RCPT TO - should reject invalid email format', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let testIndex = 0; - - const invalidRecipients = [ - 'notanemail', - '@example.com', - 'user@', - 'user@.com', - 'user@domain..com' - ]; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - console.log(`Testing invalid recipient: "${invalidRecipients[testIndex]}"`); - socket.write(`RCPT TO:<${invalidRecipients[testIndex]}>\r\n`); - } else if (currentStep === 'rcpt_to' && (receivedData.includes('501') || receivedData.includes('5'))) { - // Should reject with 5xx error - console.log(` Response: ${receivedData.trim()}`); - - testIndex++; - if (testIndex < invalidRecipients.length) { - currentStep = 'rset'; - receivedData = ''; - socket.write('RSET\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('RCPT TO - should handle SIZE parameter', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to_with_size'; - receivedData = ''; - // RCPT TO doesn't typically have SIZE parameter, but test server response - socket.write('RCPT TO: SIZE=1024\r\n'); - } else if (currentStep === 'rcpt_to_with_size') { - // Server might accept or reject the parameter - expect(receivedData).toMatch(/^(250|555|501)/); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-04.data-command.ts b/test/suite/smtpserver_commands/test.cmd-04.data-command.ts deleted file mode 100644 index c9a3fca..0000000 --- a/test/suite/smtpserver_commands/test.cmd-04.data-command.ts +++ /dev/null @@ -1,395 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 15000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('DATA - should accept email data after RCPT TO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data_command'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_command' && receivedData.includes('354')) { - currentStep = 'message_body'; - receivedData = ''; - // Send email content - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Test message\r\n'); - socket.write('\r\n'); // Empty line to separate headers from body - socket.write('This is a test message.\r\n'); - socket.write('.\r\n'); // End of message - } else if (currentStep === 'message_body' && receivedData.includes('250')) { - expect(receivedData).toInclude('250'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('DATA - should reject without RCPT TO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'data_without_rcpt'; - receivedData = ''; - // Try DATA without MAIL FROM or RCPT TO - socket.write('DATA\r\n'); - } else if (currentStep === 'data_without_rcpt' && receivedData.includes('503')) { - // Should get 503 (bad sequence) - expect(receivedData).toInclude('503'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('DATA - should accept empty message body', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data_command'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_command' && receivedData.includes('354')) { - currentStep = 'empty_message'; - receivedData = ''; - // Send only the terminator - socket.write('.\r\n'); - } else if (currentStep === 'empty_message') { - // Server should accept empty message - expect(receivedData).toMatch(/^(250|5\d\d)/); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('DATA - should handle dot stuffing correctly', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data_command'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_command' && receivedData.includes('354')) { - currentStep = 'dot_stuffed_message'; - receivedData = ''; - // Send message with dots that need stuffing - socket.write('This line is normal.\r\n'); - socket.write('..This line starts with two dots (one will be removed).\r\n'); - socket.write('.This line starts with a single dot.\r\n'); - socket.write('...This line starts with three dots.\r\n'); - socket.write('.\r\n'); // End of message - } else if (currentStep === 'dot_stuffed_message' && receivedData.includes('250')) { - expect(receivedData).toInclude('250'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('DATA - should handle large messages', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data_command'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_command' && receivedData.includes('354')) { - currentStep = 'large_message'; - receivedData = ''; - // Send a large message (100KB) - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Large test message\r\n'); - socket.write('\r\n'); - - // Generate 100KB of data - const lineContent = 'This is a test line that will be repeated many times. '; - const linesNeeded = Math.ceil(100000 / lineContent.length); - - for (let i = 0; i < linesNeeded; i++) { - socket.write(lineContent + '\r\n'); - } - - socket.write('.\r\n'); // End of message - } else if (currentStep === 'large_message' && receivedData.includes('250')) { - expect(receivedData).toInclude('250'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('DATA - should handle binary data in message', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data_command'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_command' && receivedData.includes('354')) { - currentStep = 'binary_message'; - receivedData = ''; - // Send message with binary data (base64 encoded attachment) - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Binary test message\r\n'); - socket.write('MIME-Version: 1.0\r\n'); - socket.write('Content-Type: multipart/mixed; boundary="boundary123"\r\n'); - socket.write('\r\n'); - socket.write('--boundary123\r\n'); - socket.write('Content-Type: text/plain\r\n'); - socket.write('\r\n'); - socket.write('This message contains binary data.\r\n'); - socket.write('--boundary123\r\n'); - socket.write('Content-Type: application/octet-stream\r\n'); - socket.write('Content-Transfer-Encoding: base64\r\n'); - socket.write('\r\n'); - socket.write('SGVsbG8gV29ybGQhIFRoaXMgaXMgYmluYXJ5IGRhdGEu\r\n'); - socket.write('--boundary123--\r\n'); - socket.write('.\r\n'); // End of message - } else if (currentStep === 'binary_message' && receivedData.includes('250')) { - expect(receivedData).toInclude('250'); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-05.noop-command.ts b/test/suite/smtpserver_commands/test.cmd-05.noop-command.ts deleted file mode 100644 index d5de611..0000000 --- a/test/suite/smtpserver_commands/test.cmd-05.noop-command.ts +++ /dev/null @@ -1,320 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic NOOP command -tap.test('NOOP - should accept NOOP command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'noop'; - socket.write('NOOP\r\n'); - } else if (currentStep === 'noop' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); // NOOP response - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple NOOP commands -tap.test('NOOP - should handle multiple consecutive NOOP commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let noopCount = 0; - const maxNoops = 3; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; // Clear buffer after processing - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'noop'; - receivedData = ''; // Clear buffer after processing - socket.write('NOOP\r\n'); - } else if (currentStep === 'noop' && receivedData.includes('250 OK')) { - noopCount++; - receivedData = ''; // Clear buffer after processing - - if (noopCount < maxNoops) { - // Send another NOOP command - socket.write('NOOP\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(noopCount).toEqual(maxNoops); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: NOOP during transaction -tap.test('NOOP - should work during email transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'noop_after_mail'; - socket.write('NOOP\r\n'); - } else if (currentStep === 'noop_after_mail' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'noop_after_rcpt'; - socket.write('NOOP\r\n'); - } else if (currentStep === 'noop_after_rcpt' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: NOOP with parameter (should be ignored) -tap.test('NOOP - should handle NOOP with parameters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'noop_with_param'; - socket.write('NOOP ignored parameter\r\n'); // Parameters should be ignored - } else if (currentStep === 'noop_with_param' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: NOOP before EHLO/HELO -tap.test('NOOP - should work before EHLO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'noop_before_ehlo'; - socket.write('NOOP\r\n'); - } else if (currentStep === 'noop_before_ehlo' && receivedData.includes('250')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Rapid NOOP commands (stress test) -tap.test('NOOP - should handle rapid NOOP commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let noopsSent = 0; - let noopsReceived = 0; - const rapidNoops = 10; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'rapid_noop'; - // Send multiple NOOPs rapidly - for (let i = 0; i < rapidNoops; i++) { - socket.write('NOOP\r\n'); - noopsSent++; - } - } else if (currentStep === 'rapid_noop') { - // Count 250 responses - const matches = receivedData.match(/250 /g); - if (matches) { - noopsReceived = matches.length - 1; // -1 for EHLO response - } - - if (noopsReceived >= rapidNoops) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(noopsReceived).toBeGreaterThan(rapidNoops - 1); - done.resolve(); - }, 500); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-06.rset-command.ts b/test/suite/smtpserver_commands/test.cmd-06.rset-command.ts deleted file mode 100644 index 292e68b..0000000 --- a/test/suite/smtpserver_commands/test.cmd-06.rset-command.ts +++ /dev/null @@ -1,399 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic RSET command -tap.test('RSET - should reset transaction after MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rset'; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset' && receivedData.includes('250')) { - // RSET successful, try to send MAIL FROM again to verify reset - currentStep = 'mail_from_after_rset'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from_after_rset' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250 OK'); // RSET response - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RSET after RCPT TO -tap.test('RSET - should reset transaction after RCPT TO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'rset'; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset' && receivedData.includes('250')) { - // After RSET, should need MAIL FROM before RCPT TO - currentStep = 'rcpt_to_after_rset'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to_after_rset' && receivedData.includes('503')) { - // Should get 503 bad sequence - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); // Bad sequence after RSET - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RSET during DATA -tap.test('RSET - should reset transaction during DATA phase', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - // Start sending data but then RSET - currentStep = 'rset_during_data'; - socket.write('Subject: Test\r\n\r\nPartial message...\r\n'); - socket.write('RSET\r\n'); // This should be treated as part of data - socket.write('\r\n.\r\n'); // End data - } else if (currentStep === 'rset_during_data' && receivedData.includes('250')) { - // Message accepted, now send actual RSET - currentStep = 'rset_after_data'; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset_after_data' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple RSET commands -tap.test('RSET - should handle multiple consecutive RSET commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let rsetCount = 0; - const maxRsets = 3; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'multiple_rsets'; - receivedData = ''; - socket.write('RSET\r\n'); - } else if (currentStep === 'multiple_rsets' && receivedData.includes('250')) { - rsetCount++; - receivedData = ''; // Clear buffer after processing - - if (rsetCount < maxRsets) { - socket.write('RSET\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(rsetCount).toEqual(maxRsets); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RSET without transaction -tap.test('RSET - should work without active transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'rset_without_transaction'; - socket.write('RSET\r\n'); - } else if (currentStep === 'rset_without_transaction' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); // RSET should work even without transaction - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RSET with multiple recipients -tap.test('RSET - should clear all recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'add_recipients'; - recipientCount++; - socket.write(`RCPT TO:\r\n`); - } else if (currentStep === 'add_recipients' && receivedData.includes('250')) { - if (recipientCount < 3) { - recipientCount++; - receivedData = ''; // Clear buffer - socket.write(`RCPT TO:\r\n`); - } else { - currentStep = 'rset'; - socket.write('RSET\r\n'); - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - // After RSET, all recipients should be cleared - currentStep = 'data_after_rset'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_after_rset' && receivedData.includes('503')) { - // Should get 503 bad sequence (no recipients) - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RSET with parameter (should be ignored) -tap.test('RSET - should ignore parameters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'rset_with_param'; - socket.write('RSET ignored parameter\r\n'); // Parameters should be ignored - } else if (currentStep === 'rset_with_param' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-07.vrfy-command.ts b/test/suite/smtpserver_commands/test.cmd-07.vrfy-command.ts deleted file mode 100644 index bed30bd..0000000 --- a/test/suite/smtpserver_commands/test.cmd-07.vrfy-command.ts +++ /dev/null @@ -1,391 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic VRFY command -tap.test('VRFY - should respond to VRFY command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'vrfy'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write('VRFY postmaster\r\n'); - } else if (currentStep === 'vrfy' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - const vrfyResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = vrfyResponse?.substring(0, 3); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // VRFY may be: - // 250/251 - User found/will forward - // 252 - Cannot verify but will try - // 502 - Command not implemented (common for security) - // 503 - Bad sequence of commands (this server rejects VRFY due to sequence validation) - // 550 - User not found - expect(responseCode).toMatch(/^(250|251|252|502|503|550)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: VRFY multiple users -tap.test('VRFY - should handle multiple VRFY requests', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const testUsers = ['postmaster', 'admin', 'test', 'nonexistent']; - let currentUserIndex = 0; - const vrfyResults: Array<{ user: string; responseCode: string; supported: boolean }> = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'vrfy'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write(`VRFY ${testUsers[currentUserIndex]}\r\n`); - } else if (currentStep === 'vrfy' && receivedData.includes('503') && currentUserIndex < testUsers.length) { - // This server always returns 503 for VRFY - vrfyResults.push({ - user: testUsers[currentUserIndex], - responseCode: '503', - supported: false - }); - - currentUserIndex++; - - if (currentUserIndex < testUsers.length) { - receivedData = ''; // Clear buffer - socket.write(`VRFY ${testUsers[currentUserIndex]}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should have results for all users - expect(vrfyResults.length).toEqual(testUsers.length); - - // All responses should be valid SMTP codes - vrfyResults.forEach(result => { - expect(result.responseCode).toMatch(/^(250|251|252|502|503|550)$/); - }); - - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: VRFY without parameter -tap.test('VRFY - should reject VRFY without parameter', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'vrfy_empty'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write('VRFY\r\n'); // No user specified - } else if (currentStep === 'vrfy_empty' && receivedData.includes(' ')) { - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should be 501 (syntax error), 502 (not implemented), or 503 (bad sequence) - expect(responseCode).toMatch(/^(501|502|503)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: VRFY during transaction -tap.test('VRFY - should work during mail transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'vrfy_during_transaction'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write('VRFY test@example.com\r\n'); - } else if (currentStep === 'vrfy_during_transaction' && receivedData.includes('503')) { - const responseCode = '503'; // We know this server always returns 503 - - // VRFY may be rejected with 503 during transaction in this server - expect(responseCode).toMatch(/^(250|251|252|502|503|550)$/); - - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: VRFY special addresses -tap.test('VRFY - should handle special addresses', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const specialAddresses = [ - 'postmaster', - 'postmaster@localhost', - 'abuse', - 'abuse@localhost', - 'noreply', - '' // With angle brackets - ]; - let currentIndex = 0; - const results: Array<{ address: string; responseCode: string }> = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'vrfy_special'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write(`VRFY ${specialAddresses[currentIndex]}\r\n`); - } else if (currentStep === 'vrfy_special' && receivedData.includes('503') && currentIndex < specialAddresses.length) { - // This server always returns 503 for VRFY - results.push({ - address: specialAddresses[currentIndex], - responseCode: '503' - }); - - currentIndex++; - - if (currentIndex < specialAddresses.length) { - receivedData = ''; // Clear buffer - socket.write(`VRFY ${specialAddresses[currentIndex]}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // All addresses should get valid responses - results.forEach(result => { - expect(result.responseCode).toMatch(/^(250|251|252|502|503|550)$/); - }); - - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: VRFY security considerations -tap.test('VRFY - verify security behavior', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let commandDisabled = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'vrfy_security'; - receivedData = ''; // Clear buffer before sending VRFY - socket.write('VRFY randomuser123\r\n'); - } else if (currentStep === 'vrfy_security' && receivedData.includes(' ')) { - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - - // Check if command is disabled for security or sequence validation - if (responseCode === '502' || responseCode === '252' || responseCode === '503') { - commandDisabled = true; - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Note: Many servers disable VRFY for security reasons - // Both enabled and disabled are valid configurations - // This server rejects VRFY with 503 due to sequence validation - if (responseCode === '503' || commandDisabled) { - expect(responseCode).toMatch(/^(502|252|503)$/); - } else { - expect(responseCode).toMatch(/^(250|251|550)$/); - } - - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-08.expn-command.ts b/test/suite/smtpserver_commands/test.cmd-08.expn-command.ts deleted file mode 100644 index 4db81f9..0000000 --- a/test/suite/smtpserver_commands/test.cmd-08.expn-command.ts +++ /dev/null @@ -1,450 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic EXPN command -tap.test('EXPN - should respond to EXPN command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write('EXPN postmaster\r\n'); - } else if (currentStep === 'expn' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - const expnResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = expnResponse?.substring(0, 3); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // EXPN may be: - // 250/251 - List expanded - // 252 - Cannot expand but will try to deliver - // 502 - Command not implemented (common for security) - // 503 - Bad sequence of commands (this server rejects EXPN due to sequence validation) - // 550 - List not found - expect(responseCode).toMatch(/^(250|251|252|502|503|550)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN multiple lists -tap.test('EXPN - should handle multiple EXPN requests', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const testLists = ['postmaster', 'admin', 'staff', 'all', 'users']; - let currentListIndex = 0; - const expnResults: Array<{ list: string; responseCode: string; supported: boolean }> = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write(`EXPN ${testLists[currentListIndex]}\r\n`); - } else if (currentStep === 'expn' && receivedData.includes('503') && currentListIndex < testLists.length) { - // This server always returns 503 for EXPN - const responseCode = '503'; - expnResults.push({ - list: testLists[currentListIndex], - responseCode: responseCode, - supported: responseCode.startsWith('2') - }); - - currentListIndex++; - - if (currentListIndex < testLists.length) { - receivedData = ''; // Clear buffer - socket.write(`EXPN ${testLists[currentListIndex]}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should have results for all lists - expect(expnResults.length).toEqual(testLists.length); - - // All responses should be valid SMTP codes - expnResults.forEach(result => { - expect(result.responseCode).toMatch(/^(250|251|252|502|503|550)$/); - }); - - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN without parameter -tap.test('EXPN - should reject EXPN without parameter', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn_empty'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write('EXPN\r\n'); // No list specified - } else if (currentStep === 'expn_empty' && receivedData.includes(' ')) { - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should be 501 (syntax error), 502 (not implemented), or 503 (bad sequence) - expect(responseCode).toMatch(/^(501|502|503)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN during transaction -tap.test('EXPN - should work during mail transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'expn_during_transaction'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write('EXPN admin\r\n'); - } else if (currentStep === 'expn_during_transaction' && receivedData.includes('503')) { - const responseCode = '503'; // We know this server always returns 503 - - // EXPN may be rejected with 503 during transaction in this server - expect(responseCode).toMatch(/^(250|251|252|502|503|550)$/); - - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN special lists -tap.test('EXPN - should handle special mailing lists', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const specialLists = [ - 'postmaster', - 'postmaster@localhost', - 'abuse', - 'webmaster', - 'noreply', - '' // With angle brackets - ]; - let currentIndex = 0; - const results: Array<{ list: string; responseCode: string }> = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn_special'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write(`EXPN ${specialLists[currentIndex]}\r\n`); - } else if (currentStep === 'expn_special' && receivedData.includes('503') && currentIndex < specialLists.length) { - // This server always returns 503 for EXPN - results.push({ - list: specialLists[currentIndex], - responseCode: '503' - }); - - currentIndex++; - - if (currentIndex < specialLists.length) { - receivedData = ''; // Clear buffer - socket.write(`EXPN ${specialLists[currentIndex]}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // All lists should get valid responses - results.forEach(result => { - expect(result.responseCode).toMatch(/^(250|251|252|502|503|550)$/); - }); - - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN security considerations -tap.test('EXPN - verify security behavior', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let commandDisabled = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn_security'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write('EXPN randomlist123\r\n'); - } else if (currentStep === 'expn_security' && receivedData.includes(' ')) { - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - - // Check if command is disabled for security or sequence validation - if (responseCode === '502' || responseCode === '252' || responseCode === '503') { - commandDisabled = true; - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Note: Many servers disable EXPN for security reasons - // to prevent email address harvesting - // Both enabled and disabled are valid configurations - // This server rejects EXPN with 503 due to sequence validation - if (responseCode === '503' || commandDisabled) { - expect(responseCode).toMatch(/^(502|252|503)$/); - console.log('EXPN disabled - good security practice'); - } else { - expect(responseCode).toMatch(/^(250|251|550)$/); - } - - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EXPN response format -tap.test('EXPN - verify proper response format when supported', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'expn_format'; - receivedData = ''; // Clear buffer before sending EXPN - socket.write('EXPN postmaster\r\n'); - } else if (currentStep === 'expn_format' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - - // This server returns 503 for EXPN commands - if (receivedData.includes('503')) { - // Server doesn't support EXPN in the current state - expect(receivedData).toInclude('503'); - } else if (receivedData.includes('250-') || receivedData.includes('250 ')) { - // Multi-line response format check - const expansionLines = lines.filter(l => l.startsWith('250')); - expect(expansionLines.length).toBeGreaterThan(0); - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-09.size-extension.ts b/test/suite/smtpserver_commands/test.cmd-09.size-extension.ts deleted file mode 100644 index 5c5042e..0000000 --- a/test/suite/smtpserver_commands/test.cmd-09.size-extension.ts +++ /dev/null @@ -1,465 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 15000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: SIZE extension advertised in EHLO -tap.test('SIZE Extension - should advertise SIZE in EHLO response', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let sizeSupported = false; - let maxMessageSize: number | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - // Check if SIZE extension is advertised - if (receivedData.includes('SIZE')) { - sizeSupported = true; - - // Extract maximum message size if specified - const sizeMatch = receivedData.match(/SIZE\s+(\d+)/); - if (sizeMatch) { - maxMessageSize = parseInt(sizeMatch[1]); - } - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(sizeSupported).toEqual(true); - if (maxMessageSize !== null) { - expect(maxMessageSize).toBeGreaterThan(0); - } - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: MAIL FROM with SIZE parameter -tap.test('SIZE Extension - should accept MAIL FROM with SIZE parameter', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const messageSize = 1000; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from_size'; - socket.write(`MAIL FROM: SIZE=${messageSize}\r\n`); - } else if (currentStep === 'mail_from_size' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250 OK'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: SIZE parameter with various sizes -tap.test('SIZE Extension - should handle different message sizes', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const testSizes = [1000, 10000, 100000, 1000000]; // 1KB, 10KB, 100KB, 1MB - let currentSizeIndex = 0; - const sizeResults: Array<{ size: number; accepted: boolean; response: string }> = []; - - const testNextSize = () => { - if (currentSizeIndex < testSizes.length) { - receivedData = ''; // Clear buffer - const size = testSizes[currentSizeIndex]; - socket.write(`MAIL FROM: SIZE=${size}\r\n`); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // At least some sizes should be accepted - const acceptedCount = sizeResults.filter(r => r.accepted).length; - expect(acceptedCount).toBeGreaterThan(0); - - // Verify larger sizes may be rejected - const largeRejected = sizeResults - .filter(r => r.size >= 1000000 && !r.accepted) - .length; - expect(largeRejected + acceptedCount).toEqual(sizeResults.length); - - done.resolve(); - }, 100); - } - }; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from_sizes'; - testNextSize(); - } else if (currentStep === 'mail_from_sizes') { - if (receivedData.includes('250')) { - // Size accepted - sizeResults.push({ - size: testSizes[currentSizeIndex], - accepted: true, - response: receivedData.trim() - }); - - socket.write('RSET\r\n'); - currentSizeIndex++; - currentStep = 'rset'; - } else if (receivedData.includes('552') || receivedData.includes('5')) { - // Size rejected - sizeResults.push({ - size: testSizes[currentSizeIndex], - accepted: false, - response: receivedData.trim() - }); - - socket.write('RSET\r\n'); - currentSizeIndex++; - currentStep = 'rset'; - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_from_sizes'; - testNextSize(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: SIZE parameter exceeding limit -tap.test('SIZE Extension - should reject SIZE exceeding server limit', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let maxSize: number | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - // Extract max size if advertised - const sizeMatch = receivedData.match(/SIZE\s+(\d+)/); - if (sizeMatch) { - maxSize = parseInt(sizeMatch[1]); - } - - currentStep = 'mail_from_oversized'; - // Try to send a message larger than any reasonable limit - const oversizedValue = maxSize ? maxSize + 1 : 100000000; // 100MB or maxSize+1 - socket.write(`MAIL FROM: SIZE=${oversizedValue}\r\n`); - } else if (currentStep === 'mail_from_oversized') { - if (receivedData.includes('552') || receivedData.includes('5')) { - // Size limit exceeded - expected - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toMatch(/552|5\d{2}/); - done.resolve(); - }, 100); - } else if (receivedData.includes('250')) { - // If accepted, server has very high or no limit - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: SIZE=0 (empty message) -tap.test('SIZE Extension - should handle SIZE=0', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from_zero_size'; - socket.write('MAIL FROM: SIZE=0\r\n'); - } else if (currentStep === 'mail_from_zero_size' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Invalid SIZE parameter -tap.test('SIZE Extension - should reject invalid SIZE values', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const invalidSizes = ['abc', '-1', '1.5', '']; // Invalid size values - let currentIndex = 0; - const results: Array<{ value: string; rejected: boolean }> = []; - - const testNextInvalidSize = () => { - if (currentIndex < invalidSizes.length) { - receivedData = ''; // Clear buffer - const invalidSize = invalidSizes[currentIndex]; - socket.write(`MAIL FROM: SIZE=${invalidSize}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // This server accepts invalid SIZE values without strict validation - // This is permissive but not necessarily incorrect - // Just verify we got responses for all test cases - expect(results.length).toEqual(invalidSizes.length); - - done.resolve(); - }, 100); - } - }; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'invalid_sizes'; - testNextInvalidSize(); - } else if (currentStep === 'invalid_sizes' && currentIndex < invalidSizes.length) { - if (receivedData.includes('250')) { - // This server accepts invalid size values - results.push({ - value: invalidSizes[currentIndex], - rejected: false - }); - } else if (receivedData.includes('501') || receivedData.includes('552')) { - // Invalid parameter - proper validation - results.push({ - value: invalidSizes[currentIndex], - rejected: true - }); - } - - socket.write('RSET\r\n'); - currentIndex++; - currentStep = 'rset'; - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'invalid_sizes'; - testNextInvalidSize(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: SIZE with actual message data -tap.test('SIZE Extension - should enforce SIZE during DATA phase', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const declaredSize = 100; // Declare 100 bytes - const actualMessage = 'X'.repeat(200); // Send 200 bytes (more than declared) - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write(`MAIL FROM: SIZE=${declaredSize}\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'message'; - // Send message larger than declared size - socket.write(`Subject: Size Test\r\n\r\n${actualMessage}\r\n.\r\n`); - } else if (currentStep === 'message') { - // Server may accept or reject based on enforcement - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Either accepted (250) or rejected (552) - expect(receivedData).toMatch(/250|552/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-10.help-command.ts b/test/suite/smtpserver_commands/test.cmd-10.help-command.ts deleted file mode 100644 index f8575b4..0000000 --- a/test/suite/smtpserver_commands/test.cmd-10.help-command.ts +++ /dev/null @@ -1,454 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic HELP command -tap.test('HELP - should respond to general HELP command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'help'; - receivedData = ''; // Clear buffer before sending HELP - socket.write('HELP\r\n'); - } else if (currentStep === 'help' && receivedData.includes('214')) { - const lines = receivedData.split('\r\n'); - const helpResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = helpResponse?.substring(0, 3); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // HELP may return: - // 214 - Help message - // 502 - Command not implemented - // 504 - Command parameter not implemented - expect(responseCode).toMatch(/^(214|502|504)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP with specific topics -tap.test('HELP - should respond to HELP with specific command topics', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const helpTopics = ['EHLO', 'MAIL', 'RCPT', 'DATA', 'QUIT']; - let currentTopicIndex = 0; - const helpResults: Array<{ topic: string; responseCode: string; supported: boolean }> = []; - - const getLastResponse = (data: string): string => { - const lines = data.split('\r\n'); - for (let i = lines.length - 1; i >= 0; i--) { - const line = lines[i].trim(); - if (line && /^\d{3}/.test(line)) { - return line; - } - } - return ''; - }; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'help_topics'; - receivedData = ''; // Clear buffer before sending first HELP topic - socket.write(`HELP ${helpTopics[currentTopicIndex]}\r\n`); - } else if (currentStep === 'help_topics' && (receivedData.includes('214') || receivedData.includes('502') || receivedData.includes('504'))) { - const lastResponse = getLastResponse(receivedData); - - if (lastResponse && lastResponse.match(/^\d{3}/)) { - const responseCode = lastResponse.substring(0, 3); - helpResults.push({ - topic: helpTopics[currentTopicIndex], - responseCode: responseCode, - supported: responseCode === '214' - }); - - currentTopicIndex++; - - if (currentTopicIndex < helpTopics.length) { - receivedData = ''; // Clear buffer - socket.write(`HELP ${helpTopics[currentTopicIndex]}\r\n`); - } else { - currentStep = 'done'; // Change state to prevent processing QUIT response - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should have results for all topics - expect(helpResults.length).toEqual(helpTopics.length); - - // All responses should be valid - helpResults.forEach(result => { - expect(result.responseCode).toMatch(/^(214|502|504)$/); - }); - - done.resolve(); - }, 100); - } - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP response format -tap.test('HELP - should return properly formatted help text', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let helpResponse = ''; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'help'; - receivedData = ''; // Clear to capture only HELP response - socket.write('HELP\r\n'); - } else if (currentStep === 'help') { - helpResponse = receivedData; - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - - if (responseCode === '214') { - // Help is supported - check format - const lines = receivedData.split('\r\n'); - const helpLines = lines.filter(l => l.startsWith('214')); - - // Should have at least one help line - expect(helpLines.length).toBeGreaterThan(0); - - // Multi-line help should use 214- prefix - if (helpLines.length > 1) { - const hasMultilineFormat = helpLines.some(l => l.startsWith('214-')); - expect(hasMultilineFormat).toEqual(true); - } - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP during transaction -tap.test('HELP - should work during mail transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'help_during_transaction'; - receivedData = ''; // Clear buffer before sending HELP - socket.write('HELP RCPT\r\n'); - } else if (currentStep === 'help_during_transaction' && receivedData.includes('214')) { - const responseCode = '214'; // We know HELP works on this server - - // HELP should work even during transaction - expect(responseCode).toMatch(/^(214|502|504)$/); - - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP with invalid topic -tap.test('HELP - should handle HELP with invalid topic', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'help_invalid'; - receivedData = ''; // Clear buffer before sending HELP - socket.write('HELP INVALID_COMMAND_XYZ\r\n'); - } else if (currentStep === 'help_invalid' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - const helpResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = helpResponse?.substring(0, 3); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Should return 504 (command parameter not implemented) or - // 214 (general help) or 502 (not implemented) - expect(responseCode).toMatch(/^(214|502|504)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP availability check -tap.test('HELP - verify HELP command optional status', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let helpSupported = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - // Check if HELP is advertised in EHLO response - if (receivedData.includes('HELP')) { - console.log('HELP command advertised in EHLO response'); - } - - currentStep = 'help_test'; - receivedData = ''; // Clear buffer before sending HELP - socket.write('HELP\r\n'); - } else if (currentStep === 'help_test' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - const helpResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = helpResponse?.substring(0, 3); - - if (responseCode === '214') { - helpSupported = true; - console.log('HELP command is supported'); - } else if (responseCode === '502') { - console.log('HELP command not implemented (optional per RFC 5321)'); - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Both supported and not supported are valid - expect(responseCode).toMatch(/^(214|502)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELP content usefulness -tap.test('HELP - check if help content is useful when supported', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'help_data'; - receivedData = ''; // Clear buffer before sending HELP - socket.write('HELP DATA\r\n'); - } else if (currentStep === 'help_data' && receivedData.includes(' ')) { - const lines = receivedData.split('\r\n'); - const helpResponse = lines.find(line => line.match(/^\d{3}/)); - const responseCode = helpResponse?.substring(0, 3); - - if (responseCode === '214') { - // Check if help text mentions relevant DATA command info - const helpText = receivedData.toLowerCase(); - if (helpText.includes('data') || helpText.includes('message') || helpText.includes('354')) { - console.log('HELP provides relevant information about DATA command'); - } - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-11.command-pipelining.ts b/test/suite/smtpserver_commands/test.cmd-11.command-pipelining.ts deleted file mode 100644 index e51a47c..0000000 --- a/test/suite/smtpserver_commands/test.cmd-11.command-pipelining.ts +++ /dev/null @@ -1,334 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 30000; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('Command Pipelining - should advertise PIPELINING in EHLO response', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - console.log('EHLO response:', ehloResponse); - - // Check if PIPELINING is advertised - const pipeliningAdvertised = ehloResponse.includes('250-PIPELINING') || ehloResponse.includes('250 PIPELINING'); - console.log('PIPELINING advertised:', pipeliningAdvertised); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - // Note: PIPELINING is optional per RFC 2920 - expect(ehloResponse).toInclude('250'); - - } finally { - done.resolve(); - } -}); - -tap.test('Command Pipelining - should handle pipelined MAIL FROM and RCPT TO', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send pipelined commands (all at once) - const pipelinedCommands = - 'MAIL FROM:\r\n' + - 'RCPT TO:\r\n'; - - console.log('Sending pipelined commands...'); - socket.write(pipelinedCommands); - - // Collect responses - const responses = await new Promise((resolve) => { - let data = ''; - let responseCount = 0; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - const lines = data.split('\r\n').filter(line => line.trim()); - - // Count responses that look like complete SMTP responses - const completeResponses = lines.filter(line => /^[0-9]{3}(\s|-)/.test(line)); - - // We expect 2 responses (one for MAIL FROM, one for RCPT TO) - if (completeResponses.length >= 2) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - - // Timeout if we don't get responses - setTimeout(() => { - socket.removeListener('data', handler); - resolve(data); - }, 5000); - }); - - console.log('Pipelined command responses:', responses); - - // Parse responses - const responseLines = responses.split('\r\n').filter(line => line.trim()); - const mailFromResponse = responseLines.find(line => line.match(/^250.*/) && responseLines.indexOf(line) === 0); - const rcptToResponse = responseLines.find(line => line.match(/^250.*/) && responseLines.indexOf(line) === 1); - - // Both commands should succeed - expect(mailFromResponse).toBeDefined(); - expect(rcptToResponse).toBeDefined(); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Command Pipelining - should handle pipelined commands with DATA', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send pipelined MAIL FROM, RCPT TO, and DATA commands - const pipelinedCommands = - 'MAIL FROM:\r\n' + - 'RCPT TO:\r\n' + - 'DATA\r\n'; - - console.log('Sending pipelined commands with DATA...'); - socket.write(pipelinedCommands); - - // Collect responses - const responses = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - - // Look for the DATA prompt (354) - if (data.includes('354')) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - - setTimeout(() => { - socket.removeListener('data', handler); - resolve(data); - }, 5000); - }); - - console.log('Responses including DATA:', responses); - - // Should get 250 for MAIL FROM, 250 for RCPT TO, and 354 for DATA - expect(responses).toInclude('250'); // MAIL FROM OK - expect(responses).toInclude('354'); // Start mail input - - // Send email content - const emailContent = 'Subject: Pipelining Test\r\nFrom: sender@example.com\r\nTo: recipient@example.com\r\n\r\nTest email with pipelining.\r\n.\r\n'; - socket.write(emailContent); - - // Get final response - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Final response:', finalResponse); - expect(finalResponse).toInclude('250'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Command Pipelining - should handle pipelined NOOP commands', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send multiple pipelined NOOP commands - const pipelinedNoops = - 'NOOP\r\n' + - 'NOOP\r\n' + - 'NOOP\r\n'; - - console.log('Sending pipelined NOOP commands...'); - socket.write(pipelinedNoops); - - // Collect responses - const responses = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - const responseCount = (data.match(/^250.*OK/gm) || []).length; - - // We expect 3 NOOP responses - if (responseCount >= 3) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - - setTimeout(() => { - socket.removeListener('data', handler); - resolve(data); - }, 5000); - }); - - console.log('NOOP responses:', responses); - - // Count OK responses - const okResponses = (responses.match(/^250.*OK/gm) || []).length; - expect(okResponses).toBeGreaterThanOrEqual(3); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-12.helo-command.ts b/test/suite/smtpserver_commands/test.cmd-12.helo-command.ts deleted file mode 100644 index 270fc40..0000000 --- a/test/suite/smtpserver_commands/test.cmd-12.helo-command.ts +++ /dev/null @@ -1,420 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic HELO command -tap.test('HELO - should accept HELO command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo'; - socket.write('HELO test.example.com\r\n'); - } else if (currentStep === 'helo' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELO without hostname -tap.test('HELO - should reject HELO without hostname', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo_no_hostname'; - socket.write('HELO\r\n'); // Missing hostname - } else if (currentStep === 'helo_no_hostname' && receivedData.includes('501')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('501'); // Syntax error - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple HELO commands -tap.test('HELO - should accept multiple HELO commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let heloCount = 0; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'first_helo'; - receivedData = ''; - socket.write('HELO test1.example.com\r\n'); - } else if (currentStep === 'first_helo' && receivedData.includes('250 ')) { - heloCount++; - currentStep = 'second_helo'; - receivedData = ''; // Clear buffer - socket.write('HELO test2.example.com\r\n'); - } else if (currentStep === 'second_helo' && receivedData.includes('250 ')) { - heloCount++; - receivedData = ''; - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(heloCount).toEqual(2); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELO after EHLO -tap.test('HELO - should accept HELO after EHLO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'helo_after_ehlo'; - receivedData = ''; // Clear buffer - socket.write('HELO test.example.com\r\n'); - } else if (currentStep === 'helo_after_ehlo' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELO response format -tap.test('HELO - should return simple 250 response', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let heloResponse = ''; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo'; - receivedData = ''; // Clear to capture only HELO response - socket.write('HELO test.example.com\r\n'); - } else if (currentStep === 'helo' && receivedData.includes('250')) { - heloResponse = receivedData.trim(); - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // This server returns multi-line response even for HELO - // (technically incorrect per RFC, but we test actual behavior) - expect(heloResponse).toStartWith('250'); - - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: SMTP commands after HELO -tap.test('HELO - should process SMTP commands after HELO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo'; - socket.write('HELO test.example.com\r\n'); - } else if (currentStep === 'helo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELO with special characters -tap.test('HELO - should handle hostnames with special characters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const specialHostnames = [ - 'test-host.example.com', // Hyphen - 'test_host.example.com', // Underscore (technically invalid but common) - '192.168.1.1', // IP address - '[192.168.1.1]', // Bracketed IP - 'localhost', // Single label - 'UPPERCASE.EXAMPLE.COM' // Uppercase - ]; - let currentIndex = 0; - const results: Array<{ hostname: string; accepted: boolean }> = []; - - const testNextHostname = () => { - if (currentIndex < specialHostnames.length) { - receivedData = ''; // Clear buffer - socket.write(`HELO ${specialHostnames[currentIndex]}\r\n`); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - - // Most hostnames should be accepted - const acceptedCount = results.filter(r => r.accepted).length; - expect(acceptedCount).toBeGreaterThan(specialHostnames.length / 2); - - done.resolve(); - }, 100); - } - }; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo_special'; - testNextHostname(); - } else if (currentStep === 'helo_special') { - if (receivedData.includes('250')) { - results.push({ - hostname: specialHostnames[currentIndex], - accepted: true - }); - } else if (receivedData.includes('501')) { - results.push({ - hostname: specialHostnames[currentIndex], - accepted: false - }); - } - - currentIndex++; - testNextHostname(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: HELO vs EHLO feature availability -tap.test('HELO - verify no extensions with HELO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'helo'; - socket.write('HELO test.example.com\r\n'); - } else if (currentStep === 'helo' && receivedData.includes('250')) { - // Note: This server returns ESMTP extensions even for HELO commands - // This differs from strict RFC compliance but matches the server's behavior - // expect(receivedData).not.toInclude('SIZE'); - // expect(receivedData).not.toInclude('STARTTLS'); - // expect(receivedData).not.toInclude('AUTH'); - // expect(receivedData).not.toInclude('8BITMIME'); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_commands/test.cmd-13.quit-command.ts b/test/suite/smtpserver_commands/test.cmd-13.quit-command.ts deleted file mode 100644 index 341920e..0000000 --- a/test/suite/smtpserver_commands/test.cmd-13.quit-command.ts +++ /dev/null @@ -1,384 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; - -let testServer; -const TEST_TIMEOUT = 10000; - -// Setup -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -// Test: Basic QUIT command -tap.test('QUIT - should close connection gracefully', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let connectionClosed = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - // Don't destroy immediately, wait for server to close connection - setTimeout(() => { - if (!connectionClosed) { - socket.destroy(); - expect(receivedData).toInclude('221'); // Closing connection message - done.resolve(); - } - }, 2000); - } - }); - - socket.on('close', () => { - if (currentStep === 'quit' && receivedData.includes('221')) { - connectionClosed = true; - expect(receivedData).toInclude('221'); - done.resolve(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: QUIT during transaction -tap.test('QUIT - should work during active transaction', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('221'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: QUIT immediately after connect -tap.test('QUIT - should work immediately after connection', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('221'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: QUIT with parameters (should be ignored or rejected) -tap.test('QUIT - should handle QUIT with parameters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'quit_with_param'; - receivedData = ''; - socket.write('QUIT unexpected parameter\r\n'); - } else if (currentStep === 'quit_with_param' && (receivedData.includes('221') || receivedData.includes('501'))) { - // Server may accept (221) or reject (501) QUIT with parameters - const responseCode = receivedData.match(/(\d{3})/)?.[1]; - socket.destroy(); - expect(['221', '501']).toInclude(responseCode); - done.resolve(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple QUITs (second should fail) -tap.test('QUIT - second QUIT should fail after connection closed', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let quitSent = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'quit'; - receivedData = ''; - socket.write('QUIT\r\n'); - quitSent = true; - } else if (currentStep === 'quit' && receivedData.includes('221')) { - // Try to send another QUIT - try { - socket.write('QUIT\r\n'); - // If write succeeds, wait a bit to see if we get a response - setTimeout(() => { - socket.destroy(); - done.resolve(); // Test passes either way - }, 500); - } catch (err) { - // Write failed because connection closed - this is expected - done.resolve(); - } - } - }); - - socket.on('close', () => { - if (quitSent) { - done.resolve(); - } - }); - - socket.on('error', (error) => { - if (quitSent && error.message.includes('EPIPE')) { - // Expected error when writing to closed socket - done.resolve(); - } else { - done.reject(error); - } - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: QUIT response format -tap.test('QUIT - should return proper 221 response', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let quitResponse = ''; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'quit'; - receivedData = ''; // Clear buffer to capture only QUIT response - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - quitResponse = receivedData.trim(); - setTimeout(() => { - socket.destroy(); - expect(quitResponse).toStartWith('221'); - expect(quitResponse.toLowerCase()).toInclude('closing'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Connection cleanup after QUIT -tap.test('QUIT - verify clean connection shutdown', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let closeEventFired = false; - let endEventFired = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - // Wait for clean shutdown - setTimeout(() => { - if (!closeEventFired && !endEventFired) { - socket.destroy(); - done.resolve(); - } - }, 3000); - } - }); - - socket.on('end', () => { - endEventFired = true; - }); - - socket.on('close', () => { - closeEventFired = true; - if (currentStep === 'quit') { - expect(endEventFired || closeEventFired).toEqual(true); - done.resolve(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-01.tls-connection.ts b/test/suite/smtpserver_connection/test.cm-01.tls-connection.ts deleted file mode 100644 index e546da0..0000000 --- a/test/suite/smtpserver_connection/test.cm-01.tls-connection.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -import { connectToSmtp, performSmtpHandshake, closeSmtpConnection } from '../../helpers/utils.js'; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server with TLS support', async () => { - testServer = await startTestServer({ - port: 2525, - tlsEnabled: true // Enable TLS support - }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(testServer.port).toEqual(2525); -}); - -tap.test('CM-01: TLS Connection Test - server should advertise STARTTLS capability', async () => { - const startTime = Date.now(); - - try { - // Connect to SMTP server - const socket = await connectToSmtp(testServer.hostname, testServer.port); - expect(socket).toBeInstanceOf(Object); - - // Perform handshake and get capabilities - const capabilities = await performSmtpHandshake(socket, 'test.example.com'); - expect(capabilities).toBeArray(); - - // Check for STARTTLS support - const supportsStarttls = capabilities.some(cap => cap.toUpperCase().includes('STARTTLS')); - expect(supportsStarttls).toEqual(true); - - // Close connection gracefully - await closeSmtpConnection(socket); - - const duration = Date.now() - startTime; - console.log(`✅ TLS capability test completed in ${duration}ms`); - console.log(`📋 Server capabilities: ${capabilities.join(', ')}`); - - } catch (error) { - const duration = Date.now() - startTime; - console.error(`❌ TLS connection test failed after ${duration}ms:`, error); - throw error; - } -}); - -tap.test('CM-01: TLS Connection Test - verify TLS certificate configuration', async () => { - // This test verifies that the server has TLS certificates configured - expect(testServer.config.tlsEnabled).toEqual(true); - - // The server should have loaded certificates during startup - // In production, this would validate actual certificate properties - console.log('✅ TLS configuration verified'); -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - console.log('✅ Test server stopped'); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-02.multiple-connections.ts b/test/suite/smtpserver_connection/test.cm-02.multiple-connections.ts deleted file mode 100644 index ec99e39..0000000 --- a/test/suite/smtpserver_connection/test.cm-02.multiple-connections.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -import { createConcurrentConnections, performSmtpHandshake, closeSmtpConnection } from '../../helpers/utils.js'; - -let testServer: ITestServer; -const CONCURRENT_COUNT = 10; -const TEST_PORT = 2527; - -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ - port: 2526 - }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(testServer.port).toEqual(2526); -}); - -tap.test('CM-02: Multiple Simultaneous Connections - server handles concurrent connections', async () => { - const startTime = Date.now(); - - try { - // Create multiple concurrent connections - console.log(`🔄 Creating ${CONCURRENT_COUNT} concurrent connections...`); - const sockets = await createConcurrentConnections( - testServer.hostname, - testServer.port, - CONCURRENT_COUNT - ); - - expect(sockets).toBeArray(); - expect(sockets.length).toEqual(CONCURRENT_COUNT); - - // Verify all connections are active - let activeCount = 0; - for (const socket of sockets) { - if (socket && !socket.destroyed) { - activeCount++; - } - } - expect(activeCount).toEqual(CONCURRENT_COUNT); - - // Perform handshake on all connections - console.log('🤝 Performing handshake on all connections...'); - const handshakePromises = sockets.map(socket => - performSmtpHandshake(socket).catch(err => ({ error: err.message })) - ); - - const results = await Promise.all(handshakePromises); - const successCount = results.filter(r => Array.isArray(r)).length; - - expect(successCount).toBeGreaterThan(0); - console.log(`✅ ${successCount}/${CONCURRENT_COUNT} connections completed handshake`); - - // Close all connections - console.log('🔚 Closing all connections...'); - await Promise.all( - sockets.map(socket => closeSmtpConnection(socket).catch(() => {})) - ); - - const duration = Date.now() - startTime; - console.log(`✅ Multiple connection test completed in ${duration}ms`); - - } catch (error) { - console.error('❌ Multiple connection test failed:', error); - throw error; - } -}); - -// TODO: Enable this test when connection limits are implemented in the server -// tap.test('CM-02: Connection limit enforcement - verify max connections', async () => { -// const maxConnections = 5; -// -// // Start a new server with lower connection limit -// const limitedServer = await startTestServer({ port: TEST_PORT }); -// -// await new Promise(resolve => setTimeout(resolve, 1000)); -// -// try { -// // Try to create more connections than allowed -// const attemptCount = maxConnections + 5; -// console.log(`🔄 Attempting ${attemptCount} connections (limit: ${maxConnections})...`); -// -// const connectionPromises = []; -// for (let i = 0; i < attemptCount; i++) { -// connectionPromises.push( -// createConcurrentConnections(limitedServer.hostname, limitedServer.port, 1) -// .then(() => ({ success: true, index: i })) -// .catch(err => ({ success: false, index: i, error: err.message })) -// ); -// } -// -// const results = await Promise.all(connectionPromises); -// const successfulConnections = results.filter(r => r.success).length; -// const failedConnections = results.filter(r => !r.success).length; -// -// console.log(`✅ Successful connections: ${successfulConnections}`); -// console.log(`❌ Failed connections: ${failedConnections}`); -// -// // Some connections should fail due to limit -// expect(failedConnections).toBeGreaterThan(0); -// -// } finally { -// await stopTestServer(limitedServer); -// } -// }); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - console.log('✅ Test server stopped'); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-03.connection-timeout.ts b/test/suite/smtpserver_connection/test.cm-03.connection-timeout.ts deleted file mode 100644 index 4eeef39..0000000 --- a/test/suite/smtpserver_connection/test.cm-03.connection-timeout.ts +++ /dev/null @@ -1,134 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -import * as plugins from '../../../ts/plugins.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -tap.test('setup - start SMTP server with short timeout', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - timeout: 5000 // 5 second timeout for this test - }); - - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('CM-03: Connection Timeout - idle connections are closed after timeout', async (tools) => { - const startTime = Date.now(); - - // Create connection - const socket = await new Promise((resolve, reject) => { - const client = plugins.net.createConnection({ - host: testServer.hostname, - port: testServer.port - }); - - client.on('connect', () => resolve(client)); - client.on('error', reject); - - setTimeout(() => reject(new Error('Connection timeout')), 3000); - }); - - // Wait for greeting - await new Promise((resolve) => { - socket.once('data', (data) => { - const response = data.toString(); - expect(response).toInclude('220'); - resolve(); - }); - }); - - console.log('✅ Connected and received greeting'); - - // Now stay idle and wait for server to timeout the connection - const disconnectPromise = new Promise((resolve) => { - socket.on('close', () => { - const duration = Date.now() - startTime; - resolve(duration); - }); - - socket.on('end', () => { - console.log('📡 Server initiated connection close'); - }); - - socket.on('error', (err) => { - console.log('⚠️ Socket error:', err.message); - }); - }); - - // Wait for timeout (should be around 5 seconds) - const duration = await disconnectPromise; - - console.log(`⏱️ Connection closed after ${duration}ms`); - - // Verify timeout happened within expected range (4-6 seconds) - expect(duration).toBeGreaterThan(4000); - expect(duration).toBeLessThan(7000); - - console.log('✅ Connection timeout test passed'); -}); - -tap.test('CM-03: Active connection should not timeout', async () => { - // Create new connection - const socket = plugins.net.createConnection({ - host: testServer.hostname, - port: testServer.port - }); - - await new Promise((resolve) => { - socket.on('connect', resolve); - }); - - // Wait for greeting - await new Promise((resolve) => { - socket.once('data', resolve); - }); - - // Keep connection active with NOOP commands - let isConnected = true; - socket.on('close', () => { - isConnected = false; - }); - - // Send NOOP every 2 seconds for 8 seconds - for (let i = 0; i < 4; i++) { - if (!isConnected) break; - - socket.write('NOOP\r\n'); - - // Wait for response - await new Promise((resolve) => { - socket.once('data', (data) => { - const response = data.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - console.log(`✅ NOOP ${i + 1}/4 successful`); - - // Wait 2 seconds before next NOOP - await new Promise(resolve => setTimeout(resolve, 2000)); - } - - // Connection should still be active - expect(isConnected).toEqual(true); - - // Close connection gracefully - socket.write('QUIT\r\n'); - await new Promise((resolve) => { - socket.once('data', () => { - socket.end(); - resolve(); - }); - }); - - console.log('✅ Active connection did not timeout'); -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-04.connection-limits.ts b/test/suite/smtpserver_connection/test.cm-04.connection-limits.ts deleted file mode 100644 index ceb54ae..0000000 --- a/test/suite/smtpserver_connection/test.cm-04.connection-limits.ts +++ /dev/null @@ -1,374 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 5000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); - -}); - -// Test: Basic connection limit enforcement -tap.test('Connection Limits - should handle multiple connections gracefully', async (tools) => { - const done = tools.defer(); - - const maxConnections = 20; // Test with reasonable number - const testConnections = maxConnections + 5; // Try 5 more than limit - const connections: net.Socket[] = []; - const connectionPromises: Promise<{ index: number; success: boolean; error?: string }>[] = []; - - // Helper to create a connection with index - const createConnectionWithIndex = (index: number): Promise<{ index: number; success: boolean; error?: string }> => { - return new Promise((resolve) => { - let timeoutHandle: NodeJS.Timeout; - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - socket.on('connect', () => { - clearTimeout(timeoutHandle); - connections[index] = socket; - - // Wait for server greeting - socket.on('data', (data) => { - if (data.toString().includes('220')) { - resolve({ index, success: true }); - } - }); - }); - - socket.on('error', (err) => { - clearTimeout(timeoutHandle); - resolve({ index, success: false, error: err.message }); - }); - - timeoutHandle = setTimeout(() => { - socket.destroy(); - resolve({ index, success: false, error: 'Connection timeout' }); - }, TEST_TIMEOUT); - } catch (err: any) { - resolve({ index, success: false, error: err.message }); - } - }); - }; - - // Create connections - for (let i = 0; i < testConnections; i++) { - connectionPromises.push(createConnectionWithIndex(i)); - } - - const results = await Promise.all(connectionPromises); - - // Count successful connections - const successfulConnections = results.filter(r => r.success).length; - const failedConnections = results.filter(r => !r.success).length; - - // Clean up connections - for (const socket of connections) { - if (socket && !socket.destroyed) { - socket.write('QUIT\r\n'); - setTimeout(() => socket.destroy(), 100); - } - } - - // Verify results - expect(successfulConnections).toBeGreaterThan(0); - - // If some connections were rejected, that's good (limit enforced) - // If all connections succeeded, that's also acceptable (high/no limit) - if (failedConnections > 0) { - console.log(`Server enforced connection limit: ${successfulConnections} accepted, ${failedConnections} rejected`); - } else { - console.log(`Server accepted all ${successfulConnections} connections`); - } - - done.resolve(); - - await done.promise; -}); - -// Test: Connection limit recovery -tap.test('Connection Limits - should accept new connections after closing old ones', async (tools) => { - const done = tools.defer(); - - const batchSize = 10; - const firstBatch: net.Socket[] = []; - const secondBatch: net.Socket[] = []; - - // Create first batch of connections - const firstBatchPromises = []; - for (let i = 0; i < batchSize; i++) { - firstBatchPromises.push( - new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - socket.on('connect', () => { - firstBatch.push(socket); - socket.on('data', (data) => { - if (data.toString().includes('220')) { - resolve(true); - } - }); - }); - - socket.on('error', () => resolve(false)); - }) - ); - } - - const firstResults = await Promise.all(firstBatchPromises); - const firstSuccessCount = firstResults.filter(r => r).length; - - // Close first batch - for (const socket of firstBatch) { - if (socket && !socket.destroyed) { - socket.write('QUIT\r\n'); - } - } - - // Wait for connections to close - await new Promise(resolve => setTimeout(resolve, 1000)); - - // Destroy sockets - for (const socket of firstBatch) { - if (socket && !socket.destroyed) { - socket.destroy(); - } - } - - // Create second batch - const secondBatchPromises = []; - for (let i = 0; i < batchSize; i++) { - secondBatchPromises.push( - new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - socket.on('connect', () => { - secondBatch.push(socket); - socket.on('data', (data) => { - if (data.toString().includes('220')) { - resolve(true); - } - }); - }); - - socket.on('error', () => resolve(false)); - }) - ); - } - - const secondResults = await Promise.all(secondBatchPromises); - const secondSuccessCount = secondResults.filter(r => r).length; - - // Clean up second batch - for (const socket of secondBatch) { - if (socket && !socket.destroyed) { - socket.write('QUIT\r\n'); - setTimeout(() => socket.destroy(), 100); - } - } - - // Both batches should have successful connections - expect(firstSuccessCount).toBeGreaterThan(0); - expect(secondSuccessCount).toBeGreaterThan(0); - - done.resolve(); - - await done.promise; -}); - -// Test: Rapid connection attempts -tap.test('Connection Limits - should handle rapid connection attempts', async (tools) => { - const done = tools.defer(); - - const rapidConnections = 50; - const connections: net.Socket[] = []; - let successCount = 0; - let errorCount = 0; - - // Create connections as fast as possible - for (let i = 0; i < rapidConnections; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT - }); - - socket.on('connect', () => { - connections.push(socket); - successCount++; - }); - - socket.on('error', () => { - errorCount++; - }); - } - - // Wait for all connection attempts to settle - await new Promise(resolve => setTimeout(resolve, 3000)); - - // Clean up - for (const socket of connections) { - if (socket && !socket.destroyed) { - socket.destroy(); - } - } - - // Should handle at least some connections - expect(successCount).toBeGreaterThan(0); - console.log(`Rapid connections: ${successCount} succeeded, ${errorCount} failed`); - - done.resolve(); - - await done.promise; -}); - -// Test: Connection limit with different client IPs (simulated) -tap.test('Connection Limits - should track connections per IP or globally', async (tools) => { - const done = tools.defer(); - - // Note: In real test, this would use different source IPs - // For now, we test from same IP but document the behavior - const connectionsPerIP = 5; - const connections: net.Socket[] = []; - const results: boolean[] = []; - - for (let i = 0; i < connectionsPerIP; i++) { - const result = await new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - socket.on('connect', () => { - connections.push(socket); - socket.on('data', (data) => { - if (data.toString().includes('220')) { - resolve(true); - } - }); - }); - - socket.on('error', () => resolve(false)); - }); - - results.push(result); - } - - const successCount = results.filter(r => r).length; - - // Clean up - for (const socket of connections) { - if (socket && !socket.destroyed) { - socket.write('QUIT\r\n'); - setTimeout(() => socket.destroy(), 100); - } - } - - // Should accept connections from same IP - expect(successCount).toBeGreaterThan(0); - console.log(`Per-IP connections: ${successCount} of ${connectionsPerIP} succeeded`); - - done.resolve(); - - await done.promise; -}); - -// Test: Connection limit error messages -tap.test('Connection Limits - should provide meaningful error when limit reached', async (tools) => { - const done = tools.defer(); - - const manyConnections = 100; - const connections: net.Socket[] = []; - const errors: string[] = []; - let rejected = false; - - // Create many connections to try to hit limit - const promises = []; - for (let i = 0; i < manyConnections; i++) { - promises.push( - new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 1000 - }); - - socket.on('connect', () => { - connections.push(socket); - - socket.on('data', (data) => { - const response = data.toString(); - // Check if server sends connection limit message - if (response.includes('421') || response.includes('too many connections')) { - rejected = true; - errors.push(response); - } - resolve(); - }); - }); - - socket.on('error', (err) => { - if (err.message.includes('ECONNREFUSED') || err.message.includes('ECONNRESET')) { - rejected = true; - errors.push(err.message); - } - resolve(); - }); - - socket.on('timeout', () => { - resolve(); - }); - }) - ); - } - - await Promise.all(promises); - - // Clean up - for (const socket of connections) { - if (socket && !socket.destroyed) { - socket.destroy(); - } - } - - // Log results - console.log(`Connection limit test: ${connections.length} connected, ${errors.length} rejected`); - if (rejected) { - console.log(`Sample rejection: ${errors[0]}`); - } - - // Should have handled connections (either accepted or properly rejected) - expect(connections.length + errors.length).toBeGreaterThan(0); - - done.resolve(); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-05.connection-rejection.ts b/test/suite/smtpserver_connection/test.cm-05.connection-rejection.ts deleted file mode 100644 index 584e065..0000000 --- a/test/suite/smtpserver_connection/test.cm-05.connection-rejection.ts +++ /dev/null @@ -1,296 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for connection rejection tests', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('Connection Rejection - should handle suspicious domains', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - - // Send EHLO with suspicious domain - socket.write('EHLO blocked.spammer.com\r\n'); - - const response = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n')) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - - // Timeout after 5 seconds - setTimeout(() => { - socket.removeListener('data', handler); - resolve(data || 'TIMEOUT'); - }, 5000); - }); - - console.log('Response to suspicious domain:', response); - - // Server might reject with 421, 550, or accept (depends on configuration) - // We just verify it responds appropriately - const validResponses = ['250', '421', '550', '501']; - const hasValidResponse = validResponses.some(code => response.includes(code)); - expect(hasValidResponse).toEqual(true); - - // Clean up - if (!socket.destroyed) { - socket.write('QUIT\r\n'); - socket.end(); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Connection Rejection - should handle overload conditions', async (tools) => { - const done = tools.defer(); - - const connections: net.Socket[] = []; - - try { - // Create many connections rapidly - const rapidConnectionCount = 20; // Reduced from 50 to be more reasonable - const connectionPromises: Promise[] = []; - - for (let i = 0; i < rapidConnectionCount; i++) { - connectionPromises.push( - new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT - }); - - socket.on('connect', () => { - connections.push(socket); - resolve(socket); - }); - - socket.on('error', () => { - // Connection rejected - this is OK during overload - resolve(null); - }); - - // Timeout individual connections - setTimeout(() => resolve(null), 2000); - }) - ); - } - - // Wait for all connection attempts - const results = await Promise.all(connectionPromises); - const successfulConnections = results.filter(r => r !== null).length; - - console.log(`Created ${successfulConnections}/${rapidConnectionCount} connections`); - - // Now try one more connection - let overloadRejected = false; - try { - const testSocket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - testSocket.once('connect', () => { - testSocket.end(); - resolve(); - }); - testSocket.once('error', (err) => { - overloadRejected = true; - reject(err); - }); - - setTimeout(() => { - testSocket.destroy(); - resolve(); - }, 5000); - }); - } catch (error) { - console.log('Additional connection was rejected:', error); - overloadRejected = true; - } - - console.log(`Overload test results: - - Successful connections: ${successfulConnections} - - Additional connection rejected: ${overloadRejected} - - Server behavior: ${overloadRejected ? 'Properly rejected under load' : 'Accepted all connections'}`); - - // Either behavior is acceptable - rejection shows overload protection, - // acceptance shows high capacity - expect(true).toEqual(true); - - } finally { - // Clean up all connections - for (const socket of connections) { - try { - if (!socket.destroyed) { - socket.end(); - } - } catch (e) { - // Ignore cleanup errors - } - } - - done.resolve(); - } -}); - -tap.test('Connection Rejection - should reject invalid protocol', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner first - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Got banner:', banner); - - // Send HTTP request instead of SMTP - socket.write('GET / HTTP/1.1\r\nHost: example.com\r\n\r\n'); - - const response = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - }; - socket.on('data', handler); - - // Wait for response or connection close - socket.on('close', () => { - socket.removeListener('data', handler); - resolve(data); - }); - - // Timeout - setTimeout(() => { - socket.removeListener('data', handler); - socket.destroy(); - resolve(data || 'CLOSED_WITHOUT_RESPONSE'); - }, 3000); - }); - - console.log('Response to HTTP request:', response); - - // Server should either: - // - Send error response (500, 501, 502, 421) - // - Close connection immediately - // - Send nothing and close - const errorResponses = ['500', '501', '502', '421']; - const hasErrorResponse = errorResponses.some(code => response.includes(code)); - const closedWithoutResponse = response === 'CLOSED_WITHOUT_RESPONSE' || response === ''; - - expect(hasErrorResponse || closedWithoutResponse).toEqual(true); - - if (hasErrorResponse) { - console.log('Server properly rejected with error response'); - } else if (closedWithoutResponse) { - console.log('Server closed connection without response (also valid)'); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Connection Rejection - should handle invalid commands gracefully', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send completely invalid command - socket.write('INVALID_COMMAND_12345\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to invalid command:', response); - - // Should get 500 or 502 error - expect(response).toMatch(/^5\d{2}/); - - // Server should still be responsive - socket.write('NOOP\r\n'); - - const noopResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('NOOP response after error:', noopResponse); - expect(noopResponse).toInclude('250'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-06.starttls-upgrade.ts b/test/suite/smtpserver_connection/test.cm-06.starttls-upgrade.ts deleted file mode 100644 index 5d7a993..0000000 --- a/test/suite/smtpserver_connection/test.cm-06.starttls-upgrade.ts +++ /dev/null @@ -1,468 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as tls from 'tls'; -import * as path from 'path'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 30000; // Increased timeout for TLS handshake - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server with STARTTLS support', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - tlsEnabled: true // Enable TLS to advertise STARTTLS - }); - - - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(testServer.port).toEqual(TEST_PORT); -}); - -// Test: Basic STARTTLS upgrade -tap.test('STARTTLS - should upgrade plain connection to TLS', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let tlsSocket: tls.TLSSocket | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - // Check if STARTTLS is advertised - if (receivedData.includes('STARTTLS')) { - currentStep = 'starttls'; - socket.write('STARTTLS\r\n'); - } else { - socket.destroy(); - done.reject(new Error('STARTTLS not advertised in EHLO response')); - } - } else if (currentStep === 'starttls' && receivedData.includes('220')) { - // Server accepted STARTTLS - upgrade to TLS - currentStep = 'tls_handshake'; - - const tlsOptions: tls.ConnectionOptions = { - socket: socket, - servername: 'localhost', - rejectUnauthorized: false // Accept self-signed certificates for testing - }; - - tlsSocket = tls.connect(tlsOptions); - - tlsSocket.on('secureConnect', () => { - // TLS handshake successful - currentStep = 'tls_ehlo'; - tlsSocket!.write('EHLO test.example.com\r\n'); - }); - - tlsSocket.on('data', (tlsData) => { - const tlsResponse = tlsData.toString(); - - if (currentStep === 'tls_ehlo' && tlsResponse.includes('250')) { - tlsSocket!.write('QUIT\r\n'); - setTimeout(() => { - tlsSocket!.destroy(); - expect(tlsSocket!.encrypted).toEqual(true); - done.resolve(); - }, 100); - } - }); - - tlsSocket.on('error', (error) => { - done.reject(error); - }); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - if (tlsSocket) tlsSocket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: STARTTLS with commands after upgrade -tap.test('STARTTLS - should process SMTP commands after TLS upgrade', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let tlsSocket: tls.TLSSocket | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - if (receivedData.includes('STARTTLS')) { - currentStep = 'starttls'; - socket.write('STARTTLS\r\n'); - } - } else if (currentStep === 'starttls' && receivedData.includes('220')) { - currentStep = 'tls_handshake'; - - tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }); - - tlsSocket.on('secureConnect', () => { - currentStep = 'tls_ehlo'; - tlsSocket!.write('EHLO test.example.com\r\n'); - }); - - tlsSocket.on('data', (tlsData) => { - const tlsResponse = tlsData.toString(); - - if (currentStep === 'tls_ehlo' && tlsResponse.includes('250')) { - currentStep = 'tls_mail_from'; - tlsSocket!.write('MAIL FROM:\r\n'); - } else if (currentStep === 'tls_mail_from' && tlsResponse.includes('250')) { - currentStep = 'tls_rcpt_to'; - tlsSocket!.write('RCPT TO:\r\n'); - } else if (currentStep === 'tls_rcpt_to' && tlsResponse.includes('250')) { - currentStep = 'tls_data'; - tlsSocket!.write('DATA\r\n'); - } else if (currentStep === 'tls_data' && tlsResponse.includes('354')) { - currentStep = 'tls_message'; - tlsSocket!.write('Subject: Test over TLS\r\n\r\nSecure message\r\n.\r\n'); - } else if (currentStep === 'tls_message' && tlsResponse.includes('250')) { - tlsSocket!.write('QUIT\r\n'); - setTimeout(() => { - const protocol = tlsSocket!.getProtocol(); - const cipher = tlsSocket!.getCipher(); - tlsSocket!.destroy(); - // Protocol and cipher might be null in some cases - if (protocol) { - expect(typeof protocol).toEqual('string'); - } - if (cipher) { - expect(cipher).toBeDefined(); - expect(cipher.name).toBeDefined(); - } - done.resolve(); - }, 100); - } - }); - - tlsSocket.on('error', (error) => { - done.reject(error); - }); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - if (tlsSocket) tlsSocket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: STARTTLS rejected after MAIL FROM -tap.test('STARTTLS - should reject STARTTLS after transaction started', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'starttls_after_mail'; - socket.write('STARTTLS\r\n'); - } else if (currentStep === 'starttls_after_mail') { - if (receivedData.includes('503')) { - // Server correctly rejected STARTTLS after MAIL FROM - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); // Bad sequence - done.resolve(); - }, 100); - } else if (receivedData.includes('220')) { - // Server incorrectly accepted STARTTLS - this is a bug - // For now, let's accept this behavior but log it - console.log('WARNING: Server accepted STARTTLS after MAIL FROM - this violates RFC 3207'); - socket.destroy(); - done.resolve(); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple STARTTLS attempts -tap.test('STARTTLS - should not allow STARTTLS after TLS is established', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let tlsSocket: tls.TLSSocket | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - if (receivedData.includes('STARTTLS')) { - currentStep = 'starttls'; - socket.write('STARTTLS\r\n'); - } - } else if (currentStep === 'starttls' && receivedData.includes('220')) { - currentStep = 'tls_handshake'; - - tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }); - - tlsSocket.on('secureConnect', () => { - currentStep = 'tls_ehlo'; - tlsSocket!.write('EHLO test.example.com\r\n'); - }); - - tlsSocket.on('data', (tlsData) => { - const tlsResponse = tlsData.toString(); - - if (currentStep === 'tls_ehlo') { - // Check that STARTTLS is NOT advertised after TLS upgrade - expect(tlsResponse).not.toInclude('STARTTLS'); - tlsSocket!.write('QUIT\r\n'); - setTimeout(() => { - tlsSocket!.destroy(); - done.resolve(); - }, 100); - } - }); - - tlsSocket.on('error', (error) => { - done.reject(error); - }); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - if (tlsSocket) tlsSocket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: STARTTLS with invalid command -tap.test('STARTTLS - should handle commands during TLS negotiation', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - if (receivedData.includes('STARTTLS')) { - currentStep = 'starttls'; - socket.write('STARTTLS\r\n'); - } - } else if (currentStep === 'starttls' && receivedData.includes('220')) { - // Send invalid data instead of starting TLS handshake - currentStep = 'invalid_after_starttls'; - socket.write('EHLO should.not.work\r\n'); - - setTimeout(() => { - socket.destroy(); - done.resolve(); // Connection should close or timeout - }, 2000); - } - }); - - socket.on('close', () => { - if (currentStep === 'invalid_after_starttls') { - done.resolve(); - } - }); - - socket.on('error', (error) => { - if (currentStep === 'invalid_after_starttls') { - done.resolve(); // Expected error - } else { - done.reject(error); - } - }); - - socket.on('timeout', () => { - socket.destroy(); - if (currentStep === 'invalid_after_starttls') { - done.resolve(); - } else { - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - } - }); - - await done.promise; -}); - -// Test: STARTTLS TLS version and cipher info -tap.test('STARTTLS - should use secure TLS version and ciphers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let tlsSocket: tls.TLSSocket | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - if (receivedData.includes('STARTTLS')) { - currentStep = 'starttls'; - socket.write('STARTTLS\r\n'); - } - } else if (currentStep === 'starttls' && receivedData.includes('220')) { - currentStep = 'tls_handshake'; - - tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false, - minVersion: 'TLSv1.2' // Require at least TLS 1.2 - }); - - tlsSocket.on('secureConnect', () => { - const protocol = tlsSocket!.getProtocol(); - const cipher = tlsSocket!.getCipher(); - - // Verify TLS version - expect(typeof protocol).toEqual('string'); - expect(['TLSv1.2', 'TLSv1.3']).toInclude(protocol!); - - // Verify cipher info - expect(cipher).toBeDefined(); - expect(cipher.name).toBeDefined(); - expect(typeof cipher.name).toEqual('string'); - - tlsSocket!.write('QUIT\r\n'); - setTimeout(() => { - tlsSocket!.destroy(); - done.resolve(); - }, 100); - }); - - tlsSocket.on('error', (error) => { - done.reject(error); - }); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - if (tlsSocket) tlsSocket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-07.abrupt-disconnection.ts b/test/suite/smtpserver_connection/test.cm-07.abrupt-disconnection.ts deleted file mode 100644 index 56aebdb..0000000 --- a/test/suite/smtpserver_connection/test.cm-07.abrupt-disconnection.ts +++ /dev/null @@ -1,321 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for abrupt disconnection tests', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('Abrupt Disconnection - should handle socket destruction without QUIT', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Abruptly disconnect without QUIT - console.log('Destroying socket without QUIT...'); - socket.destroy(); - - // Wait a moment for server to handle the disconnection - await new Promise(resolve => setTimeout(resolve, 1000)); - - // Test server recovery - try new connection - console.log('Testing server recovery with new connection...'); - const recoverySocket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - const recoveryConnected = await new Promise((resolve) => { - recoverySocket.once('connect', () => resolve(true)); - recoverySocket.once('error', () => resolve(false)); - setTimeout(() => resolve(false), 5000); - }); - - expect(recoveryConnected).toEqual(true); - - if (recoveryConnected) { - // Get banner from recovery connection - const recoveryBanner = await new Promise((resolve) => { - recoverySocket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(recoveryBanner).toInclude('220'); - console.log('Server recovered successfully, accepting new connections'); - - // Clean up recovery connection properly - recoverySocket.write('QUIT\r\n'); - recoverySocket.end(); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Abrupt Disconnection - should handle multiple simultaneous abrupt disconnections', async (tools) => { - const done = tools.defer(); - - try { - const connections = 5; - const sockets: net.Socket[] = []; - - // Create multiple connections - for (let i = 0; i < connections; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - sockets.push(socket); - } - - console.log(`Created ${connections} connections`); - - // Abruptly disconnect all at once - console.log('Destroying all sockets simultaneously...'); - sockets.forEach(socket => socket.destroy()); - - // Wait for server to handle disconnections - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Test that server still accepts new connections - console.log('Testing server stability after multiple abrupt disconnections...'); - const testSocket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - const stillAccepting = await new Promise((resolve) => { - testSocket.once('connect', () => resolve(true)); - testSocket.once('error', () => resolve(false)); - setTimeout(() => resolve(false), 5000); - }); - - expect(stillAccepting).toEqual(true); - - if (stillAccepting) { - const banner = await new Promise((resolve) => { - testSocket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - console.log('Server remained stable after multiple abrupt disconnections'); - - testSocket.write('QUIT\r\n'); - testSocket.end(); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Abrupt Disconnection - should handle disconnection during DATA transfer', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Start DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(dataResponse).toInclude('354'); - - // Send partial email data then disconnect abruptly - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Test '); - - console.log('Disconnecting during DATA transfer...'); - socket.destroy(); - - // Wait for server to handle disconnection - await new Promise(resolve => setTimeout(resolve, 1500)); - - // Verify server can handle new connections - const newSocket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - const canConnect = await new Promise((resolve) => { - newSocket.once('connect', () => resolve(true)); - newSocket.once('error', () => resolve(false)); - setTimeout(() => resolve(false), 5000); - }); - - expect(canConnect).toEqual(true); - - if (canConnect) { - const banner = await new Promise((resolve) => { - newSocket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - console.log('Server recovered from disconnection during DATA transfer'); - - newSocket.write('QUIT\r\n'); - newSocket.end(); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Abrupt Disconnection - should timeout idle connections', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - console.log('Connected, now testing idle timeout...'); - - // Don't send any commands and wait for server to potentially timeout - // Most servers have a timeout of 5-10 minutes, so we'll test shorter - let disconnectedByServer = false; - - socket.on('close', () => { - disconnectedByServer = true; - }); - - socket.on('end', () => { - disconnectedByServer = true; - }); - - // Wait 10 seconds to see if server has a short idle timeout - await new Promise(resolve => setTimeout(resolve, 10000)); - - if (!disconnectedByServer) { - console.log('Server maintains idle connections (no short timeout detected)'); - // Send QUIT to close gracefully - socket.write('QUIT\r\n'); - socket.end(); - } else { - console.log('Server disconnected idle connection'); - } - - // Either behavior is acceptable - expect(true).toEqual(true); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); diff --git a/test/suite/smtpserver_connection/test.cm-08.tls-versions.ts b/test/suite/smtpserver_connection/test.cm-08.tls-versions.ts deleted file mode 100644 index 0971bc6..0000000 --- a/test/suite/smtpserver_connection/test.cm-08.tls-versions.ts +++ /dev/null @@ -1,361 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as tls from 'tls'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server with TLS support for version tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - tlsEnabled: true - }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(testServer).toBeDefined(); -}); - -tap.test('TLS Versions - should support STARTTLS capability', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - console.log('EHLO response:', ehloResponse); - - // Check for STARTTLS support - const supportsStarttls = ehloResponse.includes('250-STARTTLS') || ehloResponse.includes('250 STARTTLS'); - console.log('STARTTLS supported:', supportsStarttls); - - if (supportsStarttls) { - // Test STARTTLS upgrade - socket.write('STARTTLS\r\n'); - - const starttlsResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(starttlsResponse).toInclude('220'); - console.log('STARTTLS ready response received'); - - // Would upgrade to TLS here in a real implementation - // For testing, we just verify the capability - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - // STARTTLS is optional but common - expect(true).toEqual(true); - - } finally { - done.resolve(); - } -}); - -tap.test('TLS Versions - should support modern TLS versions via STARTTLS', async (tools) => { - const done = tools.defer(); - - try { - // Test TLS 1.2 via STARTTLS - console.log('Testing TLS 1.2 support via STARTTLS...'); - const tls12Result = await testTlsVersionViaStartTls('TLSv1.2', TEST_PORT); - console.log('TLS 1.2 result:', tls12Result); - - // Test TLS 1.3 via STARTTLS - console.log('Testing TLS 1.3 support via STARTTLS...'); - const tls13Result = await testTlsVersionViaStartTls('TLSv1.3', TEST_PORT); - console.log('TLS 1.3 result:', tls13Result); - - // At least one modern version should be supported - const supportsModernTls = tls12Result.success || tls13Result.success; - expect(supportsModernTls).toEqual(true); - - if (tls12Result.success) { - console.log('TLS 1.2 supported with cipher:', tls12Result.cipher); - } - if (tls13Result.success) { - console.log('TLS 1.3 supported with cipher:', tls13Result.cipher); - } - - } finally { - done.resolve(); - } -}); - -tap.test('TLS Versions - should reject obsolete TLS versions via STARTTLS', async (tools) => { - const done = tools.defer(); - - try { - // Test TLS 1.0 (should be rejected by modern servers) - console.log('Testing TLS 1.0 (obsolete) via STARTTLS...'); - const tls10Result = await testTlsVersionViaStartTls('TLSv1', TEST_PORT); - - // Test TLS 1.1 (should be rejected by modern servers) - console.log('Testing TLS 1.1 (obsolete) via STARTTLS...'); - const tls11Result = await testTlsVersionViaStartTls('TLSv1.1', TEST_PORT); - - // Modern servers should reject these old versions - // But some might still support them for compatibility - console.log(`TLS 1.0 ${tls10Result.success ? 'accepted (legacy support)' : 'rejected (good)'}`); - console.log(`TLS 1.1 ${tls11Result.success ? 'accepted (legacy support)' : 'rejected (good)'}`); - - // Either behavior is acceptable - log the results - expect(true).toEqual(true); - - } finally { - done.resolve(); - } -}); - -tap.test('TLS Versions - should provide cipher information via STARTTLS', async (tools) => { - const done = tools.defer(); - - try { - // Connect to plain SMTP port - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - console.log('Server does not support STARTTLS - skipping cipher info test'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Upgrade to TLS - const tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }); - - await new Promise((resolve, reject) => { - tlsSocket.once('secureConnect', () => resolve()); - tlsSocket.once('error', reject); - }); - - // Get connection details - const cipher = tlsSocket.getCipher(); - const protocol = tlsSocket.getProtocol(); - const authorized = tlsSocket.authorized; - - console.log('TLS connection established via STARTTLS:'); - console.log('- Protocol:', protocol); - console.log('- Cipher:', cipher?.name); - console.log('- Key exchange:', cipher?.standardName); - console.log('- Authorized:', authorized); - - if (protocol) { - expect(typeof protocol).toEqual('string'); - } - if (cipher) { - expect(cipher.name).toBeDefined(); - } - - // Clean up - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - - } finally { - done.resolve(); - } -}); - -// Helper function to test specific TLS version via STARTTLS -async function testTlsVersionViaStartTls(version: string, port: number): Promise<{success: boolean, cipher?: any, error?: string}> { - return new Promise(async (resolve) => { - try { - // Connect to plain SMTP port - const socket = net.createConnection({ - host: 'localhost', - port: port, - timeout: 5000 - }); - - await new Promise((socketResolve, socketReject) => { - socket.once('connect', () => socketResolve()); - socket.once('error', socketReject); - }); - - // Get banner - await new Promise((bannerResolve) => { - socket.once('data', (chunk) => bannerResolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((ehloResolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - ehloResolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - socket.destroy(); - resolve({ - success: false, - error: 'STARTTLS not supported' - }); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - await new Promise((starttlsResolve) => { - socket.once('data', (chunk) => starttlsResolve(chunk.toString())); - }); - - // Set up TLS options with version constraints - const tlsOptions: any = { - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }; - - // Set version constraints based on requested version - switch (version) { - case 'TLSv1': - tlsOptions.minVersion = 'TLSv1'; - tlsOptions.maxVersion = 'TLSv1'; - break; - case 'TLSv1.1': - tlsOptions.minVersion = 'TLSv1.1'; - tlsOptions.maxVersion = 'TLSv1.1'; - break; - case 'TLSv1.2': - tlsOptions.minVersion = 'TLSv1.2'; - tlsOptions.maxVersion = 'TLSv1.2'; - break; - case 'TLSv1.3': - tlsOptions.minVersion = 'TLSv1.3'; - tlsOptions.maxVersion = 'TLSv1.3'; - break; - } - - // Upgrade to TLS - const tlsSocket = tls.connect(tlsOptions); - - tlsSocket.once('secureConnect', () => { - const cipher = tlsSocket.getCipher(); - const protocol = tlsSocket.getProtocol(); - - tlsSocket.destroy(); - resolve({ - success: true, - cipher: { - name: cipher?.name, - standardName: cipher?.standardName, - protocol: protocol - } - }); - }); - - tlsSocket.once('error', (error) => { - resolve({ - success: false, - error: error.message - }); - }); - - setTimeout(() => { - tlsSocket.destroy(); - resolve({ - success: false, - error: 'TLS handshake timeout' - }); - }, 5000); - - } catch (error) { - resolve({ - success: false, - error: error instanceof Error ? error.message : 'Unknown error' - }); - } - }); -} - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); diff --git a/test/suite/smtpserver_connection/test.cm-09.tls-ciphers.ts b/test/suite/smtpserver_connection/test.cm-09.tls-ciphers.ts deleted file mode 100644 index cebf9fc..0000000 --- a/test/suite/smtpserver_connection/test.cm-09.tls-ciphers.ts +++ /dev/null @@ -1,556 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as tls from 'tls'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer: ITestServer; -const TEST_TIMEOUT = 30000; - -tap.test('TLS Ciphers - should advertise STARTTLS for cipher negotiation', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT, tlsEnabled: true }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS support - const supportsStarttls = ehloResponse.includes('250-STARTTLS') || ehloResponse.includes('250 STARTTLS'); - console.log('STARTTLS supported:', supportsStarttls); - - if (supportsStarttls) { - console.log('Server supports STARTTLS - cipher negotiation available'); - } else { - console.log('Server does not advertise STARTTLS - direct TLS connections may be required'); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - // Either behavior is acceptable - expect(true).toEqual(true); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('TLS Ciphers - should negotiate secure cipher suites via STARTTLS', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT, tlsEnabled: true }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - console.log('Server does not support STARTTLS - skipping cipher test'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - const starttlsResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(starttlsResponse).toInclude('220'); - - // Upgrade to TLS - const tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }); - - await new Promise((resolve, reject) => { - tlsSocket.once('secureConnect', () => resolve()); - tlsSocket.once('error', reject); - }); - - // Get cipher information - const cipher = tlsSocket.getCipher(); - console.log('Negotiated cipher suite:'); - console.log('- Name:', cipher.name); - console.log('- Standard name:', cipher.standardName); - console.log('- Version:', cipher.version); - - // Check cipher security - const cipherSecurity = checkCipherSecurity(cipher); - console.log('Cipher security analysis:', cipherSecurity); - - expect(cipher.name).toBeDefined(); - expect(cipherSecurity.secure).toEqual(true); - - // Clean up - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('TLS Ciphers - should reject weak cipher suites', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT, tlsEnabled: true }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - console.log('Server does not support STARTTLS - skipping weak cipher test'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Try to connect with weak ciphers only - const weakCiphers = [ - 'DES-CBC3-SHA', - 'RC4-MD5', - 'RC4-SHA', - 'NULL-SHA', - 'EXPORT-DES40-CBC-SHA' - ]; - - console.log('Testing connection with weak ciphers only...'); - - const connectionResult = await new Promise<{success: boolean, error?: string}>((resolve) => { - const tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false, - ciphers: weakCiphers.join(':') - }); - - tlsSocket.once('secureConnect', () => { - // If connection succeeds, server accepts weak ciphers - const cipher = tlsSocket.getCipher(); - tlsSocket.destroy(); - resolve({ - success: true, - error: `Server accepted weak cipher: ${cipher.name}` - }); - }); - - tlsSocket.once('error', (err) => { - // Connection failed - good, server rejects weak ciphers - resolve({ - success: false, - error: err.message - }); - }); - - setTimeout(() => { - tlsSocket.destroy(); - resolve({ - success: false, - error: 'Connection timeout' - }); - }, 5000); - }); - - if (!connectionResult.success) { - console.log('Good: Server rejected weak ciphers'); - } else { - console.log('Warning:', connectionResult.error); - } - - // Either behavior is logged - some servers may support legacy ciphers - expect(true).toEqual(true); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('TLS Ciphers - should support forward secrecy', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT, tlsEnabled: true }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - console.log('Server does not support STARTTLS - skipping forward secrecy test'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Prefer ciphers with forward secrecy (ECDHE, DHE) - const forwardSecrecyCiphers = [ - 'ECDHE-RSA-AES128-GCM-SHA256', - 'ECDHE-RSA-AES256-GCM-SHA384', - 'ECDHE-ECDSA-AES128-GCM-SHA256', - 'ECDHE-ECDSA-AES256-GCM-SHA384', - 'DHE-RSA-AES128-GCM-SHA256', - 'DHE-RSA-AES256-GCM-SHA384' - ]; - - const tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false, - ciphers: forwardSecrecyCiphers.join(':') - }); - - await new Promise((resolve, reject) => { - tlsSocket.once('secureConnect', () => resolve()); - tlsSocket.once('error', reject); - setTimeout(() => reject(new Error('TLS connection timeout')), 5000); - }); - - const cipher = tlsSocket.getCipher(); - console.log('Forward secrecy cipher negotiated:', cipher.name); - - // Check if cipher provides forward secrecy - const hasForwardSecrecy = cipher.name.includes('ECDHE') || cipher.name.includes('DHE'); - console.log('Forward secrecy:', hasForwardSecrecy ? 'YES' : 'NO'); - - if (hasForwardSecrecy) { - console.log('Good: Server supports forward secrecy'); - } else { - console.log('Warning: Negotiated cipher does not provide forward secrecy'); - } - - // Clean up - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - - // Forward secrecy is recommended but not required - expect(true).toEqual(true); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('TLS Ciphers - should list all supported ciphers', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT, tlsEnabled: true }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - // Get list of ciphers supported by Node.js - const supportedCiphers = tls.getCiphers(); - console.log(`Node.js supports ${supportedCiphers.length} cipher suites`); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check for STARTTLS - if (!ehloResponse.includes('STARTTLS')) { - console.log('Server does not support STARTTLS - skipping cipher list test'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - return; - } - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Test connection with default ciphers - const tlsSocket = tls.connect({ - socket: socket, - servername: 'localhost', - rejectUnauthorized: false - }); - - await new Promise((resolve, reject) => { - tlsSocket.once('secureConnect', () => resolve()); - tlsSocket.once('error', reject); - setTimeout(() => reject(new Error('TLS connection timeout')), 5000); - }); - - const negotiatedCipher = tlsSocket.getCipher(); - console.log('\nServer selected cipher:', negotiatedCipher.name); - - // Categorize the cipher - const categories = { - 'AEAD': negotiatedCipher.name.includes('GCM') || negotiatedCipher.name.includes('CCM') || negotiatedCipher.name.includes('POLY1305'), - 'Forward Secrecy': negotiatedCipher.name.includes('ECDHE') || negotiatedCipher.name.includes('DHE'), - 'Strong Encryption': negotiatedCipher.name.includes('AES') && (negotiatedCipher.name.includes('128') || negotiatedCipher.name.includes('256')) - }; - - console.log('Cipher properties:'); - Object.entries(categories).forEach(([property, value]) => { - console.log(`- ${property}: ${value ? 'YES' : 'NO'}`); - }); - - // Clean up - tlsSocket.end(); - - expect(negotiatedCipher.name).toBeDefined(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -// Helper function to check cipher security -function checkCipherSecurity(cipher: any): {secure: boolean, reason?: string, recommendations?: string[]} { - if (!cipher || !cipher.name) { - return { - secure: false, - reason: 'No cipher information available' - }; - } - - const cipherName = cipher.name.toUpperCase(); - const recommendations: string[] = []; - - // Check for insecure ciphers - const insecureCiphers = ['NULL', 'EXPORT', 'DES', '3DES', 'RC4', 'MD5']; - - for (const insecure of insecureCiphers) { - if (cipherName.includes(insecure)) { - return { - secure: false, - reason: `Insecure cipher detected: ${insecure} in ${cipherName}`, - recommendations: ['Use AEAD ciphers like AES-GCM or ChaCha20-Poly1305'] - }; - } - } - - // Check for recommended secure ciphers - const secureCiphers = [ - 'AES128-GCM', 'AES256-GCM', 'CHACHA20-POLY1305', - 'AES128-CCM', 'AES256-CCM' - ]; - - const hasSecureCipher = secureCiphers.some(secure => - cipherName.includes(secure.replace('-', '_')) || cipherName.includes(secure) - ); - - if (hasSecureCipher) { - return { - secure: true, - recommendations: ['Cipher suite is considered secure'] - }; - } - - // Check for acceptable but not ideal ciphers - if (cipherName.includes('AES') && !cipherName.includes('CBC')) { - return { - secure: true, - recommendations: ['Consider upgrading to AEAD ciphers for better security'] - }; - } - - // Check for weak but sometimes acceptable ciphers - if (cipherName.includes('AES') && cipherName.includes('CBC')) { - recommendations.push('CBC mode ciphers are vulnerable to padding oracle attacks'); - recommendations.push('Consider upgrading to GCM or other AEAD modes'); - return { - secure: true, // Still acceptable but not ideal - recommendations: recommendations - }; - } - - // Default to secure if it's a modern cipher we don't recognize - return { - secure: true, - recommendations: [`Unknown cipher ${cipherName} - verify security manually`] - }; -} - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-10.plain-connection.ts b/test/suite/smtpserver_connection/test.cm-10.plain-connection.ts deleted file mode 100644 index 611213c..0000000 --- a/test/suite/smtpserver_connection/test.cm-10.plain-connection.ts +++ /dev/null @@ -1,293 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer: ITestServer; -const TEST_TIMEOUT = 30000; - -tap.test('Plain Connection - should establish basic TCP connection', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - const connected = await new Promise((resolve) => { - socket.once('connect', () => resolve(true)); - socket.once('error', () => resolve(false)); - setTimeout(() => resolve(false), 5000); - }); - - expect(connected).toEqual(true); - - if (connected) { - console.log('Plain connection established:'); - console.log('- Local:', `${socket.localAddress}:${socket.localPort}`); - console.log('- Remote:', `${socket.remoteAddress}:${socket.remotePort}`); - - // Close connection - socket.destroy(); - } - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Plain Connection - should receive SMTP banner on plain connection', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Received banner:', banner.trim()); - - expect(banner).toInclude('220'); - expect(banner).toInclude('ESMTP'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Plain Connection - should complete full SMTP transaction on plain connection', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - expect(ehloResponse).toInclude('250'); - console.log('EHLO successful on plain connection'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(dataResponse).toInclude('354'); - - // Send email content - const emailContent = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Plain Connection Test\r\n' + - '\r\n' + - 'This email was sent over a plain connection.\r\n' + - '.\r\n'; - - socket.write(emailContent); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(finalResponse).toInclude('250'); - console.log('Email sent successfully over plain connection'); - - // Clean up - socket.write('QUIT\r\n'); - - const quitResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(quitResponse).toInclude('221'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Plain Connection - should handle multiple plain connections', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const connectionCount = 3; - const connections: net.Socket[] = []; - - // Create multiple connections - for (let i = 0; i < connectionCount; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => { - connections.push(socket); - resolve(); - }); - socket.once('error', reject); - }); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - console.log(`Connection ${i + 1} established`); - } - - expect(connections.length).toEqual(connectionCount); - console.log(`All ${connectionCount} plain connections established successfully`); - - // Clean up all connections - for (const socket of connections) { - socket.write('QUIT\r\n'); - socket.end(); - } - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Plain Connection - should work on standard SMTP port 25', async (tools) => { - const done = tools.defer(); - - // Test port 25 (standard SMTP port) - const SMTP_PORT = 25; - - // Note: Port 25 might require special permissions or might be blocked - // We'll test the connection but handle failures gracefully - const socket = net.createConnection({ - host: 'localhost', - port: SMTP_PORT, - timeout: 5000 - }); - - const result = await new Promise<{connected: boolean, error?: string}>((resolve) => { - socket.once('connect', () => { - socket.destroy(); - resolve({ connected: true }); - }); - - socket.once('error', (err) => { - resolve({ - connected: false, - error: err.message - }); - }); - - setTimeout(() => { - socket.destroy(); - resolve({ - connected: false, - error: 'Connection timeout' - }); - }, 5000); - }); - - if (result.connected) { - console.log('Successfully connected to port 25 (standard SMTP)'); - } else { - console.log(`Could not connect to port 25: ${result.error}`); - console.log('This is expected if port 25 is blocked or requires privileges'); - } - - // Test passes regardless - port 25 connectivity is environment-dependent - expect(true).toEqual(true); - - done.resolve(); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_connection/test.cm-11.keepalive.ts b/test/suite/smtpserver_connection/test.cm-11.keepalive.ts deleted file mode 100644 index bc23c96..0000000 --- a/test/suite/smtpserver_connection/test.cm-11.keepalive.ts +++ /dev/null @@ -1,382 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer: ITestServer; -const TEST_TIMEOUT = 60000; // Longer timeout for keepalive tests - -tap.test('Keepalive - should maintain TCP keepalive', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Enable TCP keepalive - const keepAliveDelay = 1000; // 1 second - socket.setKeepAlive(true, keepAliveDelay); - console.log(`TCP keepalive enabled with ${keepAliveDelay}ms delay`); - - // Get banner - const banner = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(banner).toInclude('220'); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - expect(ehloResponse).toInclude('250'); - - // Wait for keepalive duration + buffer - console.log('Waiting for keepalive period...'); - await new Promise(resolve => setTimeout(resolve, keepAliveDelay + 500)); - - // Verify connection is still alive by sending NOOP - socket.write('NOOP\r\n'); - - const noopResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(noopResponse).toInclude('250'); - console.log('Connection maintained after keepalive period'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Keepalive - should maintain idle connection for extended period', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Enable keepalive - socket.setKeepAlive(true, 1000); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Test multiple keepalive periods - const periods = 3; - const periodDuration = 1000; // 1 second each - - for (let i = 0; i < periods; i++) { - console.log(`Keepalive period ${i + 1}/${periods}...`); - await new Promise(resolve => setTimeout(resolve, periodDuration)); - - // Send NOOP to verify connection - socket.write('NOOP\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(response).toInclude('250'); - console.log(`Connection alive after ${(i + 1) * periodDuration}ms`); - } - - console.log(`Connection maintained for ${periods * periodDuration}ms total`); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Keepalive - should detect connection loss', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Enable keepalive with short interval - socket.setKeepAlive(true, 1000); - - // Track connection state - let connectionLost = false; - socket.on('close', () => { - connectionLost = true; - console.log('Connection closed'); - }); - - socket.on('error', (err) => { - connectionLost = true; - console.log('Connection error:', err.message); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - console.log('Connection established, now simulating server shutdown...'); - - // Shutdown server to simulate connection loss - await stopTestServer(testServer); - - // Wait for keepalive to detect connection loss - await new Promise(resolve => setTimeout(resolve, 3000)); - - // Connection should be detected as lost - expect(connectionLost).toEqual(true); - console.log('Keepalive detected connection loss'); - - } finally { - // Server already shutdown, just resolve - done.resolve(); - } -}); - -tap.test('Keepalive - should handle long-running SMTP session', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Enable keepalive - socket.setKeepAlive(true, 2000); - - const sessionStart = Date.now(); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Simulate a long-running session with periodic activity - const activities = [ - { command: 'MAIL FROM:', delay: 500 }, - { command: 'RSET', delay: 500 }, - { command: 'MAIL FROM:', delay: 500 }, - { command: 'RSET', delay: 500 } - ]; - - for (const activity of activities) { - await new Promise(resolve => setTimeout(resolve, activity.delay)); - - console.log(`Sending: ${activity.command}`); - socket.write(`${activity.command}\r\n`); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(response).toInclude('250'); - } - - const sessionDuration = Date.now() - sessionStart; - console.log(`Long-running session maintained for ${sessionDuration}ms`); - - // Clean up - socket.write('QUIT\r\n'); - - const quitResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(quitResponse).toInclude('221'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Keepalive - should handle NOOP as keepalive mechanism', async (tools) => { - const done = tools.defer(); - - // Start test server - testServer = await startTestServer({ port: TEST_PORT }); - - await new Promise(resolve => setTimeout(resolve, 1000)); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Use NOOP as application-level keepalive - const noopInterval = 1000; // 1 second - const noopCount = 3; - - console.log(`Sending ${noopCount} NOOP commands as keepalive...`); - - for (let i = 0; i < noopCount; i++) { - await new Promise(resolve => setTimeout(resolve, noopInterval)); - - socket.write('NOOP\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(response).toInclude('250'); - console.log(`NOOP ${i + 1}/${noopCount} successful`); - } - - console.log('Application-level keepalive successful'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-01.very-large-email.ts b/test/suite/smtpserver_edge-cases/test.edge-01.very-large-email.ts deleted file mode 100644 index 962961e..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-01.very-large-email.ts +++ /dev/null @@ -1,239 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -import { connectToSmtp, waitForGreeting, sendSmtpCommand, closeSmtpConnection, generateRandomEmail } from '../../helpers/utils.js'; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server with large size limit', async () => { - testServer = await startTestServer({ - port: 2532, - hostname: 'localhost', - size: 100 * 1024 * 1024 // 100MB limit for testing - }); - expect(testServer).toBeInstanceOf(Object); -}); - -tap.test('EDGE-01: Very Large Email - test size limits and handling', async () => { - const testCases = [ - { size: 1 * 1024 * 1024, label: '1MB', shouldPass: true }, - { size: 10 * 1024 * 1024, label: '10MB', shouldPass: true }, - { size: 50 * 1024 * 1024, label: '50MB', shouldPass: true }, - { size: 101 * 1024 * 1024, label: '101MB', shouldPass: false } // Over limit - ]; - - for (const testCase of testCases) { - console.log(`\n📧 Testing ${testCase.label} email...`); - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Check SIZE extension - await sendSmtpCommand(socket, `MAIL FROM: SIZE=${testCase.size}`, - testCase.shouldPass ? '250' : '552'); - - if (testCase.shouldPass) { - // Continue with transaction - await sendSmtpCommand(socket, 'RCPT TO:', '250'); - await sendSmtpCommand(socket, 'DATA', '354'); - - // Send large content in chunks - const chunkSize = 65536; // 64KB chunks - const totalChunks = Math.ceil(testCase.size / chunkSize); - - console.log(` Sending ${totalChunks} chunks...`); - - // Headers - socket.write('From: large@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write(`Subject: ${testCase.label} Test Email\r\n`); - socket.write('Content-Type: text/plain\r\n'); - socket.write('\r\n'); - - // Body in chunks - let bytesSent = 100; // Approximate header size - const startTime = Date.now(); - - for (let i = 0; i < totalChunks; i++) { - const chunk = generateRandomEmail(Math.min(chunkSize, testCase.size - bytesSent)); - socket.write(chunk); - bytesSent += chunk.length; - - // Progress indicator every 10% - if (i % Math.floor(totalChunks / 10) === 0) { - const progress = (i / totalChunks * 100).toFixed(0); - console.log(` Progress: ${progress}%`); - } - - // Small delay to avoid overwhelming - if (i % 100 === 0) { - await new Promise(resolve => setTimeout(resolve, 10)); - } - } - - // End of data - socket.write('\r\n.\r\n'); - - // Wait for response with longer timeout for large emails - const response = await new Promise((resolve, reject) => { - let buffer = ''; - const timeout = setTimeout(() => reject(new Error('Timeout')), 60000); - - const onData = (data: Buffer) => { - buffer += data.toString(); - if (buffer.includes('250') || buffer.includes('5')) { - clearTimeout(timeout); - socket.removeListener('data', onData); - resolve(buffer); - } - }; - - socket.on('data', onData); - }); - - const duration = Date.now() - startTime; - const throughputMBps = (testCase.size / 1024 / 1024) / (duration / 1000); - - expect(response).toInclude('250'); - console.log(` ✅ ${testCase.label} email accepted in ${duration}ms`); - console.log(` Throughput: ${throughputMBps.toFixed(2)} MB/s`); - - } else { - console.log(` ✅ ${testCase.label} email properly rejected (over size limit)`); - } - - } catch (error) { - if (!testCase.shouldPass && error.message.includes('552')) { - console.log(` ✅ ${testCase.label} email properly rejected: ${error.message}`); - } else { - throw error; - } - } finally { - await closeSmtpConnection(socket).catch(() => {}); - } - } -}); - -tap.test('EDGE-01: Email size enforcement - SIZE parameter', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - const ehloResponse = await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Extract SIZE limit from capabilities - const sizeMatch = ehloResponse.match(/250[- ]SIZE (\d+)/); - const sizeLimit = sizeMatch ? parseInt(sizeMatch[1]) : 0; - - console.log(`📏 Server advertises SIZE limit: ${sizeLimit} bytes`); - expect(sizeLimit).toBeGreaterThan(0); - - // Test SIZE parameter enforcement - const testSizes = [ - { size: 1000, shouldPass: true }, - { size: sizeLimit - 1000, shouldPass: true }, - { size: sizeLimit + 1000, shouldPass: false } - ]; - - for (const test of testSizes) { - try { - const response = await sendSmtpCommand( - socket, - `MAIL FROM: SIZE=${test.size}` - ); - - if (test.shouldPass) { - expect(response).toInclude('250'); - console.log(` ✅ SIZE=${test.size} accepted`); - await sendSmtpCommand(socket, 'RSET', '250'); - } else { - expect(response).toInclude('552'); - console.log(` ✅ SIZE=${test.size} rejected`); - } - } catch (error) { - if (!test.shouldPass) { - console.log(` ✅ SIZE=${test.size} rejected: ${error.message}`); - } else { - throw error; - } - } - } - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('EDGE-01: Memory efficiency with large emails', async () => { - // Get initial memory usage - const initialMemory = process.memoryUsage(); - console.log('📊 Initial memory usage:', { - heapUsed: `${(initialMemory.heapUsed / 1024 / 1024).toFixed(2)} MB`, - rss: `${(initialMemory.rss / 1024 / 1024).toFixed(2)} MB` - }); - - // Send a moderately large email - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - await sendSmtpCommand(socket, 'MAIL FROM:', '250'); - await sendSmtpCommand(socket, 'RCPT TO:', '250'); - await sendSmtpCommand(socket, 'DATA', '354'); - - // Send 20MB email - const size = 20 * 1024 * 1024; - const chunkSize = 1024 * 1024; // 1MB chunks - - socket.write('From: memory@test.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Memory Test\r\n\r\n'); - - for (let i = 0; i < size / chunkSize; i++) { - socket.write(generateRandomEmail(chunkSize)); - // Force garbage collection if available - if (global.gc) { - global.gc(); - } - } - - socket.write('\r\n.\r\n'); - - // Wait for response - await new Promise((resolve) => { - const onData = (data: Buffer) => { - if (data.toString().includes('250')) { - socket.removeListener('data', onData); - resolve(); - } - }; - socket.on('data', onData); - }); - - // Check memory after processing - const finalMemory = process.memoryUsage(); - const memoryIncrease = (finalMemory.heapUsed - initialMemory.heapUsed) / 1024 / 1024; - - console.log('📊 Final memory usage:', { - heapUsed: `${(finalMemory.heapUsed / 1024 / 1024).toFixed(2)} MB`, - rss: `${(finalMemory.rss / 1024 / 1024).toFixed(2)} MB`, - increase: `${memoryIncrease.toFixed(2)} MB` - }); - - // Memory increase should be reasonable (not storing entire email in memory) - expect(memoryIncrease).toBeLessThan(50); // Less than 50MB increase for 20MB email - console.log('✅ Memory efficiency test passed'); - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - console.log('✅ Test server stopped'); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-02.very-small-email.ts b/test/suite/smtpserver_edge-cases/test.edge-02.very-small-email.ts deleted file mode 100644 index 56e958d..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-02.very-small-email.ts +++ /dev/null @@ -1,389 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30034; -const TEST_TIMEOUT = 30000; - -tap.test('Very Small Email - should handle minimal email with single character body', async (tools) => { - const done = tools.defer(); - - // Start test server - const testServer = await startTestServer({ port: TEST_PORT }); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Send minimal email - just required headers and single character body - const minimalEmail = 'From: sender@example.com\r\nTo: recipient@example.com\r\nSubject: \r\n\r\nX\r\n.\r\n'; - socket.write(minimalEmail); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(finalResponse).toInclude('250'); - console.log(`Minimal email (${minimalEmail.length} bytes) processed successfully`); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Very Small Email - should handle email with empty body', async (tools) => { - const done = tools.defer(); - - // Start test server - const testServer = await startTestServer({ port: TEST_PORT }); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Complete envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send email with empty body - const emptyBodyEmail = 'From: sender@example.com\r\nTo: recipient@example.com\r\n\r\n.\r\n'; - socket.write(emptyBodyEmail); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(finalResponse).toInclude('250'); - console.log('Email with empty body processed successfully'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Very Small Email - should handle email with minimal headers only', async (tools) => { - const done = tools.defer(); - - // Start test server - const testServer = await startTestServer({ port: TEST_PORT }); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner and send EHLO - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Complete envelope - use valid email addresses - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send absolutely minimal valid email - const minimalHeaders = 'From: a@example.com\r\n\r\n.\r\n'; - socket.write(minimalHeaders); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(finalResponse).toInclude('250'); - console.log(`Ultra-minimal email (${minimalHeaders.length} bytes) processed`); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Very Small Email - should handle single dot line correctly', async (tools) => { - const done = tools.defer(); - - // Start test server - const testServer = await startTestServer({ port: TEST_PORT }); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Complete envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Test edge case: just the terminating dot - socket.write('.\r\n'); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Server should accept this as an email with no headers or body - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - console.log('Single dot terminator handled:', finalResponse.trim()); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -tap.test('Very Small Email - should handle email with empty subject', async (tools) => { - const done = tools.defer(); - - // Start test server - const testServer = await startTestServer({ port: TEST_PORT }); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Complete envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send email with empty subject line - const emptySubjectEmail = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: \r\n' + - 'Date: ' + new Date().toUTCString() + '\r\n' + - '\r\n' + - 'Email with empty subject.\r\n' + - '.\r\n'; - - socket.write(emptySubjectEmail); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(finalResponse).toInclude('250'); - console.log('Email with empty subject processed successfully'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - await stopTestServer(testServer); - done.resolve(); - } -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-03.invalid-character-handling.ts b/test/suite/smtpserver_edge-cases/test.edge-03.invalid-character-handling.ts deleted file mode 100644 index 210a6e2..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-03.invalid-character-handling.ts +++ /dev/null @@ -1,479 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30035; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for invalid character tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeDefined(); -}); - -tap.test('Invalid Character Handling - should handle control characters in email', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(dataResponse).toInclude('354'); - - // Test with control characters - const controlChars = [ - '\x00', // NULL - '\x01', // SOH - '\x02', // STX - '\x03', // ETX - '\x7F' // DEL - ]; - - const emailWithControlChars = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - `Subject: Control Character Test ${controlChars.join('')}\r\n` + - '\r\n' + - `This email contains control characters: ${controlChars.join('')}\r\n` + - 'Null byte: \x00\r\n' + - 'Delete char: \x7F\r\n' + - '.\r\n'; - - socket.write(emailWithControlChars); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to control characters:', finalResponse); - - // Server might accept or reject based on security settings - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('550') || finalResponse.includes('554'); - - expect(accepted || rejected).toEqual(true); - - if (rejected) { - console.log('Server rejected control characters (strict security)'); - } else { - console.log('Server accepted control characters (may sanitize internally)'); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Invalid Character Handling - should handle high-byte characters', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Test with high-byte characters - const highByteChars = [ - '\xFF', // 255 - '\xFE', // 254 - '\xFD', // 253 - '\xFC', // 252 - '\xFB' // 251 - ]; - - const emailWithHighBytes = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: High-byte Character Test\r\n' + - '\r\n' + - `High-byte characters: ${highByteChars.join('')}\r\n` + - 'Extended ASCII: \xE0\xE1\xE2\xE3\xE4\r\n' + - '.\r\n'; - - socket.write(emailWithHighBytes); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to high-byte characters:', finalResponse); - - // Both acceptance and rejection are valid - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Invalid Character Handling - should handle Unicode special characters', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Test with Unicode special characters - const unicodeSpecials = [ - '\u2000', // EN QUAD - '\u2028', // LINE SEPARATOR - '\u2029', // PARAGRAPH SEPARATOR - '\uFEFF', // ZERO WIDTH NO-BREAK SPACE (BOM) - '\u200B', // ZERO WIDTH SPACE - '\u200C', // ZERO WIDTH NON-JOINER - '\u200D' // ZERO WIDTH JOINER - ]; - - const emailWithUnicode = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Unicode Special Characters Test\r\n' + - 'Content-Type: text/plain; charset=utf-8\r\n' + - '\r\n' + - `Unicode specials: ${unicodeSpecials.join('')}\r\n` + - 'Line separator: \u2028\r\n' + - 'Paragraph separator: \u2029\r\n' + - 'Zero-width space: word\u200Bword\r\n' + - '.\r\n'; - - socket.write(emailWithUnicode); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to Unicode special characters:', finalResponse); - - // Most servers should accept Unicode with proper charset declaration - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Invalid Character Handling - should handle bare LF and CR', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Test with bare LF and CR (not allowed in SMTP) - const emailWithBareLfCr = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Bare LF and CR Test\r\n' + - '\r\n' + - 'Line with bare LF:\nThis should not be allowed\r\n' + - 'Line with bare CR:\rThis should also not be allowed\r\n' + - 'Correct line ending\r\n' + - '.\r\n'; - - socket.write(emailWithBareLfCr); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to bare LF/CR:', finalResponse); - - // Servers may accept and fix, or reject - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('550') || finalResponse.includes('554'); - - if (accepted) { - console.log('Server accepted bare LF/CR (may convert to CRLF)'); - } else if (rejected) { - console.log('Server rejected bare LF/CR (strict SMTP compliance)'); - } - - expect(accepted || rejected).toEqual(true); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Invalid Character Handling - should handle long lines without proper folding', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Create a line that exceeds RFC 5322 limit (998 characters) - const longLine = 'X'.repeat(1500); - - const emailWithLongLine = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Long Line Test\r\n' + - '\r\n' + - 'Normal line\r\n' + - longLine + '\r\n' + - 'Another normal line\r\n' + - '.\r\n'; - - socket.write(emailWithLongLine); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to long line:', finalResponse); - console.log(`Line length: ${longLine.length} characters`); - - // Server should handle this (accept, wrap, or reject) - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-04.empty-commands.ts b/test/suite/smtpserver_edge-cases/test.edge-04.empty-commands.ts deleted file mode 100644 index 4c423f1..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-04.empty-commands.ts +++ /dev/null @@ -1,430 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30036; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for empty command tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeDefined(); -}); - -tap.test('Empty Commands - should reject empty line (just CRLF)', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO first - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send empty line (just CRLF) - socket.write('\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - setTimeout(() => resolve('TIMEOUT'), 2000); - }); - - console.log('Response to empty line:', response); - - // Should get syntax error (500, 501, or 502) - if (response !== 'TIMEOUT') { - expect(response).toMatch(/^5\d{2}/); - } else { - // Server might ignore empty lines - console.log('Server ignored empty line'); - expect(true).toEqual(true); - } - - // Test server is still responsive - socket.write('NOOP\r\n'); - const noopResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(noopResponse).toInclude('250'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Empty Commands - should reject commands with only whitespace', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner and send EHLO - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Test various whitespace-only commands - const whitespaceCommands = [ - ' \r\n', // Spaces only - '\t\r\n', // Tab only - ' \t \r\n', // Mixed whitespace - ' \r\n' // Multiple spaces - ]; - - for (const cmd of whitespaceCommands) { - socket.write(cmd); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - setTimeout(() => resolve('TIMEOUT'), 2000); - }); - - console.log(`Response to whitespace "${cmd.trim()}"\\r\\n:`, response); - - if (response !== 'TIMEOUT') { - // Should get syntax error - expect(response).toMatch(/^5\d{2}/); - } - } - - // Verify server still works - socket.write('NOOP\r\n'); - const noopResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(noopResponse).toInclude('250'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Empty Commands - should reject MAIL FROM with empty parameter', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM with empty parameter - socket.write('MAIL FROM:\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to empty MAIL FROM:', response); - - // Should get syntax error (501 or 550) - expect(response).toMatch(/^5\d{2}/); - expect(response).toMatch(/syntax|parameter|address/i); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Empty Commands - should reject RCPT TO with empty parameter', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send valid MAIL FROM first - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send RCPT TO with empty parameter - socket.write('RCPT TO:\r\n'); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to empty RCPT TO:', response); - - // Should get syntax error - expect(response).toMatch(/^5\d{2}/); - expect(response).toMatch(/syntax|parameter|address/i); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Empty Commands - should reject EHLO/HELO without hostname', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO without hostname - socket.write('EHLO\r\n'); - - const ehloResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to EHLO without hostname:', ehloResponse); - - // Should get syntax error - expect(ehloResponse).toMatch(/^5\d{2}/); - - // Try HELO without hostname - socket.write('HELO\r\n'); - - const heloResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to HELO without hostname:', heloResponse); - - // Should get syntax error - expect(heloResponse).toMatch(/^5\d{2}/); - - // Send valid EHLO to establish session - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Empty Commands - server should remain stable after empty commands', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send multiple empty/invalid commands - const invalidCommands = [ - '\r\n', - ' \r\n', - 'MAIL FROM:\r\n', - 'RCPT TO:\r\n', - 'EHLO\r\n', - '\t\r\n' - ]; - - for (const cmd of invalidCommands) { - socket.write(cmd); - - // Read response but don't fail if error - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - setTimeout(() => resolve('TIMEOUT'), 1000); - }); - } - - // Now test that server is still functional - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(mailResponse).toInclude('250'); - - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(rcptResponse).toInclude('250'); - - console.log('Server remained stable after multiple empty commands'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-05.extremely-long-lines.ts b/test/suite/smtpserver_edge-cases/test.edge-05.extremely-long-lines.ts deleted file mode 100644 index 5585962..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-05.extremely-long-lines.ts +++ /dev/null @@ -1,425 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30037; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for extremely long lines tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeDefined(); -}); - -tap.test('Extremely Long Lines - should handle lines exceeding RFC 5321 limit', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(dataResponse).toInclude('354'); - - // Create line exceeding RFC 5321 limit (1000 chars including CRLF) - const longLine = 'X'.repeat(2000); // 2000 character line - - const emailWithLongLine = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Long Line Test\r\n' + - '\r\n' + - 'This email contains an extremely long line:\r\n' + - longLine + '\r\n' + - 'End of test.\r\n' + - '.\r\n'; - - socket.write(emailWithLongLine); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log(`Response to ${longLine.length} character line:`, finalResponse); - - // Server should handle gracefully (accept, wrap, or reject) - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('552') || finalResponse.includes('500') || finalResponse.includes('554'); - - expect(accepted || rejected).toEqual(true); - - if (accepted) { - console.log('Server accepted long line (may wrap internally)'); - } else { - console.log('Server rejected long line'); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Lines - should handle extremely long subject header', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Create extremely long subject (3000 characters) - const longSubject = 'A'.repeat(3000); - - const emailWithLongSubject = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - `Subject: ${longSubject}\r\n` + - '\r\n' + - 'Body of email with extremely long subject.\r\n' + - '.\r\n'; - - socket.write(emailWithLongSubject); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log(`Response to ${longSubject.length} character subject:`, finalResponse); - - // Server should handle this - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Lines - should handle multiple consecutive long lines', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Create multiple long lines - const longLine1 = 'A'.repeat(1500); - const longLine2 = 'B'.repeat(1800); - const longLine3 = 'C'.repeat(2000); - - const emailWithMultipleLongLines = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: Multiple Long Lines Test\r\n' + - '\r\n' + - 'First long line:\r\n' + - longLine1 + '\r\n' + - 'Second long line:\r\n' + - longLine2 + '\r\n' + - 'Third long line:\r\n' + - longLine3 + '\r\n' + - '.\r\n'; - - socket.write(emailWithMultipleLongLines); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to multiple long lines:', finalResponse); - - // Server should handle this - expect(finalResponse).toMatch(/^[2-5]\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Lines - should handle extremely long MAIL FROM parameter', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Create extremely long email address (technically invalid but testing limits) - const longLocalPart = 'a'.repeat(500); - const longDomain = 'b'.repeat(500) + '.com'; - const longEmail = `${longLocalPart}@${longDomain}`; - - socket.write(`MAIL FROM:<${longEmail}>\r\n`); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log(`Response to ${longEmail.length} character email address:`, response); - - // Should get error response - expect(response).toMatch(/^5\d{2}/); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Lines - should handle line exactly at RFC limit', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Setup connection - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send envelope - socket.write('MAIL FROM:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('RCPT TO:\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - socket.write('DATA\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Create line exactly at RFC 5321 limit (998 chars + CRLF = 1000) - const rfcLimitLine = 'X'.repeat(998); - - const emailWithRfcLimitLine = - 'From: sender@example.com\r\n' + - 'To: recipient@example.com\r\n' + - 'Subject: RFC Limit Test\r\n' + - '\r\n' + - 'Line at RFC 5321 limit:\r\n' + - rfcLimitLine + '\r\n' + - 'This should be accepted.\r\n' + - '.\r\n'; - - socket.write(emailWithRfcLimitLine); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log(`Response to ${rfcLimitLine.length} character line (RFC limit):`, finalResponse); - - // This should be accepted - expect(finalResponse).toInclude('250'); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-06.extremely-long-headers.ts b/test/suite/smtpserver_edge-cases/test.edge-06.extremely-long-headers.ts deleted file mode 100644 index 433769f..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-06.extremely-long-headers.ts +++ /dev/null @@ -1,404 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(testServer).toBeDefined(); -}); - -tap.test('Extremely Long Headers - should handle single extremely long header', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Send email with extremely long header (3000 characters) - const longValue = 'X'.repeat(3000); - const emailContent = [ - `Subject: Test Email`, - `From: sender@example.com`, - `To: recipient@example.com`, - `X-Long-Header: ${longValue}`, - '', - 'This email has an extremely long header.', - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Server might accept or reject - both are valid for extremely long headers - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('552') || finalResponse.includes('554') || finalResponse.includes('500'); - - console.log(`Long header test ${accepted ? 'accepted' : 'rejected'}: ${finalResponse.trim()}`); - expect(accepted || rejected).toEqual(true); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Headers - should handle multi-line header with many segments', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Create multi-line header with 50 segments (RFC 5322 folding) - const segments = []; - for (let i = 0; i < 50; i++) { - segments.push(` Segment ${i}: ${' '.repeat(60)}value`); - } - - const emailContent = [ - `Subject: Test Email`, - `From: sender@example.com`, - `To: recipient@example.com`, - `X-Multi-Line: Initial value`, - ...segments, - '', - 'This email has a multi-line header with many segments.', - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('552') || finalResponse.includes('554') || finalResponse.includes('500'); - - console.log(`Multi-line header test ${accepted ? 'accepted' : 'rejected'}: ${finalResponse.trim()}`); - expect(accepted || rejected).toEqual(true); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Headers - should handle multiple long headers in one email', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Create multiple long headers - const header1 = 'A'.repeat(1000); - const header2 = 'B'.repeat(1500); - const header3 = 'C'.repeat(2000); - - const emailContent = [ - `Subject: Test Email with Multiple Long Headers`, - `From: sender@example.com`, - `To: recipient@example.com`, - `X-Long-Header-1: ${header1}`, - `X-Long-Header-2: ${header2}`, - `X-Long-Header-3: ${header3}`, - '', - 'This email has multiple long headers.', - '.', - '' - ].join('\r\n'); - - const totalHeaderSize = header1.length + header2.length + header3.length; - console.log(`Total header size: ${totalHeaderSize} bytes`); - - socket.write(emailContent); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('552') || finalResponse.includes('554') || finalResponse.includes('500'); - - console.log(`Multiple long headers test ${accepted ? 'accepted' : 'rejected'}: ${finalResponse.trim()}`); - expect(accepted || rejected).toEqual(true); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Extremely Long Headers - should handle header with exactly RFC limit', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(mailResponse).toInclude('250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(rcptResponse).toInclude('250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - expect(dataResponse).toInclude('354'); - - // Create header line exactly at RFC 5322 limit (998 chars excluding CRLF) - // Header name and colon take some space - const headerName = 'X-RFC-Limit'; - const colonSpace = ': '; - const remainingSpace = 998 - headerName.length - colonSpace.length; - const headerValue = 'X'.repeat(remainingSpace); - - const emailContent = [ - `Subject: Test Email`, - `From: sender@example.com`, - `To: recipient@example.com`, - `${headerName}${colonSpace}${headerValue}`, - '', - 'This email has a header at exactly the RFC limit.', - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - - const finalResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // This should be accepted since it's exactly at the limit - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('552') || finalResponse.includes('554') || finalResponse.includes('500'); - - console.log(`RFC limit header test ${accepted ? 'accepted' : 'rejected'}: ${finalResponse.trim()}`); - expect(accepted || rejected).toEqual(true); - - // RFC compliant servers should accept headers exactly at the limit - if (accepted) { - console.log('✓ Server correctly accepts headers at RFC limit'); - } else { - console.log('⚠ Server rejected header at RFC limit (may be overly strict)'); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-07.unusual-mime-types.ts b/test/suite/smtpserver_edge-cases/test.edge-07.unusual-mime-types.ts deleted file mode 100644 index 783d49a..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-07.unusual-mime-types.ts +++ /dev/null @@ -1,333 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30041; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeDefined(); -}); - -tap.test('Unusual MIME Types - should handle email with various unusual MIME types', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - console.log('Server response:', data.toString()); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO testclient\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - // Create multipart email with unusual MIME types - const boundary = '----=_Part_1_' + Date.now(); - const unusualMimeTypes = [ - { type: 'text/plain', content: 'This is plain text content.' }, - { type: 'application/x-custom-unusual-type', content: 'Custom proprietary format data' }, - { type: 'model/vrml', content: '#VRML V2.0 utf8\nShape { geometry Box {} }' }, - { type: 'chemical/x-mdl-molfile', content: 'Molecule data\n -ISIS- 04249412312D\n\n 3 2 0 0 0 0 0 0 0 0999 V2000' }, - { type: 'application/vnd.ms-fontobject', content: 'Font binary data simulation' }, - { type: 'application/x-doom', content: 'IWAD game data simulation' } - ]; - - let emailContent = [ - 'Subject: Email with Unusual MIME Types', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - 'This is a multipart message with unusual MIME types.', - '' - ]; - - // Add each unusual MIME type as a part - unusualMimeTypes.forEach((mime, index) => { - emailContent.push(`--${boundary}`); - emailContent.push(`Content-Type: ${mime.type}`); - emailContent.push(`Content-Disposition: attachment; filename="part${index + 1}"`); - emailContent.push(''); - emailContent.push(mime.content); - emailContent.push(''); - }); - - emailContent.push(`--${boundary}--`); - emailContent.push('.'); - emailContent.push(''); - - const fullEmail = emailContent.join('\r\n'); - console.log(`Sending email with ${unusualMimeTypes.length} unusual MIME types`); - - socket.write(fullEmail); - currentStep = 'waiting_response'; - receivedData = ''; - } else if (currentStep === 'waiting_response' && (receivedData.includes('250 ') || - receivedData.includes('552 ') || - receivedData.includes('554 ') || - receivedData.includes('500 '))) { - // Either accepted or gracefully rejected - const accepted = receivedData.includes('250 '); - console.log(`Unusual MIME types test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('Unusual MIME Types - should handle email with deeply nested multipart structure', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - console.log('Server response:', data.toString()); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO testclient\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - // Create nested multipart structure - const boundary1 = '----=_Part_Outer_' + Date.now(); - const boundary2 = '----=_Part_Inner_' + Date.now(); - - let emailContent = [ - 'Subject: Nested Multipart Email', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${boundary1}"`, - '', - 'This is a nested multipart message.', - '', - `--${boundary1}`, - 'Content-Type: text/plain', - '', - 'First level plain text.', - '', - `--${boundary1}`, - `Content-Type: multipart/alternative; boundary="${boundary2}"`, - '', - `--${boundary2}`, - 'Content-Type: text/richtext', - '', - 'Rich text content', - '', - `--${boundary2}`, - 'Content-Type: application/rtf', - '', - '{\\rtf1 RTF content}', - '', - `--${boundary2}--`, - '', - `--${boundary1}`, - 'Content-Type: audio/x-aiff', - 'Content-Disposition: attachment; filename="sound.aiff"', - '', - 'AIFF audio data simulation', - '', - `--${boundary1}--`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - currentStep = 'waiting_response'; - receivedData = ''; - } else if (currentStep === 'waiting_response' && (receivedData.includes('250 ') || - receivedData.includes('552 ') || - receivedData.includes('554 ') || - receivedData.includes('500 '))) { - const accepted = receivedData.includes('250 '); - console.log(`Nested multipart test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('Unusual MIME Types - should handle email with non-standard charset encodings', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - console.log('Server response:', data.toString()); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - receivedData = ''; - socket.write('EHLO testclient\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250 ')) { - currentStep = 'mail_from'; - receivedData = ''; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - receivedData = ''; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - receivedData = ''; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - // Create email with various charset encodings - const boundary = '----=_Part_Charset_' + Date.now(); - - let emailContent = [ - 'Subject: Email with Various Charset Encodings', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - 'This email contains various charset encodings.', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset="iso-2022-jp"', - '', - 'Japanese text simulation', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset="windows-1251"', - '', - 'Cyrillic text simulation', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset="koi8-r"', - '', - 'Russian KOI8-R text', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset="gb2312"', - '', - 'Chinese GB2312 text', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - currentStep = 'waiting_response'; - receivedData = ''; - } else if (currentStep === 'waiting_response' && (receivedData.includes('250 ') || - receivedData.includes('552 ') || - receivedData.includes('554 ') || - receivedData.includes('500 '))) { - const accepted = receivedData.includes('250 '); - console.log(`Various charset test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_edge-cases/test.edge-08.nested-mime-structures.ts b/test/suite/smtpserver_edge-cases/test.edge-08.nested-mime-structures.ts deleted file mode 100644 index 6cb1486..0000000 --- a/test/suite/smtpserver_edge-cases/test.edge-08.nested-mime-structures.ts +++ /dev/null @@ -1,379 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -let testServer: ITestServer; -const TEST_PORT = 2525; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('Nested MIME Structures - should handle deeply nested multipart structure', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let state = 'initial'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (dataBuffer.includes('220 ') && state === 'initial') { - // Send EHLO - socket.write('EHLO testclient\r\n'); - state = 'ehlo_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'ehlo_sent') { - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - state = 'mail_from_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'mail_from_sent') { - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - state = 'rcpt_to_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'rcpt_to_sent') { - // Send DATA - socket.write('DATA\r\n'); - state = 'data_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('354 ') && state === 'data_sent') { - // Create deeply nested MIME structure (4 levels) - const outerBoundary = '----=_Outer_Boundary_' + Date.now(); - const middleBoundary = '----=_Middle_Boundary_' + Date.now(); - const innerBoundary = '----=_Inner_Boundary_' + Date.now(); - const deepBoundary = '----=_Deep_Boundary_' + Date.now(); - - let emailContent = [ - 'Subject: Deeply Nested MIME Structure Test', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${outerBoundary}"`, - '', - 'This is a multipart message with deeply nested structure.', - '', - // Level 1: Outer boundary - `--${outerBoundary}`, - 'Content-Type: text/plain', - '', - 'This is the first part at the outer level.', - '', - `--${outerBoundary}`, - `Content-Type: multipart/alternative; boundary="${middleBoundary}"`, - '', - // Level 2: Middle boundary - `--${middleBoundary}`, - 'Content-Type: text/plain', - '', - 'Alternative plain text version.', - '', - `--${middleBoundary}`, - `Content-Type: multipart/related; boundary="${innerBoundary}"`, - '', - // Level 3: Inner boundary - `--${innerBoundary}`, - 'Content-Type: text/html', - '', - '

HTML with related content

', - '', - `--${innerBoundary}`, - 'Content-Type: image/png', - 'Content-ID: ', - 'Content-Transfer-Encoding: base64', - '', - 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==', - '', - `--${innerBoundary}`, - `Content-Type: multipart/mixed; boundary="${deepBoundary}"`, - '', - // Level 4: Deep boundary - `--${deepBoundary}`, - 'Content-Type: application/octet-stream', - 'Content-Disposition: attachment; filename="data.bin"', - '', - 'Binary data simulation', - '', - `--${deepBoundary}`, - 'Content-Type: message/rfc822', - '', - 'Subject: Embedded Message', - 'From: embedded@example.com', - 'To: recipient@example.com', - '', - 'This is an embedded email message.', - '', - `--${deepBoundary}--`, - '', - `--${innerBoundary}--`, - '', - `--${middleBoundary}--`, - '', - `--${outerBoundary}`, - 'Content-Type: application/pdf', - 'Content-Disposition: attachment; filename="document.pdf"', - '', - 'PDF document data simulation', - '', - `--${outerBoundary}--`, - '.', - '' - ].join('\r\n'); - - console.log('Sending email with 4-level nested MIME structure'); - socket.write(emailContent); - state = 'email_sent'; - dataBuffer = ''; - } else if ((dataBuffer.includes('250 OK') && state === 'email_sent') || - dataBuffer.includes('552 ') || - dataBuffer.includes('554 ') || - dataBuffer.includes('500 ')) { - // Either accepted or gracefully rejected - const accepted = dataBuffer.includes('250 '); - console.log(`Nested MIME structure test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('Nested MIME Structures - should handle circular references in multipart structure', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let state = 'initial'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (dataBuffer.includes('220 ') && state === 'initial') { - socket.write('EHLO testclient\r\n'); - state = 'ehlo_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'ehlo_sent') { - socket.write('MAIL FROM:\r\n'); - state = 'mail_from_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'mail_from_sent') { - socket.write('RCPT TO:\r\n'); - state = 'rcpt_to_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'rcpt_to_sent') { - socket.write('DATA\r\n'); - state = 'data_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('354 ') && state === 'data_sent') { - // Create structure with references between parts - const boundary1 = '----=_Boundary1_' + Date.now(); - const boundary2 = '----=_Boundary2_' + Date.now(); - - let emailContent = [ - 'Subject: Multipart with Cross-References', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/related; boundary="${boundary1}"`, - '', - `--${boundary1}`, - `Content-Type: multipart/alternative; boundary="${boundary2}"`, - 'Content-ID: ', - '', - `--${boundary2}`, - 'Content-Type: text/html', - '', - 'See related part: Link', - '', - `--${boundary2}`, - 'Content-Type: text/plain', - '', - 'Plain text with reference to part2', - '', - `--${boundary2}--`, - '', - `--${boundary1}`, - 'Content-Type: application/xml', - 'Content-ID: ', - '', - '', - '', - `--${boundary1}--`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - state = 'email_sent'; - dataBuffer = ''; - } else if ((dataBuffer.includes('250 OK') && state === 'email_sent') || - dataBuffer.includes('552 ') || - dataBuffer.includes('554 ') || - dataBuffer.includes('500 ')) { - const accepted = dataBuffer.includes('250 '); - console.log(`Cross-reference test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('Nested MIME Structures - should handle mixed nesting with various encodings', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let state = 'initial'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (dataBuffer.includes('220 ') && state === 'initial') { - socket.write('EHLO testclient\r\n'); - state = 'ehlo_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'ehlo_sent') { - socket.write('MAIL FROM:\r\n'); - state = 'mail_from_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'mail_from_sent') { - socket.write('RCPT TO:\r\n'); - state = 'rcpt_to_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') && state === 'rcpt_to_sent') { - socket.write('DATA\r\n'); - state = 'data_sent'; - dataBuffer = ''; - } else if (dataBuffer.includes('354 ') && state === 'data_sent') { - // Create structure with various encodings - const boundary1 = '----=_Encoding_Outer_' + Date.now(); - const boundary2 = '----=_Encoding_Inner_' + Date.now(); - - let emailContent = [ - 'Subject: Mixed Encodings in Nested Structure', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${boundary1}"`, - '', - `--${boundary1}`, - 'Content-Type: text/plain; charset="utf-8"', - 'Content-Transfer-Encoding: quoted-printable', - '', - 'This is quoted-printable encoded: =C3=A9=C3=A8=C3=AA', - '', - `--${boundary1}`, - `Content-Type: multipart/alternative; boundary="${boundary2}"`, - '', - `--${boundary2}`, - 'Content-Type: text/plain; charset="iso-8859-1"', - 'Content-Transfer-Encoding: 8bit', - '', - 'Text with 8-bit characters: ñáéíóú', - '', - `--${boundary2}`, - 'Content-Type: text/html; charset="utf-16"', - 'Content-Transfer-Encoding: base64', - '', - '//48AGgAdABtAGwAPgA8AGIAbwBkAHkAPgBVAFQARgAtADEANgAgAHQAZQB4AHQAPAAvAGIAbwBkAHkAPgA8AC8AaAB0AG0AbAA+', - '', - `--${boundary2}--`, - '', - `--${boundary1}`, - 'Content-Type: application/octet-stream', - 'Content-Transfer-Encoding: base64', - 'Content-Disposition: attachment; filename="binary.dat"', - '', - 'VGhpcyBpcyBiaW5hcnkgZGF0YQ==', - '', - `--${boundary1}--`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - state = 'email_sent'; - dataBuffer = ''; - } else if ((dataBuffer.includes('250 OK') && state === 'email_sent') || - dataBuffer.includes('552 ') || - dataBuffer.includes('554 ') || - dataBuffer.includes('500 ')) { - const accepted = dataBuffer.includes('250 '); - console.log(`Mixed encodings test ${accepted ? 'accepted' : 'rejected'}`); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('timeout', () => { - console.error('Socket timeout'); - socket.destroy(); - done.reject(new Error('Socket timeout')); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-01.basic-email-sending.ts b/test/suite/smtpserver_email-processing/test.ep-01.basic-email-sending.ts deleted file mode 100644 index 7d5f3fb..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-01.basic-email-sending.ts +++ /dev/null @@ -1,338 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 15000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -// Test: Complete email sending flow -tap.test('Basic Email Sending - should send email through complete SMTP flow', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const fromAddress = 'sender@example.com'; - const toAddress = 'recipient@example.com'; - const emailContent = `Subject: Production Test Email\r\nFrom: ${fromAddress}\r\nTo: ${toAddress}\r\nDate: ${new Date().toUTCString()}\r\n\r\nThis is a test email sent during production testing.\r\nTest ID: EP-01\r\nTimestamp: ${Date.now()}\r\n`; - - const steps: string[] = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - steps.push('CONNECT'); - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - steps.push('EHLO'); - currentStep = 'mail_from'; - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - steps.push('MAIL FROM'); - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${toAddress}>\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - steps.push('RCPT TO'); - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - steps.push('DATA'); - currentStep = 'email_content'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); // End of data marker - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - steps.push('CONTENT'); - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - steps.push('QUIT'); - socket.destroy(); - - // Verify all steps completed - expect(steps).toInclude('CONNECT'); - expect(steps).toInclude('EHLO'); - expect(steps).toInclude('MAIL FROM'); - expect(steps).toInclude('RCPT TO'); - expect(steps).toInclude('DATA'); - expect(steps).toInclude('CONTENT'); - expect(steps).toInclude('QUIT'); - expect(steps.length).toEqual(7); - - done.resolve(); - } else if (receivedData.match(/\r\n5\d{2}\s/)) { - // Server error (5xx response codes) - socket.destroy(); - done.reject(new Error(`Email sending failed at step ${currentStep}: ${receivedData}`)); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Send email with attachments (MIME) -tap.test('Basic Email Sending - should send email with MIME attachment', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const fromAddress = 'sender@example.com'; - const toAddress = 'recipient@example.com'; - const boundary = '----=_Part_0_1234567890'; - - const emailContent = `Subject: Email with Attachment\r\nFrom: ${fromAddress}\r\nTo: ${toAddress}\r\nMIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary="${boundary}"\r\n\r\n--${boundary}\r\nContent-Type: text/plain; charset=UTF-8\r\n\r\nThis email contains an attachment.\r\n\r\n--${boundary}\r\nContent-Type: text/plain; name="test.txt"\r\nContent-Disposition: attachment; filename="test.txt"\r\nContent-Transfer-Encoding: base64\r\n\r\nVGhpcyBpcyBhIHRlc3QgZmlsZS4=\r\n\r\n--${boundary}--\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${toAddress}>\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); // End of data marker - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Send HTML email -tap.test('Basic Email Sending - should send HTML email', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const fromAddress = 'sender@example.com'; - const toAddress = 'recipient@example.com'; - const boundary = '----=_Part_0_987654321'; - - const emailContent = `Subject: HTML Email Test\r\nFrom: ${fromAddress}\r\nTo: ${toAddress}\r\nMIME-Version: 1.0\r\nContent-Type: multipart/alternative; boundary="${boundary}"\r\n\r\n--${boundary}\r\nContent-Type: text/plain; charset=UTF-8\r\n\r\nThis is the plain text version.\r\n\r\n--${boundary}\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n

HTML Email

This is the HTML version.

\r\n\r\n--${boundary}--\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${toAddress}>\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); // End of data marker - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Send email with custom headers -tap.test('Basic Email Sending - should send email with custom headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const fromAddress = 'sender@example.com'; - const toAddress = 'recipient@example.com'; - - const emailContent = `Subject: Custom Headers Test\r\nFrom: ${fromAddress}\r\nTo: ${toAddress}\r\nX-Custom-Header: CustomValue\r\nX-Priority: 1\r\nX-Mailer: SMTP Test Suite\r\nReply-To: noreply@example.com\r\nOrganization: Test Organization\r\n\r\nThis email contains custom headers.\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${toAddress}>\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); // End of data marker - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Minimal email (only required headers) -tap.test('Basic Email Sending - should send minimal email', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const fromAddress = 'sender@example.com'; - const toAddress = 'recipient@example.com'; - - // Minimal email - just a body, no headers - const emailContent = 'This is a minimal email with no headers.\r\n'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${toAddress}>\r\n`); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); // End of data marker - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-02.invalid-email-addresses.ts b/test/suite/smtpserver_email-processing/test.ep-02.invalid-email-addresses.ts deleted file mode 100644 index 8336d90..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-02.invalid-email-addresses.ts +++ /dev/null @@ -1,315 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 20000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -// Test: Invalid email address validation -tap.test('Invalid Email Addresses - should reject various invalid email formats', async (tools) => { - const done = tools.defer(); - - const invalidAddresses = [ - 'invalid-email', - '@example.com', - 'user@', - 'user..name@example.com', - 'user@.example.com', - 'user@example..com', - 'user@example.', - 'user name@example.com', - 'user@exam ple.com', - 'user@[invalid]', - 'a'.repeat(65) + '@example.com', // Local part too long - 'user@' + 'a'.repeat(250) + '.com' // Domain too long - ]; - - const results: Array<{ - address: string; - response: string; - responseCode: string; - properlyRejected: boolean; - accepted: boolean; - }> = []; - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let currentIndex = 0; - let state = 'connecting'; - let buffer = ''; - let lastResponseCode = ''; - const fromAddress = 'test@example.com'; - - const processNextAddress = () => { - if (currentIndex < invalidAddresses.length) { - socket.write(`RCPT TO:<${invalidAddresses[currentIndex]}>\r\n`); - state = 'rcpt'; - } else { - socket.write('QUIT\r\n'); - state = 'quit'; - } - }; - - socket.on('data', (data) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Process complete lines - for (let i = 0; i < lines.length - 1; i++) { - const line = lines[i]; - if (line.match(/^\d{3}/)) { - lastResponseCode = line.substring(0, 3); - - if (state === 'connecting' && line.startsWith('220')) { - socket.write('EHLO test.example.com\r\n'); - state = 'ehlo'; - } else if (state === 'ehlo' && line.startsWith('250') && !line.includes('250-')) { - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - state = 'mail'; - } else if (state === 'mail' && line.startsWith('250')) { - processNextAddress(); - } else if (state === 'rcpt') { - // Record result - const rejected = lastResponseCode.startsWith('5') || lastResponseCode.startsWith('4'); - results.push({ - address: invalidAddresses[currentIndex], - response: line, - responseCode: lastResponseCode, - properlyRejected: rejected, - accepted: lastResponseCode.startsWith('2') - }); - - currentIndex++; - - if (currentIndex < invalidAddresses.length) { - // Reset and test next - socket.write('RSET\r\n'); - state = 'rset'; - } else { - socket.write('QUIT\r\n'); - state = 'quit'; - } - } else if (state === 'rset' && line.startsWith('250')) { - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - state = 'mail'; - } else if (state === 'quit' && line.startsWith('221')) { - socket.destroy(); - - // Analyze results - const rejected = results.filter(r => r.properlyRejected).length; - const rate = results.length > 0 ? rejected / results.length : 0; - - // Log results for debugging - results.forEach(r => { - if (!r.properlyRejected) { - console.log(`WARNING: Invalid address accepted: ${r.address}`); - } - }); - - // We expect at least 70% rejection rate for invalid addresses - expect(rate).toBeGreaterThan(0.7); - expect(results.length).toEqual(invalidAddresses.length); - - done.resolve(); - } - } - } - - // Keep incomplete line in buffer - buffer = lines[lines.length - 1]; - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error('Test timeout')); - }); - - socket.on('error', (err) => { - done.reject(err); - }); - - await done.promise; -}); - -// Test: Edge case email addresses that might be valid -tap.test('Invalid Email Addresses - should handle edge case addresses', async (tools) => { - const done = tools.defer(); - - const edgeCaseAddresses = [ - 'user+tag@example.com', // Valid - with plus addressing - 'user.name@example.com', // Valid - with dot - 'user@sub.example.com', // Valid - subdomain - 'user@192.168.1.1', // Valid - IP address - 'user@[192.168.1.1]', // Valid - IP in brackets - '"user name"@example.com', // Valid - quoted local part - 'user\\@name@example.com', // Valid - escaped character - 'user@localhost', // Might be valid depending on server config - ]; - - const results: Array<{ - address: string; - accepted: boolean; - }> = []; - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let currentIndex = 0; - let state = 'connecting'; - let buffer = ''; - const fromAddress = 'test@example.com'; - - socket.on('data', (data) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (let i = 0; i < lines.length - 1; i++) { - const line = lines[i]; - if (line.match(/^\d{3}/)) { - const responseCode = line.substring(0, 3); - - if (state === 'connecting' && line.startsWith('220')) { - socket.write('EHLO test.example.com\r\n'); - state = 'ehlo'; - } else if (state === 'ehlo' && line.startsWith('250') && !line.includes('250-')) { - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - state = 'mail'; - } else if (state === 'mail' && line.startsWith('250')) { - if (currentIndex < edgeCaseAddresses.length) { - socket.write(`RCPT TO:<${edgeCaseAddresses[currentIndex]}>\r\n`); - state = 'rcpt'; - } else { - socket.write('QUIT\r\n'); - state = 'quit'; - } - } else if (state === 'rcpt') { - results.push({ - address: edgeCaseAddresses[currentIndex], - accepted: responseCode.startsWith('2') - }); - - currentIndex++; - - if (currentIndex < edgeCaseAddresses.length) { - socket.write('RSET\r\n'); - state = 'rset'; - } else { - socket.write('QUIT\r\n'); - state = 'quit'; - } - } else if (state === 'rset' && line.startsWith('250')) { - socket.write(`MAIL FROM:<${fromAddress}>\r\n`); - state = 'mail'; - } else if (state === 'quit' && line.startsWith('221')) { - socket.destroy(); - - // Just verify we tested all addresses - expect(results.length).toEqual(edgeCaseAddresses.length); - - done.resolve(); - } - } - } - - buffer = lines[lines.length - 1]; - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error('Test timeout')); - }); - - socket.on('error', (err) => { - done.reject(err); - }); - - await done.promise; -}); - -// Test: Empty and null addresses -tap.test('Invalid Email Addresses - should handle empty addresses', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_empty'; - socket.write('RCPT TO:<>\r\n'); // Empty address - } else if (currentStep === 'rcpt_empty') { - if (receivedData.includes('250')) { - // Empty recipient allowed (for bounces) - currentStep = 'rset'; - socket.write('RSET\r\n'); - } else if (receivedData.match(/[45]\d{2}/)) { - // Empty recipient rejected - currentStep = 'rset'; - socket.write('RSET\r\n'); - } - } else if (currentStep === 'rset' && receivedData.includes('250')) { - currentStep = 'mail_empty'; - socket.write('MAIL FROM:<>\r\n'); // Empty sender (bounce) - } else if (currentStep === 'mail_empty' && receivedData.includes('250')) { - currentStep = 'rcpt_after_empty'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_after_empty' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Empty MAIL FROM should be accepted for bounces - expect(receivedData).toInclude('250'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - await stopTestServer(testServer); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-03.multiple-recipients.ts b/test/suite/smtpserver_email-processing/test.ep-03.multiple-recipients.ts deleted file mode 100644 index 6b69e8a..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-03.multiple-recipients.ts +++ /dev/null @@ -1,493 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 30049; -const TEST_TIMEOUT = 15000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ port: TEST_PORT, hostname: 'localhost' }); - - expect(testServer).toBeDefined(); - expect(testServer.port).toEqual(TEST_PORT); -}); - -// Test: Basic multiple recipients -tap.test('Multiple Recipients - should accept multiple valid recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - const recipients = [ - 'recipient1@example.com', - 'recipient2@example.com', - 'recipient3@example.com' - ]; - let acceptedRecipients = 0; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else if (currentStep === 'rcpt_to') { - if (receivedData.includes('250')) { - acceptedRecipients++; - recipientCount++; - - if (recipientCount < recipients.length) { - receivedData = ''; // Clear buffer for next response - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else { - currentStep = 'data'; - socket.write('DATA\r\n'); - } - } - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - const emailContent = `Subject: Multiple Recipients Test\r\nFrom: sender@example.com\r\nTo: ${recipients.join(', ')}\r\n\r\nThis email was sent to ${acceptedRecipients} recipients.\r\n`; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(acceptedRecipients).toEqual(recipients.length); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Mixed valid and invalid recipients -tap.test('Multiple Recipients - should handle mix of valid and invalid recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientIndex = 0; - const recipients = [ - 'valid@example.com', - 'invalid-email', // Invalid format - 'another.valid@example.com', - '@example.com', // Invalid format - 'third.valid@example.com' - ]; - const recipientResults: Array<{ email: string, accepted: boolean }> = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${recipients[recipientIndex]}>\r\n`); - } else if (currentStep === 'rcpt_to') { - const lines = receivedData.split('\r\n'); - const lastLine = lines[lines.length - 2] || lines[lines.length - 1]; - - if (lastLine.match(/^\d{3}/)) { - const accepted = lastLine.startsWith('250'); - recipientResults.push({ - email: recipients[recipientIndex], - accepted: accepted - }); - - recipientIndex++; - - if (recipientIndex < recipients.length) { - receivedData = ''; // Clear buffer - socket.write(`RCPT TO:<${recipients[recipientIndex]}>\r\n`); - } else { - const acceptedCount = recipientResults.filter(r => r.accepted).length; - - if (acceptedCount > 0) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(acceptedCount).toEqual(0); - done.resolve(); - }, 100); - } - } - } - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - const acceptedEmails = recipientResults.filter(r => r.accepted).map(r => r.email); - const emailContent = `Subject: Mixed Recipients Test\r\nFrom: sender@example.com\r\nTo: ${acceptedEmails.join(', ')}\r\n\r\nDelivered to ${acceptedEmails.length} valid recipients.\r\n`; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - const acceptedCount = recipientResults.filter(r => r.accepted).length; - const rejectedCount = recipientResults.filter(r => !r.accepted).length; - expect(acceptedCount).toEqual(3); // 3 valid recipients - expect(rejectedCount).toEqual(2); // 2 invalid recipients - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Large number of recipients -tap.test('Multiple Recipients - should handle many recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - const totalRecipients = 10; - const recipients: string[] = []; - for (let i = 1; i <= totalRecipients; i++) { - recipients.push(`recipient${i}@example.com`); - } - let acceptedCount = 0; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else if (currentStep === 'rcpt_to') { - if (receivedData.includes('250')) { - acceptedCount++; - } - - recipientCount++; - - if (recipientCount < recipients.length) { - receivedData = ''; // Clear buffer - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else { - currentStep = 'data'; - socket.write('DATA\r\n'); - } - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - const emailContent = `Subject: Large Recipients Test\r\nFrom: sender@example.com\r\n\r\nSent to ${acceptedCount} recipients.\r\n`; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(acceptedCount).toBeGreaterThan(0); - expect(acceptedCount).toBeLessThan(totalRecipients + 1); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Duplicate recipients -tap.test('Multiple Recipients - should handle duplicate recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - const recipients = [ - 'duplicate@example.com', - 'unique@example.com', - 'duplicate@example.com', // Duplicate - 'another@example.com', - 'duplicate@example.com' // Another duplicate - ]; - const results: boolean[] = []; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else if (currentStep === 'rcpt_to') { - if (receivedData.match(/[245]\d{2}/)) { - results.push(receivedData.includes('250')); - recipientCount++; - - if (recipientCount < recipients.length) { - receivedData = ''; // Clear buffer - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else { - currentStep = 'data'; - socket.write('DATA\r\n'); - } - } - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - const emailContent = `Subject: Duplicate Recipients Test\r\nFrom: sender@example.com\r\n\r\nTesting duplicate recipient handling.\r\n`; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(results.length).toEqual(recipients.length); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: No recipients (should fail DATA) -tap.test('Multiple Recipients - DATA should fail with no recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - // Skip RCPT TO, go directly to DATA - currentStep = 'data_no_recipients'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_no_recipients') { - if (receivedData.includes('503')) { - // Expected: bad sequence error - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); // Bad sequence - done.resolve(); - }, 100); - } else if (receivedData.includes('354')) { - // Some servers accept DATA without recipients and fail later - // Send empty data to trigger the error - socket.write('.\r\n'); - currentStep = 'data_sent'; - } - } else if (currentStep === 'data_sent' && receivedData.match(/[45]\d{2}/)) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Should get an error when trying to send without recipients - expect(receivedData).toMatch(/[45]\d{2}/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Recipients with different domains -tap.test('Multiple Recipients - should handle recipients from different domains', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let recipientCount = 0; - const recipients = [ - 'user1@example.com', - 'user2@test.com', - 'user3@localhost', - 'user4@example.org', - 'user5@subdomain.example.com' - ]; - let acceptedCount = 0; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else if (currentStep === 'rcpt_to') { - if (receivedData.includes('250')) { - acceptedCount++; - } - - recipientCount++; - - if (recipientCount < recipients.length) { - receivedData = ''; // Clear buffer - socket.write(`RCPT TO:<${recipients[recipientCount]}>\r\n`); - } else { - if (acceptedCount > 0) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'email_content'; - const emailContent = `Subject: Multi-domain Test\r\nFrom: sender@example.com\r\n\r\nDelivered to ${acceptedCount} recipients across different domains.\r\n`; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - } else if (currentStep === 'email_content' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(acceptedCount).toBeGreaterThan(0); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } - expect(true).toEqual(true); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-04.large-email.ts b/test/suite/smtpserver_email-processing/test.ep-04.large-email.ts deleted file mode 100644 index 115cd6a..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-04.large-email.ts +++ /dev/null @@ -1,528 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 30048; -const TEST_TIMEOUT = 60000; // Increased for large email handling - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ port: TEST_PORT, hostname: 'localhost' }); - expect(testServer).toBeDefined(); -}); - -// Test: Moderately large email (1MB) -tap.test('Large Email - should handle 1MB email', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let completed = false; - - // Generate 1MB of content - const largeBody = 'X'.repeat(1024 * 1024); // 1MB - const emailContent = `Subject: 1MB Email Test\r\nFrom: sender@example.com\r\nTo: recipient@example.com\r\n\r\n${largeBody}\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'sending_large_email'; - - // Send in chunks to avoid overwhelming - const chunkSize = 64 * 1024; // 64KB chunks - let sent = 0; - - const sendChunk = () => { - if (sent < emailContent.length) { - const chunk = emailContent.slice(sent, sent + chunkSize); - socket.write(chunk); - sent += chunk.length; - - // Small delay between chunks - if (sent < emailContent.length) { - setTimeout(sendChunk, 10); - } else { - // End of data - socket.write('.\r\n'); - currentStep = 'sent'; - } - } - }; - - sendChunk(); - } else if (currentStep === 'sent' && (receivedData.includes('250') || receivedData.includes('552'))) { - if (!completed) { - completed = true; - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Either accepted (250) or size exceeded (552) - expect(receivedData).toMatch(/250|552/); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Large email with MIME attachments -tap.test('Large Email - should handle multi-part MIME message', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let completed = false; - - const boundary = '----=_Part_0_123456789'; - const attachment1 = 'A'.repeat(500 * 1024); // 500KB - const attachment2 = 'B'.repeat(300 * 1024); // 300KB - - const emailContent = [ - 'Subject: Large MIME Email Test', - 'From: sender@example.com', - 'To: recipient@example.com', - 'MIME-Version: 1.0', - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - 'This is a multi-part message in MIME format.', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset=utf-8', - '', - 'This email contains large attachments.', - '', - `--${boundary}`, - 'Content-Type: text/plain; charset=utf-8', - 'Content-Disposition: attachment; filename="file1.txt"', - '', - attachment1, - '', - `--${boundary}`, - 'Content-Type: application/octet-stream', - 'Content-Disposition: attachment; filename="file2.bin"', - 'Content-Transfer-Encoding: base64', - '', - Buffer.from(attachment2).toString('base64'), - '', - `--${boundary}--`, - '' - ].join('\r\n'); - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'sending_mime'; - socket.write(emailContent); - socket.write('\r\n.\r\n'); - currentStep = 'sent'; - } else if (currentStep === 'sent' && (receivedData.includes('250') || receivedData.includes('552'))) { - if (!completed) { - completed = true; - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toMatch(/250|552/); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Email size limits with SIZE extension -tap.test('Large Email - should respect SIZE limits if advertised', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let maxSize: number | null = null; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - // Check for SIZE extension - const sizeMatch = receivedData.match(/SIZE\s+(\d+)/); - if (sizeMatch) { - maxSize = parseInt(sizeMatch[1]); - console.log(`Server advertises max size: ${maxSize} bytes`); - } - - currentStep = 'mail_from'; - const emailSize = maxSize ? maxSize + 1000 : 5000000; // Over limit or 5MB - socket.write(`MAIL FROM: SIZE=${emailSize}\r\n`); - } else if (currentStep === 'mail_from') { - if (maxSize && receivedData.includes('552')) { - // Size rejected - expected - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('552'); - done.resolve(); - }, 100); - } else if (receivedData.includes('250')) { - // Size accepted or no limit - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Very large email handling (5MB) -tap.test('Large Email - should handle or reject very large emails gracefully', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let completed = false; - - // Generate 5MB email - const largeContent = 'X'.repeat(5 * 1024 * 1024); // 5MB - const emailContent = `Subject: 5MB Email Test\r\nFrom: sender@example.com\r\nTo: recipient@example.com\r\n\r\n${largeContent}\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'sending_5mb'; - - console.log('Sending 5MB email...'); - - // Send in larger chunks for efficiency - const chunkSize = 256 * 1024; // 256KB chunks - let sent = 0; - - const sendChunk = () => { - if (sent < emailContent.length) { - const chunk = emailContent.slice(sent, sent + chunkSize); - socket.write(chunk); - sent += chunk.length; - - if (sent < emailContent.length) { - setImmediate(sendChunk); // Use setImmediate for better performance - } else { - socket.write('.\r\n'); - currentStep = 'sent'; - } - } - }; - - sendChunk(); - } else if (currentStep === 'sent' && receivedData.match(/[245]\d{2}/)) { - if (!completed) { - completed = true; - // Extract the last response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - - // Look for the most recent response code - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([245]\d{2})[\s-]/); - if (match) { - responseCode = match[1]; - break; - } - } - - // If we couldn't extract, but we know there's a response, default to 250 - if (!responseCode && receivedData.includes('250 OK message queued')) { - responseCode = '250'; - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Accept various responses: 250 (accepted), 552 (size exceeded), 554 (failed) - expect(responseCode).toMatch(/^(250|552|554|451|452)$/); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - // Connection errors during large transfers are acceptable - if (currentStep === 'sending_5mb' || currentStep === 'sent') { - done.resolve(); - } else { - done.reject(error); - } - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Chunked transfer handling -tap.test('Large Email - should handle chunked transfers properly', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let chunksSent = 0; - let completed = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'chunked_sending'; - - // Send headers - socket.write('Subject: Chunked Transfer Test\r\n'); - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('\r\n'); - - // Send body in multiple chunks with delays - const chunks = [ - 'First chunk of data\r\n', - 'Second chunk of data\r\n', - 'Third chunk of data\r\n', - 'Fourth chunk of data\r\n', - 'Final chunk of data\r\n' - ]; - - const sendNextChunk = () => { - if (chunksSent < chunks.length) { - socket.write(chunks[chunksSent]); - chunksSent++; - setTimeout(sendNextChunk, 100); // 100ms delay between chunks - } else { - socket.write('.\r\n'); - } - }; - - sendNextChunk(); - } else if (currentStep === 'chunked_sending' && receivedData.includes('250')) { - if (!completed) { - completed = true; - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(chunksSent).toEqual(5); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Email with very long lines -tap.test('Large Email - should handle emails with very long lines', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let completed = false; - - // Create a very long line (10KB) - const veryLongLine = 'A'.repeat(10 * 1024); - const emailContent = `Subject: Long Line Test\r\nFrom: sender@example.com\r\nTo: recipient@example.com\r\n\r\n${veryLongLine}\r\nNormal line after long line.\r\n`; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'long_line'; - socket.write(emailContent); - socket.write('.\r\n'); - currentStep = 'sent'; - } else if (currentStep === 'sent') { - // Extract the last response code from the received data - // Look for response codes that are at the beginning of a line - const responseMatches = receivedData.split('\r\n').filter(line => /^\d{3}\s/.test(line)); - const lastResponseLine = responseMatches[responseMatches.length - 1]; - const responseCode = lastResponseLine?.match(/^(\d{3})/)?.[1]; - if (responseCode && !completed) { - completed = true; - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // May accept or reject based on line length limits - expect(responseCode).toMatch(/^(250|500|501|552)$/); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } - expect(true).toEqual(true); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-05.mime-handling.ts b/test/suite/smtpserver_email-processing/test.ep-05.mime-handling.ts deleted file mode 100644 index 685ead6..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-05.mime-handling.ts +++ /dev/null @@ -1,515 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('MIME Handling - Comprehensive multipart message', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - // Create comprehensive MIME test email - const boundary = 'mime-test-boundary-12345'; - const innerBoundary = 'inner-mime-boundary-67890'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: MIME Handling Test - Comprehensive`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - 'This is a multi-part message in MIME format.', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Transfer-Encoding: 7bit`, - '', - 'This is the plain text part of the email.', - 'It tests basic MIME text handling.', - '', - `--${boundary}`, - `Content-Type: text/html; charset=utf-8`, - `Content-Transfer-Encoding: quoted-printable`, - '', - '', - 'MIME Test', - '', - '

HTML MIME Content

', - '

This tests HTML MIME content handling.

', - '

Special chars: =E2=98=85 =E2=9C=93 =E2=9D=A4

', - '', - '', - '', - `--${boundary}`, - `Content-Type: multipart/alternative; boundary="${innerBoundary}"`, - '', - `--${innerBoundary}`, - `Content-Type: text/plain; charset=iso-8859-1`, - `Content-Transfer-Encoding: base64`, - '', - 'VGhpcyBpcyBiYXNlNjQgZW5jb2RlZCB0ZXh0IGNvbnRlbnQu', - '', - `--${innerBoundary}`, - `Content-Type: application/json; charset=utf-8`, - '', - '{"message": "JSON MIME content", "test": true, "special": "àáâãäå"}', - '', - `--${innerBoundary}--`, - '', - `--${boundary}`, - `Content-Type: image/png`, - `Content-Disposition: attachment; filename="test.png"`, - `Content-Transfer-Encoding: base64`, - '', - 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg==', - '', - `--${boundary}`, - `Content-Type: text/csv`, - `Content-Disposition: attachment; filename="data.csv"`, - '', - 'Name,Age,Email', - 'John,25,john@example.com', - 'Jane,30,jane@example.com', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="document.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - 'JVBERi0xLjQKJcOkw7zDtsOVDQo=', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - console.log('Sending comprehensive MIME email with multiple parts and encodings'); - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Complex MIME message accepted successfully'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('MIME Handling - Quoted-printable encoding', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: =?UTF-8?Q?Quoted=2DPrintable=20Test=20=F0=9F=8C=9F?=`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Transfer-Encoding: quoted-printable`, - '', - 'This is a test of quoted-printable encoding.', - 'Special characters: =C3=A9 =C3=A8 =C3=AA =C3=AB', - 'Long line that needs to be wrapped with soft line breaks at 76 character=', - 's per line to comply with MIME standards for quoted-printable encoding.', - 'Emoji: =F0=9F=98=80 =F0=9F=91=8D =F0=9F=8C=9F', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Quoted-printable encoded email accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('MIME Handling - Base64 encoding', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'base64-test-boundary'; - const textContent = 'This is a test of base64 encoding with various content types.\nSpecial chars: éèêë\nEmoji: 😀 👍 🌟'; - const base64Content = Buffer.from(textContent).toString('base64'); - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Base64 Encoding Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Transfer-Encoding: base64`, - '', - base64Content, - '', - `--${boundary}`, - `Content-Type: application/octet-stream`, - `Content-Disposition: attachment; filename="binary.dat"`, - `Content-Transfer-Encoding: base64`, - '', - 'VGhpcyBpcyBiaW5hcnkgZGF0YSBmb3IgdGVzdGluZw==', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Base64 encoded email accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('MIME Handling - Content-Disposition headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'disposition-test-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Content-Disposition Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: inline`, - '', - 'This is inline text content.', - '', - `--${boundary}`, - `Content-Type: image/jpeg`, - `Content-Disposition: attachment; filename="photo.jpg"`, - `Content-Transfer-Encoding: base64`, - '', - '/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAEBAQ==', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="report.pdf"; size=1234`, - `Content-Description: Monthly Report`, - '', - 'PDF content here', - '', - `--${boundary}`, - `Content-Type: text/html`, - `Content-Disposition: inline; filename="content.html"`, - '', - 'Inline HTML content', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with various Content-Disposition headers accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('MIME Handling - International character sets', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'intl-charset-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: International Character Sets`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - '', - 'UTF-8: Français, Español, Deutsch, 中文, 日本語, 한국어, العربية', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=iso-8859-1`, - '', - 'ISO-8859-1: Français, Español, Português', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=windows-1252`, - '', - 'Windows-1252: Special chars: €‚ƒ„…†‡', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=shift_jis`, - '', - 'Shift-JIS: Japanese text', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with international character sets accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-06.attachment-handling.ts b/test/suite/smtpserver_email-processing/test.ep-06.attachment-handling.ts deleted file mode 100644 index 50b3039..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-06.attachment-handling.ts +++ /dev/null @@ -1,629 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as fs from 'fs'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; -const SAMPLE_FILES_DIR = path.join(process.cwd(), '.nogit', 'sample-files'); - -let testServer: ITestServer; - -// Helper function to read and encode files -function readFileAsBase64(filePath: string): string { - try { - const fileContent = fs.readFileSync(filePath); - return fileContent.toString('base64'); - } catch (err) { - console.error(`Failed to read file ${filePath}:`, err); - return ''; - } -} - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('Attachment Handling - Multiple file types', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'attachment-test-boundary-12345'; - - // Create various attachments - const textAttachment = 'This is a text attachment content.\nIt has multiple lines.\nAnd special chars: åäö'; - const jsonAttachment = JSON.stringify({ - name: 'test', - data: [1, 2, 3], - unicode: 'ñoño', - special: '∑∆≈' - }, null, 2); - - // Read real files from sample directory - const sampleImage = readFileAsBase64(path.join(SAMPLE_FILES_DIR, '003-pdflatex-image/image.jpg')); - const minimalPdf = readFileAsBase64(path.join(SAMPLE_FILES_DIR, '001-trivial/minimal-document.pdf')); - const multiPagePdf = readFileAsBase64(path.join(SAMPLE_FILES_DIR, '004-pdflatex-4-pages/pdflatex-4-pages.pdf')); - const pdfWithAttachment = readFileAsBase64(path.join(SAMPLE_FILES_DIR, '025-attachment/with-attachment.pdf')); - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Attachment Handling Test - Multiple Types`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - 'This is a multi-part message with various attachments.', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - '', - 'This email tests attachment handling capabilities.', - 'The server should properly process all attached files.', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Disposition: attachment; filename="document.txt"`, - `Content-Transfer-Encoding: 7bit`, - '', - textAttachment, - '', - `--${boundary}`, - `Content-Type: application/json; charset=utf-8`, - `Content-Disposition: attachment; filename="data.json"`, - '', - jsonAttachment, - '', - `--${boundary}`, - `Content-Type: image/jpeg`, - `Content-Disposition: attachment; filename="sample-image.jpg"`, - `Content-Transfer-Encoding: base64`, - '', - sampleImage, - '', - `--${boundary}`, - `Content-Type: application/octet-stream`, - `Content-Disposition: attachment; filename="binary.bin"`, - `Content-Transfer-Encoding: base64`, - '', - Buffer.from('Binary file content with null bytes\0\0\0').toString('base64'), - '', - `--${boundary}`, - `Content-Type: text/csv`, - `Content-Disposition: attachment; filename="spreadsheet.csv"`, - '', - 'Name,Age,Country', - 'Alice,25,Sweden', - 'Bob,30,Norway', - 'Charlie,35,Denmark', - '', - `--${boundary}`, - `Content-Type: application/xml; charset=utf-8`, - `Content-Disposition: attachment; filename="config.xml"`, - '', - '', - '', - ' value', - ' ñoño ∑∆≈', - '', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="minimal-document.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - minimalPdf, - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="multi-page-document.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - multiPagePdf, - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="pdf-with-embedded-attachment.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - pdfWithAttachment, - '', - `--${boundary}`, - `Content-Type: text/html; charset=utf-8`, - `Content-Disposition: attachment; filename="webpage.html"`, - '', - '', - 'Test', - '

HTML Attachment

Content with markup

', - '', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - console.log('Sending email with 10 different attachment types including real PDFs'); - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with multiple attachments accepted successfully'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Attachment Handling - Large attachment', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'large-attachment-boundary'; - - // Use a real large PDF file - const largePdf = readFileAsBase64(path.join(SAMPLE_FILES_DIR, '009-pdflatex-geotopo/GeoTopo.pdf')); - const largePdfSize = Buffer.from(largePdf, 'base64').length; - console.log(`Large PDF size: ${(largePdfSize / 1024).toFixed(2)}KB`); - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Large Attachment Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain`, - '', - 'This email contains a large attachment.', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="large-geotopo.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - largePdf, - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - console.log(`Sending email with large PDF attachment (${(largePdfSize / 1024).toFixed(2)}KB)`); - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && (dataBuffer.includes('250 ') || dataBuffer.includes('552 '))) { - if (!completed) { - completed = true; - const accepted = dataBuffer.includes('250'); - const rejected = dataBuffer.includes('552'); // Size exceeded - - console.log(`Large attachment: ${accepted ? 'accepted' : 'rejected (size limit)'}`); - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Attachment Handling - Inline vs attachment disposition', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'inline-attachment-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Inline vs Attachment Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/related; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/html`, - '', - '', - '

This email has inline images:

', - '', - '', - '', - '', - `--${boundary}`, - `Content-Type: image/png`, - `Content-ID: `, - `Content-Disposition: inline; filename="inline1.png"`, - `Content-Transfer-Encoding: base64`, - '', - readFileAsBase64(path.join(SAMPLE_FILES_DIR, '008-reportlab-inline-image/smile.png')) || 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==', - '', - `--${boundary}`, - `Content-Type: image/png`, - `Content-ID: `, - `Content-Disposition: inline; filename="inline2.png"`, - `Content-Transfer-Encoding: base64`, - '', - readFileAsBase64(path.join(SAMPLE_FILES_DIR, '019-grayscale-image/page-0-X0.png')) || 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg==', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="document.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - readFileAsBase64(path.join(SAMPLE_FILES_DIR, '013-reportlab-overlay/reportlab-overlay.pdf')) || 'JVBERi0xLjQKJcOkw7zDtsOVDQo=', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with inline and attachment dispositions accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Attachment Handling - Filename encoding', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'filename-encoding-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Filename Encoding Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain`, - '', - 'Testing various filename encodings.', - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment; filename="simple.txt"`, - '', - 'Simple ASCII filename', - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment; filename="åäö-nordic.txt"`, - '', - 'Nordic characters in filename', - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment; filename*=UTF-8''%C3%A5%C3%A4%C3%B6-encoded.txt`, - '', - 'RFC 2231 encoded filename', - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment; filename="=?UTF-8?B?8J+YgC1lbW9qaS50eHQ=?="`, - '', - 'MIME encoded filename with emoji', - '', - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment; filename="very long filename that exceeds normal limits and should be handled properly by the server.txt"`, - '', - 'Very long filename', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with various filename encodings accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Attachment Handling - Empty and malformed attachments', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'malformed-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Empty and Malformed Attachments`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain`, - '', - 'Testing empty and malformed attachments.', - '', - `--${boundary}`, - `Content-Type: application/octet-stream`, - `Content-Disposition: attachment; filename="empty.dat"`, - '', - '', // Empty attachment - `--${boundary}`, - `Content-Type: text/plain`, - `Content-Disposition: attachment`, // Missing filename - '', - 'Attachment without filename', - '', - `--${boundary}`, - `Content-Type: application/pdf`, - `Content-Disposition: attachment; filename="broken.pdf"`, - `Content-Transfer-Encoding: base64`, - '', - 'NOT-VALID-BASE64-@#$%', // Invalid base64 - '', - `--${boundary}`, - `Content-Disposition: attachment; filename="no-content-type.txt"`, // Missing Content-Type - '', - 'Attachment without Content-Type header', - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && (dataBuffer.includes('250 ') || dataBuffer.includes('550 '))) { - if (!completed) { - completed = true; - const result = dataBuffer.includes('250') ? 'accepted' : 'rejected'; - console.log(`Email with malformed attachments ${result}`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-07.special-character-handling.ts b/test/suite/smtpserver_email-processing/test.ep-07.special-character-handling.ts deleted file mode 100644 index fd84553..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-07.special-character-handling.ts +++ /dev/null @@ -1,462 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30050; - -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT, hostname: 'localhost' }); - expect(testServer).toBeDefined(); -}); - -tap.test('Special Character Handling - Comprehensive Unicode test', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Special Character Test - Unicode & Symbols ñáéíóú`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Transfer-Encoding: 8bit`, - '', - 'This email tests special character handling:', - '', - '=== UNICODE CHARACTERS ===', - 'Accented letters: àáâãäåæçèéêëìíîïñòóôõöøùúûüý', - 'German umlauts: äöüÄÖÜß', - 'Scandinavian: åäöÅÄÖ', - 'French: àâéèêëïîôœùûüÿç', - 'Spanish: ñáéíóúü¿¡', - 'Polish: ąćęłńóśźż', - 'Russian: абвгдеёжзийклмнопрстуфхцчшщъыьэюя', - 'Greek: αβγδεζηθικλμνξοπρστυφχψω', - 'Arabic: العربية', - 'Hebrew: עברית', - 'Chinese: 中文测试', - 'Japanese: 日本語テスト', - 'Korean: 한국어 테스트', - 'Thai: ภาษาไทย', - '', - '=== MATHEMATICAL SYMBOLS ===', - 'Math: ∑∏∫∆∇∂∞±×÷≠≤≥≈∝∪∩⊂⊃∈∀∃', - 'Greek letters: αβγδεζηθικλμνξοπρστυφχψω', - 'Arrows: ←→↑↓↔↕⇐⇒⇑⇓⇔⇕', - '', - '=== CURRENCY & SYMBOLS ===', - 'Currency: $€£¥¢₹₽₩₪₫₨₦₡₵₴₸₼₲₱', - 'Symbols: ©®™§¶†‡•…‰‱°℃℉№', - `Punctuation: «»""''‚„‹›–—―‖‗''""‚„…‰′″‴‵‶‷‸‹›※‼‽⁇⁈⁉⁏⁐⁑⁒⁓⁔⁕⁖⁗⁘⁙⁚⁛⁜⁝⁞`, - '', - '=== EMOJI & SYMBOLS ===', - 'Common: ☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☔☕☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷', - 'Smileys: ☺☻☹☿♀♁♂♃♄♅♆♇', - 'Hearts: ♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯', - '', - '=== SPECIAL FORMATTING ===', - 'Zero-width chars: ​‌‍‎‏', - 'Combining: e̊åa̋o̧ç', - 'Ligatures: fffiflffifflſtst', - 'Fractions: ½⅓⅔¼¾⅛⅜⅝⅞', - 'Superscript: ⁰¹²³⁴⁵⁶⁷⁸⁹', - 'Subscript: ₀₁₂₃₄₅₆₇₈₉', - '', - 'End of special character test.', - '.', - '' - ].join('\r\n'); - - console.log('Sending email with comprehensive Unicode characters'); - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with special characters accepted successfully'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Special Character Handling - Control characters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Control Character Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: text/plain; charset=utf-8`, - '', - '=== CONTROL CHARACTERS TEST ===', - 'Tab character: (between words)', - 'Non-breaking space: word word', - 'Soft hyphen: super­cali­fragi­listic­expi­ali­docious', - 'Vertical tab: word\x0Bword', - 'Form feed: word\x0Cword', - 'Backspace: word\x08word', - '', - '=== LINE ENDING TESTS ===', - 'Unix LF: Line1\nLine2', - 'Windows CRLF: Line3\r\nLine4', - 'Mac CR: Line5\rLine6', - '', - '=== BOUNDARY CHARACTERS ===', - 'SMTP boundary test: . (dot at start)', - 'Double dots: .. (escaped in SMTP)', - 'CRLF.CRLF sequence test', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with control characters accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Special Character Handling - Subject header encoding', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: =?UTF-8?B?8J+YgCBFbW9qaSBpbiBTdWJqZWN0IOKcqCDwn4yI?=`, - `Subject: =?UTF-8?Q?Quoted=2DPrintable=20Subject=20=C3=A1=C3=A9=C3=AD=C3=B3=C3=BA?=`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing encoded subject headers with special characters.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with encoded subject headers accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Special Character Handling - Address headers with special chars', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: "José García" `, - `To: "François Müller" , "北京用户" `, - `Cc: =?UTF-8?B?IkFubmEgw4XDpMO2Ig==?= `, - `Reply-To: "Søren Ñoño" `, - `Subject: Special names in address headers`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing special characters in email addresses and display names.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with special characters in addresses accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Special Character Handling - Mixed encodings', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const boundary = 'mixed-encoding-boundary'; - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Mixed Encoding Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `MIME-Version: 1.0`, - `Content-Type: multipart/mixed; boundary="${boundary}"`, - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-8`, - `Content-Transfer-Encoding: 8bit`, - '', - 'UTF-8 part: ñáéíóú 中文 日本語', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=iso-8859-1`, - `Content-Transfer-Encoding: quoted-printable`, - '', - 'ISO-8859-1 part: =F1=E1=E9=ED=F3=FA', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=windows-1252`, - '', - 'Windows-1252 part: €‚ƒ„…†‡', - '', - `--${boundary}`, - `Content-Type: text/plain; charset=utf-16`, - `Content-Transfer-Encoding: base64`, - '', - Buffer.from('UTF-16 text: ñoño', 'utf16le').toString('base64'), - '', - `--${boundary}--`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with mixed character encodings accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-08.email-routing.ts b/test/suite/smtpserver_email-processing/test.ep-08.email-routing.ts deleted file mode 100644 index 6928ccb..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-08.email-routing.ts +++ /dev/null @@ -1,527 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; - -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('Email Routing - Local domain routing', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - // Local sender - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - // Local recipient - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - console.log(`Local domain routing: ${accepted ? 'accepted' : 'rejected'}`); - - if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: test@example.com`, - `To: local@localhost`, - `Subject: Local Domain Routing Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests local domain routing.', - 'The server should route this email locally.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Local domain email routed successfully'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Email Routing - External domain routing', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - // External recipient - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - console.log(`External domain routing: ${accepted ? 'accepted' : 'rejected'}`); - - if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@external.com`, - `Subject: External Domain Routing Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests external domain routing.', - 'The server should accept this for relay.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('External domain email accepted for relay'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Email Routing - Multiple recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let recipientCount = 0; - const totalRecipients = 5; - let completed = false; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - recipientCount++; - socket.write(`RCPT TO:\r\n`); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - if (recipientCount < totalRecipients) { - recipientCount++; - socket.write(`RCPT TO:\r\n`); - dataBuffer = ''; - } else { - console.log(`All ${totalRecipients} recipients accepted`); - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'data' && dataBuffer.includes('354')) { - const recipients = Array.from({length: totalRecipients}, (_, i) => `recipient${i+1}@example.com`); - const email = [ - `From: sender@example.com`, - `To: ${recipients.join(', ')}`, - `Subject: Multiple Recipients Routing Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests routing to multiple recipients.', - `Total recipients: ${totalRecipients}`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with multiple recipients routed successfully'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Email Routing - Invalid domain handling', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let testType = 'invalid-tld'; - const testCases = [ - { email: 'user@invalid-tld', type: 'invalid-tld' }, - { email: 'user@.com', type: 'missing-domain' }, - { email: 'user@domain..com', type: 'double-dot' }, - { email: 'user@-domain.com', type: 'leading-dash' }, - { email: 'user@domain-.com', type: 'trailing-dash' } - ]; - let currentTest = 0; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - testType = testCases[currentTest].type; - socket.write(`RCPT TO:<${testCases[currentTest].email}>\r\n`); - dataBuffer = ''; - } else if (step === 'rcpt') { - const rejected = dataBuffer.includes('550') || dataBuffer.includes('553') || dataBuffer.includes('501'); - console.log(`Invalid domain test (${testType}): ${rejected ? 'properly rejected' : 'unexpectedly accepted'}`); - - currentTest++; - if (currentTest < testCases.length) { - // Reset for next test - socket.write('RSET\r\n'); - step = 'rset'; - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'rset' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Email Routing - Mixed local and external recipients', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - const recipients = [ - 'local@localhost', - 'external@example.com', - 'another@localhost', - 'remote@external.com' - ]; - let currentRecipient = 0; - let acceptedRecipients: string[] = []; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write(`RCPT TO:<${recipients[currentRecipient]}>\r\n`); - dataBuffer = ''; - } else if (step === 'rcpt') { - if (dataBuffer.includes('250')) { - acceptedRecipients.push(recipients[currentRecipient]); - console.log(`Recipient ${recipients[currentRecipient]} accepted`); - } else { - console.log(`Recipient ${recipients[currentRecipient]} rejected`); - } - - currentRecipient++; - if (currentRecipient < recipients.length) { - socket.write(`RCPT TO:<${recipients[currentRecipient]}>\r\n`); - dataBuffer = ''; - } else if (acceptedRecipients.length > 0) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: ${acceptedRecipients.join(', ')}`, - `Subject: Mixed Recipients Routing Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests routing to mixed local and external recipients.', - `Accepted recipients: ${acceptedRecipients.length}`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with mixed recipients routed successfully'); - expect(acceptedRecipients.length).toBeGreaterThan(0); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Email Routing - Subdomain routing', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - const subdomainTests = [ - 'user@mail.example.com', - 'user@smtp.corp.example.com', - 'user@deep.sub.domain.example.com' - ]; - let currentTest = 0; - - socket.on('data', (data) => { - if (completed) return; - - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO localhost\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write(`RCPT TO:<${subdomainTests[currentTest]}>\r\n`); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - console.log(`Subdomain routing test (${subdomainTests[currentTest]}): ${accepted ? 'accepted' : 'rejected'}`); - - currentTest++; - if (currentTest < subdomainTests.length) { - socket.write('RSET\r\n'); - step = 'rset'; - dataBuffer = ''; - } else { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'rset' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: ${subdomainTests[subdomainTests.length - 1]}`, - `Subject: Subdomain Routing Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests subdomain routing.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - step = 'sent'; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Subdomain routing test completed'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_email-processing/test.ep-09.delivery-status-notifications.ts b/test/suite/smtpserver_email-processing/test.ep-09.delivery-status-notifications.ts deleted file mode 100644 index 84d01fd..0000000 --- a/test/suite/smtpserver_email-processing/test.ep-09.delivery-status-notifications.ts +++ /dev/null @@ -1,486 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; -const TEST_PORT = 2525; - -let testServer: ITestServer; - -tap.test('setup - start test server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 1000)); -}); - -tap.test('DSN - Extension advertised in EHLO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (dataBuffer.includes('220 ') && !dataBuffer.includes('EHLO')) { - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (dataBuffer.includes('250')) { - // Check if DSN extension is advertised - const dsnSupported = dataBuffer.toLowerCase().includes('dsn'); - console.log('DSN extension advertised:', dsnSupported); - - // Parse extensions - const lines = dataBuffer.split('\r\n'); - const extensions = lines - .filter(line => line.startsWith('250-') || (line.startsWith('250 ') && lines.indexOf(line) > 0)) - .map(line => line.substring(4).split(' ')[0].toUpperCase()); - - console.log('Server extensions:', extensions); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('DSN - Success notification request', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - // MAIL FROM with DSN parameters - const envId = `dsn-success-${Date.now()}`; - socket.write(`MAIL FROM: RET=FULL ENVID=${envId}\r\n`); - dataBuffer = ''; - } else if (step === 'mail') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`MAIL FROM with DSN: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - - if (accepted || notSupported) { - step = 'rcpt'; - // Plain MAIL FROM if DSN not supported - if (notSupported) { - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else { - // RCPT TO with NOTIFY parameter - socket.write('RCPT TO: NOTIFY=SUCCESS\r\n'); - dataBuffer = ''; - } - } - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - if (notSupported) { - // DSN not supported, try plain RCPT TO - socket.write('RCPT TO:\r\n'); - step = 'rcpt_plain'; - dataBuffer = ''; - } else if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'rcpt_plain' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DSN Test - Success Notification`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests DSN success notification.', - 'The server should send a success DSN if supported.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with DSN success request accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('DSN - Multiple notification types', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - // Request multiple notification types - socket.write('RCPT TO: NOTIFY=SUCCESS,FAILURE,DELAY\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`Multiple NOTIFY types: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - - if (notSupported) { - // Try plain RCPT TO - socket.write('RCPT TO:\r\n'); - step = 'rcpt_plain'; - dataBuffer = ''; - } else if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'rcpt_plain' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DSN Test - Multiple Notifications`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing multiple DSN notification types.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with multiple DSN types accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('DSN - Never notify', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - // Request no notifications - socket.write('RCPT TO: NOTIFY=NEVER\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`NOTIFY=NEVER: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - expect(accepted || notSupported).toEqual(true); - - if (notSupported) { - socket.write('RCPT TO:\r\n'); - step = 'rcpt_plain'; - dataBuffer = ''; - } else if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'rcpt_plain' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DSN Test - Never Notify`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email should not generate any DSN.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with NOTIFY=NEVER accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('DSN - Original recipient tracking', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - let completed = false; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - // Include original recipient for tracking - socket.write('RCPT TO: NOTIFY=FAILURE ORCPT=rfc822;original@example.com\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`ORCPT parameter: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - - if (notSupported) { - socket.write('RCPT TO:\r\n'); - step = 'rcpt_plain'; - dataBuffer = ''; - } else if (accepted) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } - } else if (step === 'rcpt_plain' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DSN Test - Original Recipient`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests ORCPT parameter for tracking.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - step = 'sent'; - dataBuffer = ''; - } else if (step === 'sent' && dataBuffer.includes('250 ') && dataBuffer.includes('message queued')) { - if (!completed) { - completed = true; - console.log('Email with ORCPT tracking accepted'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('DSN - Return parameter handling', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail_hdrs'; - // Test RET=HDRS - socket.write('MAIL FROM: RET=HDRS\r\n'); - dataBuffer = ''; - } else if (step === 'mail_hdrs') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`RET=HDRS: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - - if (accepted || notSupported) { - // Reset and test RET=FULL - socket.write('RSET\r\n'); - step = 'reset'; - dataBuffer = ''; - } - } else if (step === 'reset' && dataBuffer.includes('250')) { - step = 'mail_full'; - socket.write('MAIL FROM: RET=FULL\r\n'); - dataBuffer = ''; - } else if (step === 'mail_full') { - const accepted = dataBuffer.includes('250'); - const notSupported = dataBuffer.includes('501') || dataBuffer.includes('555'); - - console.log(`RET=FULL: ${accepted ? 'accepted' : notSupported ? 'not supported' : 'error'}`); - expect(accepted || notSupported).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-01.syntax-errors.ts b/test/suite/smtpserver_error-handling/test.err-01.syntax-errors.ts deleted file mode 100644 index 08a70c2..0000000 --- a/test/suite/smtpserver_error-handling/test.err-01.syntax-errors.ts +++ /dev/null @@ -1,475 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 10000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - tlsEnabled: false, - hostname: 'localhost' - }); - - expect(testServer).toBeDefined(); - expect(testServer.port).toEqual(TEST_PORT); -}); - -// Test: Invalid command -tap.test('Syntax Errors - should reject invalid command', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'invalid_command'; - socket.write('INVALID_COMMAND\r\n'); - } else if (currentStep === 'invalid_command' && receivedData.match(/[45]\d{2}/)) { - // Extract response code immediately after receiving error response - const lines = receivedData.split('\r\n'); - // Find the last line that starts with 4xx or 5xx - let errorCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - errorCode = match[1]; - break; - } - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 500 (syntax error) or 502 (command not implemented) - expect(errorCode).toMatch(/^(500|502)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: MAIL FROM without brackets -tap.test('Syntax Errors - should reject MAIL FROM without brackets', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from_no_brackets'; - socket.write('MAIL FROM:test@example.com\r\n'); // Missing angle brackets - } else if (currentStep === 'mail_from_no_brackets' && receivedData.match(/[45]\d{2}/)) { - // Extract the most recent error response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 501 (syntax error in parameters) - expect(responseCode).toEqual('501'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RCPT TO without brackets -tap.test('Syntax Errors - should reject RCPT TO without brackets', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to_no_brackets'; - socket.write('RCPT TO:recipient@example.com\r\n'); // Missing angle brackets - } else if (currentStep === 'rcpt_to_no_brackets' && receivedData.match(/[45]\d{2}/)) { - // Extract the most recent error response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 501 (syntax error in parameters) - expect(responseCode).toEqual('501'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: EHLO without hostname -tap.test('Syntax Errors - should reject EHLO without hostname', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo_no_hostname'; - socket.write('EHLO\r\n'); // Missing hostname - } else if (currentStep === 'ehlo_no_hostname' && receivedData.match(/[45]\d{2}/)) { - // Extract the most recent error response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 501 (syntax error in parameters) - expect(responseCode).toEqual('501'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Command with extra parameters -tap.test('Syntax Errors - should handle commands with extra parameters', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'quit_extra'; - socket.write('QUIT extra parameters\r\n'); // QUIT doesn't take parameters - } else if (currentStep === 'quit_extra') { - // Extract the most recent response code (could be 221 or error) - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([2-5]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.destroy(); - // Some servers might accept it (221) or reject it (501) - expect(responseCode).toMatch(/^(221|501)$/); - done.resolve(); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Malformed addresses -tap.test('Syntax Errors - should reject malformed email addresses', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from_malformed'; - socket.write('MAIL FROM:\r\n'); // Malformed address - } else if (currentStep === 'mail_from_malformed' && receivedData.match(/[45]\d{2}/)) { - // Extract the most recent error response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 501 or 553 (bad address) - expect(responseCode).toMatch(/^(501|553)$/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Commands in wrong order -tap.test('Syntax Errors - should reject commands in wrong sequence', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'data_without_rcpt'; - socket.write('DATA\r\n'); // DATA without MAIL FROM/RCPT TO - } else if (currentStep === 'data_without_rcpt' && receivedData.match(/[45]\d{2}/)) { - // Extract the most recent error response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([45]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Expect 503 (bad sequence of commands) - expect(responseCode).toEqual('503'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Long commands -tap.test('Syntax Errors - should handle excessively long commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - const longString = 'A'.repeat(1000); // Very long string - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'long_command'; - socket.write(`EHLO ${longString}\r\n`); // Excessively long hostname - } else if (currentStep === 'long_command') { - // Wait for complete response (including all continuation lines) - if (receivedData.includes('250 ') || receivedData.match(/[45]\d{2}\s/)) { - currentStep = 'done'; - - // The server accepted the long EHLO command with 250 - // Some servers might reject with 500/501 - // Since we see 250 in the logs, the server accepts it - const hasError = receivedData.match(/([45]\d{2})\s/); - const hasSuccess = receivedData.includes('250 '); - - // Determine the response code - let responseCode = ''; - if (hasError) { - responseCode = hasError[1]; - } else if (hasSuccess) { - responseCode = '250'; - } - - // Some servers accept long hostnames, others reject them - // Accept either 250 (ok), 500 (syntax error), or 501 (line too long) - expect(responseCode).toMatch(/^(250|500|501)$/); - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-02.invalid-sequence.ts b/test/suite/smtpserver_error-handling/test.err-02.invalid-sequence.ts deleted file mode 100644 index 73f7a8a..0000000 --- a/test/suite/smtpserver_error-handling/test.err-02.invalid-sequence.ts +++ /dev/null @@ -1,450 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 30051; -const TEST_TIMEOUT = 10000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - tlsEnabled: false, - hostname: 'localhost' - }); - - expect(testServer).toBeDefined(); - expect(testServer.port).toEqual(TEST_PORT); -}); - -// Test: MAIL FROM before EHLO/HELO -tap.test('Invalid Sequence - should reject MAIL FROM before EHLO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'mail_from_without_ehlo'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from_without_ehlo' && receivedData.includes('503')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); // Bad sequence of commands - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RCPT TO before MAIL FROM -tap.test('Invalid Sequence - should reject RCPT TO before MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'rcpt_without_mail'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_without_mail' && receivedData.includes('503')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: DATA before RCPT TO -tap.test('Invalid Sequence - should reject DATA before RCPT TO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'data_without_rcpt'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_without_rcpt') { - if (receivedData.includes('503')) { - // Expected: bad sequence error - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); - done.resolve(); - }, 100); - } else if (receivedData.includes('354')) { - // Some servers accept DATA without recipients - // Send empty data to trigger error - socket.write('.\r\n'); - currentStep = 'data_sent'; - } - } else if (currentStep === 'data_sent' && receivedData.match(/[45]\d{2}/)) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Should get an error when trying to send without recipients - expect(receivedData).toMatch(/[45]\d{2}/); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Multiple EHLO commands (should be allowed) -tap.test('Invalid Sequence - should allow multiple EHLO commands', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let commandsSent = false; - - socket.on('data', async (data) => { - receivedData += data.toString(); - - // Wait for server greeting and only send commands once - if (!commandsSent && receivedData.includes('220 localhost ESMTP')) { - commandsSent = true; - - // Send all 3 EHLO commands sequentially - socket.write('EHLO test1.example.com\r\n'); - - // Wait for response before sending next - await new Promise(resolve => setTimeout(resolve, 100)); - socket.write('EHLO test2.example.com\r\n'); - - // Wait for response before sending next - await new Promise(resolve => setTimeout(resolve, 100)); - socket.write('EHLO test3.example.com\r\n'); - - // Wait for all responses - await new Promise(resolve => setTimeout(resolve, 200)); - - // Check that we got 3 successful EHLO responses - const ehloResponses = (receivedData.match(/250-localhost greets test\d+\.example\.com/g) || []).length; - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(ehloResponses).toEqual(3); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error('Connection timeout')); - }); - - await done.promise; -}); - -// Test: Multiple MAIL FROM without RSET -tap.test('Invalid Sequence - should reject second MAIL FROM without RSET', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'first_mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'first_mail_from' && receivedData.includes('250')) { - currentStep = 'second_mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'second_mail_from') { - // Check if we get either 503 (expected) or 250 (current behavior) - if (receivedData.includes('503') || receivedData.includes('250 OK')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Accept either behavior for now - expect(receivedData).toMatch(/503|250 OK/); - done.resolve(); - }, 100); - } - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: DATA without MAIL FROM -tap.test('Invalid Sequence - should reject DATA without MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'data_without_mail'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data_without_mail' && receivedData.includes('503')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('503'); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Commands after QUIT -tap.test('Invalid Sequence - should reject commands after QUIT', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let quitResponseReceived = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'quit'; - socket.write('QUIT\r\n'); - } else if (currentStep === 'quit' && receivedData.includes('221')) { - quitResponseReceived = true; - // Try to send command after QUIT - try { - socket.write('EHLO test.example.com\r\n'); - // If write succeeds, wait to see if we get a response - setTimeout(() => { - socket.destroy(); - done.resolve(); // No response expected after QUIT - }, 1000); - } catch (err) { - // Write failed - connection already closed - done.resolve(); - } - } - }); - - socket.on('close', () => { - if (quitResponseReceived) { - done.resolve(); - } - }); - - socket.on('error', (error) => { - if (quitResponseReceived && error.message.includes('EPIPE')) { - done.resolve(); - } else { - done.reject(error); - } - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: RCPT TO without proper email brackets -tap.test('Invalid Sequence - should handle commands with wrong syntax in sequence', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'bad_rcpt'; - // RCPT TO with wrong syntax - socket.write('RCPT TO:recipient@example.com\r\n'); // Missing brackets - } else if (currentStep === 'bad_rcpt' && receivedData.includes('501')) { - // After syntax error, try valid command - currentStep = 'valid_rcpt'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'valid_rcpt' && receivedData.includes('250')) { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(receivedData).toInclude('501'); // Syntax error - expect(receivedData).toInclude('250'); // Valid command worked - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } - expect(true).toEqual(true); -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-03.temporary-failures.ts b/test/suite/smtpserver_error-handling/test.err-03.temporary-failures.ts deleted file mode 100644 index 1ab2801..0000000 --- a/test/suite/smtpserver_error-handling/test.err-03.temporary-failures.ts +++ /dev/null @@ -1,453 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import * as path from 'path'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -// Test configuration -const TEST_PORT = 2525; -const TEST_TIMEOUT = 10000; - -let testServer: ITestServer; - -// Setup -tap.test('setup - start SMTP server', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - tlsEnabled: false, - hostname: 'localhost' - }); - - expect(testServer).toBeDefined(); - expect(testServer.port).toEqual(TEST_PORT); -}); - -// Test: Temporary failure response codes -tap.test('Temporary Failures - should handle 4xx response codes properly', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - // Use a special address that might trigger temporary failure - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.match(/[245]\d{2}/)) { - // Extract the most recent response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([245]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - - if (responseCode?.startsWith('4')) { - // Temporary failure - expected for special addresses - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - expect(responseCode).toMatch(/^4\d{2}$/); - done.resolve(); - }, 100); - } else if (responseCode === '250') { - // Server accepts the address - this is also valid behavior - // Continue with the flow to test normal operation - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } - } else if (currentStep === 'rcpt_to') { - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Test passed - server handled the flow - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Retry after temporary failure -tap.test('Temporary Failures - should allow retry after temporary failure', async (tools) => { - const done = tools.defer(); - - const attemptConnection = async (attemptNumber: number): Promise<{ success: boolean; responseCode?: string }> => { - return new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - // Include attempt number to potentially vary server response - socket.write(`MAIL FROM:\r\n`); - } else if (currentStep === 'mail_from' && receivedData.match(/[245]\d{2}/)) { - // Extract the most recent response code - const lines = receivedData.split('\r\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - const match = lines[i].match(/^([245]\d{2})\s/); - if (match) { - responseCode = match[1]; - break; - } - } - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - resolve({ success: responseCode === '250' || responseCode?.startsWith('4'), responseCode }); - }, 100); - } - }); - - socket.on('error', () => { - resolve({ success: false }); - }); - - socket.on('timeout', () => { - socket.destroy(); - resolve({ success: false }); - }); - }); - }; - - // Try multiple attempts - const attempt1 = await attemptConnection(1); - await new Promise(resolve => setTimeout(resolve, 1000)); // Wait before retry - const attempt2 = await attemptConnection(2); - - // At least one attempt should work - expect(attempt1.success || attempt2.success).toEqual(true); - - done.resolve(); - - await done.promise; -}); - -// Test: Temporary failure during DATA -tap.test('Temporary Failures - should handle temporary failure during DATA phase', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from' && receivedData.includes('250')) { - currentStep = 'rcpt_to'; - socket.write('RCPT TO:\r\n'); - } else if (currentStep === 'rcpt_to' && receivedData.includes('250')) { - currentStep = 'data'; - socket.write('DATA\r\n'); - } else if (currentStep === 'data' && receivedData.includes('354')) { - currentStep = 'message'; - // Send a message that might trigger temporary failure - const message = 'Subject: Temporary Failure Test\r\n' + - 'X-Test-Header: temporary-failure\r\n' + - '\r\n' + - 'This message tests temporary failure handling.\r\n' + - '.\r\n'; - socket.write(message); - } else if (currentStep === 'message' && receivedData.match(/[245]\d{2}/)) { - currentStep = 'done'; // Prevent further processing - - // Extract the most recent response code - handle both plain and log format - const lines = receivedData.split('\n'); - let responseCode = ''; - for (let i = lines.length - 1; i >= 0; i--) { - // Try to match response codes in different formats - const plainMatch = lines[i].match(/^([245]\d{2})\s/); - const logMatch = lines[i].match(/→\s*([245]\d{2})\s/); - const embeddedMatch = lines[i].match(/\b([245]\d{2})\s+OK/); - - if (plainMatch) { - responseCode = plainMatch[1]; - break; - } else if (logMatch) { - responseCode = logMatch[1]; - break; - } else if (embeddedMatch) { - responseCode = embeddedMatch[1]; - break; - } - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Either accepted (250) or temporary failure (4xx) - if (responseCode) { - console.log(`Response code found: '${responseCode}'`); - // Ensure the response code is trimmed and valid - const trimmedCode = responseCode.trim(); - if (trimmedCode === '250' || trimmedCode.match(/^4\d{2}$/)) { - expect(true).toEqual(true); - } else { - console.error(`Unexpected response code: '${trimmedCode}'`); - expect(true).toEqual(true); // Pass anyway to avoid blocking - } - } else { - // If no response code found, just pass the test - expect(true).toEqual(true); - } - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Common temporary failure codes -tap.test('Temporary Failures - verify proper temporary failure codes', async (tools) => { - const done = tools.defer(); - - // Common temporary failure codes and their meanings - const temporaryFailureCodes = { - '421': 'Service not available, closing transmission channel', - '450': 'Requested mail action not taken: mailbox unavailable', - '451': 'Requested action aborted: local error in processing', - '452': 'Requested action not taken: insufficient system storage' - }; - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - let foundTemporaryCode = false; - - socket.on('data', (data) => { - receivedData += data.toString(); - - // Check for any temporary failure codes - for (const code of Object.keys(temporaryFailureCodes)) { - if (receivedData.includes(code)) { - foundTemporaryCode = true; - console.log(`Found temporary failure code: ${code} - ${temporaryFailureCodes[code as keyof typeof temporaryFailureCodes]}`); - } - } - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'testing'; - // Try various commands that might trigger temporary failures - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'testing') { - // Continue with normal flow - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - // Test passes whether we found temporary codes or not - // (server may not expose them in normal operation) - done.resolve(); - }, 500); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Test: Server overload simulation -tap.test('Temporary Failures - should handle server overload gracefully', async (tools) => { - const done = tools.defer(); - - const connections: net.Socket[] = []; - const results: Array<{ connected: boolean; responseCode?: string }> = []; - - // Create multiple rapid connections to simulate load - const connectionPromises = []; - for (let i = 0; i < 10; i++) { - connectionPromises.push( - new Promise((resolve) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 2000 - }); - - socket.on('connect', () => { - connections.push(socket); - - socket.on('data', (data) => { - const response = data.toString(); - const responseCode = response.match(/(\d{3})/)?.[1]; - - if (responseCode?.startsWith('4')) { - // Temporary failure due to load - results.push({ connected: true, responseCode }); - } else if (responseCode === '220') { - // Normal greeting - results.push({ connected: true, responseCode }); - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - resolve(); - }, 100); - }); - }); - - socket.on('error', () => { - results.push({ connected: false }); - resolve(); - }); - - socket.on('timeout', () => { - socket.destroy(); - results.push({ connected: false }); - resolve(); - }); - }) - ); - } - - await Promise.all(connectionPromises); - - // Clean up any remaining connections - for (const socket of connections) { - if (socket && !socket.destroyed) { - socket.destroy(); - } - } - - // Should handle connections (either accept or temporary failure) - const handled = results.filter(r => r.connected).length; - expect(handled).toBeGreaterThan(0); - - done.resolve(); - - await done.promise; -}); - -// Test: Temporary failure with retry header -tap.test('Temporary Failures - should provide retry information if available', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - let receivedData = ''; - let currentStep = 'connecting'; - - socket.on('data', (data) => { - receivedData += data.toString(); - - if (currentStep === 'connecting' && receivedData.includes('220')) { - currentStep = 'ehlo'; - socket.write('EHLO test.example.com\r\n'); - } else if (currentStep === 'ehlo' && receivedData.includes('250')) { - currentStep = 'mail_from'; - // Try to trigger a temporary failure - socket.write('MAIL FROM:\r\n'); - } else if (currentStep === 'mail_from') { - const response = receivedData; - - // Check if response includes retry information - if (response.includes('try again') || response.includes('retry') || response.includes('later')) { - console.log('Server provided retry guidance in temporary failure'); - } - - socket.write('QUIT\r\n'); - setTimeout(() => { - socket.destroy(); - done.resolve(); - }, 100); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); - - socket.on('timeout', () => { - socket.destroy(); - done.reject(new Error(`Connection timeout at step: ${currentStep}`)); - }); - - await done.promise; -}); - -// Teardown -tap.test('teardown - stop SMTP server', async () => { - if (testServer) { - await stopTestServer(testServer); - } -}); - -// Start the test -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-04.permanent-failures.ts b/test/suite/smtpserver_error-handling/test.err-04.permanent-failures.ts deleted file mode 100644 index 6146a30..0000000 --- a/test/suite/smtpserver_error-handling/test.err-04.permanent-failures.ts +++ /dev/null @@ -1,325 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30028; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for permanent failure tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeDefined(); -}); - -tap.test('Permanent Failures - should return 5xx for invalid recipient syntax', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(mailResponse).toInclude('250'); - - // Send RCPT TO with invalid syntax (double @) - socket.write('RCPT TO:\r\n'); - - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to invalid recipient:', rcptResponse); - - // Should get a permanent failure (5xx) - const permanentFailureCodes = ['550', '551', '552', '553', '554', '501']; - const isPermanentFailure = permanentFailureCodes.some(code => rcptResponse.includes(code)); - - expect(isPermanentFailure).toEqual(true); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Permanent Failures - should handle non-existent domain', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(mailResponse).toInclude('250'); - - // Send RCPT TO with non-existent domain - socket.write('RCPT TO:\r\n'); - - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to non-existent domain:', rcptResponse); - - // Server might: - // 1. Accept it (250) and handle bounces later - // 2. Reject with permanent failure (5xx) - // Both are valid approaches - const acceptedOrRejected = rcptResponse.includes('250') || /^5\d{2}/.test(rcptResponse); - expect(acceptedOrRejected).toEqual(true); - - if (rcptResponse.includes('250')) { - console.log('Server accepts unknown domains (will handle bounces later)'); - } else { - console.log('Server rejects unknown domains immediately'); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Permanent Failures - should reject oversized messages', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // Check if SIZE is advertised - const sizeMatch = ehloResponse.match(/250[- ]SIZE\s+(\d+)/); - const maxSize = sizeMatch ? parseInt(sizeMatch[1]) : null; - - console.log('Server max size:', maxSize || 'not advertised'); - - // Send MAIL FROM with SIZE parameter exceeding limit - const oversizeAmount = maxSize ? maxSize + 1000000 : 100000000; // 100MB if no limit advertised - socket.write(`MAIL FROM: SIZE=${oversizeAmount}\r\n`); - - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Response to oversize MAIL FROM:', mailResponse); - - if (maxSize && oversizeAmount > maxSize) { - // Server should reject with 552 but currently accepts - this is a bug - // TODO: Fix server to properly enforce SIZE limits - // For now, accept both behaviors - if (mailResponse.match(/^5\d{2}/)) { - // Correct behavior - server rejects oversized message - expect(mailResponse.toLowerCase()).toMatch(/size|too.*large|exceed/); - } else { - // Current behavior - server incorrectly accepts oversized message - expect(mailResponse).toMatch(/^250/); - console.log('WARNING: Server not enforcing SIZE limit - accepting oversized message'); - } - } else { - // No size limit advertised, server might accept - expect(mailResponse).toMatch(/^[2-5]\d{2}/); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('Permanent Failures - should persist after RSET', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - // First attempt with invalid syntax - socket.write('MAIL FROM:\r\n'); - - const firstMailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('First MAIL FROM response:', firstMailResponse); - const firstWasRejected = /^5\d{2}/.test(firstMailResponse); - - if (firstWasRejected) { - // Try RSET - socket.write('RSET\r\n'); - - const rsetResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - expect(rsetResponse).toInclude('250'); - - // Try same invalid syntax again - socket.write('MAIL FROM:\r\n'); - - const secondMailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - console.log('Second MAIL FROM response after RSET:', secondMailResponse); - - // Should still get permanent failure - expect(secondMailResponse).toMatch(/^5\d{2}/); - console.log('Permanent failures persist correctly after RSET'); - } else { - console.log('Server accepts invalid syntax in MAIL FROM (lenient parsing)'); - expect(true).toEqual(true); - } - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-05.resource-exhaustion.ts b/test/suite/smtpserver_error-handling/test.err-05.resource-exhaustion.ts deleted file mode 100644 index fadfc37..0000000 --- a/test/suite/smtpserver_error-handling/test.err-05.resource-exhaustion.ts +++ /dev/null @@ -1,302 +0,0 @@ -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30052; - -let testServer: ITestServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT, hostname: 'localhost' }); - expect(testServer).toBeDefined(); -}); - -tap.test('ERR-05: Resource exhaustion handling - Connection limit', async (tools) => { - const done = tools.defer(); - const connections: net.Socket[] = []; - const maxAttempts = 50; // Reduced from 150 to speed up test - let exhaustionDetected = false; - let connectionsEstablished = 0; - let lastError: string | null = null; - - // Set a timeout for the entire test - const testTimeout = setTimeout(() => { - console.log('Test timeout reached, cleaning up...'); - exhaustionDetected = true; // Consider timeout as resource protection - }, 20000); // 20 second timeout - - try { - for (let i = 0; i < maxAttempts; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => { - connections.push(socket); - connectionsEstablished++; - resolve(); - }); - socket.once('error', (err) => { - reject(err); - }); - }); - - // Try EHLO on each connection - const response = await new Promise((resolve) => { - let data = ''; - socket.once('data', (chunk) => { - data += chunk.toString(); - if (data.includes('\r\n')) { - resolve(data); - } - }); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - const ehloResponse = await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(data); - } - }; - socket.on('data', handleData); - }); - - // Check for resource exhaustion indicators - if (ehloResponse.includes('421') || - ehloResponse.includes('too many') || - ehloResponse.includes('limit') || - ehloResponse.includes('resource')) { - exhaustionDetected = true; - break; - } - - // Don't keep all connections open - close older ones to prevent timeout - if (connections.length > 10) { - const oldSocket = connections.shift(); - if (oldSocket && !oldSocket.destroyed) { - oldSocket.write('QUIT\r\n'); - oldSocket.destroy(); - } - } - - // Small delay every 10 connections to avoid overwhelming - if (i % 10 === 0 && i > 0) { - await new Promise(resolve => setTimeout(resolve, 50)); - } - - } catch (err) { - const error = err as Error; - lastError = error.message; - - // Connection refused or resource errors indicate exhaustion handling - if (error.message.includes('ECONNREFUSED') || - error.message.includes('EMFILE') || - error.message.includes('ENFILE') || - error.message.includes('too many') || - error.message.includes('resource')) { - exhaustionDetected = true; - break; - } - - // For other errors, continue trying - } - } - - // Clean up connections - for (const socket of connections) { - try { - if (!socket.destroyed) { - socket.write('QUIT\r\n'); - socket.end(); - } - } catch (e) { - // Ignore cleanup errors - } - } - - // Wait for connections to close - await new Promise(resolve => setTimeout(resolve, 500)); - - // Test passes if we either: - // 1. Detected resource exhaustion (server properly limits connections) - // 2. Established fewer connections than attempted (server has limits) - // 3. Server handled all connections gracefully (no crashes) - const hasResourceProtection = exhaustionDetected || connectionsEstablished < maxAttempts; - const handledGracefully = connectionsEstablished === maxAttempts && !lastError; - - console.log(`Connections established: ${connectionsEstablished}/${maxAttempts}`); - console.log(`Exhaustion detected: ${exhaustionDetected}`); - if (lastError) console.log(`Last error: ${lastError}`); - - clearTimeout(testTimeout); // Clear the timeout - - // Pass if server either has protection OR handles many connections gracefully - expect(hasResourceProtection || handledGracefully).toEqual(true); - - if (handledGracefully) { - console.log('Server handled all connections gracefully without resource limits'); - } - done.resolve(); - } catch (error) { - console.error('Test error:', error); - clearTimeout(testTimeout); // Clear the timeout - done.reject(error); - } -}); - -tap.test('ERR-05: Resource exhaustion handling - Memory limits', async (tools) => { - const done = tools.defer(); - - // Set a timeout for this test - const testTimeout = setTimeout(() => { - console.log('Memory test timeout reached'); - done.resolve(); // Just pass the test on timeout - }, 15000); // 15 second timeout - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 10000 // Reduced from 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Try to send a very large email that might exhaust memory - socket.write('MAIL FROM:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - socket.write('RCPT TO:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(dataResponse).toInclude('354'); - - // Try to send extremely large headers to test memory limits - const largeHeader = 'X-Test-Header: ' + 'A'.repeat(1024 * 100) + '\r\n'; - let resourceError = false; - - try { - // Send multiple large headers - for (let i = 0; i < 100; i++) { - socket.write(largeHeader); - - // Check if socket is still writable - if (!socket.writable) { - resourceError = true; - break; - } - } - - socket.write('\r\n.\r\n'); - - const endResponse = await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error('Timeout waiting for response')); - }, 10000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - - socket.once('error', (err) => { - clearTimeout(timeout); - // Connection errors during large data handling indicate resource protection - resourceError = true; - resolve(''); - }); - }); - - // Check for resource protection responses - if (endResponse.includes('552') || // Message too large - endResponse.includes('451') || // Temporary failure - endResponse.includes('421') || // Service unavailable - endResponse.includes('resource') || - endResponse.includes('memory') || - endResponse.includes('limit')) { - resourceError = true; - } - - // Resource protection is working if we got an error or protective response - expect(resourceError || endResponse.includes('552') || endResponse.includes('451')).toEqual(true); - - } catch (err) { - // Errors during large data transmission indicate resource protection - console.log('Expected resource protection error:', err); - expect(true).toEqual(true); - } - - socket.write('QUIT\r\n'); - socket.end(); - clearTimeout(testTimeout); - done.resolve(); - } catch (error) { - socket.end(); - clearTimeout(testTimeout); - done.reject(error); - } - }); - - socket.on('error', (error) => { - clearTimeout(testTimeout); - done.reject(error); - }); -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-06.malformed-mime.ts b/test/suite/smtpserver_error-handling/test.err-06.malformed-mime.ts deleted file mode 100644 index 860773a..0000000 --- a/test/suite/smtpserver_error-handling/test.err-06.malformed-mime.ts +++ /dev/null @@ -1,374 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('ERR-06: Malformed MIME handling - Invalid boundary', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send DATA - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(dataResponse).toInclude('354'); - - // Send malformed MIME with invalid boundary - const malformedMime = [ - 'From: sender@example.com', - 'To: recipient@example.com', - 'Subject: Malformed MIME Test', - 'MIME-Version: 1.0', - 'Content-Type: multipart/mixed; boundary=invalid-boundary', - '', - '--invalid-boundary', - 'Content-Type: text/plain', - 'Content-Transfer-Encoding: invalid-encoding', - '', - 'This is malformed MIME content.', - '--invalid-boundary', - 'Content-Type: application/octet-stream', - 'Content-Disposition: attachment; filename="malformed.txt', // Missing closing quote - '', - 'Malformed attachment content without proper boundary.', - '--invalid-boundary--missing-final-boundary', // Malformed closing boundary - '.', - '' - ].join('\r\n'); - - socket.write(malformedMime); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - // Server should either: - // 1. Accept the message (250) - tolerant handling - // 2. Reject with error (550/552) - strict MIME validation - // 3. Return temporary failure (4xx) - processing error - const validResponse = response.includes('250') || - response.includes('550') || - response.includes('552') || - response.includes('451') || - response.includes('mime') || - response.includes('malformed'); - - console.log('Malformed MIME response:', response.substring(0, 100)); - expect(validResponse).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-06: Malformed MIME handling - Missing headers', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send DATA - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(dataResponse).toInclude('354'); - - // Send MIME with missing required headers - const malformedMime = [ - 'Subject: Missing MIME headers', - 'Content-Type: multipart/mixed', // Missing boundary parameter - '', - '--boundary', - // Missing Content-Type for part - '', - 'This part has no Content-Type header.', - '--boundary', - 'Content-Type: text/plain', - // Missing blank line between headers and body - 'This part has no separator line.', - '--boundary--', - '.', - '' - ].join('\r\n'); - - socket.write(malformedMime); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - // Server should handle this gracefully - const validResponse = response.includes('250') || - response.includes('550') || - response.includes('552') || - response.includes('451'); - - console.log('Missing headers response:', response.substring(0, 100)); - expect(validResponse).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-06: Malformed MIME handling - Nested multipart errors', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Send DATA - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(dataResponse).toInclude('354'); - - // Send deeply nested multipart with errors - const malformedMime = [ - 'From: sender@example.com', - 'To: recipient@example.com', - 'Subject: Nested multipart errors', - 'MIME-Version: 1.0', - 'Content-Type: multipart/mixed; boundary="outer"', - '', - '--outer', - 'Content-Type: multipart/alternative; boundary="inner"', - '', - '--inner', - 'Content-Type: multipart/related; boundary="nested"', // Too deeply nested - '', - '--nested', - 'Content-Type: text/plain', - 'Content-Transfer-Encoding: base64', - '', - 'NOT-VALID-BASE64-CONTENT!!!', // Invalid base64 - '--nested', // Missing closing -- - '--inner--', // Improper nesting - '--outer', // Missing part content - '--outer--', - '.', - '' - ].join('\r\n'); - - socket.write(malformedMime); - - const response = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - // Server should handle complex MIME errors gracefully - const validResponse = response.includes('250') || - response.includes('550') || - response.includes('552') || - response.includes('451'); - - console.log('Nested multipart response:', response.substring(0, 100)); - expect(validResponse).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-07.exception-handling.ts b/test/suite/smtpserver_error-handling/test.err-07.exception-handling.ts deleted file mode 100644 index 5c97e04..0000000 --- a/test/suite/smtpserver_error-handling/test.err-07.exception-handling.ts +++ /dev/null @@ -1,333 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; -const activeSockets = new Set(); - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('ERR-07: Exception handling - Invalid commands', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - activeSockets.add(socket); - socket.on('close', () => activeSockets.delete(socket)); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Test various exception-triggering commands - const invalidCommands = [ - 'INVALID_COMMAND_THAT_SHOULD_TRIGGER_EXCEPTION', - 'MAIL FROM:<>', // Empty address - 'RCPT TO:<>', // Empty address - '\x00\x01\x02INVALID_BYTES', // Binary data - 'VERY_LONG_COMMAND_' + 'X'.repeat(1000), // Excessively long command - 'MAIL FROM', // Missing parameter - 'RCPT TO', // Missing parameter - 'DATA DATA DATA' // Invalid syntax - ]; - - let exceptionHandled = false; - let serverStillResponding = true; - - for (const command of invalidCommands) { - try { - socket.write(command + '\r\n'); - - const response = await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error('Timeout waiting for response')); - }, 5000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - console.log(`Command: "${command.substring(0, 50)}..." -> Response: ${response.substring(0, 50)}`); - - // Check if server handled the exception properly - if (response.includes('500') || // Command not recognized - response.includes('501') || // Syntax error - response.includes('502') || // Command not implemented - response.includes('503') || // Bad sequence - response.includes('error') || - response.includes('invalid')) { - exceptionHandled = true; - } - - // Small delay between commands - await new Promise(resolve => setTimeout(resolve, 100)); - - } catch (err) { - console.log('Error with command:', command, err); - // Connection might be closed by server - that's ok for some commands - serverStillResponding = false; - break; - } - } - - // If still connected, verify server is still responsive - if (serverStillResponding) { - try { - socket.write('NOOP\r\n'); - const noopResponse = await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error('Timeout on NOOP')); - }, 5000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - if (noopResponse.includes('250')) { - serverStillResponding = true; - } - } catch (err) { - serverStillResponding = false; - } - } - - console.log('Exception handled:', exceptionHandled); - console.log('Server still responding:', serverStillResponding); - - // Test passes if exceptions were handled OR server is still responding - expect(exceptionHandled || serverStillResponding).toEqual(true); - - if (socket.writable) { - socket.write('QUIT\r\n'); - } - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-07: Exception handling - Malformed protocol', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - activeSockets.add(socket); - socket.on('close', () => activeSockets.delete(socket)); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send commands with protocol violations - const protocolViolations = [ - 'EHLO', // No hostname - 'MAIL FROM: SIZE=', // Incomplete SIZE - 'RCPT TO: NOTIFY=', // Incomplete NOTIFY - 'AUTH PLAIN', // No credentials - 'STARTTLS EXTRA', // Extra parameters - 'MAIL FROM:\r\nRCPT TO:', // Multiple commands in one line - ]; - - let violationsHandled = 0; - - for (const violation of protocolViolations) { - try { - socket.write(violation + '\r\n'); - - const response = await new Promise((resolve) => { - const timeout = setTimeout(() => { - resolve('TIMEOUT'); - }, 3000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - if (response !== 'TIMEOUT' && - (response.includes('500') || - response.includes('501') || - response.includes('503'))) { - violationsHandled++; - } - - await new Promise(resolve => setTimeout(resolve, 100)); - - } catch (err) { - // Error is ok - server might close connection - } - } - - console.log(`Protocol violations handled: ${violationsHandled}/${protocolViolations.length}`); - - // Server should handle at least some violations properly - expect(violationsHandled).toBeGreaterThan(0); - - if (socket.writable) { - socket.write('QUIT\r\n'); - } - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-07: Exception handling - Recovery after errors', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - activeSockets.add(socket); - socket.on('close', () => activeSockets.delete(socket)); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Trigger an error - socket.write('INVALID_COMMAND\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toMatch(/50[0-3]/); - resolve(); - }); - }); - - // Now try a valid command sequence to ensure recovery - socket.write('MAIL FROM:\r\n'); - - const mailResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(mailResponse).toInclude('250'); - - socket.write('RCPT TO:\r\n'); - - const rcptResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(rcptResponse).toInclude('250'); - - // Server recovered successfully after exception - socket.write('RSET\r\n'); - - const rsetResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(rsetResponse).toInclude('250'); - - console.log('Server recovered successfully after exception'); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('cleanup server', async () => { - // Close any remaining sockets - for (const socket of activeSockets) { - if (!socket.destroyed) { - socket.destroy(); - } - } - - // Wait for all sockets to be fully closed - await new Promise(resolve => setTimeout(resolve, 500)); - - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_error-handling/test.err-08.error-logging.ts b/test/suite/smtpserver_error-handling/test.err-08.error-logging.ts deleted file mode 100644 index c60f7ec..0000000 --- a/test/suite/smtpserver_error-handling/test.err-08.error-logging.ts +++ /dev/null @@ -1,324 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('ERR-08: Error logging - Command errors', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Test various error conditions that should be logged - const errorTests = [ - { command: 'INVALID_COMMAND', expectedCode: '500', description: 'Invalid command' }, - { command: 'MAIL FROM:', expectedCode: '501', description: 'Invalid email syntax' }, - { command: 'RCPT TO:', expectedCode: '501', description: 'Invalid recipient syntax' }, - { command: 'VRFY nonexistent@domain.com', expectedCode: '550', description: 'User verification failed' }, - { command: 'EXPN invalidlist', expectedCode: '550', description: 'List expansion failed' } - ]; - - let errorsDetected = 0; - let totalTests = errorTests.length; - - for (const test of errorTests) { - try { - socket.write(test.command + '\r\n'); - - const response = await new Promise((resolve) => { - const timeout = setTimeout(() => { - resolve('TIMEOUT'); - }, 5000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - console.log(`${test.description}: ${test.command} -> ${response.substring(0, 50)}`); - - // Check if appropriate error code was returned - if (response.includes(test.expectedCode) || - response.includes('500') || // General error - response.includes('501') || // Syntax error - response.includes('502') || // Not implemented - response.includes('550')) { // Action not taken - errorsDetected++; - } - - // Small delay between commands - await new Promise(resolve => setTimeout(resolve, 100)); - - } catch (err) { - console.log('Error during test:', test.description, err); - // Connection errors also count as detected errors - errorsDetected++; - } - } - - const detectionRate = errorsDetected / totalTests; - console.log(`Error detection rate: ${errorsDetected}/${totalTests} (${Math.round(detectionRate * 100)}%)`); - - // Expect at least 80% of errors to be properly detected and responded to - expect(detectionRate).toBeGreaterThanOrEqual(0.8); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-08: Error logging - Protocol violations', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Test protocol violations that should trigger error logging - const violations = [ - { - sequence: ['RCPT TO:'], // RCPT before MAIL - description: 'RCPT before MAIL FROM' - }, - { - sequence: ['MAIL FROM:', 'DATA'], // DATA before RCPT - description: 'DATA before RCPT TO' - }, - { - sequence: ['EHLO testhost', 'EHLO testhost', 'MAIL FROM:', 'MAIL FROM:'], // Double MAIL FROM - description: 'Multiple MAIL FROM commands' - } - ]; - - let violationsDetected = 0; - - for (const violation of violations) { - // Reset connection state - socket.write('RSET\r\n'); - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - console.log(`Testing: ${violation.description}`); - - for (const cmd of violation.sequence) { - socket.write(cmd + '\r\n'); - - const response = await new Promise((resolve) => { - const timeout = setTimeout(() => { - resolve('TIMEOUT'); - }, 5000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - // Check for error responses - if (response.includes('503') || // Bad sequence - response.includes('501') || // Syntax error - response.includes('500')) { // Error - violationsDetected++; - console.log(` Violation detected: ${response.substring(0, 50)}`); - break; // Move to next violation test - } - } - - await new Promise(resolve => setTimeout(resolve, 100)); - } - - console.log(`Protocol violations detected: ${violationsDetected}/${violations.length}`); - - // Expect all protocol violations to be detected - expect(violationsDetected).toBeGreaterThan(0); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('ERR-08: Error logging - Data transmission errors', async (tools) => { - const done = tools.defer(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('connect', async () => { - try { - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ') && data.includes('\r\n')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Set up valid email transaction - socket.write('MAIL FROM:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - socket.write('RCPT TO:\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - socket.write('DATA\r\n'); - - const dataResponse = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(dataResponse).toInclude('354'); - - // Test various data transmission errors - const dataErrors = [ - { - data: 'From: sender@example.com\r\n.\r\n', // Premature termination - description: 'Premature dot termination' - }, - { - data: 'Subject: Test\r\n\r\n' + '\x00\x01\x02\x03', // Binary data - description: 'Binary data in message' - }, - { - data: 'X-Long-Line: ' + 'A'.repeat(2000) + '\r\n', // Excessively long line - description: 'Excessively long header line' - } - ]; - - for (const errorData of dataErrors) { - console.log(`Testing: ${errorData.description}`); - socket.write(errorData.data); - } - - // Terminate the data - socket.write('\r\n.\r\n'); - - const finalResponse = await new Promise((resolve) => { - const timeout = setTimeout(() => { - resolve('TIMEOUT'); - }, 10000); - - socket.once('data', (chunk) => { - clearTimeout(timeout); - resolve(chunk.toString()); - }); - }); - - console.log('Data transmission response:', finalResponse.substring(0, 100)); - - // Server should either accept (250) or reject (5xx) but must respond - const hasResponse = finalResponse !== 'TIMEOUT' && - (finalResponse.includes('250') || - finalResponse.includes('5')); - - expect(hasResponse).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - socket.end(); - done.reject(error); - } - }); - - socket.on('error', (error) => { - done.reject(error); - }); -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-01.throughput.ts b/test/suite/smtpserver_performance/test.perf-01.throughput.ts deleted file mode 100644 index b4fcd25..0000000 --- a/test/suite/smtpserver_performance/test.perf-01.throughput.ts +++ /dev/null @@ -1,183 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -// import { createTestSmtpClient, sendConcurrentEmails, measureClientThroughput } from '../../helpers/smtp.client.js'; -import { connectToSmtp, sendSmtpCommand, waitForGreeting, createMimeMessage, closeSmtpConnection } from '../../helpers/utils.js'; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for performance testing', async () => { - testServer = await startTestServer({ - port: 2531, - hostname: 'localhost', - maxConnections: 1000, - size: 50 * 1024 * 1024 // 50MB for performance testing - }); - expect(testServer).toBeInstanceOf(Object); -}); - -// TODO: Enable these tests when the helper functions are implemented -/* -tap.test('PERF-01: Throughput Testing - measure emails per second', async () => { - const client = createTestSmtpClient({ - host: testServer.hostname, - port: testServer.port, - maxConnections: 10 - }); - - try { - // Warm up the connection pool - console.log('🔥 Warming up connection pool...'); - await sendConcurrentEmails(client, 5); - - // Measure throughput for 10 seconds - console.log('📊 Measuring throughput for 10 seconds...'); - const startTime = Date.now(); - const testDuration = 10000; // 10 seconds - - const result = await measureClientThroughput(client, testDuration, { - from: 'perf-test@example.com', - to: 'recipient@example.com', - subject: 'Performance Test Email', - text: 'This is a performance test email to measure throughput.' - }); - - const actualDuration = (Date.now() - startTime) / 1000; - - console.log('📈 Throughput Test Results:'); - console.log(` Total emails sent: ${result.totalSent}`); - console.log(` Successful: ${result.successCount}`); - console.log(` Failed: ${result.errorCount}`); - console.log(` Duration: ${actualDuration.toFixed(2)}s`); - console.log(` Throughput: ${result.throughput.toFixed(2)} emails/second`); - - // Performance expectations - expect(result.throughput).toBeGreaterThan(10); // At least 10 emails/second - expect(result.errorCount).toBeLessThan(result.totalSent * 0.05); // Less than 5% errors - - console.log('✅ Throughput test passed'); - - } finally { - if (client.close) { - await client.close(); - } - } -}); - -tap.test('PERF-01: Burst throughput - handle sudden load spikes', async () => { - const client = createTestSmtpClient({ - host: testServer.hostname, - port: testServer.port, - maxConnections: 20 - }); - - try { - // Send burst of emails - const burstSize = 100; - console.log(`💥 Sending burst of ${burstSize} emails...`); - - const startTime = Date.now(); - const results = await sendConcurrentEmails(client, burstSize, { - from: 'burst-test@example.com', - to: 'recipient@example.com', - subject: 'Burst Test Email', - text: 'Testing burst performance.' - }); - - const duration = Date.now() - startTime; - const successCount = results.filter(r => r && !r.rejected).length; - const throughput = (successCount / duration) * 1000; - - console.log(`✅ Burst completed in ${duration}ms`); - console.log(` Success rate: ${successCount}/${burstSize} (${(successCount/burstSize*100).toFixed(1)}%)`); - console.log(` Burst throughput: ${throughput.toFixed(2)} emails/second`); - - expect(successCount).toBeGreaterThan(burstSize * 0.95); // 95% success rate - - } finally { - if (client.close) { - await client.close(); - } - } -}); -*/ - -tap.test('PERF-01: Large message throughput - measure with varying sizes', async () => { - const messageSizes = [ - { size: 1024, label: '1KB' }, - { size: 100 * 1024, label: '100KB' }, - { size: 1024 * 1024, label: '1MB' }, - { size: 5 * 1024 * 1024, label: '5MB' } - ]; - - for (const { size, label } of messageSizes) { - console.log(`\n📧 Testing throughput with ${label} messages...`); - - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Send a few messages of this size - const messageCount = 5; - const timings: number[] = []; - - for (let i = 0; i < messageCount; i++) { - const startTime = Date.now(); - - await sendSmtpCommand(socket, 'MAIL FROM:', '250'); - await sendSmtpCommand(socket, 'RCPT TO:', '250'); - await sendSmtpCommand(socket, 'DATA', '354'); - - // Create message with padding to reach target size - const padding = 'X'.repeat(Math.max(0, size - 200)); // Account for headers - const emailContent = createMimeMessage({ - from: 'size-test@example.com', - to: 'recipient@example.com', - subject: `${label} Performance Test`, - text: padding - }); - - socket.write(emailContent); - socket.write('\r\n.\r\n'); - - // Wait for acceptance - await new Promise((resolve, reject) => { - const timeout = setTimeout(() => reject(new Error('Timeout')), 30000); - const onData = (data: Buffer) => { - if (data.toString().includes('250')) { - clearTimeout(timeout); - socket.removeListener('data', onData); - resolve(); - } - }; - socket.on('data', onData); - }); - - const duration = Date.now() - startTime; - timings.push(duration); - - // Reset for next message - await sendSmtpCommand(socket, 'RSET', '250'); - } - - const avgTime = timings.reduce((a, b) => a + b, 0) / timings.length; - const throughputMBps = (size / 1024 / 1024) / (avgTime / 1000); - - console.log(` Average time: ${avgTime.toFixed(0)}ms`); - console.log(` Throughput: ${throughputMBps.toFixed(2)} MB/s`); - - } finally { - await closeSmtpConnection(socket); - } - } - - console.log('\n✅ Large message throughput test completed'); -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - console.log('✅ Test server stopped'); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-02.concurrency.ts b/test/suite/smtpserver_performance/test.perf-02.concurrency.ts deleted file mode 100644 index 4c3c2d1..0000000 --- a/test/suite/smtpserver_performance/test.perf-02.concurrency.ts +++ /dev/null @@ -1,388 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-02: Concurrency testing - Multiple simultaneous connections', async (tools) => { - const done = tools.defer(); - const concurrentCount = 20; - const connectionResults: Array<{ - connectionId: number; - success: boolean; - duration: number; - error?: string; - }> = []; - - const createConcurrentConnection = (connectionId: number): Promise => { - return new Promise((resolve) => { - const startTime = Date.now(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 10000 - }); - - let state = 'connecting'; - let receivedData = ''; - - const timeoutHandle = setTimeout(() => { - socket.destroy(); - connectionResults.push({ - connectionId, - success: false, - duration: Date.now() - startTime, - error: 'Connection timeout' - }); - resolve(); - }, 10000); - - socket.on('connect', () => { - state = 'connected'; - }); - - socket.on('data', (chunk) => { - receivedData += chunk.toString(); - const lines = receivedData.split('\r\n'); - - for (const line of lines) { - if (!line.trim()) continue; - - if (state === 'connected' && line.startsWith('220')) { - state = 'ehlo'; - socket.write(`EHLO testhost-${connectionId}\r\n`); - } else if (state === 'ehlo' && line.includes('250 ') && !line.includes('250-')) { - // Final 250 response received - state = 'quit'; - socket.write('QUIT\r\n'); - } else if (state === 'quit' && line.startsWith('221')) { - clearTimeout(timeoutHandle); - socket.end(); - connectionResults.push({ - connectionId, - success: true, - duration: Date.now() - startTime - }); - resolve(); - } - } - }); - - socket.on('error', (error) => { - clearTimeout(timeoutHandle); - connectionResults.push({ - connectionId, - success: false, - duration: Date.now() - startTime, - error: error.message - }); - resolve(); - }); - - socket.on('close', () => { - clearTimeout(timeoutHandle); - if (!connectionResults.find(r => r.connectionId === connectionId)) { - connectionResults.push({ - connectionId, - success: false, - duration: Date.now() - startTime, - error: 'Connection closed unexpectedly' - }); - } - resolve(); - }); - }); - }; - - try { - // Create all concurrent connections - const promises: Promise[] = []; - console.log(`Creating ${concurrentCount} concurrent connections...`); - - for (let i = 0; i < concurrentCount; i++) { - promises.push(createConcurrentConnection(i)); - // Small stagger to avoid overwhelming the system - if (i % 5 === 0) { - await new Promise(resolve => setTimeout(resolve, 10)); - } - } - - // Wait for all connections to complete - await Promise.all(promises); - - // Analyze results - const successful = connectionResults.filter(r => r.success).length; - const failed = connectionResults.filter(r => !r.success).length; - const successRate = successful / concurrentCount; - const avgDuration = connectionResults - .filter(r => r.success) - .reduce((sum, r) => sum + r.duration, 0) / successful || 0; - - console.log(`\nConcurrency Test Results:`); - console.log(`Total connections: ${concurrentCount}`); - console.log(`Successful: ${successful} (${(successRate * 100).toFixed(1)}%)`); - console.log(`Failed: ${failed}`); - console.log(`Average duration: ${avgDuration.toFixed(0)}ms`); - - if (failed > 0) { - const errors = connectionResults - .filter(r => !r.success) - .map(r => r.error) - .filter((v, i, a) => a.indexOf(v) === i); // unique errors - console.log(`Unique errors: ${errors.join(', ')}`); - } - - // Success if at least 80% of connections succeed - expect(successRate).toBeGreaterThanOrEqual(0.8); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('PERF-02: Concurrency testing - Concurrent transactions', async (tools) => { - const done = tools.defer(); - const transactionCount = 10; - const transactionResults: Array<{ - transactionId: number; - success: boolean; - duration: number; - error?: string; - }> = []; - - const performConcurrentTransaction = (transactionId: number): Promise => { - return new Promise((resolve) => { - const startTime = Date.now(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 15000 - }); - - let state = 'connecting'; - - const timeoutHandle = setTimeout(() => { - socket.destroy(); - transactionResults.push({ - transactionId, - success: false, - duration: Date.now() - startTime, - error: 'Transaction timeout' - }); - resolve(); - }, 15000); - - const processResponse = async () => { - try { - // Read greeting - await new Promise((res) => { - let greeting = ''; - const handleGreeting = (chunk: Buffer) => { - greeting += chunk.toString(); - if (greeting.includes('220') && greeting.includes('\r\n')) { - socket.removeListener('data', handleGreeting); - res(); - } - }; - socket.on('data', handleGreeting); - }); - - // Send EHLO - socket.write(`EHLO testhost-tx-${transactionId}\r\n`); - - await new Promise((res) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - // Look for the end of EHLO response (250 without dash) - if (data.includes('250 ')) { - socket.removeListener('data', handleData); - res(); - } - }; - socket.on('data', handleData); - }); - - // Complete email transaction - socket.write(`MAIL FROM:\r\n`); - - await new Promise((res, rej) => { - let mailResponse = ''; - const handleMailResponse = (chunk: Buffer) => { - mailResponse += chunk.toString(); - if (mailResponse.includes('\r\n')) { - socket.removeListener('data', handleMailResponse); - if (!mailResponse.includes('250')) { - rej(new Error('MAIL FROM failed')); - } else { - res(); - } - } - }; - socket.on('data', handleMailResponse); - }); - - socket.write(`RCPT TO:\r\n`); - - await new Promise((res, rej) => { - let rcptResponse = ''; - const handleRcptResponse = (chunk: Buffer) => { - rcptResponse += chunk.toString(); - if (rcptResponse.includes('\r\n')) { - socket.removeListener('data', handleRcptResponse); - if (!rcptResponse.includes('250')) { - rej(new Error('RCPT TO failed')); - } else { - res(); - } - } - }; - socket.on('data', handleRcptResponse); - }); - - socket.write('DATA\r\n'); - - await new Promise((res, rej) => { - let dataResponse = ''; - const handleDataResponse = (chunk: Buffer) => { - dataResponse += chunk.toString(); - if (dataResponse.includes('\r\n')) { - socket.removeListener('data', handleDataResponse); - if (!dataResponse.includes('354')) { - rej(new Error('DATA command failed')); - } else { - res(); - } - } - }; - socket.on('data', handleDataResponse); - }); - - // Send email content - const emailContent = [ - `From: sender${transactionId}@example.com`, - `To: recipient${transactionId}@example.com`, - `Subject: Concurrent test ${transactionId}`, - '', - `This is concurrent test message ${transactionId}`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - - await new Promise((res, rej) => { - let submitResponse = ''; - const handleSubmitResponse = (chunk: Buffer) => { - submitResponse += chunk.toString(); - if (submitResponse.includes('\r\n') && submitResponse.includes('250')) { - socket.removeListener('data', handleSubmitResponse); - res(); - } else if (submitResponse.includes('\r\n') && (submitResponse.includes('4') || submitResponse.includes('5'))) { - socket.removeListener('data', handleSubmitResponse); - rej(new Error('Message submission failed')); - } - }; - socket.on('data', handleSubmitResponse); - }); - - socket.write('QUIT\r\n'); - - await new Promise((res) => { - socket.once('data', () => res()); - }); - - clearTimeout(timeoutHandle); - socket.end(); - - transactionResults.push({ - transactionId, - success: true, - duration: Date.now() - startTime - }); - resolve(); - - } catch (error) { - clearTimeout(timeoutHandle); - socket.end(); - const errorMsg = error instanceof Error ? error.message : 'Unknown error'; - console.log(`Transaction ${transactionId} failed: ${errorMsg}`); - transactionResults.push({ - transactionId, - success: false, - duration: Date.now() - startTime, - error: errorMsg - }); - resolve(); - } - }; - - socket.on('connect', () => { - state = 'connected'; - processResponse(); - }); - - socket.on('error', (error) => { - clearTimeout(timeoutHandle); - if (!transactionResults.find(r => r.transactionId === transactionId)) { - transactionResults.push({ - transactionId, - success: false, - duration: Date.now() - startTime, - error: error.message - }); - } - resolve(); - }); - }); - }; - - try { - // Create concurrent transactions - const promises: Promise[] = []; - console.log(`\nStarting ${transactionCount} concurrent email transactions...`); - - for (let i = 0; i < transactionCount; i++) { - promises.push(performConcurrentTransaction(i)); - // Small stagger - await new Promise(resolve => setTimeout(resolve, 50)); - } - - // Wait for all transactions - await Promise.all(promises); - - // Analyze results - const successful = transactionResults.filter(r => r.success).length; - const failed = transactionResults.filter(r => !r.success).length; - const successRate = successful / transactionCount; - const avgDuration = transactionResults - .filter(r => r.success) - .reduce((sum, r) => sum + r.duration, 0) / successful || 0; - - console.log(`\nConcurrent Transaction Results:`); - console.log(`Total transactions: ${transactionCount}`); - console.log(`Successful: ${successful} (${(successRate * 100).toFixed(1)}%)`); - console.log(`Failed: ${failed}`); - console.log(`Average duration: ${avgDuration.toFixed(0)}ms`); - - // Success if at least 80% of transactions complete - expect(successRate).toBeGreaterThanOrEqual(0.8); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-03.cpu-utilization.ts b/test/suite/smtpserver_performance/test.perf-03.cpu-utilization.ts deleted file mode 100644 index 3e3fc79..0000000 --- a/test/suite/smtpserver_performance/test.perf-03.cpu-utilization.ts +++ /dev/null @@ -1,245 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-03: CPU utilization - Load test', async (tools) => { - const done = tools.defer(); - const monitoringDuration = 3000; // 3 seconds (reduced from 5) - const connectionCount = 5; // Reduced from 10 - const connections: net.Socket[] = []; - - // Add timeout to prevent hanging - const testTimeout = setTimeout(() => { - console.log('CPU test timeout reached, cleaning up...'); - for (const socket of connections) { - if (!socket.destroyed) socket.destroy(); - } - done.resolve(); - }, 30000); // 30 second timeout - - try { - // Record initial CPU usage - const initialCpuUsage = process.cpuUsage(); - const startTime = Date.now(); - - // Create multiple connections and send emails - console.log(`Creating ${connectionCount} connections for CPU load test...`); - - for (let i = 0; i < connectionCount; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - connections.push(socket); - - await new Promise((resolve, reject) => { - socket.once('connect', () => { - resolve(); - }); - socket.once('error', reject); - }); - - // Process greeting - await new Promise((resolve) => { - let greeting = ''; - const handleGreeting = (chunk: Buffer) => { - greeting += chunk.toString(); - if (greeting.includes('220') && greeting.includes('\r\n')) { - socket.removeListener('data', handleGreeting); - resolve(); - } - }; - socket.on('data', handleGreeting); - }); - - // Send EHLO - socket.write(`EHLO testhost-cpu-${i}\r\n`); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Keep connection active, don't send full transaction to avoid timeout - } - - // Keep connections active during monitoring period - console.log(`Monitoring CPU usage for ${monitoringDuration}ms...`); - - // Send periodic NOOP commands to keep connections active - const noopInterval = setInterval(() => { - connections.forEach((socket, idx) => { - if (socket.writable) { - socket.write('NOOP\r\n'); - } - }); - }, 1000); - - await new Promise(resolve => setTimeout(resolve, monitoringDuration)); - clearInterval(noopInterval); - - // Calculate CPU usage - const finalCpuUsage = process.cpuUsage(initialCpuUsage); - const totalCpuTimeMs = (finalCpuUsage.user + finalCpuUsage.system) / 1000; - const elapsedTime = Date.now() - startTime; - const cpuUtilizationPercent = (totalCpuTimeMs / elapsedTime) * 100; - - console.log(`\nCPU Utilization Results:`); - console.log(`Total CPU time: ${totalCpuTimeMs.toFixed(0)}ms`); - console.log(`Elapsed time: ${elapsedTime}ms`); - console.log(`CPU utilization: ${cpuUtilizationPercent.toFixed(1)}%`); - console.log(`User CPU: ${(finalCpuUsage.user / 1000).toFixed(0)}ms`); - console.log(`System CPU: ${(finalCpuUsage.system / 1000).toFixed(0)}ms`); - - // Clean up connections - for (const socket of connections) { - if (socket.writable) { - socket.write('QUIT\r\n'); - socket.end(); - } - } - - // Test passes if CPU usage is reasonable (less than 80%) - expect(cpuUtilizationPercent).toBeLessThan(80); - clearTimeout(testTimeout); - done.resolve(); - } catch (error) { - // Clean up on error - connections.forEach(socket => socket.destroy()); - clearTimeout(testTimeout); - done.reject(error); - } -}); - -tap.test('PERF-03: CPU utilization - Stress test', async (tools) => { - const done = tools.defer(); - const testDuration = 2000; // 2 seconds (reduced from 3) - let requestCount = 0; - - // Add timeout to prevent hanging - const testTimeout = setTimeout(() => { - console.log('Stress test timeout reached, completing...'); - done.resolve(); - }, 15000); // 15 second timeout - - try { - const initialCpuUsage = process.cpuUsage(); - const startTime = Date.now(); - - console.log(`\nRunning CPU stress test for ${testDuration}ms...`); - - // Create a single connection for rapid requests - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await new Promise((resolve) => { - let greeting = ''; - const handleGreeting = (chunk: Buffer) => { - greeting += chunk.toString(); - if (greeting.includes('220') && greeting.includes('\r\n')) { - socket.removeListener('data', handleGreeting); - resolve(); - } - }; - socket.on('data', handleGreeting); - }); - - // Send EHLO - socket.write('EHLO stresstest\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Rapid command loop - const endTime = Date.now() + testDuration; - const commands = ['NOOP', 'RSET', 'VRFY test@example.com', 'HELP']; - let commandIndex = 0; - - while (Date.now() < endTime) { - const command = commands[commandIndex % commands.length]; - socket.write(`${command}\r\n`); - - await new Promise((resolve) => { - socket.once('data', () => { - requestCount++; - resolve(); - }); - }); - - commandIndex++; - - // Small delay to avoid overwhelming - if (requestCount % 20 === 0) { - await new Promise(resolve => setTimeout(resolve, 10)); - } - } - - // Calculate final CPU usage - const finalCpuUsage = process.cpuUsage(initialCpuUsage); - const totalCpuTimeMs = (finalCpuUsage.user + finalCpuUsage.system) / 1000; - const elapsedTime = Date.now() - startTime; - const cpuUtilizationPercent = (totalCpuTimeMs / elapsedTime) * 100; - const requestsPerSecond = (requestCount / elapsedTime) * 1000; - - console.log(`\nStress Test Results:`); - console.log(`Requests processed: ${requestCount}`); - console.log(`Requests per second: ${requestsPerSecond.toFixed(1)}`); - console.log(`CPU utilization: ${cpuUtilizationPercent.toFixed(1)}%`); - console.log(`CPU time per request: ${(totalCpuTimeMs / requestCount).toFixed(2)}ms`); - - socket.write('QUIT\r\n'); - socket.end(); - - // Test passes if CPU usage per request is reasonable - const cpuPerRequest = totalCpuTimeMs / requestCount; - expect(cpuPerRequest).toBeLessThan(10); // Less than 10ms CPU per request - clearTimeout(testTimeout); - done.resolve(); - } catch (error) { - clearTimeout(testTimeout); - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-04.memory-usage.ts b/test/suite/smtpserver_performance/test.perf-04.memory-usage.ts deleted file mode 100644 index 51209d9..0000000 --- a/test/suite/smtpserver_performance/test.perf-04.memory-usage.ts +++ /dev/null @@ -1,238 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-04: Memory usage - Connection memory test', async (tools) => { - const done = tools.defer(); - const connectionCount = 10; // Reduced from 20 to make test faster - const connections: net.Socket[] = []; - - try { - // Force garbage collection if available - if (global.gc) { - global.gc(); - } - - // Record initial memory usage - const initialMemory = process.memoryUsage(); - console.log(`Initial memory usage: ${Math.round(initialMemory.heapUsed / (1024 * 1024))}MB`); - - // Create multiple connections with large email content - console.log(`Creating ${connectionCount} connections with large emails...`); - - for (let i = 0; i < connectionCount; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - connections.push(socket); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write(`EHLO testhost-mem-${i}\r\n`); - await waitForResponse(socket, '250'); - - // Send email transaction - socket.write(`MAIL FROM:\r\n`); - await waitForResponse(socket, '250'); - - socket.write(`RCPT TO:\r\n`); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send large email content - const largeContent = 'This is a large email content for memory testing. '.repeat(100); - const emailContent = [ - `From: sender${i}@example.com`, - `To: recipient${i}@example.com`, - `Subject: Memory Usage Test ${i}`, - '', - largeContent, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - await waitForResponse(socket, '250'); - - // Pause every 5 connections - if (i > 0 && i % 5 === 0) { - await new Promise(resolve => setTimeout(resolve, 100)); - const intermediateMemory = process.memoryUsage(); - console.log(`Memory after ${i} connections: ${Math.round(intermediateMemory.heapUsed / (1024 * 1024))}MB`); - } - } - - // Wait to let memory stabilize - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Record final memory usage - const finalMemory = process.memoryUsage(); - const memoryIncreaseMB = (finalMemory.heapUsed - initialMemory.heapUsed) / (1024 * 1024); - const memoryPerConnectionKB = (memoryIncreaseMB * 1024) / connectionCount; - - console.log(`\nMemory Usage Results:`); - console.log(`Initial heap: ${Math.round(initialMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Final heap: ${Math.round(finalMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Memory increase: ${memoryIncreaseMB.toFixed(2)}MB`); - console.log(`Memory per connection: ${memoryPerConnectionKB.toFixed(2)}KB`); - console.log(`RSS increase: ${Math.round((finalMemory.rss - initialMemory.rss) / (1024 * 1024))}MB`); - - // Clean up connections - for (const socket of connections) { - if (socket.writable) { - socket.write('QUIT\r\n'); - socket.end(); - } - } - - // Test passes if memory increase is reasonable (less than 30MB for 10 connections) - expect(memoryIncreaseMB).toBeLessThan(30); - done.resolve(); - } catch (error) { - // Clean up on error - connections.forEach(socket => socket.destroy()); - done.reject(error); - } -}); - -tap.test('PERF-04: Memory usage - Memory leak detection', async (tools) => { - const done = tools.defer(); - const iterations = 3; // Reduced from 5 - const connectionsPerIteration = 3; // Reduced from 5 - - try { - // Force GC if available - if (global.gc) { - global.gc(); - } - - const initialMemory = process.memoryUsage(); - const memorySnapshots: number[] = []; - - console.log(`\nRunning memory leak detection (${iterations} iterations)...`); - - for (let iteration = 0; iteration < iterations; iteration++) { - const sockets: net.Socket[] = []; - - // Create and close connections - for (let i = 0; i < connectionsPerIteration; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Quick transaction - await waitForResponse(socket, '220'); - - socket.write('EHLO leaktest\r\n'); - await waitForResponse(socket, '250'); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - sockets.push(socket); - } - - // Wait for sockets to close - await new Promise(resolve => setTimeout(resolve, 500)); - - // Force cleanup - sockets.forEach(s => s.destroy()); - - // Force GC if available - if (global.gc) { - global.gc(); - } - - // Record memory after each iteration - const currentMemory = process.memoryUsage(); - const memoryMB = currentMemory.heapUsed / (1024 * 1024); - memorySnapshots.push(memoryMB); - - console.log(`Iteration ${iteration + 1}: ${memoryMB.toFixed(2)}MB`); - - await new Promise(resolve => setTimeout(resolve, 500)); - } - - // Check for memory leak pattern - const firstSnapshot = memorySnapshots[0]; - const lastSnapshot = memorySnapshots[memorySnapshots.length - 1]; - const memoryGrowth = lastSnapshot - firstSnapshot; - const avgGrowthPerIteration = memoryGrowth / (iterations - 1); - - console.log(`\nMemory Leak Detection Results:`); - console.log(`First snapshot: ${firstSnapshot.toFixed(2)}MB`); - console.log(`Last snapshot: ${lastSnapshot.toFixed(2)}MB`); - console.log(`Total growth: ${memoryGrowth.toFixed(2)}MB`); - console.log(`Average growth per iteration: ${avgGrowthPerIteration.toFixed(2)}MB`); - - // Test passes if average growth per iteration is less than 2MB - expect(avgGrowthPerIteration).toBeLessThan(2); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-05.connection-processing-time.ts b/test/suite/smtpserver_performance/test.perf-05.connection-processing-time.ts deleted file mode 100644 index 2dfd4ad..0000000 --- a/test/suite/smtpserver_performance/test.perf-05.connection-processing-time.ts +++ /dev/null @@ -1,363 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-05: Connection processing time - Connection establishment', async (tools) => { - const done = tools.defer(); - const testConnections = 10; - const connectionTimes: number[] = []; - - try { - console.log(`Testing connection establishment time for ${testConnections} connections...`); - - for (let i = 0; i < testConnections; i++) { - const connectionStart = Date.now(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => { - const connectionTime = Date.now() - connectionStart; - connectionTimes.push(connectionTime); - resolve(); - }); - socket.once('error', reject); - }); - - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Clean close - socket.write('QUIT\r\n'); - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - socket.end(); - - // Small delay between connections - await new Promise(resolve => setTimeout(resolve, 50)); - } - - // Calculate statistics - const avgConnectionTime = connectionTimes.reduce((a, b) => a + b, 0) / connectionTimes.length; - const minConnectionTime = Math.min(...connectionTimes); - const maxConnectionTime = Math.max(...connectionTimes); - - console.log(`\nConnection Establishment Results:`); - console.log(`Average: ${avgConnectionTime.toFixed(0)}ms`); - console.log(`Min: ${minConnectionTime}ms`); - console.log(`Max: ${maxConnectionTime}ms`); - console.log(`All times: ${connectionTimes.join(', ')}ms`); - - // Test passes if average connection time is less than 1000ms - expect(avgConnectionTime).toBeLessThan(1000); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('PERF-05: Connection processing time - Transaction processing', async (tools) => { - const done = tools.defer(); - const testTransactions = 10; - const processingTimes: number[] = []; - const fullTransactionTimes: number[] = []; - - // Add a timeout to prevent test from hanging - const testTimeout = setTimeout(() => { - console.log('Test timeout reached, moving on...'); - done.resolve(); - }, 30000); // 30 second timeout - - try { - console.log(`\nTesting transaction processing time for ${testTransactions} transactions...`); - - for (let i = 0; i < testTransactions; i++) { - const fullTransactionStart = Date.now(); - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - const processingStart = Date.now(); - - // Send EHLO - socket.write(`EHLO testhost-perf-${i}\r\n`); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - // Look for the end of EHLO response (250 without dash) - if (data.includes('250 ')) { - socket.removeListener('data', handleData); - resolve(); - } - }; - socket.on('data', handleData); - }); - - // Send MAIL FROM - socket.write(`MAIL FROM:\r\n`); - - await new Promise((resolve, reject) => { - let mailResponse = ''; - const handleMailResponse = (chunk: Buffer) => { - mailResponse += chunk.toString(); - if (mailResponse.includes('\r\n')) { - socket.removeListener('data', handleMailResponse); - if (mailResponse.includes('250')) { - resolve(); - } else { - reject(new Error(`MAIL FROM failed: ${mailResponse}`)); - } - } - }; - socket.on('data', handleMailResponse); - }); - - // Send RCPT TO - socket.write(`RCPT TO:\r\n`); - - await new Promise((resolve, reject) => { - let rcptResponse = ''; - const handleRcptResponse = (chunk: Buffer) => { - rcptResponse += chunk.toString(); - if (rcptResponse.includes('\r\n')) { - socket.removeListener('data', handleRcptResponse); - if (rcptResponse.includes('250')) { - resolve(); - } else { - reject(new Error(`RCPT TO failed: ${rcptResponse}`)); - } - } - }; - socket.on('data', handleRcptResponse); - }); - - // Send DATA - socket.write('DATA\r\n'); - - await new Promise((resolve, reject) => { - let dataResponse = ''; - const handleDataResponse = (chunk: Buffer) => { - dataResponse += chunk.toString(); - if (dataResponse.includes('\r\n')) { - socket.removeListener('data', handleDataResponse); - if (dataResponse.includes('354')) { - resolve(); - } else { - reject(new Error(`DATA failed: ${dataResponse}`)); - } - } - }; - socket.on('data', handleDataResponse); - }); - - // Send email content - const emailContent = [ - `From: sender${i}@example.com`, - `To: recipient${i}@example.com`, - `Subject: Connection Processing Test ${i}`, - '', - 'Connection processing time test.', - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - - await new Promise((resolve, reject) => { - let submitResponse = ''; - const handleSubmitResponse = (chunk: Buffer) => { - submitResponse += chunk.toString(); - if (submitResponse.includes('\r\n') && submitResponse.includes('250')) { - socket.removeListener('data', handleSubmitResponse); - resolve(); - } else if (submitResponse.includes('\r\n') && (submitResponse.includes('4') || submitResponse.includes('5'))) { - socket.removeListener('data', handleSubmitResponse); - reject(new Error(`Message submission failed: ${submitResponse}`)); - } - }; - socket.on('data', handleSubmitResponse); - }); - - const processingTime = Date.now() - processingStart; - processingTimes.push(processingTime); - - // Send QUIT - socket.write('QUIT\r\n'); - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - socket.end(); - - const fullTransactionTime = Date.now() - fullTransactionStart; - fullTransactionTimes.push(fullTransactionTime); - - // Small delay between transactions - await new Promise(resolve => setTimeout(resolve, 50)); - } - - // Calculate statistics - const avgProcessingTime = processingTimes.reduce((a, b) => a + b, 0) / processingTimes.length; - const minProcessingTime = Math.min(...processingTimes); - const maxProcessingTime = Math.max(...processingTimes); - - const avgFullTime = fullTransactionTimes.reduce((a, b) => a + b, 0) / fullTransactionTimes.length; - - console.log(`\nTransaction Processing Results:`); - console.log(`Average processing: ${avgProcessingTime.toFixed(0)}ms`); - console.log(`Min processing: ${minProcessingTime}ms`); - console.log(`Max processing: ${maxProcessingTime}ms`); - console.log(`Average full transaction: ${avgFullTime.toFixed(0)}ms`); - - // Test passes if average processing time is less than 2000ms - expect(avgProcessingTime).toBeLessThan(2000); - clearTimeout(testTimeout); - done.resolve(); - } catch (error) { - clearTimeout(testTimeout); - done.reject(error); - } -}); - -tap.test('PERF-05: Connection processing time - Command response times', async (tools) => { - const done = tools.defer(); - const commandTimings: { [key: string]: number[] } = { - EHLO: [], - NOOP: [] - }; - - // Add a timeout to prevent test from hanging - const testTimeout = setTimeout(() => { - console.log('Command timing test timeout reached, moving on...'); - done.resolve(); - }, 20000); // 20 second timeout - - try { - console.log(`\nMeasuring individual command response times...`); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await new Promise((resolve) => { - let greeting = ''; - const handleGreeting = (chunk: Buffer) => { - greeting += chunk.toString(); - if (greeting.includes('220') && greeting.includes('\r\n')) { - socket.removeListener('data', handleGreeting); - resolve(); - } - }; - socket.on('data', handleGreeting); - }); - - // Measure EHLO response times - for (let i = 0; i < 3; i++) { - const start = Date.now(); - socket.write('EHLO testhost\r\n'); - - await new Promise((resolve) => { - let data = ''; - const handleData = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('250 ')) { - socket.removeListener('data', handleData); - commandTimings.EHLO.push(Date.now() - start); - resolve(); - } - }; - socket.on('data', handleData); - }); - } - - // Measure NOOP response times - for (let i = 0; i < 3; i++) { - const start = Date.now(); - socket.write('NOOP\r\n'); - - await new Promise((resolve) => { - let noopResponse = ''; - const handleNoop = (chunk: Buffer) => { - noopResponse += chunk.toString(); - if (noopResponse.includes('\r\n')) { - socket.removeListener('data', handleNoop); - commandTimings.NOOP.push(Date.now() - start); - resolve(); - } - }; - socket.on('data', handleNoop); - }); - } - - // Close connection - socket.write('QUIT\r\n'); - await new Promise((resolve) => { - socket.once('data', () => { - socket.end(); - resolve(); - }); - }); - - // Calculate and display results - console.log(`\nCommand Response Times (ms):`); - for (const [command, times] of Object.entries(commandTimings)) { - if (times.length > 0) { - const avg = times.reduce((a, b) => a + b, 0) / times.length; - console.log(`${command}: avg=${avg.toFixed(0)}, samples=[${times.join(', ')}]`); - - // All commands should respond in less than 500ms on average - expect(avg).toBeLessThan(500); - } - } - - clearTimeout(testTimeout); - done.resolve(); - } catch (error) { - clearTimeout(testTimeout); - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-06.message-processing-time.ts b/test/suite/smtpserver_performance/test.perf-06.message-processing-time.ts deleted file mode 100644 index b9442b3..0000000 --- a/test/suite/smtpserver_performance/test.perf-06.message-processing-time.ts +++ /dev/null @@ -1,252 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-06: Message processing time - Various message sizes', async (tools) => { - const done = tools.defer(); - const messageSizes = [1000, 5000, 10000, 25000, 50000]; // bytes - const messageProcessingTimes: number[] = []; - const processingRates: number[] = []; - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await waitForResponse(socket, '250'); - - console.log('Testing message processing times for various sizes...\n'); - - for (let i = 0; i < messageSizes.length; i++) { - const messageSize = messageSizes[i]; - const messageContent = 'A'.repeat(messageSize); - - const messageStart = Date.now(); - - // Send MAIL FROM - socket.write(`MAIL FROM:\r\n`); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write(`RCPT TO:\r\n`); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send email content - const emailContent = [ - `From: sender${i}@example.com`, - `To: recipient${i}@example.com`, - `Subject: Message Processing Test ${i} (${messageSize} bytes)`, - '', - messageContent, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - await waitForResponse(socket, '250'); - - const messageProcessingTime = Date.now() - messageStart; - messageProcessingTimes.push(messageProcessingTime); - - const processingRateKBps = (messageSize / 1024) / (messageProcessingTime / 1000); - processingRates.push(processingRateKBps); - - console.log(`${messageSize} bytes: ${messageProcessingTime}ms (${processingRateKBps.toFixed(1)} KB/s)`); - - // Send RSET - socket.write('RSET\r\n'); - - await new Promise((resolve) => { - socket.once('data', (chunk) => { - const response = chunk.toString(); - expect(response).toInclude('250'); - resolve(); - }); - }); - - // Small delay between tests - await new Promise(resolve => setTimeout(resolve, 100)); - } - - // Calculate statistics - const avgProcessingTime = messageProcessingTimes.reduce((a, b) => a + b, 0) / messageProcessingTimes.length; - const avgProcessingRate = processingRates.reduce((a, b) => a + b, 0) / processingRates.length; - const minProcessingTime = Math.min(...messageProcessingTimes); - const maxProcessingTime = Math.max(...messageProcessingTimes); - - console.log(`\nMessage Processing Results:`); - console.log(`Average processing time: ${avgProcessingTime.toFixed(0)}ms`); - console.log(`Min/Max processing time: ${minProcessingTime}ms / ${maxProcessingTime}ms`); - console.log(`Average processing rate: ${avgProcessingRate.toFixed(1)} KB/s`); - - socket.write('QUIT\r\n'); - socket.end(); - - // Test passes if average processing time is less than 3000ms and rate > 10KB/s - expect(avgProcessingTime).toBeLessThan(3000); - expect(avgProcessingRate).toBeGreaterThan(10); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('PERF-06: Message processing time - Large message handling', async (tools) => { - const done = tools.defer(); - const largeSizes = [100000, 250000, 500000]; // 100KB, 250KB, 500KB - const results: Array<{ size: number; time: number; rate: number }> = []; - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 60000 // Longer timeout for large messages - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testhost-large\r\n'); - await waitForResponse(socket, '250'); - - console.log('\nTesting large message processing...\n'); - - for (let i = 0; i < largeSizes.length; i++) { - const messageSize = largeSizes[i]; - - const messageStart = Date.now(); - - // Send MAIL FROM - socket.write(`MAIL FROM:\r\n`); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write(`RCPT TO:\r\n`); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send large email content in chunks to avoid buffer issues - socket.write(`From: largesender${i}@example.com\r\n`); - socket.write(`To: largerecipient${i}@example.com\r\n`); - socket.write(`Subject: Large Message Test ${i} (${messageSize} bytes)\r\n\r\n`); - - // Send content in 10KB chunks - const chunkSize = 10000; - let remaining = messageSize; - while (remaining > 0) { - const currentChunk = Math.min(remaining, chunkSize); - socket.write('B'.repeat(currentChunk)); - remaining -= currentChunk; - - // Small delay to avoid overwhelming buffers - if (remaining > 0) { - await new Promise(resolve => setTimeout(resolve, 10)); - } - } - - socket.write('\r\n.\r\n'); - - const response = await waitForResponse(socket, '250', 30000); - expect(response).toInclude('250'); - - const messageProcessingTime = Date.now() - messageStart; - const processingRateMBps = (messageSize / (1024 * 1024)) / (messageProcessingTime / 1000); - - results.push({ - size: messageSize, - time: messageProcessingTime, - rate: processingRateMBps - }); - - console.log(`${(messageSize/1024).toFixed(0)}KB: ${messageProcessingTime}ms (${processingRateMBps.toFixed(2)} MB/s)`); - - // Send RSET - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - - // Delay between large tests - await new Promise(resolve => setTimeout(resolve, 500)); - } - - const avgRate = results.reduce((sum, r) => sum + r.rate, 0) / results.length; - console.log(`\nAverage large message rate: ${avgRate.toFixed(2)} MB/s`); - - socket.write('QUIT\r\n'); - socket.end(); - - // Test passes if we can process at least 0.5 MB/s - expect(avgRate).toBeGreaterThan(0.5); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_performance/test.perf-07.resource-cleanup.ts b/test/suite/smtpserver_performance/test.perf-07.resource-cleanup.ts deleted file mode 100644 index 1b82a07..0000000 --- a/test/suite/smtpserver_performance/test.perf-07.resource-cleanup.ts +++ /dev/null @@ -1,317 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('PERF-07: Resource cleanup - Connection cleanup efficiency', async (tools) => { - const done = tools.defer(); - const testConnections = 20; // Reduced from 50 - const connections: net.Socket[] = []; - const cleanupTimes: number[] = []; - - try { - // Force GC if available - if (global.gc) { - global.gc(); - } - - const initialMemory = process.memoryUsage(); - console.log(`Initial memory: ${Math.round(initialMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Creating ${testConnections} connections for resource cleanup test...`); - - // Create many connections and process emails - for (let i = 0; i < testConnections; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - connections.push(socket); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write(`EHLO testhost-cleanup-${i}\r\n`); - - await waitForResponse(socket, '250'); - - // Complete email transaction - socket.write(`MAIL FROM:\r\n`); - await waitForResponse(socket, '250'); - - socket.write(`RCPT TO:\r\n`); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - const emailContent = [ - `From: sender${i}@example.com`, - `To: recipient${i}@example.com`, - `Subject: Resource Cleanup Test ${i}`, - '', - 'Testing resource cleanup.', - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - await waitForResponse(socket, '250'); - - // Pause every 10 connections - if (i > 0 && i % 10 === 0) { - await new Promise(resolve => setTimeout(resolve, 50)); - } - } - - const midTestMemory = process.memoryUsage(); - console.log(`Memory after creating connections: ${Math.round(midTestMemory.heapUsed / (1024 * 1024))}MB`); - - // Clean up all connections and measure cleanup time - console.log('\nCleaning up connections...'); - - for (let i = 0; i < connections.length; i++) { - const socket = connections[i]; - const cleanupStart = Date.now(); - - try { - if (socket.writable) { - socket.write('QUIT\r\n'); - try { - await waitForResponse(socket, '221', 1000); - } catch (e) { - // Ignore timeout on QUIT - } - } - - socket.end(); - await new Promise((resolve) => { - socket.once('close', () => resolve()); - setTimeout(() => resolve(), 100); // Fallback timeout - }); - - cleanupTimes.push(Date.now() - cleanupStart); - } catch (error) { - cleanupTimes.push(Date.now() - cleanupStart); - } - } - - // Wait for cleanup to complete - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Force GC if available - if (global.gc) { - global.gc(); - await new Promise(resolve => setTimeout(resolve, 1000)); - } - - const finalMemory = process.memoryUsage(); - const memoryIncreaseMB = (finalMemory.heapUsed - initialMemory.heapUsed) / (1024 * 1024); - const avgCleanupTime = cleanupTimes.reduce((a, b) => a + b, 0) / cleanupTimes.length; - const maxCleanupTime = Math.max(...cleanupTimes); - - console.log(`\nResource Cleanup Results:`); - console.log(`Initial memory: ${Math.round(initialMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Mid-test memory: ${Math.round(midTestMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Final memory: ${Math.round(finalMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Memory increase: ${memoryIncreaseMB.toFixed(2)}MB`); - console.log(`Average cleanup time: ${avgCleanupTime.toFixed(0)}ms`); - console.log(`Max cleanup time: ${maxCleanupTime}ms`); - - // Test passes if memory increase is less than 10MB and cleanup is fast - expect(memoryIncreaseMB).toBeLessThan(10); - expect(avgCleanupTime).toBeLessThan(100); - done.resolve(); - } catch (error) { - // Emergency cleanup - connections.forEach(socket => socket.destroy()); - done.reject(error); - } -}); - -tap.test('PERF-07: Resource cleanup - File descriptor management', async (tools) => { - const done = tools.defer(); - const rapidConnections = 20; - let successfulCleanups = 0; - - try { - console.log(`\nTesting rapid connection open/close cycles...`); - - for (let i = 0; i < rapidConnections; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 10000 - }); - - try { - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Quick EHLO/QUIT - socket.write('EHLO rapidtest\r\n'); - await waitForResponse(socket, '250'); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - - await new Promise((resolve) => { - socket.once('close', () => { - successfulCleanups++; - resolve(); - }); - }); - - } catch (error) { - socket.destroy(); - console.log(`Connection ${i} failed:`, error); - } - - // Very short delay - await new Promise(resolve => setTimeout(resolve, 20)); - } - - console.log(`Successful cleanups: ${successfulCleanups}/${rapidConnections}`); - - // Test passes if at least 90% of connections cleaned up successfully - const cleanupRate = successfulCleanups / rapidConnections; - expect(cleanupRate).toBeGreaterThanOrEqual(0.9); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('PERF-07: Resource cleanup - Memory recovery after load', async (tools) => { - const done = tools.defer(); - - try { - // Force GC if available - if (global.gc) { - global.gc(); - } - - const baselineMemory = process.memoryUsage(); - console.log(`\nBaseline memory: ${Math.round(baselineMemory.heapUsed / (1024 * 1024))}MB`); - - // Create load - const loadConnections = 10; - const sockets: net.Socket[] = []; - - console.log('Creating load...'); - for (let i = 0; i < loadConnections; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - sockets.push(socket); - - // Just connect, don't send anything - await waitForResponse(socket, '220'); - } - - const loadMemory = process.memoryUsage(); - console.log(`Memory under load: ${Math.round(loadMemory.heapUsed / (1024 * 1024))}MB`); - - // Clean up all at once - console.log('Cleaning up all connections...'); - sockets.forEach(socket => { - socket.destroy(); - }); - - // Wait for cleanup - await new Promise(resolve => setTimeout(resolve, 3000)); - - // Force GC multiple times - if (global.gc) { - for (let i = 0; i < 3; i++) { - global.gc(); - await new Promise(resolve => setTimeout(resolve, 500)); - } - } - - const recoveredMemory = process.memoryUsage(); - const memoryIncrease = loadMemory.heapUsed - baselineMemory.heapUsed; - const memoryRecovered = loadMemory.heapUsed - recoveredMemory.heapUsed; - const recoveryPercent = memoryIncrease > 0 ? (memoryRecovered / memoryIncrease) * 100 : 100; - - console.log(`Memory after cleanup: ${Math.round(recoveredMemory.heapUsed / (1024 * 1024))}MB`); - console.log(`Memory recovered: ${Math.round(memoryRecovered / (1024 * 1024))}MB`); - console.log(`Recovery percentage: ${recoveryPercent.toFixed(1)}%`); - - // Test passes if memory is stable (no significant increase) or we recover at least 50% - if (memoryIncrease < 1024 * 1024) { // Less than 1MB increase - console.log('Memory usage was stable during test - good resource management!'); - expect(true).toEqual(true); - } else { - expect(recoveryPercent).toBeGreaterThan(50); - } - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-01.long-running-operation.ts b/test/suite/smtpserver_reliability/test.rel-01.long-running-operation.ts deleted file mode 100644 index 4948b1d..0000000 --- a/test/suite/smtpserver_reliability/test.rel-01.long-running-operation.ts +++ /dev/null @@ -1,344 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-01: Long-running operation - Continuous email sending', async (tools) => { - const done = tools.defer(); - const testDuration = 30000; // 30 seconds - const operationInterval = 2000; // 2 seconds between operations - const startTime = Date.now(); - const endTime = startTime + testDuration; - - let operations = 0; - let successful = 0; - let errors = 0; - let connectionIssues = 0; - const operationResults: Array<{ - operation: number; - success: boolean; - duration: number; - error?: string; - timestamp: number; - }> = []; - - console.log(`Running long-duration test for ${testDuration/1000} seconds...`); - - const performOperation = async (operationId: number): Promise => { - const operationStart = Date.now(); - operations++; - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 10000 - }); - - const result = await new Promise<{ success: boolean; error?: string; connectionIssue?: boolean }>((resolve) => { - let step = 'connecting'; - let receivedData = ''; - - const timeout = setTimeout(() => { - socket.destroy(); - resolve({ - success: false, - error: `Timeout in step ${step}`, - connectionIssue: true - }); - }, 10000); - - socket.on('connect', () => { - step = 'connected'; - }); - - socket.on('data', (chunk) => { - receivedData += chunk.toString(); - const lines = receivedData.split('\r\n'); - - for (const line of lines) { - if (!line.trim()) continue; - - // Check for errors - if (line.match(/^[45]\d\d\s/)) { - clearTimeout(timeout); - socket.destroy(); - resolve({ - success: false, - error: `SMTP error in ${step}: ${line}`, - connectionIssue: false - }); - return; - } - - // Process responses - if (step === 'connected' && line.startsWith('220')) { - step = 'ehlo'; - socket.write(`EHLO longrun-${operationId}\r\n`); - } else if (step === 'ehlo' && line.includes('250 ') && !line.includes('250-')) { - step = 'mail_from'; - socket.write(`MAIL FROM:\r\n`); - } else if (step === 'mail_from' && line.startsWith('250')) { - step = 'rcpt_to'; - socket.write(`RCPT TO:\r\n`); - } else if (step === 'rcpt_to' && line.startsWith('250')) { - step = 'data'; - socket.write('DATA\r\n'); - } else if (step === 'data' && line.startsWith('354')) { - step = 'email_content'; - const emailContent = [ - `From: sender${operationId}@example.com`, - `To: recipient${operationId}@example.com`, - `Subject: Long Running Test Operation ${operationId}`, - `Date: ${new Date().toUTCString()}`, - '', - `This is test operation ${operationId} for long-running reliability testing.`, - `Timestamp: ${Date.now()}`, - '.', - '' - ].join('\r\n'); - socket.write(emailContent); - } else if (step === 'email_content' && line.startsWith('250')) { - step = 'quit'; - socket.write('QUIT\r\n'); - } else if (step === 'quit' && line.startsWith('221')) { - clearTimeout(timeout); - socket.end(); - resolve({ - success: true - }); - return; - } - } - }); - - socket.on('error', (error) => { - clearTimeout(timeout); - resolve({ - success: false, - error: error.message, - connectionIssue: true - }); - }); - - socket.on('close', () => { - if (step !== 'quit') { - clearTimeout(timeout); - resolve({ - success: false, - error: 'Connection closed unexpectedly', - connectionIssue: true - }); - } - }); - }); - - const duration = Date.now() - operationStart; - - if (result.success) { - successful++; - } else { - errors++; - if (result.connectionIssue) { - connectionIssues++; - } - } - - operationResults.push({ - operation: operationId, - success: result.success, - duration, - error: result.error, - timestamp: operationStart - }); - - } catch (error) { - errors++; - operationResults.push({ - operation: operationId, - success: false, - duration: Date.now() - operationStart, - error: error instanceof Error ? error.message : 'Unknown error', - timestamp: operationStart - }); - } - }; - - try { - // Run operations continuously until end time - while (Date.now() < endTime) { - const operationStart = Date.now(); - - await performOperation(operations + 1); - - // Calculate wait time for next operation - const nextOperation = operationStart + operationInterval; - const waitTime = nextOperation - Date.now(); - - if (waitTime > 0 && Date.now() < endTime) { - await new Promise(resolve => setTimeout(resolve, waitTime)); - } - - // Progress update every 5 operations - if (operations % 5 === 0) { - console.log(`Progress: ${operations} operations, ${successful} successful, ${errors} errors`); - } - } - - // Calculate results - const totalDuration = Date.now() - startTime; - const successRate = successful / operations; - const connectionIssueRate = connectionIssues / operations; - const avgOperationTime = operationResults.reduce((sum, r) => sum + r.duration, 0) / operations; - - console.log(`\nLong-Running Operation Results:`); - console.log(`Total duration: ${(totalDuration/1000).toFixed(1)}s`); - console.log(`Total operations: ${operations}`); - console.log(`Successful: ${successful} (${(successRate * 100).toFixed(1)}%)`); - console.log(`Errors: ${errors}`); - console.log(`Connection issues: ${connectionIssues} (${(connectionIssueRate * 100).toFixed(1)}%)`); - console.log(`Average operation time: ${avgOperationTime.toFixed(0)}ms`); - - // Show last few operations for debugging - console.log('\nLast 5 operations:'); - operationResults.slice(-5).forEach(op => { - console.log(` Op ${op.operation}: ${op.success ? 'success' : 'failed'} (${op.duration}ms)${op.error ? ' - ' + op.error : ''}`); - }); - - // Test passes with 85% success rate and max 10% connection issues - expect(successRate).toBeGreaterThanOrEqual(0.85); - expect(connectionIssueRate).toBeLessThanOrEqual(0.1); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-01: Long-running operation - Server stability check', async (tools) => { - const done = tools.defer(); - const checkDuration = 15000; // 15 seconds - const checkInterval = 3000; // 3 seconds between checks - const startTime = Date.now(); - const endTime = startTime + checkDuration; - - const stabilityChecks: Array<{ - timestamp: number; - responseTime: number; - success: boolean; - error?: string; - }> = []; - - console.log(`\nRunning server stability checks for ${checkDuration/1000} seconds...`); - - try { - while (Date.now() < endTime) { - const checkStart = Date.now(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - const checkResult = await new Promise<{ success: boolean; responseTime: number; error?: string }>((resolve) => { - const connectTime = Date.now(); - let greetingReceived = false; - - const timeout = setTimeout(() => { - socket.destroy(); - resolve({ - success: false, - responseTime: Date.now() - connectTime, - error: 'Timeout waiting for greeting' - }); - }, 5000); - - socket.on('connect', () => { - // Connected - }); - - socket.once('data', (chunk) => { - const response = chunk.toString(); - clearTimeout(timeout); - greetingReceived = true; - - if (response.startsWith('220')) { - socket.write('QUIT\r\n'); - socket.end(); - resolve({ - success: true, - responseTime: Date.now() - connectTime - }); - } else { - socket.end(); - resolve({ - success: false, - responseTime: Date.now() - connectTime, - error: `Unexpected greeting: ${response.substring(0, 50)}` - }); - } - }); - - socket.on('error', (error) => { - clearTimeout(timeout); - resolve({ - success: false, - responseTime: Date.now() - connectTime, - error: error.message - }); - }); - }); - - stabilityChecks.push({ - timestamp: checkStart, - responseTime: checkResult.responseTime, - success: checkResult.success, - error: checkResult.error - }); - - console.log(`Stability check ${stabilityChecks.length}: ${checkResult.success ? 'OK' : 'FAILED'} (${checkResult.responseTime}ms)`); - - // Wait for next check - const nextCheck = checkStart + checkInterval; - const waitTime = nextCheck - Date.now(); - if (waitTime > 0 && Date.now() < endTime) { - await new Promise(resolve => setTimeout(resolve, waitTime)); - } - } - - // Analyze stability - const successfulChecks = stabilityChecks.filter(c => c.success).length; - const avgResponseTime = stabilityChecks - .filter(c => c.success) - .reduce((sum, c) => sum + c.responseTime, 0) / successfulChecks || 0; - const maxResponseTime = Math.max(...stabilityChecks.filter(c => c.success).map(c => c.responseTime)); - - console.log(`\nStability Check Results:`); - console.log(`Total checks: ${stabilityChecks.length}`); - console.log(`Successful: ${successfulChecks} (${(successfulChecks/stabilityChecks.length * 100).toFixed(1)}%)`); - console.log(`Average response time: ${avgResponseTime.toFixed(0)}ms`); - console.log(`Max response time: ${maxResponseTime}ms`); - - // All checks should succeed for stable server - expect(successfulChecks).toEqual(stabilityChecks.length); - expect(avgResponseTime).toBeLessThan(1000); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-02.restart-recovery.ts b/test/suite/smtpserver_reliability/test.rel-02.restart-recovery.ts deleted file mode 100644 index 6cb78eb..0000000 --- a/test/suite/smtpserver_reliability/test.rel-02.restart-recovery.ts +++ /dev/null @@ -1,328 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-02: Restart recovery - Server state after restart', async (tools) => { - const done = tools.defer(); - - try { - console.log('Testing server state and recovery capabilities...'); - - // First, establish that server is working normally - const socket1 = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket1.once('connect', resolve); - socket1.once('error', reject); - }); - - // Read greeting - const greeting1 = await waitForResponse(socket1, '220'); - expect(greeting1).toInclude('220'); - console.log('Initial connection successful'); - - // Send EHLO - socket1.write('EHLO testhost\r\n'); - await waitForResponse(socket1, '250'); - - // Complete a transaction - socket1.write('MAIL FROM:\r\n'); - const mailResp1 = await waitForResponse(socket1, '250'); - expect(mailResp1).toInclude('250'); - - socket1.write('RCPT TO:\r\n'); - const rcptResp1 = await waitForResponse(socket1, '250'); - expect(rcptResp1).toInclude('250'); - - socket1.write('DATA\r\n'); - const dataResp1 = await waitForResponse(socket1, '354'); - expect(dataResp1).toInclude('354'); - - const emailContent = [ - 'From: sender@example.com', - 'To: recipient@example.com', - 'Subject: Pre-restart test', - '', - 'Testing server state before restart.', - '.', - '' - ].join('\r\n'); - - socket1.write(emailContent); - const sendResp1 = await waitForResponse(socket1, '250'); - expect(sendResp1).toInclude('250'); - - socket1.write('QUIT\r\n'); - await waitForResponse(socket1, '221'); - socket1.end(); - - console.log('Pre-restart transaction completed successfully'); - - // Simulate server restart by closing and reopening connections - console.log('\nSimulating server restart scenario...'); - - // Wait a moment to simulate restart time - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Test recovery after simulated restart - const socket2 = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket2.once('connect', resolve); - socket2.once('error', reject); - }); - - // Read greeting after "restart" - const greeting2 = await new Promise((resolve) => { - socket2.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - expect(greeting2).toInclude('220'); - console.log('Post-restart connection successful'); - - // Verify server is fully functional after restart - socket2.write('EHLO testhost-postrestart\r\n'); - await waitForResponse(socket2, '250'); - - // Complete another transaction to verify full recovery - socket2.write('MAIL FROM:\r\n'); - const mailResp2 = await waitForResponse(socket2, '250'); - expect(mailResp2).toInclude('250'); - - socket2.write('RCPT TO:\r\n'); - const rcptResp2 = await waitForResponse(socket2, '250'); - expect(rcptResp2).toInclude('250'); - - socket2.write('DATA\r\n'); - const dataResp2 = await waitForResponse(socket2, '354'); - expect(dataResp2).toInclude('354'); - - const postRestartEmail = [ - 'From: sender2@example.com', - 'To: recipient2@example.com', - 'Subject: Post-restart recovery test', - '', - 'Testing server recovery after restart.', - '.', - '' - ].join('\r\n'); - - socket2.write(postRestartEmail); - const sendResp2 = await waitForResponse(socket2, '250'); - expect(sendResp2).toInclude('250'); - - socket2.write('QUIT\r\n'); - await waitForResponse(socket2, '221'); - socket2.end(); - - console.log('Post-restart transaction completed successfully'); - console.log('Server recovered successfully from restart'); - - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-02: Restart recovery - Multiple rapid reconnections', async (tools) => { - const done = tools.defer(); - const rapidConnections = 10; - let successfulReconnects = 0; - - try { - console.log(`\nTesting rapid reconnection after disruption (${rapidConnections} attempts)...`); - - for (let i = 0; i < rapidConnections; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - socket.destroy(); - reject(new Error('Connection timeout')); - }, 5000); - - socket.once('connect', () => { - clearTimeout(timeout); - resolve(); - }); - socket.once('error', (err) => { - clearTimeout(timeout); - reject(err); - }); - }); - - // Read greeting - try { - const greeting = await waitForResponse(socket, '220', 3000); - if (greeting.includes('220')) { - successfulReconnects++; - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221', 1000).catch(() => {}); - socket.end(); - } else { - socket.destroy(); - } - } catch (error) { - socket.destroy(); - throw error; - } - - // Very short delay between attempts - await new Promise(resolve => setTimeout(resolve, 100)); - - } catch (error) { - console.log(`Reconnection ${i + 1} failed:`, error.message); - } - } - - const reconnectRate = successfulReconnects / rapidConnections; - console.log(`Successful reconnections: ${successfulReconnects}/${rapidConnections} (${(reconnectRate * 100).toFixed(1)}%)`); - - // Expect high success rate for good recovery - expect(reconnectRate).toBeGreaterThanOrEqual(0.8); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-02: Restart recovery - State persistence check', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting server state persistence across connections...'); - - // Create initial connection and start transaction - const socket1 = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket1.once('connect', resolve); - socket1.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket1, '220'); - - // Send EHLO - socket1.write('EHLO persistence-test\r\n'); - await waitForResponse(socket1, '250'); - - // Start transaction but don't complete it - socket1.write('MAIL FROM:\r\n'); - const mailResp = await waitForResponse(socket1, '250'); - expect(mailResp).toInclude('250'); - - // Abruptly close connection - socket1.destroy(); - console.log('Abruptly closed connection with incomplete transaction'); - - // Wait briefly - await new Promise(resolve => setTimeout(resolve, 1000)); - - // Create new connection and verify server recovered - const socket2 = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket2.once('connect', resolve); - socket2.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket2, '220'); - - // Send EHLO - socket2.write('EHLO recovery-test\r\n'); - await waitForResponse(socket2, '250'); - - // Try new transaction - should work without issues from previous incomplete one - socket2.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket2, '250'); - expect(mailResponse).toInclude('250'); - console.log('Server recovered successfully - new transaction started without issues'); - - socket2.write('QUIT\r\n'); - await waitForResponse(socket2, '221'); - socket2.end(); - - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-03.resource-leak-detection.ts b/test/suite/smtpserver_reliability/test.rel-03.resource-leak-detection.ts deleted file mode 100644 index 8d49ae5..0000000 --- a/test/suite/smtpserver_reliability/test.rel-03.resource-leak-detection.ts +++ /dev/null @@ -1,394 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -interface ResourceMetrics { - timestamp: number; - memoryUsage: { - rss: number; - heapTotal: number; - heapUsed: number; - external: number; - }; - processInfo: { - pid: number; - uptime: number; - cpuUsage: NodeJS.CpuUsage; - }; -} - -interface LeakAnalysis { - memoryGrowthMB: number; - memoryTrend: number; - stabilityScore: number; - memoryLeakDetected: boolean; - resourcesStable: boolean; - samplesAnalyzed: number; - initialMemoryMB: number; - finalMemoryMB: number; -} - -const captureResourceMetrics = async (): Promise => { - // Force GC if available before measurement - if (global.gc) { - global.gc(); - await new Promise(resolve => setTimeout(resolve, 100)); - } - - const memUsage = process.memoryUsage(); - - return { - timestamp: Date.now(), - memoryUsage: { - rss: Math.round(memUsage.rss / 1024 / 1024 * 100) / 100, - heapTotal: Math.round(memUsage.heapTotal / 1024 / 1024 * 100) / 100, - heapUsed: Math.round(memUsage.heapUsed / 1024 / 1024 * 100) / 100, - external: Math.round(memUsage.external / 1024 / 1024 * 100) / 100 - }, - processInfo: { - pid: process.pid, - uptime: process.uptime(), - cpuUsage: process.cpuUsage() - } - }; -}; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -const analyzeResourceLeaks = (initial: ResourceMetrics, samples: Array<{ operation: number; metrics: ResourceMetrics }>, final: ResourceMetrics): LeakAnalysis => { - const memoryGrowthMB = final.memoryUsage.heapUsed - initial.memoryUsage.heapUsed; - - // Analyze memory trend over samples - let memoryTrend = 0; - if (samples.length > 1) { - const firstSample = samples[0].metrics.memoryUsage.heapUsed; - const lastSample = samples[samples.length - 1].metrics.memoryUsage.heapUsed; - memoryTrend = lastSample - firstSample; - } - - // Calculate stability score based on memory variance - let stabilityScore = 1.0; - if (samples.length > 2) { - const memoryValues = samples.map(s => s.metrics.memoryUsage.heapUsed); - const average = memoryValues.reduce((a, b) => a + b, 0) / memoryValues.length; - const variance = memoryValues.reduce((acc, val) => acc + Math.pow(val - average, 2), 0) / memoryValues.length; - const stdDev = Math.sqrt(variance); - stabilityScore = Math.max(0, 1 - (stdDev / average)); - } - - return { - memoryGrowthMB: Math.round(memoryGrowthMB * 100) / 100, - memoryTrend: Math.round(memoryTrend * 100) / 100, - stabilityScore: Math.round(stabilityScore * 100) / 100, - memoryLeakDetected: memoryGrowthMB > 50, - resourcesStable: stabilityScore > 0.8 && memoryGrowthMB < 25, - samplesAnalyzed: samples.length, - initialMemoryMB: initial.memoryUsage.heapUsed, - finalMemoryMB: final.memoryUsage.heapUsed - }; -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-03: Resource leak detection - Memory leak analysis', async (tools) => { - const done = tools.defer(); - const operationCount = 20; - const connections: net.Socket[] = []; - const samples: Array<{ operation: number; metrics: ResourceMetrics }> = []; - - try { - const initialMetrics = await captureResourceMetrics(); - console.log(`📊 Initial memory: ${initialMetrics.memoryUsage.heapUsed}MB`); - - for (let i = 0; i < operationCount; i++) { - console.log(`🔄 Operation ${i + 1}/${operationCount}...`); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - connections.push(socket); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write(`EHLO leaktest-${i}\r\n`); - await waitForResponse(socket, '250'); - - // Complete email transaction - socket.write(`MAIL FROM:\r\n`); - const mailResp = await waitForResponse(socket, '250'); - expect(mailResp).toInclude('250'); - - socket.write(`RCPT TO:\r\n`); - const rcptResp = await waitForResponse(socket, '250'); - expect(rcptResp).toInclude('250'); - - socket.write('DATA\r\n'); - const dataResp = await waitForResponse(socket, '354'); - expect(dataResp).toInclude('354'); - - const emailContent = [ - `From: sender${i}@example.com`, - `To: recipient${i}@example.com`, - `Subject: Resource Leak Test ${i + 1}`, - `Message-ID: `, - '', - `This is resource leak test iteration ${i + 1}.`, - '.', - '' - ].join('\r\n'); - - socket.write(emailContent); - const sendResp = await waitForResponse(socket, '250'); - expect(sendResp).toInclude('250'); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - socket.end(); - - // Capture metrics every 5 operations - if ((i + 1) % 5 === 0) { - const metrics = await captureResourceMetrics(); - samples.push({ - operation: i + 1, - metrics - }); - console.log(`📈 Sample ${samples.length}: Memory ${metrics.memoryUsage.heapUsed}MB`); - } - - // Small delay between operations - await new Promise(resolve => setTimeout(resolve, 100)); - } - - // Clean up all connections - connections.forEach(conn => { - if (!conn.destroyed) { - conn.destroy(); - } - }); - - // Wait for cleanup - await new Promise(resolve => setTimeout(resolve, 2000)); - - const finalMetrics = await captureResourceMetrics(); - const leakAnalysis = analyzeResourceLeaks(initialMetrics, samples, finalMetrics); - - console.log('\n📊 Resource Leak Analysis:'); - console.log(`Initial memory: ${leakAnalysis.initialMemoryMB}MB`); - console.log(`Final memory: ${leakAnalysis.finalMemoryMB}MB`); - console.log(`Memory growth: ${leakAnalysis.memoryGrowthMB}MB`); - console.log(`Memory trend: ${leakAnalysis.memoryTrend}MB`); - console.log(`Stability score: ${leakAnalysis.stabilityScore}`); - console.log(`Memory leak detected: ${leakAnalysis.memoryLeakDetected}`); - console.log(`Resources stable: ${leakAnalysis.resourcesStable}`); - - expect(leakAnalysis.memoryLeakDetected).toEqual(false); - expect(leakAnalysis.resourcesStable).toEqual(true); - done.resolve(); - } catch (error) { - connections.forEach(conn => conn.destroy()); - done.reject(error); - } -}); - -tap.test('REL-03: Resource leak detection - Connection leak test', async (tools) => { - const done = tools.defer(); - const abandonedConnections: net.Socket[] = []; - - try { - console.log('\nTesting for connection resource leaks...'); - - // Create connections that are abandoned without proper cleanup - for (let i = 0; i < 10; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - abandonedConnections.push(socket); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting but don't complete transaction - await new Promise((resolve) => { - socket.once('data', () => resolve()); - }); - - // Start but don't complete EHLO - socket.write(`EHLO abandoned-${i}\r\n`); - - // Don't wait for response, just move to next - await new Promise(resolve => setTimeout(resolve, 50)); - } - - console.log('Created 10 abandoned connections'); - - // Wait a bit - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Try to create new connections - should still work - let newConnectionsSuccessful = 0; - for (let i = 0; i < 5; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - socket.destroy(); - reject(new Error('Connection timeout')); - }, 5000); - - socket.once('connect', () => { - clearTimeout(timeout); - resolve(); - }); - socket.once('error', (err) => { - clearTimeout(timeout); - reject(err); - }); - }); - - // Verify connection works - const greeting = await new Promise((resolve) => { - socket.once('data', (chunk) => { - resolve(chunk.toString()); - }); - }); - - if (greeting.includes('220')) { - newConnectionsSuccessful++; - socket.write('QUIT\r\n'); - socket.end(); - } - } catch (error) { - console.log(`New connection ${i + 1} failed:`, error.message); - } - } - - // Clean up abandoned connections - abandonedConnections.forEach(conn => conn.destroy()); - - console.log(`New connections successful: ${newConnectionsSuccessful}/5`); - - // Server should still accept new connections despite abandoned ones - expect(newConnectionsSuccessful).toBeGreaterThanOrEqual(4); - done.resolve(); - } catch (error) { - abandonedConnections.forEach(conn => conn.destroy()); - done.reject(error); - } -}); - -tap.test('REL-03: Resource leak detection - Rapid create/destroy cycles', async (tools) => { - const done = tools.defer(); - const cycles = 30; - const initialMetrics = await captureResourceMetrics(); - - try { - console.log('\nTesting rapid connection create/destroy cycles...'); - - for (let i = 0; i < cycles; i++) { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Immediately destroy after connect - socket.destroy(); - - // Very short delay - await new Promise(resolve => setTimeout(resolve, 20)); - - if ((i + 1) % 10 === 0) { - console.log(`Completed ${i + 1} cycles`); - } - } - - // Wait for resources to be released - await new Promise(resolve => setTimeout(resolve, 3000)); - - const finalMetrics = await captureResourceMetrics(); - const memoryGrowth = finalMetrics.memoryUsage.heapUsed - initialMetrics.memoryUsage.heapUsed; - - console.log(`Memory growth after ${cycles} cycles: ${memoryGrowth.toFixed(2)}MB`); - - // Memory growth should be minimal - expect(memoryGrowth).toBeLessThan(10); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-04.error-recovery.ts b/test/suite/smtpserver_reliability/test.rel-04.error-recovery.ts deleted file mode 100644 index ecd0c81..0000000 --- a/test/suite/smtpserver_reliability/test.rel-04.error-recovery.ts +++ /dev/null @@ -1,401 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -const createConnection = async (): Promise => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - return socket; -}; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -const getResponse = waitForResponse; - -const testBasicSmtpFlow = async (socket: net.Socket): Promise => { - try { - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO recovery-test\r\n'); - const ehloResp = await waitForResponse(socket, '250'); - if (!ehloResp.includes('250')) return false; - - socket.write('MAIL FROM:\r\n'); - const mailResp = await waitForResponse(socket, '250'); - if (!mailResp.includes('250')) return false; - - socket.write('RCPT TO:\r\n'); - const rcptResp = await waitForResponse(socket, '250'); - if (!rcptResp.includes('250')) return false; - - socket.write('DATA\r\n'); - const dataResp = await waitForResponse(socket, '354'); - if (!dataResp.includes('354')) return false; - - const testEmail = [ - 'From: sender@example.com', - 'To: recipient@example.com', - 'Subject: Recovery Test Email', - '', - 'This email tests server recovery.', - '.', - '' - ].join('\r\n'); - - socket.write(testEmail); - const finalResp = await waitForResponse(socket, '250'); - - socket.write('QUIT\r\n'); - socket.end(); - - return finalResp.includes('250'); - } catch (error) { - console.log('Basic SMTP flow error:', error); - return false; - } -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-04: Error recovery - Invalid command recovery', async (tools) => { - const done = tools.defer(); - - try { - console.log('Testing recovery from invalid commands...'); - - // Phase 1: Send invalid commands - const socket1 = await createConnection(); - await waitForResponse(socket1, '220'); - - // Send multiple invalid commands - socket1.write('INVALID_COMMAND\r\n'); - const response1 = await waitForResponse(socket1); - expect(response1).toMatch(/50[0-3]/); // Should get error response - - socket1.write('ANOTHER_INVALID\r\n'); - const response2 = await waitForResponse(socket1); - expect(response2).toMatch(/50[0-3]/); - - socket1.write('YET_ANOTHER_BAD_CMD\r\n'); - const response3 = await waitForResponse(socket1); - expect(response3).toMatch(/50[0-3]/); - - socket1.end(); - - // Phase 2: Test recovery - server should still work normally - await new Promise(resolve => setTimeout(resolve, 500)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from invalid commands'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-04: Error recovery - Malformed data recovery', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting recovery from malformed data...'); - - // Phase 1: Send malformed data - const socket1 = await createConnection(); - await waitForResponse(socket1, '220'); - - socket1.write('EHLO testhost\r\n'); - await waitForResponse(socket1, '250'); - - // Send malformed MAIL FROM - socket1.write('MAIL FROM: invalid-format\r\n'); - const response1 = await waitForResponse(socket1); - expect(response1).toMatch(/50[0-3]/); - - // Send malformed RCPT TO - socket1.write('RCPT TO: also-invalid\r\n'); - const response2 = await waitForResponse(socket1); - expect(response2).toMatch(/50[0-3]/); - - // Send malformed DATA with binary - socket1.write('DATA\x00\x01\x02CORRUPTED\r\n'); - const response3 = await waitForResponse(socket1); - expect(response3).toMatch(/50[0-3]/); - - socket1.end(); - - // Phase 2: Test recovery - await new Promise(resolve => setTimeout(resolve, 500)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from malformed data'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-04: Error recovery - Premature disconnection recovery', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting recovery from premature disconnection...'); - - // Phase 1: Create incomplete transactions - for (let i = 0; i < 3; i++) { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - - socket.write('EHLO abrupt-test\r\n'); - await waitForResponse(socket, '250'); - - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Abruptly close connection during transaction - socket.destroy(); - console.log(` Abruptly closed connection ${i + 1}`); - - await new Promise(resolve => setTimeout(resolve, 200)); - } - - // Phase 2: Test recovery - await new Promise(resolve => setTimeout(resolve, 1000)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from premature disconnections'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-04: Error recovery - Data corruption recovery', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting recovery from data corruption...'); - - const socket1 = await createConnection(); - await waitForResponse(socket1, '220'); - - socket1.write('EHLO corruption-test\r\n'); - await waitForResponse(socket1, '250'); - - socket1.write('MAIL FROM:\r\n'); - await waitForResponse(socket1, '250'); - - socket1.write('RCPT TO:\r\n'); - await waitForResponse(socket1, '250'); - - socket1.write('DATA\r\n'); - const dataResp = await waitForResponse(socket1, '354'); - expect(dataResp).toInclude('354'); - - // Send corrupted email data with null bytes and invalid characters - socket1.write('From: test\r\n\0\0\0CORRUPTED DATA\xff\xfe\r\n'); - socket1.write('Subject: \x01\x02\x03Invalid\r\n'); - socket1.write('\r\n'); - socket1.write('Body with \0null bytes\r\n'); - socket1.write('.\r\n'); - - try { - const response = await waitForResponse(socket1); - console.log(' Server response to corrupted data:', response.substring(0, 50)); - } catch (error) { - console.log(' Server rejected corrupted data (expected)'); - } - - socket1.end(); - - // Phase 2: Test recovery - await new Promise(resolve => setTimeout(resolve, 1000)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from data corruption'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-04: Error recovery - Connection flooding recovery', async (tools) => { - const done = tools.defer(); - const connections: net.Socket[] = []; - - try { - console.log('\nTesting recovery from connection flooding...'); - - // Phase 1: Create multiple rapid connections - console.log(' Creating 15 rapid connections...'); - for (let i = 0; i < 15; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 2000 - }); - connections.push(socket); - - // Don't wait for connection to complete - await new Promise(resolve => setTimeout(resolve, 50)); - } catch (error) { - // Some connections might fail - that's expected - console.log(` Connection ${i + 1} failed (expected during flooding)`); - } - } - - console.log(` Created ${connections.length} connections`); - - // Close all connections - connections.forEach(conn => { - try { - conn.destroy(); - } catch (e) { - // Ignore errors - } - }); - - // Phase 2: Test recovery - console.log(' Waiting for server to recover...'); - await new Promise(resolve => setTimeout(resolve, 3000)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from connection flooding'); - done.resolve(); - } catch (error) { - connections.forEach(conn => conn.destroy()); - done.reject(error); - } -}); - -tap.test('REL-04: Error recovery - Mixed error scenario', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting recovery from mixed error scenarios...'); - - // Create multiple error conditions simultaneously - const errorPromises = []; - - // Invalid command connection - errorPromises.push((async () => { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - socket.write('TOTALLY_WRONG\r\n'); - await waitForResponse(socket); - socket.destroy(); - })()); - - // Malformed data connection - errorPromises.push((async () => { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - socket.write('MAIL FROM:<<>>\r\n'); - try { - await waitForResponse(socket); - } catch (e) { - // Expected - } - socket.destroy(); - })()); - - // Abrupt disconnection - errorPromises.push((async () => { - const socket = await createConnection(); - socket.destroy(); - })()); - - // Wait for all errors to execute - await Promise.allSettled(errorPromises); - - console.log(' All error scenarios executed'); - - // Test recovery - await new Promise(resolve => setTimeout(resolve, 2000)); - - const socket = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from mixed error scenarios'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-05.dns-resolution-failure.ts b/test/suite/smtpserver_reliability/test.rel-05.dns-resolution-failure.ts deleted file mode 100644 index 4d93fa9..0000000 --- a/test/suite/smtpserver_reliability/test.rel-05.dns-resolution-failure.ts +++ /dev/null @@ -1,335 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -interface DnsTestResult { - scenario: string; - domain: string; - expectedBehavior: string; - mailFromSuccess: boolean; - rcptToSuccess: boolean; - mailFromResponse: string; - rcptToResponse: string; - handledGracefully: boolean; -} - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-05: DNS resolution failure handling - Non-existent domains', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO dns-test\r\n'); - await waitForResponse(socket, '250'); - - console.log('Testing DNS resolution for non-existent domains...'); - - // Test 1: Non-existent domain in MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - console.log(' MAIL FROM response:', mailResponse.trim()); - - // Server should either accept (and defer later) or reject immediately - const mailFromHandled = mailResponse.includes('250') || - mailResponse.includes('450') || - mailResponse.includes('550'); - expect(mailFromHandled).toEqual(true); - - // Reset if needed - if (mailResponse.includes('250')) { - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - - // Test 2: Non-existent domain in RCPT TO - socket.write('MAIL FROM:\r\n'); - const mailFromResp = await waitForResponse(socket, '250'); - expect(mailFromResp).toInclude('250'); - - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - console.log(' RCPT TO response:', rcptResponse.trim()); - - // Server may accept (and defer validation) or reject immediately - const rcptToHandled = rcptResponse.includes('250') || // Accepted (for later validation) - rcptResponse.includes('450') || // Temporary failure - rcptResponse.includes('550') || // Permanent failure - rcptResponse.includes('553'); // Address error - expect(rcptToHandled).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-05: DNS resolution failure handling - Malformed domains', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO malformed-test\r\n'); - await waitForResponse(socket, '250'); - - console.log('\nTesting malformed domain handling...'); - - const malformedDomains = [ - 'malformed..domain..test', - 'invalid-.domain.com', - 'domain.with.spaces .com', - '.leading-dot.com', - 'trailing-dot.com.', - 'domain@with@at.com', - 'a'.repeat(255) + '.toolong.com' // Domain too long - ]; - - for (const domain of malformedDomains) { - console.log(` Testing: ${domain.substring(0, 50)}${domain.length > 50 ? '...' : ''}`); - - socket.write(`MAIL FROM:\r\n`); - const response = await waitForResponse(socket); - - // Server should reject malformed domains or accept for later validation - const properlyHandled = response.includes('250') || // Accepted (may validate later) - response.includes('501') || // Syntax error - response.includes('550') || // Rejected - response.includes('553'); // Address error - - console.log(` Response: ${response.trim().substring(0, 50)}`); - expect(properlyHandled).toEqual(true); - - // Reset if needed - if (!response.includes('5')) { - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - } - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-05: DNS resolution failure handling - Special cases', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO special-test\r\n'); - await waitForResponse(socket, '250'); - - console.log('\nTesting special DNS cases...'); - - // Test 1: Localhost (may be accepted or rejected) - socket.write('MAIL FROM:\r\n'); - const localhostResponse = await waitForResponse(socket); - - console.log(' Localhost response:', localhostResponse.trim()); - const localhostHandled = localhostResponse.includes('250') || localhostResponse.includes('501'); - expect(localhostHandled).toEqual(true); - - // Only reset if transaction was started - if (localhostResponse.includes('250')) { - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - - // Test 2: IP address (should work) - socket.write('MAIL FROM:\r\n'); - const ipResponse = await waitForResponse(socket); - - console.log(' IP address response:', ipResponse.trim()); - const ipHandled = ipResponse.includes('250') || ipResponse.includes('501'); - expect(ipHandled).toEqual(true); - - // Only reset if transaction was started - if (ipResponse.includes('250')) { - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - - // Test 3: Empty domain - socket.write('MAIL FROM:\r\n'); - const emptyResponse = await waitForResponse(socket); - - console.log(' Empty domain response:', emptyResponse.trim()); - expect(emptyResponse).toMatch(/50[1-3]/); // Should reject - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-05: DNS resolution failure handling - Mixed valid/invalid recipients', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO mixed-test\r\n'); - await waitForResponse(socket, '250'); - - console.log('\nTesting mixed valid/invalid recipients...'); - - // Start transaction - socket.write('MAIL FROM:\r\n'); - const mailFromResp = await waitForResponse(socket, '250'); - expect(mailFromResp).toInclude('250'); - - // Add valid recipient - socket.write('RCPT TO:\r\n'); - const validRcptResponse = await waitForResponse(socket, '250'); - - console.log(' Valid recipient:', validRcptResponse.trim()); - expect(validRcptResponse).toInclude('250'); - - // Add invalid recipient - socket.write('RCPT TO:\r\n'); - const invalidRcptResponse = await waitForResponse(socket); - - console.log(' Invalid recipient:', invalidRcptResponse.trim()); - - // Server may accept (for later validation) or reject invalid domain - const invalidHandled = invalidRcptResponse.includes('250') || // Accepted (for later validation) - invalidRcptResponse.includes('450') || - invalidRcptResponse.includes('550') || - invalidRcptResponse.includes('553'); - expect(invalidHandled).toEqual(true); - - // Try to send data (should work if at least one valid recipient) - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket); - - if (dataResponse.includes('354')) { - socket.write('Subject: Mixed recipient test\r\n\r\nTest\r\n.\r\n'); - await waitForResponse(socket, '250'); - console.log(' Message accepted with valid recipient'); - } else { - console.log(' Server rejected DATA (acceptable behavior)'); - } - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_reliability/test.rel-06.network-interruption.ts b/test/suite/smtpserver_reliability/test.rel-06.network-interruption.ts deleted file mode 100644 index cce98ed..0000000 --- a/test/suite/smtpserver_reliability/test.rel-06.network-interruption.ts +++ /dev/null @@ -1,410 +0,0 @@ -import * as plugins from '@git.zone/tstest/tapbundle'; -import { expect, tap } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; - -let testServer; - -const createConnection = async (): Promise => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 5000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - return socket; -}; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -const getResponse = waitForResponse; - -const testBasicSmtpFlow = async (socket: net.Socket): Promise => { - try { - await waitForResponse(socket, '220'); - - socket.write('EHLO test.example.com\r\n'); - const ehloResp = await waitForResponse(socket, '250'); - if (!ehloResp.includes('250')) return false; - - socket.write('MAIL FROM:\r\n'); - const mailResp = await waitForResponse(socket, '250'); - if (!mailResp.includes('250')) return false; - - socket.write('RCPT TO:\r\n'); - const rcptResp = await waitForResponse(socket, '250'); - if (!rcptResp.includes('250')) return false; - - socket.write('DATA\r\n'); - const dataResp = await waitForResponse(socket, '354'); - if (!dataResp.includes('354')) return false; - - const testEmail = [ - 'From: test@example.com', - 'To: recipient@example.com', - 'Subject: Interruption Recovery Test', - '', - 'This email tests server recovery after network interruption.', - '.', - '' - ].join('\r\n'); - - socket.write(testEmail); - const finalResp = await waitForResponse(socket, '250'); - - socket.write('QUIT\r\n'); - socket.end(); - - return finalResp.includes('250'); - } catch (error) { - return false; - } -}; - -tap.test('prepare server', async () => { - testServer = await startTestServer({ port: TEST_PORT }); - await new Promise(resolve => setTimeout(resolve, 100)); -}); - -tap.test('REL-06: Network interruption - Sudden connection drop', async (tools) => { - const done = tools.defer(); - - try { - console.log('Testing sudden connection drop during session...'); - - // Phase 1: Create connection and drop it mid-session - const socket1 = await createConnection(); - await waitForResponse(socket1, '220'); - - socket1.write('EHLO testhost\r\n'); - await waitForResponse(socket1, '250'); - - socket1.write('MAIL FROM:\r\n'); - await waitForResponse(socket1, '250'); - - // Abruptly close connection during active session - socket1.destroy(); - console.log(' Connection abruptly closed'); - - // Phase 2: Test recovery - await new Promise(resolve => setTimeout(resolve, 1000)); - - const socket2 = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(socket2); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from sudden connection drop'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-06: Network interruption - Data transfer interruption', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting connection interruption during data transfer...'); - - const socket = await createConnection(); - await waitForResponse(socket, '220'); - - socket.write('EHLO datatest\r\n'); - await waitForResponse(socket, '250'); - - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - const dataResp = await waitForResponse(socket, '354'); - expect(dataResp).toInclude('354'); - - // Start sending data but interrupt midway - socket.write('From: sender@example.com\r\n'); - socket.write('To: recipient@example.com\r\n'); - socket.write('Subject: Interruption Test\r\n\r\n'); - socket.write('This email will be interrupted...\r\n'); - - // Wait briefly then destroy connection (simulating network loss) - await new Promise(resolve => setTimeout(resolve, 500)); - socket.destroy(); - console.log(' Connection interrupted during data transfer'); - - // Test recovery - await new Promise(resolve => setTimeout(resolve, 1500)); - - const newSocket = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(newSocket); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from data transfer interruption'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-06: Network interruption - Rapid reconnection attempts', async (tools) => { - const done = tools.defer(); - const connections: net.Socket[] = []; - - try { - console.log('\nTesting rapid reconnection after interruptions...'); - - // Create and immediately destroy multiple connections - console.log(' Creating 5 unstable connections...'); - for (let i = 0; i < 5; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 2000 - }); - - connections.push(socket); - - // Destroy after short random delay to simulate instability - setTimeout(() => socket.destroy(), 50 + Math.random() * 150); - - await new Promise(resolve => setTimeout(resolve, 50)); - } catch (error) { - // Expected - some connections might fail - } - } - - // Wait for cleanup - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Now test if server can handle normal connections - let successfulConnections = 0; - console.log(' Testing recovery with stable connections...'); - - for (let i = 0; i < 3; i++) { - try { - const socket = await createConnection(); - const success = await testBasicSmtpFlow(socket); - - if (success) { - successfulConnections++; - } - } catch (error) { - console.log(` Connection ${i + 1} failed:`, error.message); - } - - await new Promise(resolve => setTimeout(resolve, 500)); - } - - const recoveryRate = successfulConnections / 3; - console.log(` Recovery rate: ${successfulConnections}/3 (${(recoveryRate * 100).toFixed(0)}%)`); - - expect(recoveryRate).toBeGreaterThanOrEqual(0.66); // At least 2/3 should succeed - console.log('✓ Server recovered from rapid reconnection attempts'); - done.resolve(); - } catch (error) { - connections.forEach(conn => conn.destroy()); - done.reject(error); - } -}); - -tap.test('REL-06: Network interruption - Partial command interruption', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting partial command transmission interruption...'); - - const socket = await createConnection(); - await waitForResponse(socket, '220'); - - // Send partial EHLO command and interrupt - socket.write('EH'); - console.log(' Sent partial command "EH"'); - - await new Promise(resolve => setTimeout(resolve, 100)); - socket.destroy(); - console.log(' Connection destroyed with incomplete command'); - - // Test recovery - await new Promise(resolve => setTimeout(resolve, 1000)); - - const newSocket = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(newSocket); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered from partial command interruption'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-06: Network interruption - Multiple interruption types', async (tools) => { - const done = tools.defer(); - const results: Array<{ type: string; recovered: boolean }> = []; - - try { - console.log('\nTesting recovery from multiple interruption types...'); - - // Test 1: Interrupt after greeting - try { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - socket.destroy(); - results.push({ type: 'after-greeting', recovered: false }); - } catch (e) { - results.push({ type: 'after-greeting', recovered: false }); - } - - await new Promise(resolve => setTimeout(resolve, 500)); - - // Test 2: Interrupt during EHLO - try { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - socket.write('EHLO te'); - socket.destroy(); - results.push({ type: 'during-ehlo', recovered: false }); - } catch (e) { - results.push({ type: 'during-ehlo', recovered: false }); - } - - await new Promise(resolve => setTimeout(resolve, 500)); - - // Test 3: Interrupt with invalid data - try { - const socket = await createConnection(); - await waitForResponse(socket, '220'); - socket.write('\x00\x01\x02\x03'); - socket.destroy(); - results.push({ type: 'invalid-data', recovered: false }); - } catch (e) { - results.push({ type: 'invalid-data', recovered: false }); - } - - await new Promise(resolve => setTimeout(resolve, 1000)); - - // Test final recovery - try { - const socket = await createConnection(); - const success = await testBasicSmtpFlow(socket); - - if (success) { - // Mark all previous tests as recovered - results.forEach(r => r.recovered = true); - } - } catch (error) { - console.log('Final recovery failed:', error.message); - } - - const recoveredCount = results.filter(r => r.recovered).length; - console.log(`\nInterruption recovery summary:`); - results.forEach(r => { - console.log(` ${r.type}: ${r.recovered ? 'recovered' : 'failed'}`); - }); - - expect(recoveredCount).toBeGreaterThan(0); - console.log(`✓ Server recovered from ${recoveredCount}/${results.length} interruption scenarios`); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('REL-06: Network interruption - Long delay recovery', async (tools) => { - const done = tools.defer(); - - try { - console.log('\nTesting recovery after long network interruption...'); - - // Create connection and start transaction - const socket = await createConnection(); - await waitForResponse(socket, '220'); - - socket.write('EHLO longdelay\r\n'); - await waitForResponse(socket, '250'); - - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Simulate long network interruption - socket.pause(); - console.log(' Connection paused (simulating network freeze)'); - - await new Promise(resolve => setTimeout(resolve, 5000)); // 5 second "freeze" - - // Try to continue - should fail - socket.resume(); - socket.write('RCPT TO:\r\n'); - - let continuationFailed = false; - try { - await waitForResponse(socket, '250', 3000); - } catch (error) { - continuationFailed = true; - console.log(' Continuation failed as expected'); - } - - socket.destroy(); - - // Test recovery with new connection - const newSocket = await createConnection(); - const recoverySuccess = await testBasicSmtpFlow(newSocket); - - expect(recoverySuccess).toEqual(true); - console.log('✓ Server recovered after long network interruption'); - done.resolve(); - } catch (error) { - done.reject(error); - } -}); - -tap.test('cleanup server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-01.rfc5321-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-01.rfc5321-compliance.ts deleted file mode 100644 index 2229c5c..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-01.rfc5321-compliance.ts +++ /dev/null @@ -1,382 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 5321 - Server greeting format', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for initial greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server greeting:', greeting.trim()); - - // RFC 5321: Server must provide proper 220 greeting - const greetingLine = greeting.trim(); - const validGreeting = greetingLine.startsWith('220') && greetingLine.length > 10; - - expect(validGreeting).toEqual(true); - expect(greetingLine).toMatch(/^220\s+\S+/); // Should have hostname after 220 - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5321 - EHLO response format', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // RFC 5321: EHLO must return 250 with hostname and extensions - const ehloLines = ehloResponse.split('\r\n').filter(line => line.startsWith('250')); - - expect(ehloLines.length).toBeGreaterThan(0); - expect(ehloLines[0]).toMatch(/^250[\s-]\S+/); // First line should have hostname - - // Check for common extensions - const extensions = ehloLines.slice(1).map(line => line.substring(4).trim()); - console.log('Extensions:', extensions); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5321 - Command case insensitivity', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Test lowercase command - socket.write('ehlo testclient\r\n'); - await waitForResponse(socket, '250'); - - // Test mixed case command - socket.write('MaIl FrOm:\r\n'); - await waitForResponse(socket, '250'); - - // Test uppercase command - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // All case variations worked - console.log('All case variations accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5321 - Line length limits', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // RFC 5321: Command line limit is 512 chars including CRLF - // Test with a long MAIL FROM command (but within limit) - const longDomain = 'a'.repeat(400); - socket.write(`MAIL FROM:\r\n`); - const response = await waitForResponse(socket); - - // Should either accept (if within server limits) or reject gracefully - const accepted = response.includes('250'); - const rejected = response.includes('501') || response.includes('500'); - - expect(accepted || rejected).toEqual(true); - console.log(`Long line test ${accepted ? 'accepted' : 'rejected'}`); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5321 - Standard SMTP verb compliance', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - const supportedVerbs: string[] = []; - - // Wait for greeting - await waitForResponse(socket, '220'); - - // Try HELP command to see supported verbs - socket.write('HELP\r\n'); - const helpResponse = await waitForResponse(socket); - - // Parse HELP response for supported commands - if (helpResponse.includes('214') || helpResponse.includes('502')) { - // Either help text or command not implemented - } - - // Test NOOP - socket.write('NOOP\r\n'); - const noopResponse = await waitForResponse(socket); - if (noopResponse.includes('250')) { - supportedVerbs.push('NOOP'); - } - - // Test RSET - socket.write('RSET\r\n'); - const rsetResponse = await waitForResponse(socket); - if (rsetResponse.includes('250')) { - supportedVerbs.push('RSET'); - } - - // Test VRFY - socket.write('VRFY test@example.com\r\n'); - const vrfyResponse = await waitForResponse(socket); - // VRFY may be disabled for security (252 or 502) - if (vrfyResponse.includes('250') || vrfyResponse.includes('252')) { - supportedVerbs.push('VRFY'); - } - - // Check minimum required verbs - const requiredVerbs = ['NOOP', 'RSET']; - const hasRequired = requiredVerbs.every(verb => - supportedVerbs.includes(verb) || verb === 'VRFY' // VRFY is optional - ); - - console.log('Supported verbs:', supportedVerbs); - expect(hasRequired).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5321 - Required minimum extensions', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - // Check for extensions - const lines = ehloResponse.split('\r\n'); - const extensions = lines - .filter(line => line.startsWith('250-') || (line.startsWith('250 ') && lines.indexOf(line) > 0)) - .map(line => line.substring(4).split(' ')[0].toUpperCase()); - - console.log('Server extensions:', extensions); - - // RFC 5321 recommends these extensions - const recommendedExtensions = ['8BITMIME', 'SIZE', 'PIPELINING']; - const hasRecommended = recommendedExtensions.filter(ext => extensions.includes(ext)); - - console.log('Recommended extensions present:', hasRecommended); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-02.rfc5322-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-02.rfc5322-compliance.ts deleted file mode 100644 index 6ec0450..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-02.rfc5322-compliance.ts +++ /dev/null @@ -1,428 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 5322 - Message format with required headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // RFC 5322 compliant email with all required headers - const messageId = ``; - const date = new Date().toUTCString(); - - const rfc5322Email = [ - `Date: ${date}`, - `From: "Test Sender" `, - `To: "Test Recipient" `, - `Subject: RFC 5322 Compliance Test`, - `Message-ID: ${messageId}`, - `MIME-Version: 1.0`, - `Content-Type: text/plain; charset=UTF-8`, - `Content-Transfer-Encoding: 7bit`, - '', - 'This is a test message for RFC 5322 compliance verification.', - 'It includes proper headers according to RFC 5322 specifications.', - '', - 'Best regards,', - 'Test System', - '.', - '' - ].join('\r\n'); - - socket.write(rfc5322Email); - const response = await waitForResponse(socket, '250'); - - console.log('RFC 5322 compliant message accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5322 - Folded header lines', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Test folded header lines (RFC 5322 section 2.2.3) - const email = [ - `Date: ${new Date().toUTCString()}`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: This is a very long subject line that needs to be`, - ` folded according to RFC 5322 specifications for proper`, - ` email header formatting`, - `Message-ID: <${Date.now()}@example.com>`, - `References: `, - ` `, - ` `, - '', - 'Email with folded headers.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Folded headers message accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5322 - Multiple recipient formats', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send multiple RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Test various recipient formats allowed by RFC 5322 - const email = [ - `Date: ${new Date().toUTCString()}`, - `From: "Sender Name" `, - `To: recipient1@example.com, "Recipient Two" `, - `Cc: "Carbon Copy" `, - `Bcc: bcc@example.com`, - `Reply-To: "Reply Address" `, - `Subject: Multiple recipient formats test`, - `Message-ID: <${Date.now()}@example.com>`, - '', - 'Testing various recipient header formats.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Multiple recipient formats accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5322 - Comments in headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // RFC 5322 allows comments in headers using parentheses - const email = [ - `Date: ${new Date().toUTCString()} (generated by test system)`, - `From: sender@example.com (Test Sender)`, - `To: recipient@example.com (Primary Recipient)`, - `Subject: Testing comments (RFC 5322 section 3.2.2)`, - `Message-ID: <${Date.now()}@example.com>`, - `X-Custom-Header: value (with comment)`, - '', - 'Email with comments in headers.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Headers with comments accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 5322 - Resent headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // RFC 5322 resent headers for forwarded messages - const email = [ - `Resent-Date: ${new Date().toUTCString()}`, - `Resent-From: resender@example.com`, - `Resent-To: newrecipient@example.com`, - `Resent-Message-ID: `, - `Date: ${new Date(Date.now() - 86400000).toUTCString()}`, // Original date (yesterday) - `From: original@example.com`, - `To: oldrecipient@example.com`, - `Subject: Forwarded: Original Subject`, - `Message-ID: `, - '', - 'This is a forwarded message with resent headers.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Resent headers message accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-03.rfc7208-spf-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-03.rfc7208-spf-compliance.ts deleted file mode 100644 index 9f00d20..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-03.rfc7208-spf-compliance.ts +++ /dev/null @@ -1,330 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 7208 SPF - Server handles SPF checks', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - const spfResults: any[] = []; - - // Test domains simulating different SPF scenarios - const spfTestDomains = [ - 'spf-pass.example.com', // Should have valid SPF record allowing sender - 'spf-fail.example.com', // Should have SPF record that fails - 'spf-neutral.example.com', // Should have neutral SPF record - 'no-spf.example.com' // Should have no SPF record - ]; - - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - // Check if server advertises SPF support - const advertisesSpf = ehloResponse.toLowerCase().includes('spf'); - console.log('Server advertises SPF:', advertisesSpf); - - // Test each domain - for (let i = 0; i < spfTestDomains.length; i++) { - const domain = spfTestDomains[i]; - const testEmail = `spf-test@${domain}`; - - spfResults[i] = { - domain: domain, - email: testEmail, - mailFromAccepted: false, - rcptAccepted: false, - spfFailed: false - }; - - console.log(`Testing SPF for domain: ${domain}`); - socket.write(`MAIL FROM:<${testEmail}>\r\n`); - const mailResponse = await waitForResponse(socket); - - spfResults[i].mailFromResponse = mailResponse.trim(); - - if (mailResponse.includes('250')) { - // MAIL FROM accepted - spfResults[i].mailFromAccepted = true; - - socket.write(`RCPT TO:\r\n`); - const rcptResponse = await waitForResponse(socket); - - if (rcptResponse.includes('250')) { - spfResults[i].rcptAccepted = true; - } - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - // SPF failure (expected for some domains) - spfResults[i].spfFailed = true; - } - - // Reset for next test - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - - // All tests complete - console.log('SPF test results:', spfResults); - - // Check that server handled all domains - const allDomainsHandled = spfResults.every(result => - result.mailFromResponse !== undefined && result.mailFromResponse !== 'pending' - ); - - expect(allDomainsHandled).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7208 SPF - SPF record syntax handling', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Test with domain that might have complex SPF record - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - // Server should handle this appropriately (accept or reject based on SPF) - const handled = mailResponse.includes('250') || - mailResponse.includes('550') || - mailResponse.includes('553'); - - expect(handled).toEqual(true); - console.log('SPF handling response:', mailResponse.trim()); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7208 SPF - Received-SPF header', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send email to check if server adds Received-SPF header - const email = [ - `Date: ${new Date().toUTCString()}`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: SPF Header Test`, - `Message-ID: <${Date.now()}@example.com>`, - '', - 'Testing if server adds Received-SPF header.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email accepted - server should process SPF'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7208 SPF - IPv4 and IPv6 mechanism support', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Test with IPv6 address representation - socket.write('EHLO [::1]\r\n'); - await waitForResponse(socket, '250'); - - // Test domain with IP-based SPF mechanisms - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - // Server should handle IP-based SPF mechanisms - const handled = mailResponse.includes('250') || - mailResponse.includes('550') || - mailResponse.includes('553'); - - expect(handled).toEqual(true); - console.log('IP mechanism SPF response:', mailResponse.trim()); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-04.rfc6376-dkim-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-04.rfc6376-dkim-compliance.ts deleted file mode 100644 index b79bf69..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-04.rfc6376-dkim-compliance.ts +++ /dev/null @@ -1,450 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 6376 DKIM - Server accepts email with DKIM signature', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Create email with DKIM signature - const dkimSignature = [ - 'DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=default;', - ' h=from:to:subject:date:message-id;', - ' bh=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN/XKdLCPjaYaY=;', - ' b=Kt1zLCYmUVYJKEOVL9nGF2JVPJ5/k5l6yOkNBJGCrZn4E5z9Qn7TlYrG8QfBgJ4', - ' CzYVLjKm5xOhUoEaDzTJ1E6C9A4hL8sKfBxQjN8oWv4kP3GdE6mFqS0wKcRjT+', - ' NxOz2VcJP4LmKjFsG8XqBhYoEfCvSr3UwNmEkP6RjT9WlQzA4kJe2VoMsJ=' - ].join('\r\n'); - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DKIM RFC 6376 Compliance Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - dkimSignature, - '', - 'This email tests RFC 6376 DKIM compliance.', - 'The server should properly handle DKIM signatures.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email with DKIM signature accepted'); - expect(true).toEqual(true); // Server accepts DKIM headers - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 6376 DKIM - Multiple DKIM signatures', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with multiple DKIM signatures (common in forwarding scenarios) - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Multiple DKIM Signatures Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=selector1;', - ' h=from:to:subject:date;', - ' bh=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN/XKdLCPjaYaY=;', - ' b=signature1data', - 'DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;', - ' d=forwarder.com; s=selector2;', - ' h=from:to:subject:date:message-id;', - ' bh=differentbodyhash=;', - ' b=signature2data', - '', - 'Email with multiple DKIM signatures.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email with multiple DKIM signatures accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 6376 DKIM - Various canonicalization methods', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Test different canonicalization methods - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DKIM Canonicalization Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'DKIM-Signature: v=1; a=rsa-sha256; c=simple/relaxed;', - ' d=example.com; s=default;', - ' h=from:to:subject;', - ' bh=bodyhash=;', - ' b=signature', - '', - 'Testing different canonicalization methods.', - 'Simple header canonicalization preserves whitespace.', - 'Relaxed body canonicalization normalizes whitespace.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email with different canonicalization accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 6376 DKIM - Long header fields and folding', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // DKIM signature with long fields that require folding - const longSignature = 'b=' + 'A'.repeat(200); - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DKIM Long Fields Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=default; t=' + Math.floor(Date.now() / 1000) + ';', - ' h=from:to:subject:date:message-id:content-type:mime-version;', - ' bh=verylongbodyhashvalueherethatexceedsnormallength1234567890=;', - ' ' + longSignature.substring(0, 70), - ' ' + longSignature.substring(70, 140), - ' ' + longSignature.substring(140), - '', - 'Testing DKIM with long header fields.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email with long DKIM fields accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 6376 DKIM - Authentication-Results header', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - // Check if server advertises DKIM support - const advertisesDkim = ehloResponse.toLowerCase().includes('dkim'); - console.log('Server advertises DKIM:', advertisesDkim); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email to test if server adds Authentication-Results header - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Authentication-Results Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=default;', - ' h=from:to:subject;', - ' bh=simplehash=;', - ' b=simplesignature', - '', - 'Testing if server adds Authentication-Results header.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email accepted - server should process DKIM and potentially add Authentication-Results'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-05.rfc7489-dmarc-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-05.rfc7489-dmarc-compliance.ts deleted file mode 100644 index a3c6a0c..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-05.rfc7489-dmarc-compliance.ts +++ /dev/null @@ -1,408 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 7489 DMARC - Server handles DMARC policies', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - const dmarcResults: any[] = []; - - // Test domains simulating different DMARC policies - const dmarcTestScenarios = [ - { - domain: 'dmarc-reject.example.com', - policy: 'reject', - alignment: 'strict' - }, - { - domain: 'dmarc-quarantine.example.com', - policy: 'quarantine', - alignment: 'relaxed' - }, - { - domain: 'dmarc-none.example.com', - policy: 'none', - alignment: 'relaxed' - } - ]; - - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - // Check if server advertises DMARC support - const advertisesDmarc = ehloResponse.toLowerCase().includes('dmarc'); - console.log('Server advertises DMARC:', advertisesDmarc); - - // Test each scenario - for (let i = 0; i < dmarcTestScenarios.length; i++) { - const scenario = dmarcTestScenarios[i]; - const testFromAddress = `dmarc-test@${scenario.domain}`; - - dmarcResults[i] = { - domain: scenario.domain, - policy: scenario.policy, - mailFromAccepted: false, - rcptAccepted: false - }; - - console.log(`Testing DMARC policy: ${scenario.policy} for domain: ${scenario.domain}`); - socket.write(`MAIL FROM:<${testFromAddress}>\r\n`); - const mailResponse = await waitForResponse(socket); - - dmarcResults[i].mailFromResponse = mailResponse.trim(); - - if (mailResponse.includes('250')) { - dmarcResults[i].mailFromAccepted = true; - - socket.write(`RCPT TO:\r\n`); - const rcptResponse = await waitForResponse(socket); - - if (rcptResponse.includes('250')) { - dmarcResults[i].rcptAccepted = true; - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send email with DMARC-relevant headers - const email = [ - `From: dmarc-test@${scenario.domain}`, - `To: recipient@example.com`, - `Subject: DMARC RFC 7489 Compliance Test - ${scenario.policy}`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=${scenario.domain}; s=default;`, - ` h=from:to:subject:date; bh=testbodyhash; b=testsignature`, - `Authentication-Results: example.org; spf=pass smtp.mailfrom=${scenario.domain}`, - '', - `This email tests DMARC ${scenario.policy} policy compliance.`, - 'The server should handle DMARC policies according to RFC 7489.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - dmarcResults[i].emailAccepted = true; - console.log(`DMARC ${scenario.policy} policy email accepted`); - } - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - // DMARC policy rejection (expected for some scenarios) - dmarcResults[i].dmarcRejected = true; - dmarcResults[i].rejectionResponse = mailResponse.trim(); - console.log(`DMARC ${scenario.policy} policy rejected as expected`); - } - - // Reset for next test - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - } - - // All tests complete - console.log('DMARC test results:', dmarcResults); - - // Check that server handled all scenarios - const allScenariosHandled = dmarcResults.every(result => - result.mailFromResponse !== undefined - ); - - expect(allScenariosHandled).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7489 DMARC - Alignment testing', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Test misaligned domain (envelope vs header) - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with different header From domain (testing alignment) - const email = [ - `From: sender@header-domain.com`, - `To: recipient@example.com`, - `Subject: DMARC Alignment Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=header-domain.com; s=default;`, - ` h=from:to:subject:date; bh=alignmenthash; b=alignmentsig`, - '', - 'Testing DMARC domain alignment (envelope vs header From).', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const response = await waitForResponse(socket); - - const accepted = response.includes('250'); - console.log(`Alignment test ${accepted ? 'accepted' : 'rejected due to alignment failure'}`); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7489 DMARC - Subdomain policy', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Test subdomain policy inheritance - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email from subdomain to test policy inheritance - const email = [ - `From: sender@subdomain.dmarc-policy.com`, - `To: recipient@example.com`, - `Subject: DMARC Subdomain Policy Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subdomain.dmarc-policy.com; s=default;`, - ` h=from:to:subject:date; bh=subdomainhash; b=subdomainsig`, - '', - 'Testing DMARC subdomain policy inheritance.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const response = await waitForResponse(socket); - - const accepted = response.includes('250'); - console.log(`Subdomain policy test ${accepted ? 'accepted' : 'rejected'}`); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 7489 DMARC - Report generation hint', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with DMARC report request headers - const email = [ - `From: dmarc-report@example.com`, - `To: recipient@example.com`, - `Subject: DMARC Report Generation Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=default;`, - ` h=from:to:subject:date; bh=reporthash; b=reportsig`, - `Authentication-Results: mta.example.com;`, - ` dmarc=pass (p=none dis=none) header.from=example.com`, - '', - 'Testing DMARC report generation capabilities.', - 'Server should log DMARC results for reporting.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('DMARC report test email accepted'); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-06.rfc8314-tls-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-06.rfc8314-tls-compliance.ts deleted file mode 100644 index e073401..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-06.rfc8314-tls-compliance.ts +++ /dev/null @@ -1,366 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import * as tls from 'tls'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 8314 TLS - STARTTLS advertised in EHLO', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - // Check if STARTTLS is advertised (RFC 8314 requirement) - const advertisesStarttls = ehloResponse.toLowerCase().includes('starttls'); - - console.log('STARTTLS advertised:', advertisesStarttls); - expect(advertisesStarttls).toEqual(true); - - // Parse other extensions - const lines = ehloResponse.split('\r\n'); - const extensions = lines - .filter(line => line.startsWith('250-') || (line.startsWith('250 ') && lines.indexOf(line) > 0)) - .map(line => line.substring(4).split(' ')[0].toUpperCase()); - - console.log('Server extensions:', extensions); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 8314 TLS - STARTTLS command functionality', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - - const advertisesStarttls = ehloResponse.toLowerCase().includes('starttls'); - - if (advertisesStarttls) { - // Send STARTTLS - socket.write('STARTTLS\r\n'); - const starttlsResponse = await waitForResponse(socket, '220'); - - console.log('STARTTLS command accepted, ready to upgrade'); - - // In a real test, we would upgrade to TLS here - // For this test, we just verify the command is accepted - expect(true).toEqual(true); - } else { - console.log('STARTTLS not advertised, skipping upgrade'); - } - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 8314 TLS - Commands before STARTTLS', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Try MAIL FROM before STARTTLS (server may require TLS first) - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - // Server may accept or reject based on TLS policy - if (mailResponse.includes('250')) { - console.log('Server allows MAIL FROM before STARTTLS'); - } else if (mailResponse.includes('530') || mailResponse.includes('554')) { - console.log('Server requires STARTTLS before MAIL FROM (RFC 8314 compliant)'); - expect(true).toEqual(true); // This is actually good for security - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 8314 TLS - TLS version support', async (tools) => { - const done = tools.defer(); - - // First establish plain connection to get STARTTLS - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send STARTTLS - socket.write('STARTTLS\r\n'); - const starttlsResponse = await waitForResponse(socket, '220'); - - console.log('Ready to upgrade to TLS'); - - // Upgrade connection to TLS - const tlsOptions = { - socket: socket, - rejectUnauthorized: false, // For testing - minVersion: 'TLSv1.2' as any // RFC 8314 recommends TLS 1.2 or higher - }; - - const tlsSocket = tls.connect(tlsOptions); - - tlsSocket.on('secureConnect', () => { - console.log('TLS connection established'); - console.log('Protocol:', tlsSocket.getProtocol()); - console.log('Cipher:', tlsSocket.getCipher()); - - // Verify TLS 1.2 or higher - const protocol = tlsSocket.getProtocol(); - if (protocol) { - expect(['TLSv1.2', 'TLSv1.3']).toContain(protocol); - } - - tlsSocket.write('EHLO testclient\r\n'); - }); - - tlsSocket.on('data', (data) => { - const response = data.toString(); - console.log('TLS response:', response); - - if (response.includes('250')) { - console.log('EHLO after STARTTLS successful'); - tlsSocket.write('QUIT\r\n'); - setTimeout(() => { - tlsSocket.end(); - done.resolve(); - }, 100); - } - }); - - tlsSocket.on('error', (err) => { - console.error('TLS error:', err); - // If TLS upgrade fails, still pass the test as server accepted STARTTLS - done.resolve(); - }); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 8314 TLS - Email submission after STARTTLS', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // For this test, proceed without STARTTLS to test basic functionality - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.includes('250')) { - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - const email = [ - `Date: ${new Date().toUTCString()}`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: RFC 8314 TLS Compliance Test`, - `Message-ID: `, - '', - 'Testing email submission with TLS requirements.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('Email accepted (server allows non-TLS or we are testing on TLS port)'); - } else { - // Server may require STARTTLS first - console.log('Server requires STARTTLS for mail submission'); - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_rfc-compliance/test.rfc-07.rfc3461-dsn-compliance.ts b/test/suite/smtpserver_rfc-compliance/test.rfc-07.rfc3461-dsn-compliance.ts deleted file mode 100644 index ea9a242..0000000 --- a/test/suite/smtpserver_rfc-compliance/test.rfc-07.rfc3461-dsn-compliance.ts +++ /dev/null @@ -1,399 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper function to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - // Check if we have a complete response - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Any complete response line - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('RFC 3461 DSN - DSN extension advertised', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Check if DSN extension is advertised - const advertisesDsn = ehloResponse.toLowerCase().includes('dsn'); - console.log('DSN extension advertised:', advertisesDsn); - - // Parse extensions - const lines = ehloResponse.split('\r\n'); - const extensions = lines - .filter(line => line.startsWith('250-') || (line.startsWith('250 ') && lines.indexOf(line) > 0)) - .map(line => line.substring(4).split(' ')[0].toUpperCase()); - - console.log('Server extensions:', extensions); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - socket.end(); - done.resolve(); - } catch (error) { - console.error('Socket error:', error); - done.reject(error); - } -}); - -tap.test('RFC 3461 DSN - MAIL FROM with DSN parameters', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Test MAIL FROM with DSN parameters (RFC 3461) - socket.write('MAIL FROM: RET=FULL ENVID=test-envelope-123\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - // Server should either accept (250) or reject with proper error - const accepted = mailResponse.includes('250'); - const properlyRejected = mailResponse.includes('501') || mailResponse.includes('555'); - - expect(accepted || properlyRejected).toEqual(true); - console.log(`DSN parameters in MAIL FROM ${accepted ? 'accepted' : 'rejected'}`); - - if (accepted) { - // Reset to test other parameters - socket.write('RSET\r\n'); - const resetResponse = await waitForResponse(socket, '250'); - console.log('Server response:', resetResponse); - - // Test with RET=HDRS - socket.write('MAIL FROM: RET=HDRS\r\n'); - const mailHdrsResponse = await waitForResponse(socket); - console.log('Server response:', mailHdrsResponse); - - const hdrsAccepted = mailHdrsResponse.includes('250'); - console.log(`RET=HDRS parameter ${hdrsAccepted ? 'accepted' : 'rejected'}`); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - socket.end(); - done.resolve(); - } catch (error) { - console.error('Socket error:', error); - done.reject(error); - } -}); - -tap.test('RFC 3461 DSN - RCPT TO with DSN parameters', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - await new Promise((resolve, reject) => { - socket.once('connect', resolve); - socket.once('error', reject); - }); - - // Read greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Test RCPT TO with DSN parameters - socket.write('RCPT TO: NOTIFY=SUCCESS,FAILURE ORCPT=rfc822;recipient@example.com\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - // Server should either accept (250) or reject with proper error - const accepted = rcptResponse.includes('250'); - const properlyRejected = rcptResponse.includes('501') || rcptResponse.includes('555'); - - expect(accepted || properlyRejected).toEqual(true); - console.log(`DSN parameters in RCPT TO ${accepted ? 'accepted' : 'rejected'}`); - - if (accepted) { - // Reset to test other notify values - socket.write('RSET\r\n'); - const resetResponse = await waitForResponse(socket, '250'); - console.log('Server response:', resetResponse); - - // Send MAIL FROM again - socket.write('MAIL FROM:\r\n'); - const mail2Response = await waitForResponse(socket, '250'); - console.log('Server response:', mail2Response); - - // Test NOTIFY=NEVER - socket.write('RCPT TO: NOTIFY=NEVER\r\n'); - const rcptNeverResponse = await waitForResponse(socket); - console.log('Server response:', rcptNeverResponse); - - const neverAccepted = rcptNeverResponse.includes('250'); - console.log(`NOTIFY=NEVER parameter ${neverAccepted ? 'accepted' : 'rejected'}`); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - socket.end(); - done.resolve(); - } catch (error) { - console.error('Socket error:', error); - done.reject(error); - } -}); - -tap.test('RFC 3461 DSN - Complete DSN-enabled email', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Try with DSN parameters - socket.write('MAIL FROM: RET=FULL ENVID=test123\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.includes('250')) { - // DSN parameters accepted, continue with DSN RCPT - socket.write('RCPT TO: NOTIFY=SUCCESS,FAILURE,DELAY\r\n'); - const rcptResponse = await waitForResponse(socket); - - if (!rcptResponse.includes('250')) { - // Fallback to plain RCPT if DSN parameters not supported - console.log('DSN RCPT parameters not supported, using plain RCPT TO'); - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - } - } else if (mailResponse.includes('501') || mailResponse.includes('555')) { - // DSN not supported, use plain MAIL FROM - console.log('DSN parameters not supported, using plain MAIL FROM'); - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - } - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Send email content - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: RFC 3461 DSN Compliance Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email tests RFC 3461 DSN (Delivery Status Notification) compliance.', - 'The server should handle DSN parameters according to RFC 3461.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - await waitForResponse(socket, '250'); - - console.log('DSN-enabled email accepted'); - - // Quit - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('RFC 3461 DSN - Invalid DSN parameter handling', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - socket.on('connect', async () => { - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Test with invalid RET value - socket.write('MAIL FROM: RET=INVALID\r\n'); - const mailResponse = await waitForResponse(socket); - - // Should reject with 501 or similar - const properlyRejected = mailResponse.includes('501') || - mailResponse.includes('555') || - mailResponse.includes('500'); - - if (properlyRejected) { - console.log('Invalid RET parameter properly rejected'); - expect(true).toEqual(true); - } else if (mailResponse.includes('250')) { - // Server ignores unknown parameters (also acceptable) - console.log('Server ignores invalid DSN parameters'); - } - - // Reset and test invalid NOTIFY - socket.write('RSET\r\n'); - await waitForResponse(socket, '250'); - - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Test with invalid NOTIFY value - socket.write('RCPT TO: NOTIFY=INVALID\r\n'); - const rcptResponse = await waitForResponse(socket); - - const rcptRejected = rcptResponse.includes('501') || - rcptResponse.includes('555') || - rcptResponse.includes('500'); - - if (rcptRejected) { - console.log('Invalid NOTIFY parameter properly rejected'); - } else if (rcptResponse.includes('250')) { - console.log('Server ignores invalid NOTIFY parameter'); - } - - // Quit - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - - socket.end(); - done.resolve(); - } catch (err) { - console.error('Test error:', err); - socket.end(); - done.reject(err); - } - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-01.authentication.ts b/test/suite/smtpserver_security/test.sec-01.authentication.ts deleted file mode 100644 index 1a4f5d4..0000000 --- a/test/suite/smtpserver_security/test.sec-01.authentication.ts +++ /dev/null @@ -1,218 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import { startTestServer, stopTestServer, type ITestServer } from '../../helpers/server.loader.js'; -import { connectToSmtp, waitForGreeting, sendSmtpCommand, closeSmtpConnection } from '../../helpers/utils.js'; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server with authentication', async () => { - testServer = await startTestServer({ - port: 2530, - hostname: 'localhost', - authRequired: true - }); - expect(testServer).toBeInstanceOf(Object); -}); - -tap.test('SEC-01: Authentication - server advertises AUTH capability', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - - // Send EHLO to get capabilities - const ehloResponse = await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Parse capabilities - const lines = ehloResponse.split('\r\n').filter(line => line.length > 0); - const capabilities = lines.map(line => line.substring(4).trim()); - - // Check for AUTH capability - const authCapability = capabilities.find(cap => cap.startsWith('AUTH')); - expect(authCapability).toBeDefined(); - - // Extract supported mechanisms - const supportedMechanisms = authCapability?.substring(5).split(' ') || []; - console.log('📋 Supported AUTH mechanisms:', supportedMechanisms); - - // Common mechanisms should be supported - expect(supportedMechanisms).toContain('PLAIN'); - expect(supportedMechanisms).toContain('LOGIN'); - - console.log('✅ AUTH capability test passed'); - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('SEC-01: AUTH PLAIN mechanism - correct credentials', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Create AUTH PLAIN credentials - // Format: base64(NULL + username + NULL + password) - const username = 'testuser'; - const password = 'testpass'; - const authString = Buffer.from(`\0${username}\0${password}`).toString('base64'); - - // Send AUTH PLAIN command - try { - const authResponse = await sendSmtpCommand(socket, `AUTH PLAIN ${authString}`); - // Server might accept (235) or reject (535) based on configuration - expect(authResponse).toMatch(/^(235|535)/); - - if (authResponse.startsWith('235')) { - console.log('✅ AUTH PLAIN accepted (test mode)'); - } else { - console.log('✅ AUTH PLAIN properly rejected (production mode)'); - } - } catch (error) { - // Auth failure is expected in test environment - console.log('✅ AUTH PLAIN handled:', error.message); - } - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('SEC-01: AUTH LOGIN mechanism - interactive authentication', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Start AUTH LOGIN - try { - const authStartResponse = await sendSmtpCommand(socket, 'AUTH LOGIN', '334'); - expect(authStartResponse).toInclude('334'); - - // Server should prompt for username (base64 "Username:") - const usernamePrompt = Buffer.from( - authStartResponse.substring(4).trim(), - 'base64' - ).toString(); - console.log('Server prompt:', usernamePrompt); - - // Send username - const username = Buffer.from('testuser').toString('base64'); - const passwordPromptResponse = await sendSmtpCommand(socket, username, '334'); - - // Send password - const password = Buffer.from('testpass').toString('base64'); - const authResult = await sendSmtpCommand(socket, password); - - // Check result (235 = success, 535 = failure) - expect(authResult).toMatch(/^(235|535)/); - - } catch (error) { - // Auth failure is expected in test environment - console.log('✅ AUTH LOGIN handled:', error.message); - } - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('SEC-01: Authentication required - reject commands without auth', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Try to send email without authentication - try { - const mailResponse = await sendSmtpCommand(socket, 'MAIL FROM:'); - - // Server should reject with 530 (authentication required) or similar - if (mailResponse.startsWith('530') || mailResponse.startsWith('503')) { - console.log('✅ Server properly requires authentication'); - } else if (mailResponse.startsWith('250')) { - console.log('⚠️ Server accepted mail without auth (test mode)'); - } - - } catch (error) { - // Command rejection is expected - console.log('✅ Server rejected unauthenticated command:', error.message); - } - - } finally { - await closeSmtpConnection(socket); - } -}); - -tap.test('SEC-01: Invalid authentication attempts - rate limiting', async () => { - const socket = await connectToSmtp(testServer.hostname, testServer.port); - - try { - await waitForGreeting(socket); - await sendSmtpCommand(socket, 'EHLO test.example.com', '250'); - - // Try multiple failed authentication attempts - const maxAttempts = 5; - let failedAttempts = 0; - let requiresTLS = false; - - for (let i = 0; i < maxAttempts; i++) { - try { - // Send invalid credentials - const invalidAuth = Buffer.from('\0invalid\0wrong').toString('base64'); - const response = await sendSmtpCommand(socket, `AUTH PLAIN ${invalidAuth}`); - - // Check if authentication failed - if (response.startsWith('535')) { - failedAttempts++; - console.log(`Failed attempt ${i + 1}: ${response.trim()}`); - - // Check if server requires TLS (common security practice) - if (response.includes('TLS')) { - requiresTLS = true; - console.log('✅ Server enforces TLS requirement for authentication'); - break; - } - } else if (response.startsWith('503')) { - // Too many failed attempts - failedAttempts++; - console.log('✅ Server enforces auth attempt limits'); - break; - } - } catch (error) { - // Handle connection errors - failedAttempts++; - console.log(`Failed attempt ${i + 1}: ${error.message}`); - - // Check if server closed connection or rate limited - if (error.message.includes('closed') || error.message.includes('timeout')) { - console.log('✅ Server enforces auth attempt limits by closing connection'); - break; - } - } - } - - // Either TLS is required or we had failed attempts - expect(failedAttempts).toBeGreaterThan(0); - if (requiresTLS) { - console.log('✅ Authentication properly protected by TLS requirement'); - } else { - console.log(`✅ Handled ${failedAttempts} failed auth attempts`); - } - - } finally { - if (!socket.destroyed) { - socket.destroy(); - } - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - console.log('✅ Test server stopped'); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-02.authorization.ts b/test/suite/smtpserver_security/test.sec-02.authorization.ts deleted file mode 100644 index a09765a..0000000 --- a/test/suite/smtpserver_security/test.sec-02.authorization.ts +++ /dev/null @@ -1,286 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('Authorization - Valid sender domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO test.example.com\r\n'); - await waitForResponse(socket, '250'); - - // Use valid sender domain with proper format - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - // Try recipient - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - // Valid sender should be accepted or require auth - const accepted = rcptResponse.startsWith('250'); - const authRequired = rcptResponse.startsWith('530'); - console.log(`Valid sender domain: ${accepted ? 'accepted' : authRequired ? 'auth required' : 'rejected'}`); - - expect(accepted || authRequired).toEqual(true); - } else { - // Mail from rejected - could be due to auth requirement - const authRequired = mailResponse.startsWith('530'); - console.log(`MAIL FROM requires auth: ${authRequired}`); - expect(authRequired || mailResponse.startsWith('250')).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Authorization - External sender domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO external.com\r\n'); - await waitForResponse(socket, '250'); - - // Use external sender domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - // Try recipient - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - // Check response - const accepted = rcptResponse.startsWith('250'); - const authRequired = rcptResponse.startsWith('530'); - const rejected = rcptResponse.startsWith('550') || rcptResponse.startsWith('553'); - - console.log(`External sender: accepted=${accepted}, authRequired=${authRequired}, rejected=${rejected}`); - expect(accepted || authRequired || rejected).toEqual(true); - } else { - // Check if auth required or rejected - const authRequired = mailResponse.startsWith('530'); - const rejected = mailResponse.startsWith('550') || mailResponse.startsWith('553'); - - console.log(`External sender ${authRequired ? 'requires authentication' : rejected ? 'rejected by policy' : 'error'}`); - expect(authRequired || rejected).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Authorization - Relay attempt rejection', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO external.com\r\n'); - await waitForResponse(socket, '250'); - - // External sender - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - // Try to relay to another external domain (should be rejected) - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - // Relay attempt should be rejected or accepted (test mode) - const rejected = rcptResponse.startsWith('550') || - rcptResponse.startsWith('553') || - rcptResponse.startsWith('530') || - rcptResponse.startsWith('554'); - const accepted = rcptResponse.startsWith('250'); - - console.log(`Relay attempt ${rejected ? 'properly rejected' : accepted ? 'accepted (test mode)' : 'error'}`); - // In production, relay should be rejected. In test mode, it might be accepted - expect(rejected || accepted).toEqual(true); - - if (accepted) { - console.log('⚠️ WARNING: Server accepted relay attempt - ensure relay restrictions are properly configured in production'); - } - } else { - // MAIL FROM already rejected - console.log('External sender rejected at MAIL FROM'); - expect(mailResponse.startsWith('530') || mailResponse.startsWith('550')).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Authorization - IP-based restrictions', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Use IP address in EHLO - socket.write('EHLO [127.0.0.1]\r\n'); - await waitForResponse(socket, '250'); - - // Use proper email format - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - // Localhost IP should typically be accepted - const accepted = rcptResponse.startsWith('250'); - const rejected = rcptResponse.startsWith('550') || rcptResponse.startsWith('553'); - const authRequired = rcptResponse.startsWith('530'); - - console.log(`IP-based authorization: ${accepted ? 'accepted' : rejected ? 'rejected' : 'auth required'}`); - expect(accepted || rejected || authRequired).toEqual(true); // Any is valid based on server config - } else { - // Check if auth required - const authRequired = mailResponse.startsWith('530'); - console.log(`MAIL FROM ${authRequired ? 'requires auth' : 'rejected'}`); - expect(authRequired || mailResponse.startsWith('250')).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Authorization - Case sensitivity in addresses', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO test.example.com\r\n'); - await waitForResponse(socket, '250'); - - // Use mixed case in email address with proper domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - // Mixed case recipient - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - // Email addresses should be case-insensitive - const accepted = rcptResponse.startsWith('250'); - const authRequired = rcptResponse.startsWith('530'); - console.log(`Mixed case addresses ${accepted ? 'accepted' : authRequired ? 'auth required' : 'rejected'}`); - - expect(accepted || authRequired).toEqual(true); - } else { - // Check if auth required - const authRequired = mailResponse.startsWith('530'); - console.log(`MAIL FROM ${authRequired ? 'requires auth' : 'rejected'}`); - expect(authRequired || mailResponse.startsWith('250')).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-03.dkim-processing.ts b/test/suite/smtpserver_security/test.sec-03.dkim-processing.ts deleted file mode 100644 index 29ed4c2..0000000 --- a/test/suite/smtpserver_security/test.sec-03.dkim-processing.ts +++ /dev/null @@ -1,414 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('DKIM Processing - Valid DKIM signature', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Generate valid DKIM signature - const timestamp = Math.floor(Date.now() / 1000); - const dkimSignature = [ - 'v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=default;', - ' t=' + timestamp + ';', - ' h=from:to:subject:date:message-id;', - ' bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=;', - ' b=AMGNaJ3BliF0KSLD0wTfJd1eJhYbhP8YD2z9BPwAoeh6nKzfQ8wktB9Iwml3GKKj', - ' V6zJSGxJClQAoqJnO7oiIzPvHZTMGTbMvV9YBQcw5uvxLa2mRNkRT3FQ5vKFzfVQ', - ' OlHnZ8qZJDxYO4JmReCBnHQcC8W9cNJJh9ZQ4A=' - ].join(''); - - const email = [ - `DKIM-Signature: ${dkimSignature}`, - `Subject: DKIM Test - Valid Signature`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This is a DKIM test email with a valid signature.', - `Timestamp: ${Date.now()}`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', emailResponse); - console.log('Email with valid DKIM signature accepted'); - expect(emailResponse).toInclude('250'); - expect(emailResponse.startsWith('250')).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DKIM Processing - Invalid DKIM signature', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Generate invalid DKIM signature (wrong domain, bad signature) - const timestamp = Math.floor(Date.now() / 1000); - const dkimSignature = [ - 'v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=wrong-domain.com; s=invalid;', - ' t=' + timestamp + ';', - ' h=from:to:subject:date;', - ' bh=INVALID-BODY-HASH;', - ' b=INVALID-SIGNATURE-DATA' - ].join(''); - - const email = [ - `DKIM-Signature: ${dkimSignature}`, - `Subject: DKIM Test - Invalid Signature`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This is a DKIM test email with an invalid signature.', - `Timestamp: ${Date.now()}`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket); - console.log('Server response:', emailResponse); - - const accepted = emailResponse.includes('250'); - console.log(`Email with invalid DKIM signature ${accepted ? 'accepted' : 'rejected'}`); - // Either response is valid - server may accept and mark as failed, or reject - expect(emailResponse.match(/250|550/)).toBeTruthy(); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DKIM Processing - Missing DKIM signature', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Email without DKIM signature - const email = [ - `Subject: DKIM Test - No Signature`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This is a DKIM test email without any signature.', - `Timestamp: ${Date.now()}`, - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', emailResponse); - console.log('Email without DKIM signature accepted (neutral)'); - expect(emailResponse).toInclude('250'); - expect(emailResponse.startsWith('250')).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DKIM Processing - Multiple DKIM signatures', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Email with multiple DKIM signatures (common in forwarding) - const timestamp = Math.floor(Date.now() / 1000); - - const email = [ - 'DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=selector1;', - ' t=' + timestamp + ';', - ' h=from:to:subject;', - ' bh=first-body-hash;', - ' b=first-signature', - 'DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;', - ' d=forwarder.com; s=selector2;', - ' t=' + (timestamp + 60) + ';', - ' h=from:to:subject:date:message-id;', - ' bh=second-body-hash;', - ' b=second-signature', - `Subject: DKIM Test - Multiple Signatures`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email has multiple DKIM signatures.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', emailResponse); - console.log('Email with multiple DKIM signatures accepted'); - expect(emailResponse).toInclude('250'); - expect(emailResponse.startsWith('250')).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DKIM Processing - Expired DKIM signature', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // DKIM signature with expired timestamp - const expiredTimestamp = Math.floor(Date.now() / 1000) - 2592000; // 30 days ago - const expirationTime = expiredTimestamp + 86400; // Expired 29 days ago - - const dkimSignature = [ - 'v=1; a=rsa-sha256; c=relaxed/relaxed;', - ' d=example.com; s=default;', - ' t=' + expiredTimestamp + '; x=' + expirationTime + ';', - ' h=from:to:subject:date;', - ' bh=expired-body-hash;', - ' b=expired-signature' - ].join(''); - - const email = [ - `DKIM-Signature: ${dkimSignature}`, - `Subject: DKIM Test - Expired Signature`, - `From: sender@example.com`, - `To: recipient@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email has an expired DKIM signature.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket); - console.log('Server response:', emailResponse); - - const accepted = emailResponse.includes('250'); - console.log(`Email with expired DKIM signature ${accepted ? 'accepted' : 'rejected'}`); - // Either response is valid - expect(emailResponse.match(/250|550/)).toBeTruthy(); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-04.spf-checking.ts b/test/suite/smtpserver_security/test.sec-04.spf-checking.ts deleted file mode 100644 index d8f8b94..0000000 --- a/test/suite/smtpserver_security/test.sec-04.spf-checking.ts +++ /dev/null @@ -1,280 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('SPF Checking - Authorized IP from local domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO localhost\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with example.com domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('250')) { - console.log('Local domain sender accepted (SPF pass or neutral)'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - if (rcptResponse.includes('250')) { - console.log('Email accepted - SPF likely passed or neutral'); - expect(true).toEqual(true); - } - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - console.log('Local domain sender rejected (SPF fail)'); - expect(true).toEqual(true); // Either result shows SPF processing - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('SPF Checking - External domain sender', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with well-known external domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('250')) { - console.log('External domain sender accepted'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - const accepted = rcptResponse.includes('250'); - const rejected = rcptResponse.includes('550') || rcptResponse.includes('553'); - - console.log(`External domain: accepted=${accepted}, rejected=${rejected}`); - expect(accepted || rejected).toEqual(true); - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - console.log('External domain sender rejected (SPF fail)'); - expect(true).toEqual(true); // Shows SPF is working - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('SPF Checking - Known SPF fail domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with domain that should fail SPF - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('250')) { - console.log('SPF fail domain accepted (server may not enforce SPF)'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - // Either accepted or rejected is valid - const response = rcptResponse.includes('250') || rcptResponse.includes('550') || rcptResponse.includes('553'); - expect(response).toEqual(true); - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - console.log('SPF fail domain properly rejected'); - expect(true).toEqual(true); - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('SPF Checking - IPv4 literal in HELO', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO with IP literal - socket.write('EHLO [127.0.0.1]\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with IP literal - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - // Server should handle IP literals appropriately - const accepted = mailResponse.includes('250'); - const rejected = mailResponse.includes('550') || mailResponse.includes('553'); - - console.log(`IP literal sender: accepted=${accepted}, rejected=${rejected}`); - expect(accepted || rejected).toEqual(true); - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('SPF Checking - Subdomain sender', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO subdomain.example.com\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with subdomain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('250')) { - console.log('Subdomain sender accepted'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - const accepted = rcptResponse.includes('250'); - console.log(`Subdomain SPF test: ${accepted ? 'passed' : 'failed'}`); - expect(true).toEqual(true); - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - console.log('Subdomain sender rejected'); - expect(true).toEqual(true); - } - - // Send QUIT - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-05.dmarc-policy.ts b/test/suite/smtpserver_security/test.sec-05.dmarc-policy.ts deleted file mode 100644 index dcb1a02..0000000 --- a/test/suite/smtpserver_security/test.sec-05.dmarc-policy.ts +++ /dev/null @@ -1,374 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('DMARC Policy - Reject policy enforcement', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Check if server advertises DMARC support - const advertisesDmarc = ehloResponse.toLowerCase().includes('dmarc'); - console.log('DMARC advertised:', advertisesDmarc); - - // Send MAIL FROM with domain that has reject policy - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('550') || mailResponse.includes('553')) { - // DMARC reject policy enforced at MAIL FROM - console.log('DMARC reject policy enforced at MAIL FROM'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } else if (mailResponse.includes('250')) { - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Send email with DMARC-relevant headers - const email = [ - `From: test@dmarc-reject.example.com`, - `To: recipient@example.com`, - `Subject: DMARC Policy Test - Reject`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dmarc-reject.example.com; s=default;`, - ` h=from:to:subject:date; bh=test; b=test`, - '', - 'Testing DMARC reject policy enforcement.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const finalResponse = await waitForResponse(socket); - console.log('Server response:', finalResponse); - - const accepted = finalResponse.includes('250'); - const rejected = finalResponse.includes('550'); - - console.log(`DMARC reject policy: accepted=${accepted}, rejected=${rejected}`); - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } - } finally { - socket.destroy(); - } -}); - -tap.test('DMARC Policy - Quarantine policy', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with domain that has quarantine policy - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Send email with DMARC-relevant headers - const email = [ - `From: test@dmarc-quarantine.example.com`, - `To: recipient@example.com`, - `Subject: DMARC Policy Test - Quarantine`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing DMARC quarantine policy.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const finalResponse = await waitForResponse(socket); - console.log('Server response:', finalResponse); - - const accepted = finalResponse.includes('250'); - console.log(`DMARC quarantine policy: ${accepted ? 'accepted (may be quarantined)' : 'rejected'}`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DMARC Policy - None policy', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with domain that has none policy (monitoring only) - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Send email with DMARC-relevant headers - const email = [ - `From: test@dmarc-none.example.com`, - `To: recipient@example.com`, - `Subject: DMARC Policy Test - None`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing DMARC none policy (monitoring only).', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const finalResponse = await waitForResponse(socket, '250'); - console.log('Server response:', finalResponse); - - console.log('DMARC none policy: email accepted (monitoring only)'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DMARC Policy - Alignment testing', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with envelope domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Send email with different header From (tests alignment) - const email = [ - `From: test@header-domain.com`, - `To: recipient@example.com`, - `Subject: DMARC Alignment Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=header-domain.com; s=default;`, - ` h=from:to:subject:date; bh=test; b=test`, - '', - 'Testing DMARC domain alignment (envelope vs header From).', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const finalResponse = await waitForResponse(socket); - console.log('Server response:', finalResponse); - - const result = finalResponse.includes('250') ? 'accepted' : 'rejected'; - console.log(`DMARC alignment test: ${result}`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('DMARC Policy - Percentage testing', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM with domain that has percentage-based DMARC policy - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Send email with DMARC-relevant headers - const email = [ - `From: test@dmarc-pct.example.com`, - `To: recipient@example.com`, - `Subject: DMARC Percentage Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Testing DMARC with percentage-based policy application.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const finalResponse = await waitForResponse(socket); - console.log('Server response:', finalResponse); - - const result = finalResponse.includes('250') ? 'accepted' : 'rejected'; - console.log(`DMARC percentage policy: ${result} (may vary based on percentage)`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-06.ip-reputation.ts b/test/suite/smtpserver_security/test.sec-06.ip-reputation.ts deleted file mode 100644 index ff61837..0000000 --- a/test/suite/smtpserver_security/test.sec-06.ip-reputation.ts +++ /dev/null @@ -1,303 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('IP Reputation - Suspicious hostname in EHLO', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Use suspicious hostname - socket.write('EHLO suspicious-host.badreputation.com\r\n'); - const ehloResponse = await waitForResponse(socket); - console.log('Server response:', ehloResponse); - - const accepted = ehloResponse.includes('250'); - const rejected = ehloResponse.includes('550') || ehloResponse.includes('521'); - - console.log(`Suspicious hostname: accepted=${accepted}, rejected=${rejected}`); - expect(accepted || rejected).toEqual(true); - - if (rejected) { - console.log('IP reputation check working - suspicious host rejected at EHLO'); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('IP Reputation - Blacklisted sender domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Use known spam/blacklisted domain - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket); - console.log('Server response:', mailResponse); - - if (mailResponse.includes('250')) { - console.log('Blacklisted sender accepted at MAIL FROM'); - - // Try RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - console.log('Server response:', rcptResponse); - - const accepted = rcptResponse.includes('250'); - const rejected = rcptResponse.includes('550') || rcptResponse.includes('553'); - - console.log(`Blacklisted domain at RCPT: accepted=${accepted}, rejected=${rejected}`); - expect(accepted || rejected).toEqual(true); - } else if (mailResponse.includes('550') || mailResponse.includes('553')) { - console.log('Blacklisted sender rejected - IP reputation check working'); - expect(true).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('IP Reputation - Known good sender', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO localhost\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Use legitimate sender - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket, '250'); - console.log('Server response:', rcptResponse); - - console.log('Good sender accepted - IP reputation allows legitimate senders'); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('IP Reputation - Multiple connections from same IP', async (tools) => { - const connections: net.Socket[] = []; - const totalConnections = 3; - const connectionResults: Promise[] = []; - - // Create multiple connections rapidly - for (let i = 0; i < totalConnections; i++) { - const connectionPromise = (async () => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - connections.push(socket); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log(`Connection ${i + 1} response:`, greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket); - console.log(`Connection ${i + 1} response:`, ehloResponse); - - if (ehloResponse.includes('250')) { - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } else if (ehloResponse.includes('421') || ehloResponse.includes('550')) { - // Connection rejected due to rate limiting or reputation - console.log(`Connection ${i + 1} rejected - IP reputation/rate limiting active`); - } - } catch (err: any) { - console.error(`Connection ${i + 1} error:`, err.message); - } finally { - socket.destroy(); - } - })(); - - connectionResults.push(connectionPromise); - - // Small delay between connections - if (i < totalConnections - 1) { - await tools.delayFor(100); - } - } - - // Wait for all connections to complete - await Promise.all(connectionResults); - console.log('All connections completed'); - expect(true).toEqual(true); -}); - -tap.test('IP Reputation - Suspicious patterns in email', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - const greeting = await waitForResponse(socket, '220'); - console.log('Server response:', greeting); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - const ehloResponse = await waitForResponse(socket, '250'); - console.log('Server response:', ehloResponse); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - const mailResponse = await waitForResponse(socket, '250'); - console.log('Server response:', mailResponse); - - // Multiple recipients (spam pattern) - socket.write('RCPT TO:\r\n'); - const rcpt1Response = await waitForResponse(socket, '250'); - console.log('Server response:', rcpt1Response); - - socket.write('RCPT TO:\r\n'); - const rcpt2Response = await waitForResponse(socket, '250'); - console.log('Server response:', rcpt2Response); - - socket.write('RCPT TO:\r\n'); - const rcpt3Response = await waitForResponse(socket); - console.log('Server response:', rcpt3Response); - - if (rcpt3Response.includes('250')) { - // Send DATA - socket.write('DATA\r\n'); - const dataResponse = await waitForResponse(socket, '354'); - console.log('Server response:', dataResponse); - - // Email with spam-like content - const email = [ - `From: sender@example.com`, - `To: recipient1@example.com, recipient2@example.com, recipient3@example.com`, - `Subject: URGENT!!! You've won $1,000,000!!!`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'CLICK HERE NOW!!! Limited time offer!!!', - 'Visit http://suspicious-link.com/win-money', - 'Act NOW before it\'s too late!!!', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const emailResponse = await waitForResponse(socket); - console.log('Server response:', emailResponse); - - const result = emailResponse.includes('250') ? 'accepted' : 'rejected'; - console.log(`Suspicious content email ${result}`); - expect(true).toEqual(true); - } else if (rcpt3Response.includes('452') || rcpt3Response.includes('550')) { - console.log('Multiple recipients limited - reputation control active'); - expect(true).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221'); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-07.content-scanning.ts b/test/suite/smtpserver_security/test.sec-07.content-scanning.ts deleted file mode 100644 index 9e36806..0000000 --- a/test/suite/smtpserver_security/test.sec-07.content-scanning.ts +++ /dev/null @@ -1,409 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('Content Scanning - Suspicious content patterns', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with suspicious content - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Content Scanning Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email contains suspicious content that should trigger content scanning:', - 'VIRUS_TEST_STRING', - 'SUSPICIOUS_ATTACHMENT_PATTERN', - 'MALWARE_SIGNATURE_TEST', - 'Click here for FREE MONEY!!!', - 'Visit http://phishing-site.com/steal-data', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket); - - const accepted = dataResponse.startsWith('250'); - const rejected = dataResponse.startsWith('550'); - - console.log(`Suspicious content: accepted=${accepted}, rejected=${rejected}`); - - if (rejected) { - console.log('Content scanning active - suspicious content detected'); - } else { - console.log('Content scanning operational - email processed'); - } - - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Content Scanning - Malware patterns', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with malware-like patterns - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Important Security Update`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'Content-Type: multipart/mixed; boundary="malware-boundary"', - '', - '--malware-boundary', - 'Content-Type: text/plain', - '', - 'Please run the attached file to update your security software.', - '', - '--malware-boundary', - 'Content-Type: application/x-msdownload; name="update.exe"', - 'Content-Transfer-Encoding: base64', - 'Content-Disposition: attachment; filename="update.exe"', - '', - 'TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', - 'AAAA4AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v', - '', - '--malware-boundary--', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket); - - const accepted = dataResponse.startsWith('250'); - const rejected = dataResponse.startsWith('550'); - - console.log(`Malware pattern email: ${accepted ? 'accepted' : 'rejected'}`); - - if (rejected) { - console.log('Content scanning active - malware patterns detected'); - } else { - console.log('Content scanning operational - email processed'); - } - - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Content Scanning - Spam keywords', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with spam keywords - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: URGENT!!! Act NOW!!! Limited Time OFFER!!!`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'CONGRATULATIONS!!! You have WON!!!', - 'FREE FREE FREE!!!', - 'VIAGRA CIALIS CHEAP MEDS!!!', - 'MAKE $$$ FAST!!!', - 'WORK FROM HOME!!!', - 'NO CREDIT CHECK!!!', - 'GUARANTEED WINNER!!!', - 'CLICK HERE NOW!!!', - 'This is NOT SPAM!!!', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket); - - const accepted = dataResponse.startsWith('250'); - const rejected = dataResponse.startsWith('550'); - - console.log(`Spam keyword email: ${accepted ? 'accepted' : 'rejected (spam detected)'}`); - - if (rejected) { - console.log('Content scanning active - spam keywords detected'); - } else { - console.log('Content scanning operational - email processed'); - } - - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Content Scanning - Clean legitimate email', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Clean legitimate email - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Meeting Tomorrow`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'Hi,', - '', - 'Just wanted to confirm our meeting for tomorrow at 2 PM.', - 'Please let me know if you need to reschedule.', - '', - 'Best regards,', - 'John', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - console.log('Clean email accepted - content scanning allows legitimate emails'); - expect(dataResponse.startsWith('250')).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Content Scanning - Large attachment', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with large attachment pattern - const largeData = 'A'.repeat(10000); // 10KB of data - - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Large Attachment Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - 'Content-Type: multipart/mixed; boundary="boundary123"', - '', - '--boundary123', - 'Content-Type: text/plain', - '', - 'Please find the attached file.', - '', - '--boundary123', - 'Content-Type: application/octet-stream; name="largefile.dat"', - 'Content-Transfer-Encoding: base64', - 'Content-Disposition: attachment; filename="largefile.dat"', - '', - Buffer.from(largeData).toString('base64'), - '', - '--boundary123--', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket); - - const accepted = dataResponse.startsWith('250'); - const rejected = dataResponse.startsWith('550') || dataResponse.startsWith('552'); - - console.log(`Large attachment: ${accepted ? 'accepted' : 'rejected (size or content issue)'}`); - - if (rejected) { - console.log('Content scanning active - large attachment blocked'); - } else { - console.log('Content scanning operational - email processed'); - } - - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-08.rate-limiting.ts b/test/suite/smtpserver_security/test.sec-08.rate-limiting.ts deleted file mode 100644 index a736eaa..0000000 --- a/test/suite/smtpserver_security/test.sec-08.rate-limiting.ts +++ /dev/null @@ -1,324 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.js'; -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 30025; -const TEST_TIMEOUT = 30000; - -let testServer: ITestServer; - -tap.test('setup - start SMTP server for rate limiting tests', async () => { - testServer = await startTestServer({ - port: TEST_PORT, - hostname: 'localhost' - }); - expect(testServer).toBeInstanceOf(Object); -}); - -tap.test('Rate Limiting - should limit rapid consecutive connections', async (tools) => { - const done = tools.defer(); - - try { - const connections: net.Socket[] = []; - let rateLimitTriggered = false; - let successfulConnections = 0; - const maxAttempts = 10; - - for (let i = 0; i < maxAttempts; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - connections.push(socket); - - // Try EHLO - socket.write('EHLO testhost\r\n'); - - const response = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^[0-9]{3} /m) || data.match(/^[0-9]{3}-.*\r\n[0-9]{3} /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - if (response.includes('421') || response.toLowerCase().includes('rate') || response.toLowerCase().includes('limit')) { - rateLimitTriggered = true; - console.log(`Rate limit triggered at connection ${i + 1}`); - break; - } - - if (response.includes('250')) { - successfulConnections++; - } - - // Small delay between connections - await new Promise(resolve => setTimeout(resolve, 100)); - - } catch (error) { - const errorMsg = error instanceof Error ? error.message.toLowerCase() : ''; - if (errorMsg.includes('rate') || errorMsg.includes('limit') || errorMsg.includes('too many')) { - rateLimitTriggered = true; - console.log(`Rate limit error at connection ${i + 1}: ${errorMsg}`); - break; - } - // Connection refused might also indicate rate limiting - if (errorMsg.includes('econnrefused')) { - rateLimitTriggered = true; - console.log(`Connection refused at attempt ${i + 1} - possible rate limiting`); - break; - } - } - } - - // Clean up connections - for (const socket of connections) { - try { - if (!socket.destroyed) { - socket.write('QUIT\r\n'); - socket.end(); - } - } catch (e) { - // Ignore cleanup errors - } - } - - // Rate limiting is working if either: - // 1. We got explicit rate limit responses - // 2. We couldn't make all connections (some were refused/limited) - const rateLimitWorking = rateLimitTriggered || successfulConnections < maxAttempts; - - console.log(`Rate limiting test results: - - Successful connections: ${successfulConnections}/${maxAttempts} - - Rate limit triggered: ${rateLimitTriggered} - - Rate limiting effective: ${rateLimitWorking}`); - - // Note: We consider the test passed if rate limiting is either working OR not configured - // Many SMTP servers don't have rate limiting, which is also valid - expect(true).toEqual(true); - - } finally { - done.resolve(); - } -}); - -tap.test('Rate Limiting - should allow connections after rate limit period', async (tools) => { - const done = tools.defer(); - - try { - // First, try to trigger rate limiting - const connections: net.Socket[] = []; - let rateLimitTriggered = false; - - // Make rapid connections - for (let i = 0; i < 5; i++) { - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - connections.push(socket); - - socket.write('EHLO testhost\r\n'); - - const response = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^[0-9]{3} /m) || data.match(/^[0-9]{3}-.*\r\n[0-9]{3} /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - if (response.includes('421') || response.toLowerCase().includes('rate')) { - rateLimitTriggered = true; - break; - } - } catch (error) { - // Rate limit might cause connection errors - rateLimitTriggered = true; - break; - } - } - - // Clean up initial connections - for (const socket of connections) { - try { - if (!socket.destroyed) { - socket.end(); - } - } catch (e) { - // Ignore - } - } - - if (rateLimitTriggered) { - console.log('Rate limit was triggered, waiting before retry...'); - - // Wait a bit for rate limit to potentially reset - await new Promise(resolve => setTimeout(resolve, 2000)); - - // Try a new connection - try { - const retrySocket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - retrySocket.once('connect', () => resolve()); - retrySocket.once('error', reject); - }); - - retrySocket.write('EHLO testhost\r\n'); - - const retryResponse = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^[0-9]{3} /m) || data.match(/^[0-9]{3}-.*\r\n[0-9]{3} /ms))) { - retrySocket.removeListener('data', handler); - resolve(data); - } - }; - retrySocket.on('data', handler); - }); - - console.log('Retry connection response:', retryResponse.trim()); - - // Clean up - retrySocket.write('QUIT\r\n'); - retrySocket.end(); - - // If we got a normal response, rate limiting reset worked - expect(retryResponse).toInclude('250'); - } catch (error) { - console.log('Retry connection failed:', error); - // Some servers might have longer rate limit periods - expect(true).toEqual(true); - } - } else { - console.log('Rate limiting not triggered or not configured'); - expect(true).toEqual(true); - } - - } finally { - done.resolve(); - } -}); - -tap.test('Rate Limiting - should limit rapid MAIL FROM commands', async (tools) => { - const done = tools.defer(); - - try { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: TEST_TIMEOUT - }); - - await new Promise((resolve, reject) => { - socket.once('connect', () => resolve()); - socket.once('error', reject); - }); - - // Get banner - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - - // Send EHLO - socket.write('EHLO testhost\r\n'); - await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n') && (data.match(/^250 /m) || data.match(/^250-.*\r\n250 /ms))) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - let commandRateLimitTriggered = false; - let successfulCommands = 0; - - // Try rapid MAIL FROM commands - for (let i = 0; i < 10; i++) { - socket.write(`MAIL FROM:\r\n`); - - const response = await new Promise((resolve) => { - let data = ''; - const handler = (chunk: Buffer) => { - data += chunk.toString(); - if (data.includes('\r\n')) { - socket.removeListener('data', handler); - resolve(data); - } - }; - socket.on('data', handler); - }); - - if (response.includes('421') || response.toLowerCase().includes('rate') || response.toLowerCase().includes('limit')) { - commandRateLimitTriggered = true; - console.log(`Command rate limit triggered at command ${i + 1}`); - break; - } - - if (response.includes('250')) { - successfulCommands++; - // Need to reset after each MAIL FROM - socket.write('RSET\r\n'); - await new Promise((resolve) => { - socket.once('data', (chunk) => resolve(chunk.toString())); - }); - } - } - - console.log(`Command rate limiting results: - - Successful commands: ${successfulCommands}/10 - - Rate limit triggered: ${commandRateLimitTriggered}`); - - // Clean up - socket.write('QUIT\r\n'); - socket.end(); - - // Test passes regardless - rate limiting is optional - expect(true).toEqual(true); - - } finally { - done.resolve(); - } -}); - -tap.test('cleanup - stop SMTP server', async () => { - await stopTestServer(testServer); - expect(true).toEqual(true); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-09.tls-certificate-validation.ts b/test/suite/smtpserver_security/test.sec-09.tls-certificate-validation.ts deleted file mode 100644 index 92d393c..0000000 --- a/test/suite/smtpserver_security/test.sec-09.tls-certificate-validation.ts +++ /dev/null @@ -1,312 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import * as tls from 'tls'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('TLS Certificate Validation - STARTTLS certificate check', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - const supportsStarttls = dataBuffer.toLowerCase().includes('starttls'); - console.log('STARTTLS supported:', supportsStarttls); - - if (supportsStarttls) { - step = 'starttls'; - socket.write('STARTTLS\r\n'); - dataBuffer = ''; - } else { - console.log('STARTTLS not supported, testing plain connection'); - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'starttls' && dataBuffer.includes('220')) { - console.log('Ready to start TLS'); - - // Upgrade to TLS - const tlsOptions = { - socket: socket, - rejectUnauthorized: false, // For self-signed certificates in testing - requestCert: true - }; - - const tlsSocket = tls.connect(tlsOptions); - - tlsSocket.on('secureConnect', () => { - console.log('TLS connection established'); - - // Get certificate information - const cert = tlsSocket.getPeerCertificate(); - console.log('Certificate present:', !!cert); - - if (cert && Object.keys(cert).length > 0) { - console.log('Certificate subject:', cert.subject); - console.log('Certificate issuer:', cert.issuer); - console.log('Certificate valid from:', cert.valid_from); - console.log('Certificate valid to:', cert.valid_to); - - // Check certificate validity - const now = new Date(); - const validFrom = new Date(cert.valid_from); - const validTo = new Date(cert.valid_to); - const isValid = now >= validFrom && now <= validTo; - - console.log('Certificate currently valid:', isValid); - expect(true).toEqual(true); // Certificate present - } - - // Test EHLO over TLS - tlsSocket.write('EHLO testclient\r\n'); - }); - - tlsSocket.on('data', (data) => { - const response = data.toString(); - console.log('TLS response:', response); - - if (response.includes('250')) { - console.log('EHLO over TLS successful'); - expect(true).toEqual(true); - - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - done.resolve(); - } - }); - - tlsSocket.on('error', (err) => { - console.error('TLS error:', err); - done.reject(err); - }); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('TLS Certificate Validation - Direct TLS connection', async (tools) => { - const done = tools.defer(); - - // Try connecting with TLS directly (implicit TLS) - const tlsOptions = { - host: 'localhost', - port: TEST_PORT, - rejectUnauthorized: false, - timeout: 30000 - }; - - const socket = tls.connect(tlsOptions); - - socket.on('secureConnect', () => { - console.log('Direct TLS connection established'); - - const cert = socket.getPeerCertificate(); - if (cert && Object.keys(cert).length > 0) { - console.log('Certificate found on direct TLS connection'); - expect(true).toEqual(true); - } - - socket.end(); - done.resolve(); - }); - - socket.on('error', (err) => { - // Direct TLS might not be supported, try plain connection - console.log('Direct TLS not supported, this is expected for STARTTLS servers'); - expect(true).toEqual(true); - done.resolve(); - }); - - socket.on('timeout', () => { - console.log('Direct TLS connection timeout'); - socket.destroy(); - done.resolve(); - }); - - await done.promise; -}); - -tap.test('TLS Certificate Validation - Certificate verification with strict mode', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - if (dataBuffer.toLowerCase().includes('starttls')) { - step = 'starttls'; - socket.write('STARTTLS\r\n'); - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'starttls' && dataBuffer.includes('220')) { - // Try with strict certificate verification - const tlsOptions = { - socket: socket, - rejectUnauthorized: true, // Strict mode - servername: 'localhost' // For SNI - }; - - const tlsSocket = tls.connect(tlsOptions); - - tlsSocket.on('secureConnect', () => { - console.log('TLS connection with strict verification successful'); - const authorized = tlsSocket.authorized; - console.log('Certificate authorized:', authorized); - - if (!authorized) { - console.log('Authorization error:', tlsSocket.authorizationError); - } - - expect(true).toEqual(true); // Connection established - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - done.resolve(); - }); - - tlsSocket.on('error', (err) => { - console.log('Certificate verification error (expected for self-signed):', err.message); - expect(true).toEqual(true); // Error is expected for self-signed certificates - socket.end(); - done.resolve(); - }); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('TLS Certificate Validation - Cipher suite information', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - if (dataBuffer.toLowerCase().includes('starttls')) { - step = 'starttls'; - socket.write('STARTTLS\r\n'); - dataBuffer = ''; - } else { - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - } else if (step === 'starttls' && dataBuffer.includes('220')) { - const tlsOptions = { - socket: socket, - rejectUnauthorized: false - }; - - const tlsSocket = tls.connect(tlsOptions); - - tlsSocket.on('secureConnect', () => { - console.log('TLS connection established'); - - // Get cipher information - const cipher = tlsSocket.getCipher(); - if (cipher) { - console.log('Cipher name:', cipher.name); - console.log('Cipher version:', cipher.version); - console.log('Cipher standardName:', cipher.standardName); - } - - // Get protocol version - const protocol = tlsSocket.getProtocol(); - console.log('TLS Protocol:', protocol); - - // Verify modern TLS version - expect(['TLSv1.2', 'TLSv1.3']).toContain(protocol); - - tlsSocket.write('QUIT\r\n'); - tlsSocket.end(); - done.resolve(); - }); - - tlsSocket.on('error', (err) => { - console.error('TLS error:', err); - done.reject(err); - }); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-10.header-injection-prevention.ts b/test/suite/smtpserver_security/test.sec-10.header-injection-prevention.ts deleted file mode 100644 index eebcf0b..0000000 --- a/test/suite/smtpserver_security/test.sec-10.header-injection-prevention.ts +++ /dev/null @@ -1,332 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('Header Injection Prevention - CRLF injection in headers', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - // Attempt header injection with CRLF sequences - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: Test\r\nBcc: hidden@attacker.com`, // CRLF injection attempt - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `X-Custom: normal\r\nX-Injected: malicious`, // Another injection attempt - '', - 'This email tests header injection prevention.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') || dataBuffer.includes('550 ')) { - const accepted = dataBuffer.includes('250'); - const rejected = dataBuffer.includes('550'); - - console.log(`Header injection attempt: ${accepted ? 'accepted' : 'rejected'}`); - - if (rejected) { - console.log('Header injection prevention active - malicious headers detected'); - } - - expect(accepted || rejected).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Header Injection Prevention - Command injection in MAIL FROM', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - // Attempt command injection in MAIL FROM - socket.write('MAIL FROM: SIZE=1000\r\nRCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'mail') { - // Server should reject or handle this properly - const properResponse = dataBuffer.includes('250') || - dataBuffer.includes('501') || - dataBuffer.includes('500'); - - console.log('Command injection attempt handled'); - expect(properResponse).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Header Injection Prevention - HTML/Script injection in body', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - // Email with HTML/Script content - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: HTML Injection Test`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `Content-Type: text/html`, - '', - '', - '

Test Email

', - '', - '', - 'Injected-Header: malicious-value', // Attempted header injection in body - '', - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') || dataBuffer.includes('550 ')) { - const accepted = dataBuffer.includes('250'); - console.log(`HTML/Script content: ${accepted ? 'accepted (may be sanitized)' : 'rejected'}`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Header Injection Prevention - Null byte injection', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - // Attempt null byte injection - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail') { - // Should be rejected or sanitized - const handled = dataBuffer.includes('250') || - dataBuffer.includes('501') || - dataBuffer.includes('550'); - - console.log('Null byte injection attempt handled'); - expect(handled).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('Header Injection Prevention - Unicode and encoding attacks', async (tools) => { - const done = tools.defer(); - - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - let dataBuffer = ''; - let step = 'greeting'; - - socket.on('data', (data) => { - dataBuffer += data.toString(); - console.log('Server response:', data.toString()); - - if (step === 'greeting' && dataBuffer.includes('220 ')) { - step = 'ehlo'; - socket.write('EHLO testclient\r\n'); - dataBuffer = ''; - } else if (step === 'ehlo' && dataBuffer.includes('250')) { - step = 'mail'; - socket.write('MAIL FROM:\r\n'); - dataBuffer = ''; - } else if (step === 'mail' && dataBuffer.includes('250')) { - step = 'rcpt'; - socket.write('RCPT TO:\r\n'); - dataBuffer = ''; - } else if (step === 'rcpt' && dataBuffer.includes('250')) { - step = 'data'; - socket.write('DATA\r\n'); - dataBuffer = ''; - } else if (step === 'data' && dataBuffer.includes('354')) { - // Unicode tricks and encoding attacks - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: =?UTF-8?B?${Buffer.from('Test\r\nBcc: hidden@attacker.com').toString('base64')}?=`, // Encoded injection - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `X-Test: \u000D\u000AX-Injected: true`, // Unicode CRLF - '', - 'Testing unicode and encoding attacks.', - '\x00\x0D\x0AExtra-Header: injected', // Null byte + CRLF - '.', - '' - ].join('\r\n'); - - socket.write(email); - dataBuffer = ''; - } else if (dataBuffer.includes('250 ') || dataBuffer.includes('550 ')) { - const result = dataBuffer.includes('250') ? 'accepted' : 'rejected'; - console.log(`Unicode/encoding attack: ${result}`); - expect(true).toEqual(true); - - socket.write('QUIT\r\n'); - socket.end(); - done.resolve(); - } - }); - - socket.on('error', (err) => { - console.error('Socket error:', err); - done.reject(err); - }); - - await done.promise; -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/suite/smtpserver_security/test.sec-11.bounce-management.ts b/test/suite/smtpserver_security/test.sec-11.bounce-management.ts deleted file mode 100644 index 813a758..0000000 --- a/test/suite/smtpserver_security/test.sec-11.bounce-management.ts +++ /dev/null @@ -1,363 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../../../ts/plugins.js'; -import * as net from 'net'; -import { startTestServer, stopTestServer } from '../../helpers/server.loader.ts' -import type { ITestServer } from '../../helpers/server.loader.js'; - -const TEST_PORT = 2525; -let testServer: ITestServer; - -// Helper to wait for SMTP response -const waitForResponse = (socket: net.Socket, expectedCode?: string, timeout = 5000): Promise => { - return new Promise((resolve, reject) => { - let buffer = ''; - const timer = setTimeout(() => { - socket.removeListener('data', handler); - reject(new Error(`Timeout waiting for ${expectedCode || 'any'} response`)); - }, timeout); - - const handler = (data: Buffer) => { - buffer += data.toString(); - const lines = buffer.split('\r\n'); - - for (const line of lines) { - if (expectedCode) { - if (line.startsWith(expectedCode + ' ')) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } else { - // Look for any complete response - if (line.match(/^\d{3} /)) { - clearTimeout(timer); - socket.removeListener('data', handler); - resolve(buffer); - return; - } - } - } - }; - - socket.on('data', handler); - }); -}; - -tap.test('setup - start test server', async (toolsArg) => { - testServer = await startTestServer({ port: TEST_PORT }); - await toolsArg.delayFor(1000); -}); - -tap.test('Bounce Management - Invalid recipient domain', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send to non-existent domain - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - if (rcptResponse.startsWith('550') || rcptResponse.startsWith('551') || rcptResponse.startsWith('553')) { - console.log('Bounce management active - invalid recipient properly rejected'); - expect(true).toEqual(true); - } else if (rcptResponse.startsWith('250')) { - // Server accepted, may generate bounce later - console.log('Invalid recipient accepted - bounce may be generated later'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - const email = [ - `From: sender@example.com`, - `To: nonexistent@invalid-domain-that-does-not-exist.com`, - `Subject: Bounce Management Test`, - `Return-Path: `, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email is designed to test bounce management functionality.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - console.log('Email accepted for processing - bounce will be generated'); - expect(dataResponse.startsWith('250')).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Bounce Management - Empty return path (null sender)', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Empty return path (null sender) - used for bounce messages - socket.write('MAIL FROM:<>\r\n'); - const mailResponse = await waitForResponse(socket); - - if (mailResponse.startsWith('250')) { - console.log('Null sender accepted (for bounce messages)'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - const dataCommandResponse = await waitForResponse(socket); - - if (dataCommandResponse.startsWith('354')) { - // Bounce message format - const email = [ - `From: MAILER-DAEMON@example.com`, - `To: recipient@example.com`, - `Subject: Mail delivery failed: returning message to sender`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `Auto-Submitted: auto-replied`, - '', - 'This message was created automatically by mail delivery software.', - '', - 'A message that you sent could not be delivered to one or more recipients.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - console.log('Bounce message with null sender accepted'); - expect(dataResponse.startsWith('250')).toEqual(true); - } else if (dataCommandResponse.startsWith('503')) { - // Server rejects DATA for null sender - console.log('Server rejects DATA command for null sender (strict policy)'); - expect(dataCommandResponse.startsWith('503')).toEqual(true); - } - } else { - console.log('Null sender rejected'); - expect(true).toEqual(true); - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Bounce Management - DSN headers', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - // Email with DSN request headers - const email = [ - `From: sender@example.com`, - `To: recipient@example.com`, - `Subject: DSN Test`, - `Return-Path: `, - `Disposition-Notification-To: sender@example.com`, - `Return-Receipt-To: sender@example.com`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This email requests delivery status notifications.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - console.log('Email with DSN headers accepted'); - expect(dataResponse.startsWith('250')).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Bounce Management - Bounce loop prevention', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Null sender (bounce message) - socket.write('MAIL FROM:<>\r\n'); - await waitForResponse(socket, '250'); - - // To another mailer-daemon (potential loop) - socket.write('RCPT TO:\r\n'); - const rcptResponse = await waitForResponse(socket); - - if (rcptResponse.startsWith('550') || rcptResponse.startsWith('553')) { - console.log('Bounce loop prevented - mailer-daemon recipient rejected'); - expect(true).toEqual(true); - } else if (rcptResponse.startsWith('250')) { - console.log('Mailer-daemon recipient accepted - check for loop prevention'); - - // Send DATA - socket.write('DATA\r\n'); - const dataCommandResponse = await waitForResponse(socket); - - if (dataCommandResponse.startsWith('354')) { - const email = [ - `From: MAILER-DAEMON@example.com`, - `To: mailer-daemon@another-server.com`, - `Subject: Delivery Status Notification (Failure)`, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - `Auto-Submitted: auto-replied`, - `X-Loop: example.com`, - '', - 'This is a bounce of a bounce - potential loop.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket); - - const result = dataResponse.startsWith('250') ? 'accepted' : 'rejected'; - console.log(`Bounce loop test: ${result}`); - expect(true).toEqual(true); - } else if (dataCommandResponse.startsWith('503')) { - // Server rejects DATA for null sender - console.log('Bounce loop prevented at DATA stage (null sender rejection)'); - expect(dataCommandResponse.startsWith('503')).toEqual(true); - } - } - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('Bounce Management - Valid email (control test)', async (tools) => { - const socket = net.createConnection({ - host: 'localhost', - port: TEST_PORT, - timeout: 30000 - }); - - try { - // Wait for greeting - await waitForResponse(socket, '220'); - - // Send EHLO - socket.write('EHLO testclient\r\n'); - await waitForResponse(socket, '250'); - - // Send MAIL FROM - socket.write('MAIL FROM:\r\n'); - await waitForResponse(socket, '250'); - - // Send RCPT TO - socket.write('RCPT TO:\r\n'); - await waitForResponse(socket, '250'); - - // Send DATA - socket.write('DATA\r\n'); - await waitForResponse(socket, '354'); - - const email = [ - `From: sender@example.com`, - `To: valid@example.com`, - `Subject: Valid Email Test`, - `Return-Path: `, - `Date: ${new Date().toUTCString()}`, - `Message-ID: `, - '', - 'This is a valid email that should not trigger bounce.', - '.', - '' - ].join('\r\n'); - - socket.write(email); - const dataResponse = await waitForResponse(socket, '250'); - - console.log('Valid email accepted - no bounce expected'); - expect(dataResponse.startsWith('250')).toEqual(true); - - socket.write('QUIT\r\n'); - await waitForResponse(socket, '221').catch(() => {}); - } finally { - socket.destroy(); - } -}); - -tap.test('cleanup - stop test server', async () => { - await stopTestServer(testServer); -}); - -export default tap.start(); \ No newline at end of file diff --git a/test/test.smtp.server.ts b/test/test.smtp.server.ts deleted file mode 100644 index 75bae07..0000000 --- a/test/test.smtp.server.ts +++ /dev/null @@ -1,180 +0,0 @@ -import { tap, expect } from '@git.zone/tstest/tapbundle'; -import * as plugins from '../ts/plugins.js'; -import * as paths from '../ts/paths.js'; -import { createSmtpServer } from '../ts/mail/delivery/smtpserver/index.js'; -import { UnifiedEmailServer } from '../ts/mail/routing/classes.unified.email.server.js'; -import { Email } from '../ts/mail/core/classes.email.js'; -import type { ISmtpServerOptions } from '../ts/mail/delivery/interfaces.js'; - -/** - * Tests for the SMTP server class - */ -tap.test('verify SMTP server initialization', async () => { - // Mock email server - const mockEmailServer = { - processEmailByMode: async () => new Email({ - from: 'test@example.com', - to: 'recipient@example.com', - subject: 'Test Email', - text: 'This is a test email' - }) - } as any; - - // Create test configuration - const options: ISmtpServerOptions = { - port: 2525, // Use a high port for testing - hostname: 'test.example.com', - key: '-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAxzYIwlfnr7AK2v6E+c2oYD7nAIXIIvDuvVvZ8R9kyxXIzTXB\nj5D1AgntqKS3bFR1XT8hCVeXjuLKPBvXbhVjG15gXlXxpNiFi1ZcphJvs4zB/Vh7\nZv2ALt3anSIwsJ2rZA/R/GqdJPkHvYf/GMTDLw0YllR0YOevErnRIIM5S58Lj2nT\nCr5v5hK1Gl9mWwRkFQKkWVl2UXt/JX6C7Z6UyJXMZSnoG0Kw6GQje41K5r0Zdzrh\nrGfmb9wSDUn9sZGX6il+oMiYz7UgQkPEzGUZEJxKJwxy8ZgPdSgbvYq4WwPwbBUJ\nlpw0gt5i6HOS7CphRama+zAf5LvfSLoLXSP5JwIDAQABAoIBAQC8C5Ge6wS4LuH9\ntbZFPwjdGHXL+QT2fOFxPBrE7PkeY8UXD7G5Yei6iqqCxJh8nhLQ3DoayhZM69hO\nePOV1Z/LDERCnGel15WKQ1QJ1HZ+JQXnfQrE1Mi9QrXO5bVFtnXIr0mZ+AzwoUmn\nK5fYCvaL3xDZPDzOYL5kZG2hQKgbywGKZoQx16G0dSEhlAHbK9z6XmPRrbUKGzB8\nqV7QGbL7BUTQs5JW/8LpkYr5C0q5THtUVb9mHNR3jPf9WTPQ0D3lxcbLS4PQ8jQ/\nL/GcuHGmsXhe2Unw3w2wpuJKPeHKz4rBNIvaSjIZl9/dIKM88JYQTiIGKErxsC0e\nkczQMp6BAoGBAO0zUN8H7ynXGNNtK/tJo0lI3qg1ZKgr+0CU2L5eU8Bn1oJ1JkCI\nWD3p36NdECx5tGexm9U6MN+HzKYUjnQ6LKzbHQGLZqzF5IL5axXgCn8w4BM+6Ixm\ny8kQgsTKlKRMXIn8RZCmXNnc7v0FhBgpDxPmm7ZUuOPrInd8Ph4mEsePAoGBANb4\n3/izAHnLEp3/sTOZpfWBnDcvEHCG7/JAX0TDRW1FpXiTHpvDV1j3XU3EvLl7WRJ1\nB+B8h/Z6kQtUUxQ3I+zxuQIkQYI8qPu+xhQ8gb5AIO5CMX09+xKUgYjQtm7kYs7W\nL0LD9u3hkGsJk2wfVvMJKb3OSIHeTwRzFCzGX995AoGADkLB8eu/FKAIfwRPCHVE\nsfwMtqjkj2XJ9FeNcRQ5g/Tf8OGnCGEzBwXb05wJVrXUgXp4dBaqYTdAKj8uLEvd\nmi9t/LzR+33cGUdAQHItxcKbsMv00TyNRQUvZFZ7ZEY8aBkv5uZfvJHZ5iQ8C7+g\nHGXNfVGXGPutz/KN6X25CLECgYEAjVLK0MkXzLxCYJRDIhB1TpQVXjpxYUP2Vxls\nSSxfeYqkJPgNvYiHee33xQ8+TP1y9WzkWh+g2AbGmwTuKKL6CvQS9gKVvqqaFB7y\nKrkR13MTPJKvHHdQYKGQqQGgHKh0kGFCC0+PoVwtYs/XU1KpZCE16nNgXrOvTYNN\nHxESa+kCgYB7WOcawTp3WdKP8JbolxIfxax7Kd4QkZhY7dEb4JxBBYXXXpv/NHE9\npcJw4eKDyY+QE2AHPu3+fQYzXopaaTGRpB+ynEfYfD2hW+HnOWfWu/lFJbiwBn/S\nwRsYzSWiLtNplKNFRrsSoMWlh8GOTUpZ7FMLXWhE4rE9NskQBbYq8g==\n-----END RSA PRIVATE KEY-----', - cert: '-----BEGIN CERTIFICATE-----\nMIIDazCCAlOgAwIBAgIUcmAewXEYwtzbZmZAJ5inMogKSbowDQYJKoZIhvcNAQEL\nBQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM\nGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDAyMjAwODM4MzRaFw0yNTAy\nMTkwODM4MzRaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw\nHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB\nAQUAA4IBDwAwggEKAoIBAQDHNgjCV+evsAra/oT5zahgPucAhcgi8O69W9nxH2TL\nFcjNNcGPkPUCCe2opLdsVHVdPyEJV5eO4so8G9duFWMbXmBeVfGk2IWLVlymEm+z\njMH9WHtm/YAu3dqdIjCwnatED9H8ap0k+Qd9h/8YxMMvDRiWVHRg568SudEggzlL\nnwuPadMKvm/mErUaX2ZbBGQVAqRZWXZRe38lfoLtnpTIlcxlKegbQrDoZCN7jUrm\nvRl3OuGsZ+Zv3BINSf2xkZfqKX6gyJjPtSBCQ8TMZRkQnEonDHLxmA91KBu9irhb\nA/BsFQmWnDSC3mLoc5LsKmFFqZr7MB/ku99IugtdI/knAgMBAAGjUzBRMB0GA1Ud\nDgQWBBQryyWLuN22OqU1r9HIt2tMLBk42DAfBgNVHSMEGDAWgBQryyWLuN22OqU1\nr9HIt2tMLBk42DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAe\nCeXQZlXJ2xLnDoOoKY3BpodErNmAwygGYxwDCU0xPbpUMPrQhLI80JlZmfy58gT/\n0ZbULS+srShfEsFnBLmzWLGXDvA/IKCQyTmCQwbPeELGXF6h4URMb+lQL7WL9tY0\nuUg2dA+7CtYokIrOkGqUitPK3yvVhxugkf51WIgKMACZDibOQSWrV5QO2vHOAaO9\nePzRGGl3+Ebmcs3+5w1fI6OLsIZH10lfEnC83C0lO8tIJlGsXMQkCjAcX22rT0rc\nAcxLm07H4EwMwgOAJUkuDjD3y4+KH91jKWF8bhaLZooFB8lccNnaCRiuZRnXlvmf\nM7uVlLGwlj5R9iHd+0dP\n-----END CERTIFICATE-----' - }; - - // Create SMTP server instance - const smtpServer = createSmtpServer(mockEmailServer, options); - - // Verify instance was created correctly - expect(smtpServer).toBeTruthy(); - - // Test that the listen method exists and is callable - expect(typeof smtpServer.listen === 'function').toBeTruthy(); - - // Test that the close method exists - expect(typeof smtpServer.close === 'function').toBeTruthy(); -}); - -tap.test('verify SMTP server listen method - skipping test that accesses private properties', async (tools) => { - tools.skip('Skipping test that accesses private properties'); - // Mock email server - const mockEmailServer = { - processEmailByMode: async () => new Email({ - from: 'test@example.com', - to: 'recipient@example.com', - subject: 'Test Email', - text: 'This is a test email' - }) - } as any; - - // Create test configuration without certificates (will use self-signed) - const options: ISmtpServerOptions = { - port: 2526, // Use a different port for this test - hostname: 'test.example.com', - connectionTimeout: 5000 // Short timeout for tests - }; - - // Create SMTP server instance - const smtpServer = createSmtpServer(mockEmailServer, options); - - // Test that server was created - expect(smtpServer).toBeTruthy(); - expect(smtpServer).toHaveProperty('server'); - - // Mock server methods to avoid actual networking - let listenCalled = false; - let closeCalled = false; - - if (smtpServer.server) { - const originalListen = smtpServer.server.listen; - const originalClose = smtpServer.server.close; - - smtpServer.server.listen = function(port, callback) { - listenCalled = true; - if (callback) callback(); - return this; - }; - - smtpServer.server.close = function(callback) { - closeCalled = true; - if (callback) callback(null); - return this; - }; - - try { - // Test listen method - await smtpServer.listen(); - expect(listenCalled).toBeTruthy(); - - // Test close method - await smtpServer.close(); - expect(closeCalled).toBeTruthy(); - } finally { - // Restore original methods - smtpServer.server.listen = originalListen; - smtpServer.server.close = originalClose; - } - } -}); - -tap.test('verify SMTP server error handling - skipping test that accesses private properties', async (tools) => { - tools.skip('Skipping test that accesses private properties'); - // Mock email server - const mockEmailServer = { - processEmailByMode: async () => new Email({ - from: 'test@example.com', - to: 'recipient@example.com', - subject: 'Test Email', - text: 'This is a test email' - }) - } as any; - - // Create test configuration without certificates - const options: ISmtpServerOptions = { - port: 2527, // Use port that should work - hostname: 'test.example.com' - }; - - // Create SMTP server instance - const smtpServer = createSmtpServer(mockEmailServer, options); - - // Test error handling by mocking the server's error event - if (smtpServer.server) { - const originalListen = smtpServer.server.listen; - const originalOn = smtpServer.server.on; - const originalOnce = smtpServer.server.once; - - let errorCallback: (err: Error) => void; - let listeningCallback: () => void; - - smtpServer.server.listen = function(port, callback) { - // Simulate error after a delay - setTimeout(() => { - if (errorCallback) { - errorCallback(new Error('EACCES: Permission denied')); - } - }, 10); - return this; - }; - - smtpServer.server.on = function(event: string, callback: any) { - if (event === 'error') { - errorCallback = callback; - } - return originalOn.call(this, event, callback); - }; - - smtpServer.server.once = function(event: string, callback: any) { - if (event === 'listening') { - listeningCallback = callback; - } - return originalOnce.call(this, event, callback); - }; - - try { - // This should fail with an error - await smtpServer.listen().catch(error => { - // Expect an error - expect(error).toBeTruthy(); - expect(error.message).toContain('EACCES'); - }); - } finally { - // Restore original methods - smtpServer.server.listen = originalListen; - smtpServer.server.on = originalOn as any; - smtpServer.server.once = originalOnce as any; - } - } -}); - -tap.test('stop', async () => { - await tap.stopForcefully(); -}); - -export default tap.start(); \ No newline at end of file diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index fa8491d..7e87997 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartmta', - version: '2.2.1', + version: '2.3.0', description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.' } diff --git a/ts/mail/delivery/index.ts b/ts/mail/delivery/index.ts index dc87825..e3066a9 100644 --- a/ts/mail/delivery/index.ts +++ b/ts/mail/delivery/index.ts @@ -19,6 +19,5 @@ export * from './classes.mta.config.js'; // Import and export SMTP modules as namespaces to avoid conflicts import * as smtpClientMod from './smtpclient/index.js'; -import * as smtpServerMod from './smtpserver/index.js'; -export { smtpClientMod, smtpServerMod }; \ No newline at end of file +export { smtpClientMod }; \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/certificate-utils.ts b/ts/mail/delivery/smtpserver/certificate-utils.ts deleted file mode 100644 index 1bf372f..0000000 --- a/ts/mail/delivery/smtpserver/certificate-utils.ts +++ /dev/null @@ -1,398 +0,0 @@ -/** - * Certificate Utilities for SMTP Server - * Provides utilities for managing TLS certificates - */ - -import * as fs from 'fs'; -import * as tls from 'tls'; -import { SmtpLogger } from './utils/logging.js'; - -/** - * Certificate data - */ -export interface ICertificateData { - key: Buffer; - cert: Buffer; - ca?: Buffer; -} - -/** - * Normalize a PEM certificate string - * @param str - Certificate string - * @returns Normalized certificate string - */ -function normalizeCertificate(str: string | Buffer): string { - // Handle different input types - let inputStr: string; - - if (Buffer.isBuffer(str)) { - // Convert Buffer to string using utf8 encoding - inputStr = str.toString('utf8'); - } else if (typeof str === 'string') { - inputStr = str; - } else { - throw new Error('Certificate must be a string or Buffer'); - } - - if (!inputStr) { - throw new Error('Empty certificate data'); - } - - // Remove any whitespace around the string - let normalizedStr = inputStr.trim(); - - // Make sure it has proper PEM format - if (!normalizedStr.includes('-----BEGIN ')) { - throw new Error('Invalid certificate format: Missing BEGIN marker'); - } - - if (!normalizedStr.includes('-----END ')) { - throw new Error('Invalid certificate format: Missing END marker'); - } - - // Normalize line endings (replace Windows-style \r\n with Unix-style \n) - normalizedStr = normalizedStr.replace(/\r\n/g, '\n'); - - // Only normalize if the certificate appears to have formatting issues - // Check if the certificate is already properly formatted - const lines = normalizedStr.split('\n'); - let needsReformatting = false; - - // Check for common formatting issues: - // 1. Missing line breaks after header/before footer - // 2. Lines that are too long or too short (except header/footer) - // 3. Multiple consecutive blank lines - for (let i = 0; i < lines.length; i++) { - const line = lines[i].trim(); - if (line.startsWith('-----BEGIN ') || line.startsWith('-----END ')) { - continue; // Skip header/footer lines - } - if (line.length === 0) { - continue; // Skip empty lines - } - // Check if content lines are reasonable length (base64 is typically 64 chars per line) - if (line.length > 76) { // Allow some flexibility beyond standard 64 - needsReformatting = true; - break; - } - } - - // Only reformat if necessary - if (needsReformatting) { - const beginMatch = normalizedStr.match(/^(-----BEGIN [^-]+-----)(.*)$/s); - const endMatch = normalizedStr.match(/(.*)(-----END [^-]+-----)$/s); - - if (beginMatch && endMatch) { - const header = beginMatch[1]; - const footer = endMatch[2]; - let content = normalizedStr.substring(header.length, normalizedStr.length - footer.length); - - // Clean up only line breaks and carriage returns, preserve base64 content - content = content.replace(/[\n\r]/g, '').trim(); - - // Add proper line breaks (every 64 characters) - let formattedContent = ''; - for (let i = 0; i < content.length; i += 64) { - formattedContent += content.substring(i, Math.min(i + 64, content.length)) + '\n'; - } - - // Reconstruct the certificate - return header + '\n' + formattedContent + footer; - } - } - - return normalizedStr; -} - -/** - * Load certificates from PEM format strings - * @param options - Certificate options - * @returns Certificate data with Buffer format - */ -export function loadCertificatesFromString(options: { - key: string | Buffer; - cert: string | Buffer; - ca?: string | Buffer; -}): ICertificateData { - try { - // First try to use certificates without normalization - try { - let keyStr: string; - let certStr: string; - let caStr: string | undefined; - - // Convert inputs to strings without aggressive normalization - if (Buffer.isBuffer(options.key)) { - keyStr = options.key.toString('utf8'); - } else { - keyStr = options.key; - } - - if (Buffer.isBuffer(options.cert)) { - certStr = options.cert.toString('utf8'); - } else { - certStr = options.cert; - } - - if (options.ca) { - if (Buffer.isBuffer(options.ca)) { - caStr = options.ca.toString('utf8'); - } else { - caStr = options.ca; - } - } - - // Simple cleanup - only normalize line endings - keyStr = keyStr.trim().replace(/\r\n/g, '\n'); - certStr = certStr.trim().replace(/\r\n/g, '\n'); - if (caStr) { - caStr = caStr.trim().replace(/\r\n/g, '\n'); - } - - // Convert to buffers - const keyBuffer = Buffer.from(keyStr, 'utf8'); - const certBuffer = Buffer.from(certStr, 'utf8'); - const caBuffer = caStr ? Buffer.from(caStr, 'utf8') : undefined; - - // Test the certificates first - const secureContext = tls.createSecureContext({ - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }); - - SmtpLogger.info('Successfully validated certificates without normalization'); - - return { - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }; - - } catch (simpleError) { - SmtpLogger.warn(`Simple certificate loading failed, trying normalization: ${simpleError instanceof Error ? simpleError.message : String(simpleError)}`); - - // DEBUG: Log certificate details when simple loading fails - SmtpLogger.warn('Certificate loading failure details', { - keyType: typeof options.key, - certType: typeof options.cert, - keyIsBuffer: Buffer.isBuffer(options.key), - certIsBuffer: Buffer.isBuffer(options.cert), - keyLength: options.key ? options.key.length : 0, - certLength: options.cert ? options.cert.length : 0, - keyPreview: options.key ? (typeof options.key === 'string' ? options.key.substring(0, 50) : options.key.toString('utf8').substring(0, 50)) : 'null', - certPreview: options.cert ? (typeof options.cert === 'string' ? options.cert.substring(0, 50) : options.cert.toString('utf8').substring(0, 50)) : 'null' - }); - } - - // Fallback: Try to fix and normalize certificates - try { - // Normalize certificates (handles both string and Buffer inputs) - const key = normalizeCertificate(options.key); - const cert = normalizeCertificate(options.cert); - const ca = options.ca ? normalizeCertificate(options.ca) : undefined; - - // Convert normalized strings to Buffer with explicit utf8 encoding - const keyBuffer = Buffer.from(key, 'utf8'); - const certBuffer = Buffer.from(cert, 'utf8'); - const caBuffer = ca ? Buffer.from(ca, 'utf8') : undefined; - - // Log for debugging - SmtpLogger.debug('Certificate properties', { - keyLength: keyBuffer.length, - certLength: certBuffer.length, - caLength: caBuffer ? caBuffer.length : 0 - }); - - // Validate the certificates by attempting to create a secure context - try { - const secureContext = tls.createSecureContext({ - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }); - - // If createSecureContext doesn't throw, the certificates are valid - SmtpLogger.info('Successfully validated certificate format'); - } catch (validationError) { - // Log detailed error information for debugging - SmtpLogger.error(`Certificate validation error: ${validationError instanceof Error ? validationError.message : String(validationError)}`); - SmtpLogger.debug('Certificate validation details', { - keyPreview: keyBuffer.toString('utf8').substring(0, 100) + '...', - certPreview: certBuffer.toString('utf8').substring(0, 100) + '...', - keyLength: keyBuffer.length, - certLength: certBuffer.length - }); - throw validationError; - } - - return { - key: keyBuffer, - cert: certBuffer, - ca: caBuffer - }; - } catch (innerError) { - SmtpLogger.warn(`Certificate normalization failed: ${innerError instanceof Error ? innerError.message : String(innerError)}`); - throw innerError; - } - } catch (error) { - SmtpLogger.error(`Error loading certificates: ${error instanceof Error ? error.message : String(error)}`); - throw error; - } -} - -/** - * Load certificates from files - * @param options - Certificate file paths - * @returns Certificate data with Buffer format - */ -export function loadCertificatesFromFiles(options: { - keyPath: string; - certPath: string; - caPath?: string; -}): ICertificateData { - try { - // Read files directly as Buffers - const key = fs.readFileSync(options.keyPath); - const cert = fs.readFileSync(options.certPath); - const ca = options.caPath ? fs.readFileSync(options.caPath) : undefined; - - // Log for debugging - SmtpLogger.debug('Certificate file properties', { - keyLength: key.length, - certLength: cert.length, - caLength: ca ? ca.length : 0 - }); - - // Validate the certificates by attempting to create a secure context - try { - const secureContext = tls.createSecureContext({ - key, - cert, - ca - }); - - // If createSecureContext doesn't throw, the certificates are valid - SmtpLogger.info('Successfully validated certificate files'); - } catch (validationError) { - SmtpLogger.error(`Certificate file validation error: ${validationError instanceof Error ? validationError.message : String(validationError)}`); - throw validationError; - } - - return { - key, - cert, - ca - }; - } catch (error) { - SmtpLogger.error(`Error loading certificate files: ${error instanceof Error ? error.message : String(error)}`); - throw error; - } -} - -/** - * Generate self-signed certificates for testing - * @returns Certificate data with Buffer format - */ -export function generateSelfSignedCertificates(): ICertificateData { - // This is for fallback/testing only - log a warning - SmtpLogger.warn('Generating self-signed certificates for testing - DO NOT USE IN PRODUCTION'); - - // Create selfsigned certificates using node-forge or similar library - // For now, use hardcoded certificates as a last resort - const key = Buffer.from(`-----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEgJW1HdJPACGB -ifoL3PB+HdAVA2nUmMfq43JbIUPXGTxCtzmQhuV04WjITwFw1loPx3ReHh4KR5yJ -BVdzUDocHuauMmBycHAjv7mImR/VkuK/SwT0Q5G/9/M55o6HUNol0UKt+uZuBy1r -ggFTdTDLw86i9UG5CZbWF/Yb/DTRoAkCr7iLnaZhhhqcdh5BGj7JBylIAV5RIW1y -xQxJVJZQT2KgCeCnHRRvYRQ7tVzUQBcSvtW4zYtqK4C39BgRyLUZQVYB7siGT/uP -YJE7R73u0xEgDMFWR1pItUYcVQXHQJ+YsLVCzqI22Mik7URdwxoSHSXRYKn6wnKg -4JYg65JnAgMBAAECggEAM2LlwRhwP0pnLlLHiPE4jJ3Qdz/NUF0hLnRhcUwW1iJ1 -03jzCQ4QZ3etfL9O2hVJg49J+QUG50FNduLq4SE7GZj1dEJ/YNnlk9PpI8GSpLuA -mGTUKofIEJjNy5gKR0c6/rfgP8UXYSbRnTnZwIXVkUYuAUJLJTBVcJlcvCwJ3/zz -C8789JyOO1CNwF3zEIALdW5X5se8V+sw5iHDrHVxkR2xgsYpBBOylFfBxbMvV5o1 -i+QOD1HaXdmIvjBCnHqrjX5SDnAYwHBSB9y6WbwC+Th76QHkRNcHZH86PJVdLEUi -tBPQmQh+SjDRaZzDJvURnOFks+eEsCPVPZnQ4wgnAQKBgQD8oHwGZIZRUjnXULNc -vJoPcjLpvdHRO0kXTJHtG2au2i9jVzL9SFwH1lHQM0XdXPnR2BK4Gmgc2dRnSB9n -YPPvCgyL2RS0Y7W98yEcgBgwVOJHnPQGRNwxUfCTHgmCQ7lXjQKKG51+dBfOYP3j -w8VYbS2pqxZtzzZ5zhk2BrZJdwKBgQDHDZC+NU80f7rLEr5vpwx9epTArwXre8oj -nGgzZ9/lE14qDnITBuZPUHWc4/7U1CCmP0vVH6nFVvhN9ra9QCTJBzQ5aj0l3JM7 -9j8R5QZIPqOu4+aqf0ZFEgmpBK2SAYqNrJ+YVa2T/zLF44Jlr5WiLkPTUyMxV5+k -P4ZK8QP7wQKBgQCbeLuRWCuVKNYgYjm9TA55BbJL82J+MvhcbXUccpUksJQRxMV3 -98PBUW0Qw38WciJxQF4naSKD/jXYndD+wGzpKMIU+tKU+sEYMnuFnx13++K8XrAe -NQPHDsK1wRgXk5ygOHx78xnZbMmwBXNLwQXIhyO8FJpwJHj2CtYvjb+2xwKBgQCn -KW/RiAHvG6GKjCHCOTlx2qLPxUiXYCk2xwvRnNfY5+2PFoqMI/RZLT/41kTda1fA -TDw+j4Uu/fF2ChPadwRiUjXZzZx/UjcMJXTpQ2kpbGJ11U/cL4+Tk0S6wz+HoS7z -w3vXT9UoDyFxDBjuMQJxJWTjmymaYUtNnz4iMuRqwQKBgH+HKbYHCZaIzXRMEO5S -T3xDMYH59dTEKKXEOA1KJ9Zo5XSD8NE9SQ+9etoOcEq8tdYS45OkHD3VyFQa7THu -58awjTdkpSmMPsw3AElOYDYJgD9oxKtTjwkXHqMjDBQZrXqzOImOAJhEVL+XH3LP -lv6RZ47YRC88T+P6n1yg6BPp ------END PRIVATE KEY-----`, 'utf8'); - - const cert = Buffer.from(`-----BEGIN CERTIFICATE----- -MIIDCTCCAfGgAwIBAgIUHxmGQOQoiSbzqh6hIe+7h9xDXIUwDQYJKoZIhvcNAQEL -BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MDUyMTE2MDAzM1oXDTI2MDUy -MTE2MDAzM1owFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAxICVtR3STwAhgYn6C9zwfh3QFQNp1JjH6uNyWyFD1xk8 -Qrc5kIbldOFoyE8BcNZaD8d0Xh4eCkeciwOV3FwHR4brjJgcnRwI7+5iJkf1ZLiv -0sE9EORv/fzOeaOh1DaJdFCrfrmbgdgOUm62WNQOB2hq0kggjh/S1K+TBfF+8QFs -XQyW7y7mHecNgCgK/pI5b1irdajRc7nLvzM/U8qNn4jjrLsRoYqBPpn7aLKIBrmN -pNSIe18q8EYWkdmWBcnsZpAYv75SJG8E0lAYpMv9OEUIwsPh7AYUdkZqKtFxVxV5 -bYlA5ZfnVnWrWEwRXaVdFFRXIjP+EFkGYYWThbvAIb0TPQIDAQABo1MwUTAdBgNV -HQ4EFgQUiW1MoYR8YK9KJTyip5oFoUVJoCgwHwYDVR0jBBgwFoAUiW1MoYR8YK9K -JTyip5oFoUVJoCgwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA -BToM8SbUQXwJ9rTlQB2QI2GJaFwTpCFoQZwGUOCkwGLM3nOPLEbNPMDoIKGPwenB -P1xL8uJEgYRqP6UG/xy3HsxYsLCxuoxGGP2QjuiQKnFl0n85usZ5flCxmLC5IzYx -FLcR6WPTdj6b5JX0tM8Bi6toQ9Pj3u3dSVPZKRLYvJvZKt1PXI8qsHD/LvNa2wGG -Zi1BQFAr2cScNYa+p6IYDJi9TBNxoBIHNTzQPfWaen4MHRJqUNZCzQXcOnU/NW5G -+QqQSEMmk8yGucEHWUMFrEbABVgYuBslICEEtBZALB2jZJYSaJnPOJCcmFrxUv61 -ORWZbz+8rBL0JIeA7eFxEA== ------END CERTIFICATE-----`, 'utf8'); - - return { - key, - cert - }; -} - -/** - * Create TLS options for secure server or STARTTLS - * @param certificates - Certificate data - * @param isServer - Whether this is for server (true) or client (false) - * @returns TLS options - */ -export function createTlsOptions( - certificates: ICertificateData, - isServer: boolean = true -): tls.TlsOptions { - const options: tls.TlsOptions = { - key: certificates.key, - cert: certificates.cert, - ca: certificates.ca, - // Support a wider range of TLS versions for better compatibility - minVersion: 'TLSv1', // Support older TLS versions (minimum TLS 1.0) - maxVersion: 'TLSv1.3', // Support latest TLS version (1.3) - // Cipher suites for broad compatibility - ciphers: 'HIGH:MEDIUM:!aNULL:!eNULL:!NULL:!ADH:!RC4', - // For testing, allow unauthorized (self-signed certs) - rejectUnauthorized: false, - // Longer handshake timeout for reliability - handshakeTimeout: 30000, - // TLS renegotiation option (removed - not supported in newer Node.js) - // Increase timeout for better reliability under test conditions - sessionTimeout: 600, - // Let the client choose the cipher for better compatibility - honorCipherOrder: false, - // For debugging - enableTrace: true, - // Disable secure options to allow more flexibility - secureOptions: 0 - }; - - // Server-specific options - if (isServer) { - options.ALPNProtocols = ['smtp']; // Accept non-ALPN connections (legacy clients) - } - - return options; -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/command-handler.ts b/ts/mail/delivery/smtpserver/command-handler.ts deleted file mode 100644 index 7f9a267..0000000 --- a/ts/mail/delivery/smtpserver/command-handler.ts +++ /dev/null @@ -1,1340 +0,0 @@ -/** - * SMTP Command Handler - * Responsible for parsing and handling SMTP commands - */ - -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import type { ISmtpSession, IEnvelopeRecipient } from './interfaces.js'; -import type { ICommandHandler, ISmtpServer } from './interfaces.js'; -import { SmtpCommand, SmtpResponseCode, SMTP_DEFAULTS, SMTP_EXTENSIONS } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { extractCommandName, extractCommandArgs, formatMultilineResponse } from './utils/helpers.js'; -import { validateEhlo, validateMailFrom, validateRcptTo, isValidCommandSequence } from './utils/validation.js'; - -/** - * Handles SMTP commands and responses - */ -export class CommandHandler implements ICommandHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer: ISmtpServer; - - /** - * Creates a new command handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer) { - this.smtpServer = smtpServer; - } - - /** - * Process a command from the client - * @param socket - Client socket - * @param commandLine - Command line from client - */ - public async processCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, commandLine: string): Promise { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.warn(`No session found for socket from ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - socket.end(); - return; - } - - // Check if we're in the middle of an AUTH LOGIN sequence - if ((session as any).authLoginState) { - await this.handleAuthLoginResponse(socket, session, commandLine); - return; - } - - // Handle raw data chunks from connection manager during DATA mode - if (commandLine.startsWith('__RAW_DATA__')) { - const rawData = commandLine.substring('__RAW_DATA__'.length); - - const dataHandler = this.smtpServer.getDataHandler(); - if (dataHandler) { - // Let the data handler process the raw chunk - dataHandler.handleDataReceived(socket, rawData) - .catch(error => { - SmtpLogger.error(`Error processing raw email data: ${error.message}`, { - sessionId: session.id, - error - }); - - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email data: ${error.message}`); - this.resetSession(session); - }); - } else { - // No data handler available - SmtpLogger.error('Data handler not available for raw data', { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - data handler not available`); - this.resetSession(session); - } - return; - } - - // Handle data state differently - pass to data handler (legacy line-based processing) - if (session.state === SmtpState.DATA_RECEIVING) { - // Check if this looks like an SMTP command - during DATA mode all input should be treated as message content - const looksLikeCommand = /^[A-Z]{4,}( |:)/i.test(commandLine.trim()); - - // Special handling for ERR-02 test: handle "MAIL FROM" during DATA mode - // The test expects a 503 response for this case, not treating it as content - if (looksLikeCommand && commandLine.trim().toUpperCase().startsWith('MAIL FROM')) { - // This is the command that ERR-02 test is expecting to fail with 503 - SmtpLogger.debug(`Received MAIL FROM command during DATA mode - responding with sequence error`); - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - const dataHandler = this.smtpServer.getDataHandler(); - if (dataHandler) { - // Let the data handler process the line (legacy mode) - dataHandler.processEmailData(socket, commandLine) - .catch(error => { - SmtpLogger.error(`Error processing email data: ${error.message}`, { - sessionId: session.id, - error - }); - - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email data: ${error.message}`); - this.resetSession(session); - }); - } else { - // No data handler available - SmtpLogger.error('Data handler not available', { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - data handler not available`); - this.resetSession(session); - } - return; - } - - // Handle command pipelining (RFC 2920) - // Multiple commands can be sent in a single TCP packet - if (commandLine.includes('\r\n') || commandLine.includes('\n')) { - // Split the commandLine into individual commands by newline - const commands = commandLine.split(/\r\n|\n/).filter(line => line.trim().length > 0); - - if (commands.length > 1) { - SmtpLogger.debug(`Command pipelining detected: ${commands.length} commands`, { - sessionId: session.id, - commandCount: commands.length - }); - - // Process each command separately (recursively call processCommand) - for (const cmd of commands) { - await this.processCommand(socket, cmd); - } - return; - } - } - - // Log received command using adaptive logger - adaptiveLogger.logCommand(commandLine, socket, session); - - // Extract command and arguments - const command = extractCommandName(commandLine); - const args = extractCommandArgs(commandLine); - - // For the ERR-01 test, an empty or invalid command is considered a syntax error (500) - if (!command || command.trim().length === 0) { - // Record error for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordError(session.remoteAddress); - - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive errors`); - this.sendResponse(socket, `421 Too many errors - connection blocked`); - socket.end(); - } else { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Command not recognized`); - } - return; - } - - // Handle unknown commands - this should happen before sequence validation - // RFC 5321: Use 500 for unrecognized commands, 501 for parameter errors - if (!Object.values(SmtpCommand).includes(command.toUpperCase() as SmtpCommand)) { - // Record error for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordError(session.remoteAddress); - - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive errors`); - this.sendResponse(socket, `421 Too many errors - connection blocked`); - socket.end(); - } else { - // Comply with RFC 5321 section 4.2.4: Use 500 for unrecognized commands - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Command not recognized`); - } - return; - } - - // Handle test input "MAIL FROM: missing_brackets@example.com" - specifically check for this case - // This is needed for ERR-01 test to pass - if (command.toUpperCase() === SmtpCommand.MAIL_FROM) { - // Handle "MAIL FROM:" with missing parameter - a special case for ERR-01 test - if (!args || args.trim() === '' || args.trim() === ':') { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing email address`); - return; - } - - // Handle email without angle brackets - if (args.includes('@') && !args.includes('<') && !args.includes('>')) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid syntax - angle brackets required`); - return; - } - } - - // Special handling for the "MAIL FROM:" missing parameter test (ERR-01 Test 3) - // The test explicitly sends "MAIL FROM:" without any address and expects 501 - // We need to catch this EXACT case before the sequence validation - if (commandLine.trim() === 'MAIL FROM:') { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing email address`); - return; - } - - // Validate command sequence - this must happen after validating that it's a recognized command - // The order matters for ERR-01 and ERR-02 test compliance: - // - Syntax errors (501): Invalid command format or arguments - // - Sequence errors (503): Valid command in wrong sequence - if (!this.validateCommandSequence(command, session)) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - // Process the command - switch (command) { - case SmtpCommand.EHLO: - case SmtpCommand.HELO: - this.handleEhlo(socket, args); - break; - - case SmtpCommand.MAIL_FROM: - this.handleMailFrom(socket, args); - break; - - case SmtpCommand.RCPT_TO: - this.handleRcptTo(socket, args); - break; - - case SmtpCommand.DATA: - this.handleData(socket); - break; - - case SmtpCommand.RSET: - this.handleRset(socket); - break; - - case SmtpCommand.NOOP: - this.handleNoop(socket); - break; - - case SmtpCommand.QUIT: - this.handleQuit(socket, args); - break; - - case SmtpCommand.STARTTLS: - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled()) { - await tlsHandler.handleStartTls(socket, session); - } else { - SmtpLogger.warn('STARTTLS requested but TLS is not enabled', { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort - }); - this.sendResponse(socket, `${SmtpResponseCode.TLS_UNAVAILABLE_TEMP} STARTTLS not available at this time`); - } - break; - - case SmtpCommand.AUTH: - this.handleAuth(socket, args); - break; - - case SmtpCommand.HELP: - this.handleHelp(socket, args); - break; - - case SmtpCommand.VRFY: - this.handleVrfy(socket, args); - break; - - case SmtpCommand.EXPN: - this.handleExpn(socket, args); - break; - - default: - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} Command not implemented`); - break; - } - } - - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response to send - */ - public sendResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, response: string): void { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - adaptiveLogger.logResponse(response, socket); - } catch (error) { - // Attempt to recover from known transient errors - if (this.isRecoverableSocketError(error)) { - this.handleSocketError(socket, error, response); - } else { - // Log error and destroy socket for non-recoverable errors - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - - socket.destroy(); - } - } - } - - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - private isRecoverableSocketError(error: unknown): boolean { - const recoverableErrorCodes = [ - 'EPIPE', // Broken pipe - 'ECONNRESET', // Connection reset by peer - 'ETIMEDOUT', // Connection timed out - 'ECONNABORTED' // Connection aborted - ]; - - return ( - error instanceof Error && - 'code' in error && - typeof (error as any).code === 'string' && - recoverableErrorCodes.includes((error as any).code) - ); - } - - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - private handleSocketError(socket: plugins.net.Socket | plugins.tls.TLSSocket, error: unknown, response: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.error(`Session not found when handling socket error`); - socket.destroy(); - return; - } - - // Get error details for logging - const errorMessage = error instanceof Error ? error.message : String(error); - const errorCode = error instanceof Error && 'code' in error ? (error as any).code : 'UNKNOWN'; - - SmtpLogger.warn(`Recoverable socket error (${errorCode}): ${errorMessage}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Check if socket is already destroyed - if (socket.destroyed) { - SmtpLogger.info(`Socket already destroyed, cannot retry operation`); - return; - } - - // Check if socket is writeable - if (!socket.writable) { - SmtpLogger.info(`Socket no longer writable, aborting recovery attempt`); - socket.destroy(); - return; - } - - // Attempt to retry the write operation after a short delay - setTimeout(() => { - try { - if (!socket.destroyed && socket.writable) { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.info(`Successfully retried send operation after error`); - } else { - SmtpLogger.warn(`Socket no longer available for retry`); - if (!socket.destroyed) { - socket.destroy(); - } - } - } catch (retryError) { - SmtpLogger.error(`Retry attempt failed: ${retryError instanceof Error ? retryError.message : String(retryError)}`); - if (!socket.destroyed) { - socket.destroy(); - } - } - }, 100); // Short delay before retry - } - - /** - * Handle EHLO command - * @param socket - Client socket - * @param clientHostname - Client hostname from EHLO command - */ - public handleEhlo(socket: plugins.net.Socket | plugins.tls.TLSSocket, clientHostname: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Extract command and arguments from clientHostname - // EHLO/HELO might come with the command itself in the arguments string - let hostname = clientHostname; - if (hostname.toUpperCase().startsWith('EHLO ') || hostname.toUpperCase().startsWith('HELO ')) { - hostname = hostname.substring(5).trim(); - } - - // Check for empty hostname - if (!hostname) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Missing domain name`); - return; - } - - // Validate EHLO hostname - const validation = validateEhlo(hostname); - - if (!validation.isValid) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - - // Update session state and client hostname - session.clientHostname = validation.hostname || hostname; - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - - // Get options once for this method - const options = this.smtpServer.getOptions(); - - // Set up EHLO response lines - const responseLines = [ - `${options.hostname || SMTP_DEFAULTS.HOSTNAME} greets ${session.clientHostname}`, - SMTP_EXTENSIONS.PIPELINING, - SMTP_EXTENSIONS.formatExtension(SMTP_EXTENSIONS.SIZE, options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE), - SMTP_EXTENSIONS.EIGHTBITMIME, - SMTP_EXTENSIONS.ENHANCEDSTATUSCODES - ]; - - // Add TLS extension if available and not already using TLS - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled() && !session.useTLS) { - responseLines.push(SMTP_EXTENSIONS.STARTTLS); - } - - // Add AUTH extension if configured - if (options.auth && options.auth.methods && options.auth.methods.length > 0) { - responseLines.push(`${SMTP_EXTENSIONS.AUTH} ${options.auth.methods.join(' ')}`); - } - - // Send multiline response - this.sendResponse(socket, formatMultilineResponse(SmtpResponseCode.OK, responseLines)); - } - - /** - * Handle MAIL FROM command - * @param socket - Client socket - * @param args - Command arguments - */ - public handleMailFrom(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Check if the client has sent EHLO/HELO first - if (session.state === SmtpState.GREETING) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - // For test compatibility - reset state if receiving a new MAIL FROM after previous transaction - if (session.state === SmtpState.MAIL_FROM || session.state === SmtpState.RCPT_TO) { - // Silently reset the transaction state - allow multiple MAIL FROM commands - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - } - - // Get options once for this method - const options = this.smtpServer.getOptions(); - - // Check if authentication is required but not provided - if (options.auth && options.auth.required && !session.authenticated) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_REQUIRED} Authentication required`); - return; - } - - // Get rate limiter for message-level checks - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - - // Note: Connection-level rate limiting is already handled in ConnectionManager - - // Special handling for commands that include "MAIL FROM:" in the args - let processedArgs = args; - - // Handle test formats with or without colons and "FROM" parts - if (args.toUpperCase().startsWith('FROM:')) { - processedArgs = args.substring(5).trim(); // Skip "FROM:" - } else if (args.toUpperCase().startsWith('FROM')) { - processedArgs = args.substring(4).trim(); // Skip "FROM" - } else if (args.toUpperCase().includes('MAIL FROM:')) { - // The command was already prepended to the args - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - processedArgs = args.substring(colonIndex + 1).trim(); - } - } else if (args.toUpperCase().includes('MAIL FROM')) { - // Handle case without colon - const fromIndex = args.toUpperCase().indexOf('FROM'); - if (fromIndex !== -1) { - processedArgs = args.substring(fromIndex + 4).trim(); - } - } - - // Validate MAIL FROM syntax - for ERR-01 test compliance, this must be BEFORE sequence validation - const validation = validateMailFrom(processedArgs); - - if (!validation.isValid) { - // Return 501 for syntax errors - required for ERR-01 test to pass - // This RFC 5321 compliance is critical - syntax errors must be 501 - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - - // Check message rate limits for this sender - const senderAddress = validation.address || ''; - const senderDomain = senderAddress.includes('@') ? senderAddress.split('@')[1] : undefined; - - // Check rate limits with domain context if available - const messageResult = rateLimiter.checkMessageLimit( - senderAddress, - session.remoteAddress, - 1, // We don't know recipients yet, check with 1 - undefined, // No pattern matching for now - senderDomain // Pass domain for domain-specific limits - ); - - if (!messageResult.allowed) { - SmtpLogger.warn(`Message rate limit exceeded for ${senderAddress} from IP ${session.remoteAddress}: ${messageResult.reason}`); - // Use 421 for temporary rate limiting (client should retry later) - this.sendResponse(socket, `421 ${messageResult.reason} - try again later`); - return; - } - - // Enhanced SIZE parameter handling - if (validation.params && validation.params.SIZE) { - const size = parseInt(validation.params.SIZE, 10); - - // Check for valid numeric format - if (isNaN(size)) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: not a number`); - return; - } - - // Check for negative values - if (size < 0) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: cannot be negative`); - return; - } - - // Ensure reasonable minimum size (at least 100 bytes for headers) - if (size < 100) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Invalid SIZE parameter: too small (minimum 100 bytes)`); - return; - } - - // Check against server maximum - const maxSize = options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE; - if (size > maxSize) { - // Generate informative error with the server's limit - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message size exceeds limit of ${Math.floor(maxSize / 1024)} KB`); - return; - } - - // Log large messages for monitoring - if (size > maxSize * 0.8) { - SmtpLogger.info(`Large message detected (${Math.floor(size / 1024)} KB)`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - sizeBytes: size, - percentOfMax: Math.floor((size / maxSize) * 100) - }); - } - } - - // Reset email data and recipients for new transaction - session.mailFrom = validation.address || ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - - // Update envelope information - session.envelope = { - mailFrom: { - address: validation.address || '', - args: validation.params || {} - }, - rcptTo: [] - }; - - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.MAIL_FROM); - - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - - /** - * Handle RCPT TO command - * @param socket - Client socket - * @param args - Command arguments - */ - public handleRcptTo(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Check if MAIL FROM was provided first - if (session.state !== SmtpState.MAIL_FROM && session.state !== SmtpState.RCPT_TO) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - // Special handling for commands that include "RCPT TO:" in the args - let processedArgs = args; - if (args.toUpperCase().startsWith('TO:')) { - processedArgs = args; - } else if (args.toUpperCase().includes('RCPT TO')) { - // The command was already prepended to the args - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - processedArgs = args.substring(colonIndex + 1).trim(); - } - } - - // Validate RCPT TO syntax - const validation = validateRcptTo(processedArgs); - - if (!validation.isValid) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} ${validation.errorMessage}`); - return; - } - - // Check if we've reached maximum recipients - const options = this.smtpServer.getOptions(); - const maxRecipients = options.maxRecipients || SMTP_DEFAULTS.MAX_RECIPIENTS; - if (session.rcptTo.length >= maxRecipients) { - this.sendResponse(socket, `${SmtpResponseCode.TRANSACTION_FAILED} Too many recipients`); - return; - } - - // Check rate limits for recipients - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const recipientAddress = validation.address || ''; - const recipientDomain = recipientAddress.includes('@') ? recipientAddress.split('@')[1] : undefined; - - // Check rate limits with accumulated recipient count - const recipientCount = session.rcptTo.length + 1; // Including this new recipient - const messageResult = rateLimiter.checkMessageLimit( - session.mailFrom, - session.remoteAddress, - recipientCount, - undefined, // No pattern matching for now - recipientDomain // Pass recipient domain for domain-specific limits - ); - - if (!messageResult.allowed) { - SmtpLogger.warn(`Recipient rate limit exceeded for ${recipientAddress} from IP ${session.remoteAddress}: ${messageResult.reason}`); - // Use 451 for temporary recipient rejection - this.sendResponse(socket, `451 ${messageResult.reason} - try again later`); - return; - } - - // Create recipient object - const recipient: IEnvelopeRecipient = { - address: validation.address || '', - args: validation.params || {} - }; - - // Add to session data - session.rcptTo.push(validation.address || ''); - session.envelope.rcptTo.push(recipient); - - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.RCPT_TO); - - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} Recipient ok`); - } - - /** - * Handle DATA command - * @param socket - Client socket - */ - public handleData(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // For tests, be slightly more permissive - also accept DATA after MAIL FROM - // But ensure we at least have a sender defined - if (session.state !== SmtpState.RCPT_TO && session.state !== SmtpState.MAIL_FROM) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - // Check if we have a sender - if (!session.mailFrom) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} No sender specified`); - return; - } - - // Ideally we should have recipients, but for test compatibility, we'll only - // insist on recipients if we're in RCPT_TO state - if (session.state === SmtpState.RCPT_TO && !session.rcptTo.length) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} No recipients specified`); - return; - } - - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.DATA_RECEIVING); - - // Reset email data storage - session.emailData = ''; - session.emailDataChunks = []; - - // Set up timeout for DATA command - const dataTimeout = SMTP_DEFAULTS.DATA_TIMEOUT; - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - - session.dataTimeoutId = setTimeout(() => { - if (session.state === SmtpState.DATA_RECEIVING) { - SmtpLogger.warn(`DATA command timeout for session ${session.id}`, { - sessionId: session.id, - timeout: dataTimeout - }); - - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Data timeout`); - this.resetSession(session); - } - }, dataTimeout); - - // Send intermediate response to signal start of data - this.sendResponse(socket, `${SmtpResponseCode.START_MAIL_INPUT} Start mail input; end with .`); - } - - /** - * Handle RSET command - * @param socket - Client socket - */ - public handleRset(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Reset the transaction state - this.resetSession(session); - - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - - /** - * Handle NOOP command - * @param socket - Client socket - */ - public handleNoop(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK`); - } - - /** - * Handle QUIT command - * @param socket - Client socket - */ - public handleQuit(socket: plugins.net.Socket | plugins.tls.TLSSocket, args?: string): void { - // QUIT command should not have any parameters - if (args && args.trim().length > 0) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} Syntax error in parameters`); - return; - } - - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - - // Send goodbye message - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_CLOSING} ${this.smtpServer.getOptions().hostname} Service closing transmission channel`); - - // End the connection - socket.end(); - - // Clean up session if we have one - if (session) { - this.smtpServer.getSessionManager().removeSession(socket); - } - } - - /** - * Handle AUTH command - * @param socket - Client socket - * @param args - Command arguments - */ - private handleAuth(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Check if we have auth config - if (!this.smtpServer.getOptions().auth || !this.smtpServer.getOptions().auth.methods || !this.smtpServer.getOptions().auth.methods.length) { - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} Authentication not supported`); - return; - } - - // Check if TLS is required for authentication - if (!session.useTLS) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication requires TLS`); - return; - } - - // Parse AUTH command - const parts = args.trim().split(/\s+/); - const method = parts[0]?.toUpperCase(); - const initialResponse = parts[1]; - - // Check if method is supported - const supportedMethods = this.smtpServer.getOptions().auth.methods.map(m => m.toUpperCase()); - if (!method || !supportedMethods.includes(method)) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Unsupported authentication method`); - return; - } - - // Handle different authentication methods - switch (method) { - case 'PLAIN': - this.handleAuthPlain(socket, session, initialResponse); - break; - case 'LOGIN': - this.handleAuthLogin(socket, session, initialResponse); - break; - default: - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} ${method} authentication not implemented`); - } - } - - /** - * Handle AUTH PLAIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - private async handleAuthPlain(socket: plugins.net.Socket | plugins.tls.TLSSocket, session: ISmtpSession, initialResponse?: string): Promise { - try { - let credentials: string; - - if (initialResponse) { - // Credentials provided with AUTH PLAIN command - credentials = initialResponse; - } else { - // Request credentials - this.sendResponse(socket, '334'); - - // Wait for credentials - credentials = await new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error('Auth response timeout')); - }, 30000); - - socket.once('data', (data: Buffer) => { - clearTimeout(timeout); - resolve(data.toString().trim()); - }); - }); - } - - // Decode PLAIN credentials (base64 encoded: authzid\0authcid\0password) - const decoded = Buffer.from(credentials, 'base64').toString('utf8'); - const parts = decoded.split('\0'); - - if (parts.length !== 3) { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Invalid credentials format`); - return; - } - - const [authzid, authcid, password] = parts; - const username = authcid || authzid; // Use authcid if provided, otherwise authzid - - // Authenticate using security handler - const authenticated = await this.smtpServer.getSecurityHandler().authenticate({ - username, - password - }); - - if (authenticated) { - session.authenticated = true; - session.username = username; - this.sendResponse(socket, `${SmtpResponseCode.AUTHENTICATION_SUCCESSFUL} Authentication successful`); - } else { - // Record authentication failure for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordAuthFailure(session.remoteAddress); - - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive authentication failures`); - this.sendResponse(socket, `421 Too many authentication failures - connection blocked`); - socket.end(); - } else { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication failed`); - } - } - } catch (error) { - SmtpLogger.error(`AUTH PLAIN error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - } - } - - /** - * Handle AUTH LOGIN authentication - * @param socket - Client socket - * @param session - Session - * @param initialResponse - Optional initial response - */ - private async handleAuthLogin(socket: plugins.net.Socket | plugins.tls.TLSSocket, session: ISmtpSession, initialResponse?: string): Promise { - try { - if (initialResponse) { - // Username provided with AUTH LOGIN command - const username = Buffer.from(initialResponse, 'base64').toString('utf8'); - (session as any).authLoginState = 'waiting_password'; - (session as any).authLoginUsername = username; - // Request password - this.sendResponse(socket, '334 UGFzc3dvcmQ6'); // Base64 for "Password:" - } else { - // Request username - (session as any).authLoginState = 'waiting_username'; - this.sendResponse(socket, '334 VXNlcm5hbWU6'); // Base64 for "Username:" - } - } catch (error) { - SmtpLogger.error(`AUTH LOGIN error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - delete (session as any).authLoginState; - delete (session as any).authLoginUsername; - } - } - - /** - * Handle AUTH LOGIN response - * @param socket - Client socket - * @param session - Session - * @param response - Response from client - */ - private async handleAuthLoginResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, session: ISmtpSession, response: string): Promise { - const trimmedResponse = response.trim(); - - // Check for cancellation - if (trimmedResponse === '*') { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication cancelled`); - delete (session as any).authLoginState; - delete (session as any).authLoginUsername; - return; - } - - try { - if ((session as any).authLoginState === 'waiting_username') { - // We received the username - const username = Buffer.from(trimmedResponse, 'base64').toString('utf8'); - (session as any).authLoginUsername = username; - (session as any).authLoginState = 'waiting_password'; - // Request password - this.sendResponse(socket, '334 UGFzc3dvcmQ6'); // Base64 for "Password:" - } else if ((session as any).authLoginState === 'waiting_password') { - // We received the password - const password = Buffer.from(trimmedResponse, 'base64').toString('utf8'); - const username = (session as any).authLoginUsername; - - // Clear auth state - delete (session as any).authLoginState; - delete (session as any).authLoginUsername; - - // Authenticate using security handler - const authenticated = await this.smtpServer.getSecurityHandler().authenticate({ - username, - password - }); - - if (authenticated) { - session.authenticated = true; - session.username = username; - this.sendResponse(socket, `${SmtpResponseCode.AUTHENTICATION_SUCCESSFUL} Authentication successful`); - } else { - // Record authentication failure for rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - const shouldBlock = rateLimiter.recordAuthFailure(session.remoteAddress); - - if (shouldBlock) { - SmtpLogger.warn(`IP ${session.remoteAddress} blocked due to excessive authentication failures`); - this.sendResponse(socket, `421 Too many authentication failures - connection blocked`); - socket.end(); - } else { - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication failed`); - } - } - } - } catch (error) { - SmtpLogger.error(`AUTH LOGIN response error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.AUTH_FAILED} Authentication error`); - delete (session as any).authLoginState; - delete (session as any).authLoginUsername; - } - } - - /** - * Handle HELP command - * @param socket - Client socket - * @param args - Command arguments - */ - private handleHelp(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - - // Provide help information based on arguments - const helpCommand = args.trim().toUpperCase(); - - if (!helpCommand) { - // General help - const helpLines = [ - 'Supported commands:', - 'EHLO/HELO domain - Identify yourself to the server', - 'MAIL FROM:
- Start a new mail transaction', - 'RCPT TO:
- Specify recipients for the message', - 'DATA - Start message data input', - 'RSET - Reset the transaction', - 'NOOP - No operation', - 'QUIT - Close the connection', - 'HELP [command] - Show help' - ]; - - // Add conditional commands - const tlsHandler = this.smtpServer.getTlsHandler(); - if (tlsHandler && tlsHandler.isTlsEnabled()) { - helpLines.push('STARTTLS - Start TLS negotiation'); - } - - if (this.smtpServer.getOptions().auth && this.smtpServer.getOptions().auth.methods.length) { - helpLines.push('AUTH mechanism - Authenticate with the server'); - } - - this.sendResponse(socket, formatMultilineResponse(SmtpResponseCode.HELP_MESSAGE, helpLines)); - return; - } - - // Command-specific help - let helpText: string; - - switch (helpCommand) { - case 'EHLO': - case 'HELO': - helpText = 'EHLO/HELO domain - Identify yourself to the server'; - break; - - case 'MAIL': - helpText = 'MAIL FROM:
[SIZE=size] - Start a new mail transaction'; - break; - - case 'RCPT': - helpText = 'RCPT TO:
- Specify a recipient for the message'; - break; - - case 'DATA': - helpText = 'DATA - Start message data input, end with .'; - break; - - case 'RSET': - helpText = 'RSET - Reset the transaction'; - break; - - case 'NOOP': - helpText = 'NOOP - No operation'; - break; - - case 'QUIT': - helpText = 'QUIT - Close the connection'; - break; - - case 'STARTTLS': - helpText = 'STARTTLS - Start TLS negotiation'; - break; - - case 'AUTH': - helpText = `AUTH mechanism - Authenticate with the server. Supported methods: ${this.smtpServer.getOptions().auth?.methods.join(', ')}`; - break; - - default: - helpText = `Unknown command: ${helpCommand}`; - break; - } - - this.sendResponse(socket, `${SmtpResponseCode.HELP_MESSAGE} ${helpText}`); - } - - /** - * Handle VRFY command (Verify user/mailbox) - * RFC 5321 Section 3.5.1: Server MAY respond with 252 to avoid disclosing sensitive information - * @param socket - Client socket - * @param args - Command arguments (username to verify) - */ - private handleVrfy(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - - const username = args.trim(); - - // Security best practice: Do not confirm or deny user existence - // Instead, respond with 252 "Cannot verify, but will attempt delivery" - // This prevents VRFY from being used for user enumeration attacks - if (!username) { - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR_PARAMETERS} User name required`); - } else { - // Log the VRFY attempt - SmtpLogger.info(`VRFY command received for user: ${username}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - useTLS: session.useTLS - }); - - // Respond with ambiguous response for security - this.sendResponse(socket, `${SmtpResponseCode.CANNOT_VRFY} Cannot VRFY user, but will accept message and attempt delivery`); - } - } - - /** - * Handle EXPN command (Expand mailing list) - * RFC 5321 Section 3.5.2: Server MAY disable this for security - * @param socket - Client socket - * @param args - Command arguments (mailing list to expand) - */ - private handleExpn(socket: plugins.net.Socket | plugins.tls.TLSSocket, args: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Update session activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - - const listname = args.trim(); - - // Log the EXPN attempt - SmtpLogger.info(`EXPN command received for list: ${listname}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - useTLS: session.useTLS - }); - - // Disable EXPN for security (best practice - RFC 5321 Section 3.5.2) - // EXPN allows enumeration of list members, which is a privacy concern - this.sendResponse(socket, `${SmtpResponseCode.COMMAND_NOT_IMPLEMENTED} EXPN command is disabled for security reasons`); - } - - /** - * Reset session to after-EHLO state - * @param session - SMTP session to reset - */ - private resetSession(session: ISmtpSession): void { - // Clear any data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - - // Reset data fields but keep authentication state - session.mailFrom = ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - - // Reset state to after EHLO - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - } - - /** - * Validate command sequence based on current state - * @param command - Command to validate - * @param session - Current session - * @returns Whether the command is valid in the current state - */ - private validateCommandSequence(command: string, session: ISmtpSession): boolean { - // Always allow EHLO to reset the transaction at any state - // This makes tests pass where EHLO is used multiple times - if (command.toUpperCase() === 'EHLO' || command.toUpperCase() === 'HELO') { - return true; - } - - // Always allow RSET, NOOP, QUIT, and HELP - if (command.toUpperCase() === 'RSET' || - command.toUpperCase() === 'NOOP' || - command.toUpperCase() === 'QUIT' || - command.toUpperCase() === 'HELP') { - return true; - } - - // Always allow STARTTLS after EHLO/HELO (but not in DATA state) - if (command.toUpperCase() === 'STARTTLS' && - (session.state === SmtpState.AFTER_EHLO || - session.state === SmtpState.MAIL_FROM || - session.state === SmtpState.RCPT_TO)) { - return true; - } - - // During testing, be more permissive with sequence for MAIL and RCPT commands - // This helps pass tests that may send these commands in unexpected order - if (command.toUpperCase() === 'MAIL' && session.state !== SmtpState.DATA_RECEIVING) { - return true; - } - - // Handle RCPT TO during tests - be permissive but not in DATA state - if (command.toUpperCase() === 'RCPT' && session.state !== SmtpState.DATA_RECEIVING) { - return true; - } - - // Allow DATA command if in MAIL_FROM or RCPT_TO state for test compatibility - if (command.toUpperCase() === 'DATA' && - (session.state === SmtpState.MAIL_FROM || session.state === SmtpState.RCPT_TO)) { - return true; - } - - // Check standard command sequence - return isValidCommandSequence(command, session.state); - } - - /** - * Handle an SMTP command (interface requirement) - */ - public async handleCommand( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - command: SmtpCommand, - args: string, - session: ISmtpSession - ): Promise { - // Delegate to processCommand for now - this.processCommand(socket, `${command} ${args}`.trim()); - } - - /** - * Get supported commands for current session state (interface requirement) - */ - public getSupportedCommands(session: ISmtpSession): SmtpCommand[] { - const commands: SmtpCommand[] = [SmtpCommand.NOOP, SmtpCommand.QUIT, SmtpCommand.RSET]; - - switch (session.state) { - case SmtpState.GREETING: - commands.push(SmtpCommand.EHLO, SmtpCommand.HELO); - break; - case SmtpState.AFTER_EHLO: - commands.push(SmtpCommand.MAIL_FROM, SmtpCommand.STARTTLS); - if (!session.authenticated) { - commands.push(SmtpCommand.AUTH); - } - break; - case SmtpState.MAIL_FROM: - commands.push(SmtpCommand.RCPT_TO); - break; - case SmtpState.RCPT_TO: - commands.push(SmtpCommand.RCPT_TO, SmtpCommand.DATA); - break; - default: - break; - } - - return commands; - } - - /** - * Clean up resources - */ - public destroy(): void { - // CommandHandler doesn't have timers or event listeners to clean up - SmtpLogger.debug('CommandHandler destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/connection-manager.ts b/ts/mail/delivery/smtpserver/connection-manager.ts deleted file mode 100644 index 02b27c9..0000000 --- a/ts/mail/delivery/smtpserver/connection-manager.ts +++ /dev/null @@ -1,1061 +0,0 @@ -/** - * SMTP Connection Manager - * Responsible for managing socket connections to the SMTP server - */ - -import * as plugins from '../../../plugins.js'; -import type { IConnectionManager, ISmtpServer } from './interfaces.js'; -import { SmtpResponseCode, SMTP_DEFAULTS, SmtpState } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { getSocketDetails, formatMultilineResponse } from './utils/helpers.js'; - -/** - * Manager for SMTP connections - * Handles connection setup, event listeners, and lifecycle management - * Provides resource management, connection tracking, and monitoring - */ -export class ConnectionManager implements IConnectionManager { - /** - * Reference to the SMTP server instance - */ - private smtpServer: ISmtpServer; - - /** - * Set of active socket connections - */ - private activeConnections: Set = new Set(); - - /** - * Connection tracking for resource management - */ - private connectionStats = { - totalConnections: 0, - activeConnections: 0, - peakConnections: 0, - rejectedConnections: 0, - closedConnections: 0, - erroredConnections: 0, - timedOutConnections: 0 - }; - - /** - * Per-IP connection tracking for rate limiting - */ - private ipConnections: Map = new Map(); - - /** - * Resource monitoring interval - */ - private resourceCheckInterval: NodeJS.Timeout | null = null; - - /** - * Track cleanup timers so we can clear them - */ - private cleanupTimers: Set = new Set(); - - /** - * SMTP server options with enhanced resource controls - */ - private options: { - hostname: string; - maxConnections: number; - socketTimeout: number; - maxConnectionsPerIP: number; - connectionRateLimit: number; - connectionRateWindow: number; - bufferSizeLimit: number; - resourceCheckInterval: number; - }; - - /** - * Creates a new connection manager with enhanced resource management - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer) { - this.smtpServer = smtpServer; - - // Get options from server - const serverOptions = this.smtpServer.getOptions(); - - // Default values for resource management - adjusted for production scalability - const DEFAULT_MAX_CONNECTIONS_PER_IP = 50; // Increased to support high-concurrency scenarios - const DEFAULT_CONNECTION_RATE_LIMIT = 200; // Increased for production load handling - const DEFAULT_CONNECTION_RATE_WINDOW = 60 * 1000; // 60 seconds window - const DEFAULT_BUFFER_SIZE_LIMIT = 10 * 1024 * 1024; // 10 MB - const DEFAULT_RESOURCE_CHECK_INTERVAL = 30 * 1000; // 30 seconds - - this.options = { - hostname: serverOptions.hostname || SMTP_DEFAULTS.HOSTNAME, - maxConnections: serverOptions.maxConnections || SMTP_DEFAULTS.MAX_CONNECTIONS, - socketTimeout: serverOptions.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - maxConnectionsPerIP: DEFAULT_MAX_CONNECTIONS_PER_IP, - connectionRateLimit: DEFAULT_CONNECTION_RATE_LIMIT, - connectionRateWindow: DEFAULT_CONNECTION_RATE_WINDOW, - bufferSizeLimit: DEFAULT_BUFFER_SIZE_LIMIT, - resourceCheckInterval: DEFAULT_RESOURCE_CHECK_INTERVAL - }; - - // Start resource monitoring - this.startResourceMonitoring(); - } - - /** - * Start resource monitoring interval to check resource usage - */ - private startResourceMonitoring(): void { - // Clear any existing interval - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - } - - // Set up new interval - this.resourceCheckInterval = setInterval(() => { - this.monitorResourceUsage(); - }, this.options.resourceCheckInterval); - } - - /** - * Monitor resource usage and log statistics - */ - private monitorResourceUsage(): void { - // Calculate memory usage - const memoryUsage = process.memoryUsage(); - const memoryUsageMB = { - rss: Math.round(memoryUsage.rss / 1024 / 1024), - heapTotal: Math.round(memoryUsage.heapTotal / 1024 / 1024), - heapUsed: Math.round(memoryUsage.heapUsed / 1024 / 1024), - external: Math.round(memoryUsage.external / 1024 / 1024) - }; - - // Calculate connection rate metrics - const activeIPs = Array.from(this.ipConnections.entries()) - .filter(([_, data]) => data.count > 0).length; - - const highVolumeIPs = Array.from(this.ipConnections.entries()) - .filter(([_, data]) => data.count > this.options.connectionRateLimit / 2).length; - - // Log resource usage with more detailed metrics - SmtpLogger.info('Resource usage stats', { - connections: { - active: this.activeConnections.size, - total: this.connectionStats.totalConnections, - peak: this.connectionStats.peakConnections, - rejected: this.connectionStats.rejectedConnections, - closed: this.connectionStats.closedConnections, - errored: this.connectionStats.erroredConnections, - timedOut: this.connectionStats.timedOutConnections - }, - memory: memoryUsageMB, - ipTracking: { - uniqueIPs: this.ipConnections.size, - activeIPs: activeIPs, - highVolumeIPs: highVolumeIPs - }, - resourceLimits: { - maxConnections: this.options.maxConnections, - maxConnectionsPerIP: this.options.maxConnectionsPerIP, - connectionRateLimit: this.options.connectionRateLimit, - bufferSizeLimit: Math.round(this.options.bufferSizeLimit / 1024 / 1024) + 'MB' - } - }); - - // Check for potential DoS conditions - if (highVolumeIPs > 3) { - SmtpLogger.warn(`Potential DoS detected: ${highVolumeIPs} IPs with high connection rates`); - } - - // Assess memory usage trends - if (memoryUsageMB.heapUsed > 500) { // Over 500MB heap used - SmtpLogger.warn(`High memory usage detected: ${memoryUsageMB.heapUsed}MB heap used`); - } - - // Clean up expired IP rate limits and validate resource tracking - this.cleanupIpRateLimits(); - } - - /** - * Clean up expired IP rate limits and perform additional resource monitoring - */ - private cleanupIpRateLimits(): void { - const now = Date.now(); - const windowThreshold = now - this.options.connectionRateWindow; - let activeIps = 0; - let removedEntries = 0; - - // Iterate through IP connections and manage entries - for (const [ip, data] of this.ipConnections.entries()) { - // If the last connection was before the window threshold + one extra window, remove the entry - if (data.lastConnection < windowThreshold - this.options.connectionRateWindow) { - // Remove stale entries to prevent memory growth - this.ipConnections.delete(ip); - removedEntries++; - } - // If last connection was before the window threshold, reset the count - else if (data.lastConnection < windowThreshold) { - if (data.count > 0) { - // Reset but keep the IP in the map with a zero count - this.ipConnections.set(ip, { - count: 0, - firstConnection: now, - lastConnection: now - }); - } - } else { - // This IP is still active within the current window - activeIps++; - } - } - - // Log cleanup activity if significant changes occurred - if (removedEntries > 0) { - SmtpLogger.debug(`IP rate limit cleanup: removed ${removedEntries} stale entries, ${this.ipConnections.size} remaining, ${activeIps} active in current window`); - } - - // Check for memory leaks in connection tracking - if (this.activeConnections.size > 0 && this.connectionStats.activeConnections !== this.activeConnections.size) { - SmtpLogger.warn(`Connection tracking inconsistency detected: stats.active=${this.connectionStats.activeConnections}, actual=${this.activeConnections.size}`); - // Fix the inconsistency - this.connectionStats.activeConnections = this.activeConnections.size; - } - - // Validate and clean leaked resources if needed - this.validateResourceTracking(); - } - - /** - * Validate and repair resource tracking to prevent leaks - */ - private validateResourceTracking(): void { - // Prepare a detailed report if inconsistencies are found - const inconsistenciesFound = []; - - // 1. Check active connections count matches activeConnections set size - if (this.connectionStats.activeConnections !== this.activeConnections.size) { - inconsistenciesFound.push({ - issue: 'Active connection count mismatch', - stats: this.connectionStats.activeConnections, - actual: this.activeConnections.size, - action: 'Auto-corrected' - }); - this.connectionStats.activeConnections = this.activeConnections.size; - } - - // 2. Check for destroyed sockets in active connections - let destroyedSocketsCount = 0; - const socketsToRemove: Array = []; - - for (const socket of this.activeConnections) { - if (socket.destroyed) { - destroyedSocketsCount++; - socketsToRemove.push(socket); - } - } - - // Remove destroyed sockets from tracking - for (const socket of socketsToRemove) { - this.activeConnections.delete(socket); - // Also ensure all listeners are removed - try { - socket.removeAllListeners(); - } catch { - // Ignore errors from removeAllListeners - } - } - - if (destroyedSocketsCount > 0) { - inconsistenciesFound.push({ - issue: 'Destroyed sockets in active list', - count: destroyedSocketsCount, - action: 'Removed from tracking' - }); - // Update active connections count after cleanup - this.connectionStats.activeConnections = this.activeConnections.size; - } - - // 3. Check for sessions without corresponding active connections - const sessionCount = this.smtpServer.getSessionManager().getSessionCount(); - if (sessionCount > this.activeConnections.size) { - inconsistenciesFound.push({ - issue: 'Orphaned sessions', - sessions: sessionCount, - connections: this.activeConnections.size, - action: 'Session cleanup recommended' - }); - } - - // If any inconsistencies found, log a detailed report - if (inconsistenciesFound.length > 0) { - SmtpLogger.warn('Resource tracking inconsistencies detected and repaired', { inconsistencies: inconsistenciesFound }); - } - } - - /** - * Handle a new connection with resource management - * @param socket - Client socket - */ - public async handleNewConnection(socket: plugins.net.Socket): Promise { - // Update connection stats - this.connectionStats.totalConnections++; - this.connectionStats.activeConnections = this.activeConnections.size + 1; - - if (this.connectionStats.activeConnections > this.connectionStats.peakConnections) { - this.connectionStats.peakConnections = this.connectionStats.activeConnections; - } - - // Get client IP - const remoteAddress = socket.remoteAddress || '0.0.0.0'; - - // Use UnifiedRateLimiter for connection rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - - // Check connection limit with UnifiedRateLimiter - const connectionResult = rateLimiter.recordConnection(remoteAddress); - if (!connectionResult.allowed) { - this.rejectConnection(socket, connectionResult.reason || 'Rate limit exceeded'); - this.connectionStats.rejectedConnections++; - return; - } - - // Still track IP connections locally for cleanup purposes - this.trackIPConnection(remoteAddress); - - // Check if maximum global connections reached - if (this.hasReachedMaxConnections()) { - this.rejectConnection(socket, 'Too many connections'); - this.connectionStats.rejectedConnections++; - return; - } - - // Add socket to active connections - this.activeConnections.add(socket); - - // Set up socket options - socket.setKeepAlive(true); - socket.setTimeout(this.options.socketTimeout); - - // Explicitly set socket buffer sizes to prevent memory issues - socket.setNoDelay(true); // Disable Nagle's algorithm for better responsiveness - - // Set limits on socket buffer size if supported by Node.js version - try { - // Here we set reasonable buffer limits to prevent memory exhaustion attacks - const highWaterMark = 64 * 1024; // 64 KB - // Note: Socket high water mark methods can't be set directly in newer Node.js versions - // These would need to be set during socket creation or with a different API - } catch (error) { - // Ignore errors from older Node.js versions that don't support these methods - SmtpLogger.debug(`Could not set socket buffer limits: ${error instanceof Error ? error.message : String(error)}`); - } - - // Set up event handlers - this.setupSocketEventHandlers(socket); - - // Create a session for this connection - this.smtpServer.getSessionManager().createSession(socket, false); - - // Log the new connection using adaptive logger - const socketDetails = getSocketDetails(socket); - adaptiveLogger.logConnection(socket, 'connect'); - - // Update adaptive logger with current connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - - // Send greeting - this.sendGreeting(socket); - } - - /** - * Check if an IP has exceeded the rate limit - * @param ip - Client IP address - * @returns True if rate limited - */ - private isIPRateLimited(ip: string): boolean { - const now = Date.now(); - const ipData = this.ipConnections.get(ip); - - if (!ipData) { - return false; // No previous connections - } - - // Check if we're within the rate window - const isWithinWindow = now - ipData.firstConnection <= this.options.connectionRateWindow; - - // If within window and count exceeds limit, rate limit is applied - if (isWithinWindow && ipData.count >= this.options.connectionRateLimit) { - SmtpLogger.warn(`Rate limit exceeded for IP ${ip}: ${ipData.count} connections in ${Math.round((now - ipData.firstConnection) / 1000)}s`); - return true; - } - - return false; - } - - /** - * Track a new connection from an IP - * @param ip - Client IP address - */ - private trackIPConnection(ip: string): void { - const now = Date.now(); - const ipData = this.ipConnections.get(ip); - - if (!ipData) { - // First connection from this IP - this.ipConnections.set(ip, { - count: 1, - firstConnection: now, - lastConnection: now - }); - } else { - // Check if we need to reset the window - if (now - ipData.lastConnection > this.options.connectionRateWindow) { - // Reset the window - this.ipConnections.set(ip, { - count: 1, - firstConnection: now, - lastConnection: now - }); - } else { - // Increment within the current window - this.ipConnections.set(ip, { - count: ipData.count + 1, - firstConnection: ipData.firstConnection, - lastConnection: now - }); - } - } - } - - /** - * Check if an IP has reached its connection limit - * @param ip - Client IP address - * @returns True if limit reached - */ - private hasReachedIPConnectionLimit(ip: string): boolean { - let ipConnectionCount = 0; - - // Count active connections from this IP - for (const socket of this.activeConnections) { - if (socket.remoteAddress === ip) { - ipConnectionCount++; - } - } - - return ipConnectionCount >= this.options.maxConnectionsPerIP; - } - - /** - * Handle a new secure TLS connection with resource management - * @param socket - Client TLS socket - */ - public async handleNewSecureConnection(socket: plugins.tls.TLSSocket): Promise { - // Update connection stats - this.connectionStats.totalConnections++; - this.connectionStats.activeConnections = this.activeConnections.size + 1; - - if (this.connectionStats.activeConnections > this.connectionStats.peakConnections) { - this.connectionStats.peakConnections = this.connectionStats.activeConnections; - } - - // Get client IP - const remoteAddress = socket.remoteAddress || '0.0.0.0'; - - // Use UnifiedRateLimiter for connection rate limiting - const emailServer = this.smtpServer.getEmailServer(); - const rateLimiter = emailServer.getRateLimiter(); - - // Check connection limit with UnifiedRateLimiter - const connectionResult = rateLimiter.recordConnection(remoteAddress); - if (!connectionResult.allowed) { - this.rejectConnection(socket, connectionResult.reason || 'Rate limit exceeded'); - this.connectionStats.rejectedConnections++; - return; - } - - // Still track IP connections locally for cleanup purposes - this.trackIPConnection(remoteAddress); - - // Check if maximum global connections reached - if (this.hasReachedMaxConnections()) { - this.rejectConnection(socket, 'Too many connections'); - this.connectionStats.rejectedConnections++; - return; - } - - // Add socket to active connections - this.activeConnections.add(socket); - - // Set up socket options - socket.setKeepAlive(true); - socket.setTimeout(this.options.socketTimeout); - - // Explicitly set socket buffer sizes to prevent memory issues - socket.setNoDelay(true); // Disable Nagle's algorithm for better responsiveness - - // Set limits on socket buffer size if supported by Node.js version - try { - // Here we set reasonable buffer limits to prevent memory exhaustion attacks - const highWaterMark = 64 * 1024; // 64 KB - // Note: Socket high water mark methods can't be set directly in newer Node.js versions - // These would need to be set during socket creation or with a different API - } catch (error) { - // Ignore errors from older Node.js versions that don't support these methods - SmtpLogger.debug(`Could not set socket buffer limits: ${error instanceof Error ? error.message : String(error)}`); - } - - // Set up event handlers - this.setupSocketEventHandlers(socket); - - // Create a session for this connection - this.smtpServer.getSessionManager().createSession(socket, true); - - // Log the new secure connection using adaptive logger - adaptiveLogger.logConnection(socket, 'connect'); - - // Update adaptive logger with current connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - - // Send greeting - this.sendGreeting(socket); - } - - /** - * Set up event handlers for a socket with enhanced resource management - * @param socket - Client socket - */ - public setupSocketEventHandlers(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - // Store existing socket event handlers before adding new ones - const existingDataHandler = socket.listeners('data')[0] as (...args: any[]) => void; - const existingCloseHandler = socket.listeners('close')[0] as (...args: any[]) => void; - const existingErrorHandler = socket.listeners('error')[0] as (...args: any[]) => void; - const existingTimeoutHandler = socket.listeners('timeout')[0] as (...args: any[]) => void; - - // Remove existing event handlers if they exist - if (existingDataHandler) socket.removeListener('data', existingDataHandler); - if (existingCloseHandler) socket.removeListener('close', existingCloseHandler); - if (existingErrorHandler) socket.removeListener('error', existingErrorHandler); - if (existingTimeoutHandler) socket.removeListener('timeout', existingTimeoutHandler); - - // Data event - process incoming data from the client with resource limits - let buffer = ''; - let totalBytesReceived = 0; - - socket.on('data', async (data) => { - try { - // Get current session and update activity timestamp - const session = this.smtpServer.getSessionManager().getSession(socket); - if (session) { - this.smtpServer.getSessionManager().updateSessionActivity(session); - } - - // Check if we're in DATA receiving mode - handle differently - if (session && session.state === SmtpState.DATA_RECEIVING) { - // In DATA mode, pass raw chunks directly to command handler with special marker - // Don't line-buffer large email content - try { - const dataString = data.toString('utf8'); - // Use a special prefix to indicate this is raw data, not a command line - // CRITICAL FIX: Must await to prevent async pile-up - await this.smtpServer.getCommandHandler().processCommand(socket, `__RAW_DATA__${dataString}`); - return; - } catch (dataError) { - SmtpLogger.error(`Data handler error during DATA mode: ${dataError instanceof Error ? dataError.message : String(dataError)}`); - socket.destroy(); - return; - } - } - - // For command mode, continue with line-buffered processing - // Check buffer size limits to prevent memory attacks - totalBytesReceived += data.length; - - if (buffer.length > this.options.bufferSizeLimit) { - // Buffer is too large, reject the connection - SmtpLogger.warn(`Buffer size limit exceeded: ${buffer.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message too large, disconnecting`); - socket.destroy(); - return; - } - - // Impose a total transfer limit to prevent DoS - if (totalBytesReceived > this.options.bufferSizeLimit * 2) { - SmtpLogger.warn(`Total transfer limit exceeded: ${totalBytesReceived} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Transfer limit exceeded, disconnecting`); - socket.destroy(); - return; - } - - // Convert buffer to string safely with explicit encoding - const dataString = data.toString('utf8'); - - // Buffer incoming data - buffer += dataString; - - // Process complete lines - let lineEndPos; - while ((lineEndPos = buffer.indexOf(SMTP_DEFAULTS.CRLF)) !== -1) { - // Extract a complete line - const line = buffer.substring(0, lineEndPos); - buffer = buffer.substring(lineEndPos + 2); // +2 to skip CRLF - - // Check line length to prevent extremely long lines - if (line.length > 4096) { // 4KB line limit is reasonable for SMTP - SmtpLogger.warn(`Line length limit exceeded: ${line.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Line too long, disconnecting`); - socket.destroy(); - return; - } - - // Process non-empty lines - if (line.length > 0) { - try { - // CRITICAL FIX: Must await processCommand to prevent async pile-up - // This was causing the busy loop with high CPU usage when many empty lines were processed - await this.smtpServer.getCommandHandler().processCommand(socket, line); - } catch (error) { - // Handle any errors in command processing - SmtpLogger.error(`Command handler error: ${error instanceof Error ? error.message : String(error)}`); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error`); - - // If there's a severe error, close the connection - if (error instanceof Error && - (error.message.includes('fatal') || error.message.includes('critical'))) { - socket.destroy(); - return; - } - } - } - } - - // If buffer is getting too large without CRLF, it might be a DoS attempt - if (buffer.length > 10240) { // 10KB is a reasonable limit for a line without CRLF - SmtpLogger.warn(`Incomplete line too large: ${buffer.length} bytes for ${socket.remoteAddress}`); - this.sendResponse(socket, `${SmtpResponseCode.SYNTAX_ERROR} Incomplete line too large, disconnecting`); - socket.destroy(); - } - } catch (error) { - // Handle any unexpected errors during data processing - SmtpLogger.error(`Data handler error: ${error instanceof Error ? error.message : String(error)}`); - socket.destroy(); - } - }); - - // Add drain event handler to manage flow control - socket.on('drain', () => { - // Socket buffer has been emptied, resume data flow if needed - if (socket.isPaused()) { - socket.resume(); - SmtpLogger.debug(`Resumed socket for ${socket.remoteAddress} after drain`); - } - }); - - // Close event - clean up when connection is closed - socket.on('close', (hadError) => { - this.handleSocketClose(socket, hadError); - }); - - // Error event - handle socket errors - socket.on('error', (err) => { - this.handleSocketError(socket, err); - }); - - // Timeout event - handle socket timeouts - socket.on('timeout', () => { - this.handleSocketTimeout(socket); - }); - } - - /** - * Get the current connection count - * @returns Number of active connections - */ - public getConnectionCount(): number { - return this.activeConnections.size; - } - - /** - * Check if the server has reached the maximum number of connections - * @returns True if max connections reached - */ - public hasReachedMaxConnections(): boolean { - return this.activeConnections.size >= this.options.maxConnections; - } - - /** - * Close all active connections - */ - public closeAllConnections(): void { - const connectionCount = this.activeConnections.size; - if (connectionCount === 0) { - return; - } - - SmtpLogger.info(`Closing all connections (count: ${connectionCount})`); - - for (const socket of this.activeConnections) { - try { - // Send service closing notification - this.sendServiceClosing(socket); - - // End the socket gracefully - socket.end(); - - // Force destroy after a short delay if not already destroyed - const destroyTimer = setTimeout(() => { - if (!socket.destroyed) { - socket.destroy(); - } - this.cleanupTimers.delete(destroyTimer); - }, 100); - this.cleanupTimers.add(destroyTimer); - } catch (error) { - SmtpLogger.error(`Error closing connection: ${error instanceof Error ? error.message : String(error)}`); - // Force destroy on error - try { - socket.destroy(); - } catch (e) { - // Ignore destroy errors - } - } - } - - // Clear active connections - this.activeConnections.clear(); - - // Stop resource monitoring to prevent hanging timers - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - this.resourceCheckInterval = null; - } - } - - /** - * Handle socket close event - * @param socket - Client socket - * @param hadError - Whether the socket was closed due to error - */ - private handleSocketClose(socket: plugins.net.Socket | plugins.tls.TLSSocket, hadError: boolean): void { - try { - // Update connection statistics - this.connectionStats.closedConnections++; - this.connectionStats.activeConnections = this.activeConnections.size - 1; - - // Get socket details for logging - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - - // Log with appropriate level based on whether there was an error - if (hadError) { - SmtpLogger.warn(`Socket closed with error: ${socketId}`); - } else { - SmtpLogger.debug(`Socket closed normally: ${socketId}`); - } - - // Get the session before removing it - const session = this.smtpServer.getSessionManager().getSession(socket); - - // Remove from active connections - this.activeConnections.delete(socket); - - // Remove from session manager - this.smtpServer.getSessionManager().removeSession(socket); - - // Cancel any timeout ID stored in the session - if (session?.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - - // Remove all event listeners to prevent memory leaks - socket.removeAllListeners(); - - // Log connection close with session details if available - adaptiveLogger.logConnection(socket, 'close', session); - - // Update adaptive logger with new connection count - adaptiveLogger.updateConnectionCount(this.connectionStats.activeConnections); - } catch (error) { - // Handle any unexpected errors during cleanup - SmtpLogger.error(`Error in handleSocketClose: ${error instanceof Error ? error.message : String(error)}`); - - // Ensure socket is removed from active connections even if an error occurs - this.activeConnections.delete(socket); - - // Always try to remove all listeners even on error - try { - socket.removeAllListeners(); - } catch { - // Ignore errors from removeAllListeners - } - } - } - - /** - * Handle socket error event - * @param socket - Client socket - * @param error - Error object - */ - private handleSocketError(socket: plugins.net.Socket | plugins.tls.TLSSocket, error: Error): void { - try { - // Update connection statistics - this.connectionStats.erroredConnections++; - - // Get socket details for context - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - - // Detailed error logging with context information - SmtpLogger.error(`Socket error for ${socketId}: ${error.message}`, { - errorCode: (error as any).code, - errorStack: error.stack, - sessionId: session?.id, - sessionState: session?.state, - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - - // Log the error for connection tracking using adaptive logger - adaptiveLogger.logConnection(socket, 'error', session, error); - - // Cancel any timeout ID stored in the session - if (session?.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - - // Close the socket if not already closed - if (!socket.destroyed) { - socket.destroy(); - } - - // Remove from active connections (cleanup after error) - this.activeConnections.delete(socket); - - // Remove from session manager - this.smtpServer.getSessionManager().removeSession(socket); - } catch (handlerError) { - // Meta-error handling (errors in the error handler) - SmtpLogger.error(`Error in handleSocketError: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`); - - // Ensure socket is destroyed and removed from active connections - if (!socket.destroyed) { - socket.destroy(); - } - this.activeConnections.delete(socket); - } - } - - /** - * Handle socket timeout event - * @param socket - Client socket - */ - private handleSocketTimeout(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - try { - // Update connection statistics - this.connectionStats.timedOutConnections++; - - // Get socket details for context - const socketDetails = getSocketDetails(socket); - const socketId = `${socketDetails.remoteAddress}:${socketDetails.remotePort}`; - - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - - // Get timing information for better debugging - const now = Date.now(); - const idleTime = session?.lastActivity ? now - session.lastActivity : 'unknown'; - - if (session) { - // Log the timeout with extended details - SmtpLogger.warn(`Socket timeout from ${session.remoteAddress}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - state: session.state, - timeout: this.options.socketTimeout, - idleTime: idleTime, - emailState: session.envelope?.mailFrom ? 'has-sender' : 'no-sender', - recipientCount: session.envelope?.rcptTo?.length || 0 - }); - - // Cancel any timeout ID stored in the session - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - - // Send timeout notification to client - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_NOT_AVAILABLE} Connection timeout - closing connection`); - } else { - // Log timeout without session context - SmtpLogger.warn(`Socket timeout without session from ${socketId}`); - } - - // Close the socket gracefully - try { - socket.end(); - - // Set a forced close timeout in case socket.end() doesn't close the connection - const timeoutDestroyTimer = setTimeout(() => { - if (!socket.destroyed) { - SmtpLogger.warn(`Forcing destroy of timed out socket: ${socketId}`); - socket.destroy(); - } - this.cleanupTimers.delete(timeoutDestroyTimer); - }, 5000); // 5 second grace period for socket to end properly - this.cleanupTimers.add(timeoutDestroyTimer); - } catch (error) { - SmtpLogger.error(`Error ending timed out socket: ${error instanceof Error ? error.message : String(error)}`); - - // Ensure socket is destroyed even if end() fails - if (!socket.destroyed) { - socket.destroy(); - } - } - - // Clean up resources - this.activeConnections.delete(socket); - this.smtpServer.getSessionManager().removeSession(socket); - } catch (handlerError) { - // Handle any unexpected errors during timeout handling - SmtpLogger.error(`Error in handleSocketTimeout: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`); - - // Ensure socket is destroyed and removed from tracking - if (!socket.destroyed) { - socket.destroy(); - } - this.activeConnections.delete(socket); - } - } - - /** - * Reject a connection - * @param socket - Client socket - * @param reason - Reason for rejection - */ - private rejectConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, reason: string): void { - // Log the rejection - const socketDetails = getSocketDetails(socket); - SmtpLogger.warn(`Connection rejected from ${socketDetails.remoteAddress}:${socketDetails.remotePort}: ${reason}`); - - // Send rejection message - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_NOT_AVAILABLE} ${this.options.hostname} Service temporarily unavailable - ${reason}`); - - // Close the socket - try { - socket.end(); - } catch (error) { - SmtpLogger.error(`Error ending rejected socket: ${error instanceof Error ? error.message : String(error)}`); - } - } - - /** - * Send greeting message - * @param socket - Client socket - */ - private sendGreeting(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const greeting = `${SmtpResponseCode.SERVICE_READY} ${this.options.hostname} ESMTP service ready`; - this.sendResponse(socket, greeting); - } - - /** - * Send service closing notification - * @param socket - Client socket - */ - private sendServiceClosing(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const message = `${SmtpResponseCode.SERVICE_CLOSING} ${this.options.hostname} Service closing transmission channel`; - this.sendResponse(socket, message); - } - - /** - * Send response to client - * @param socket - Client socket - * @param response - Response to send - */ - private sendResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, response: string): void { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - adaptiveLogger.logResponse(response, socket); - } catch (error) { - // Log error and destroy socket - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - - socket.destroy(); - } - } - - /** - * Handle a new connection (interface requirement) - */ - public async handleConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): Promise { - if (secure) { - this.handleNewSecureConnection(socket as plugins.tls.TLSSocket); - } else { - this.handleNewConnection(socket as plugins.net.Socket); - } - } - - /** - * Check if accepting new connections (interface requirement) - */ - public canAcceptConnection(): boolean { - return !this.hasReachedMaxConnections(); - } - - /** - * Clean up resources - */ - public destroy(): void { - // Clear resource monitoring interval - if (this.resourceCheckInterval) { - clearInterval(this.resourceCheckInterval); - this.resourceCheckInterval = null; - } - - // Clear all cleanup timers - for (const timer of this.cleanupTimers) { - clearTimeout(timer); - } - this.cleanupTimers.clear(); - - // Close all active connections - this.closeAllConnections(); - - // Clear maps - this.activeConnections.clear(); - this.ipConnections.clear(); - - // Reset connection stats - this.connectionStats = { - totalConnections: 0, - activeConnections: 0, - peakConnections: 0, - rejectedConnections: 0, - closedConnections: 0, - erroredConnections: 0, - timedOutConnections: 0 - }; - - SmtpLogger.debug('ConnectionManager destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/constants.ts b/ts/mail/delivery/smtpserver/constants.ts deleted file mode 100644 index a11b98d..0000000 --- a/ts/mail/delivery/smtpserver/constants.ts +++ /dev/null @@ -1,181 +0,0 @@ -/** - * SMTP Server Constants - * This file contains all constants and enums used by the SMTP server - */ - -import { SmtpState } from '../interfaces.js'; - -// Re-export SmtpState enum from the main interfaces file -export { SmtpState }; - -/** - * SMTP Response Codes - * Based on RFC 5321 and common SMTP practice - */ -export enum SmtpResponseCode { - // Success codes (2xx) - SUCCESS = 250, // Requested mail action okay, completed - SYSTEM_STATUS = 211, // System status, or system help reply - HELP_MESSAGE = 214, // Help message - SERVICE_READY = 220, // Service ready - SERVICE_CLOSING = 221, // Service closing transmission channel - AUTHENTICATION_SUCCESSFUL = 235, // Authentication successful - OK = 250, // Requested mail action okay, completed - FORWARD = 251, // User not local; will forward to - CANNOT_VRFY = 252, // Cannot VRFY user, but will accept message and attempt delivery - - // Intermediate codes (3xx) - MORE_INFO_NEEDED = 334, // Server challenge for authentication - START_MAIL_INPUT = 354, // Start mail input; end with . - - // Temporary error codes (4xx) - SERVICE_NOT_AVAILABLE = 421, // Service not available, closing transmission channel - MAILBOX_TEMPORARILY_UNAVAILABLE = 450, // Requested mail action not taken: mailbox unavailable - LOCAL_ERROR = 451, // Requested action aborted: local error in processing - INSUFFICIENT_STORAGE = 452, // Requested action not taken: insufficient system storage - TLS_UNAVAILABLE_TEMP = 454, // TLS not available due to temporary reason - - // Permanent error codes (5xx) - SYNTAX_ERROR = 500, // Syntax error, command unrecognized - SYNTAX_ERROR_PARAMETERS = 501, // Syntax error in parameters or arguments - COMMAND_NOT_IMPLEMENTED = 502, // Command not implemented - BAD_SEQUENCE = 503, // Bad sequence of commands - COMMAND_PARAMETER_NOT_IMPLEMENTED = 504, // Command parameter not implemented - AUTH_REQUIRED = 530, // Authentication required - AUTH_FAILED = 535, // Authentication credentials invalid - MAILBOX_UNAVAILABLE = 550, // Requested action not taken: mailbox unavailable - USER_NOT_LOCAL = 551, // User not local; please try - EXCEEDED_STORAGE = 552, // Requested mail action aborted: exceeded storage allocation - MAILBOX_NAME_INVALID = 553, // Requested action not taken: mailbox name not allowed - TRANSACTION_FAILED = 554, // Transaction failed - MAIL_RCPT_PARAMETERS_INVALID = 555, // MAIL FROM/RCPT TO parameters not recognized or not implemented -} - -/** - * SMTP Command Types - */ -export enum SmtpCommand { - HELO = 'HELO', - EHLO = 'EHLO', - MAIL_FROM = 'MAIL', - RCPT_TO = 'RCPT', - DATA = 'DATA', - RSET = 'RSET', - NOOP = 'NOOP', - QUIT = 'QUIT', - STARTTLS = 'STARTTLS', - AUTH = 'AUTH', - HELP = 'HELP', - VRFY = 'VRFY', - EXPN = 'EXPN', -} - -/** - * Security log event types - */ -export enum SecurityEventType { - CONNECTION = 'connection', - AUTHENTICATION = 'authentication', - COMMAND = 'command', - DATA = 'data', - IP_REPUTATION = 'ip_reputation', - TLS_NEGOTIATION = 'tls_negotiation', - DKIM = 'dkim', - SPF = 'spf', - DMARC = 'dmarc', - EMAIL_VALIDATION = 'email_validation', - SPAM = 'spam', - ACCESS_CONTROL = 'access_control', -} - -/** - * Security log levels - */ -export enum SecurityLogLevel { - DEBUG = 'debug', - INFO = 'info', - WARN = 'warn', - ERROR = 'error', -} - -/** - * SMTP Server Defaults - */ -export const SMTP_DEFAULTS = { - // Default timeouts in milliseconds - CONNECTION_TIMEOUT: 30000, // 30 seconds - SOCKET_TIMEOUT: 300000, // 5 minutes - DATA_TIMEOUT: 60000, // 1 minute - CLEANUP_INTERVAL: 5000, // 5 seconds - - // Default limits - MAX_CONNECTIONS: 100, - MAX_RECIPIENTS: 100, - MAX_MESSAGE_SIZE: 10485760, // 10MB - - // Default ports - SMTP_PORT: 25, - SUBMISSION_PORT: 587, - SECURE_PORT: 465, - - // Default hostname - HOSTNAME: 'mail.lossless.one', - - // CRLF line ending required by SMTP protocol - CRLF: '\r\n', -}; - -/** - * SMTP Command Patterns - * Regular expressions for parsing SMTP commands - */ -export const SMTP_PATTERNS = { - // Match EHLO/HELO command: "EHLO example.com" - // Made very permissive to handle various client implementations - EHLO: /^(?:EHLO|HELO)\s+(.+)$/i, - - // Match MAIL FROM command: "MAIL FROM: [PARAM=VALUE]" - // Made more permissive with whitespace and parameter formats - MAIL_FROM: /^MAIL\s+FROM\s*:\s*<([^>]*)>((?:\s+[a-zA-Z0-9][a-zA-Z0-9\-]*(?:=[^\s]+)?)*)$/i, - - // Match RCPT TO command: "RCPT TO: [PARAM=VALUE]" - // Made more permissive with whitespace and parameter formats - RCPT_TO: /^RCPT\s+TO\s*:\s*<([^>]*)>((?:\s+[a-zA-Z0-9][a-zA-Z0-9\-]*(?:=[^\s]+)?)*)$/i, - - // Match parameter format: "PARAM=VALUE" - PARAM: /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g, - - // Match email address format - basic validation - // This pattern rejects common invalid formats while being permissive for edge cases - // Checks: no spaces, has @, has domain with dot, no double dots, proper domain format - EMAIL: /^[^\s@]+@[^\s@]+\.[^\s@]+$/, - - // Match end of DATA marker: \r\n.\r\n or just .\r\n at the start of a line (to handle various client implementations) - END_DATA: /(\r\n\.\r\n$)|(\n\.\r\n$)|(\r\n\.\n$)|(\n\.\n$)|^\.(\r\n|\n)$/, -}; - -/** - * SMTP Extension List - * These extensions are advertised in the EHLO response - */ -export const SMTP_EXTENSIONS = { - // Basic extensions (RFC 1869) - PIPELINING: 'PIPELINING', - SIZE: 'SIZE', - EIGHTBITMIME: '8BITMIME', - - // Security extensions - STARTTLS: 'STARTTLS', - AUTH: 'AUTH', - - // Additional extensions - ENHANCEDSTATUSCODES: 'ENHANCEDSTATUSCODES', - HELP: 'HELP', - CHUNKING: 'CHUNKING', - DSN: 'DSN', - - // Format an extension with a parameter - formatExtension(name: string, parameter?: string | number): string { - return parameter !== undefined ? `${name} ${parameter}` : name; - } -}; \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/create-server.ts b/ts/mail/delivery/smtpserver/create-server.ts deleted file mode 100644 index 0f56764..0000000 --- a/ts/mail/delivery/smtpserver/create-server.ts +++ /dev/null @@ -1,31 +0,0 @@ -/** - * SMTP Server Creation Factory - * Provides a simple way to create a complete SMTP server - */ - -import { SmtpServer } from './smtp-server.js'; -import { SessionManager } from './session-manager.js'; -import { ConnectionManager } from './connection-manager.js'; -import { CommandHandler } from './command-handler.js'; -import { DataHandler } from './data-handler.js'; -import { TlsHandler } from './tls-handler.js'; -import { SecurityHandler } from './security-handler.js'; -import type { ISmtpServerOptions } from './interfaces.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; - -/** - * Create a complete SMTP server with all components - * @param emailServer - Email server reference - * @param options - SMTP server options - * @returns Configured SMTP server instance - */ -export function createSmtpServer(emailServer: UnifiedEmailServer, options: ISmtpServerOptions): SmtpServer { - // First create the SMTP server instance - const smtpServer = new SmtpServer({ - emailServer, - options - }); - - // Return the configured server - return smtpServer; -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/data-handler.ts b/ts/mail/delivery/smtpserver/data-handler.ts deleted file mode 100644 index 2e5368e..0000000 --- a/ts/mail/delivery/smtpserver/data-handler.ts +++ /dev/null @@ -1,1283 +0,0 @@ -/** - * SMTP Data Handler - * Responsible for processing email data during and after DATA command - */ - -import * as plugins from '../../../plugins.js'; -import * as fs from 'fs'; -import * as path from 'path'; -import { SmtpState } from './interfaces.js'; -import type { ISmtpSession, ISmtpTransactionResult } from './interfaces.js'; -import type { IDataHandler, ISmtpServer } from './interfaces.js'; -import { SmtpResponseCode, SMTP_PATTERNS, SMTP_DEFAULTS } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { detectHeaderInjection } from './utils/validation.js'; -import { Email } from '../../core/classes.email.js'; - -/** - * Handles SMTP DATA command and email data processing - */ -export class DataHandler implements IDataHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer: ISmtpServer; - - /** - * Creates a new data handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer) { - this.smtpServer = smtpServer; - } - - /** - * Process incoming email data - * @param socket - Client socket - * @param data - Data chunk - * @returns Promise that resolves when the data is processed - */ - public async processEmailData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Clear any existing timeout and set a new one - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - } - - session.dataTimeoutId = setTimeout(() => { - if (session.state === SmtpState.DATA_RECEIVING) { - SmtpLogger.warn(`DATA timeout for session ${session.id}`, { sessionId: session.id }); - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Data timeout`); - this.resetSession(session); - } - }, SMTP_DEFAULTS.DATA_TIMEOUT); - - // Update activity timestamp - this.smtpServer.getSessionManager().updateSessionActivity(session); - - // Store data in chunks for better memory efficiency - if (!session.emailDataChunks) { - session.emailDataChunks = []; - session.emailDataSize = 0; // Track size incrementally - } - - session.emailDataChunks.push(data); - session.emailDataSize = (session.emailDataSize || 0) + data.length; - - // Check if we've reached the max size (using incremental tracking) - const options = this.smtpServer.getOptions(); - const maxSize = options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE; - if (session.emailDataSize > maxSize) { - SmtpLogger.warn(`Message size exceeds limit for session ${session.id}`, { - sessionId: session.id, - size: session.emailDataSize, - limit: maxSize - }); - - this.sendResponse(socket, `${SmtpResponseCode.EXCEEDED_STORAGE} Message too big, size limit is ${maxSize} bytes`); - this.resetSession(session); - return; - } - - // Check for end of data marker efficiently without combining all chunks - // Only check the current chunk and the last chunk for the marker - let hasEndMarker = false; - - // Check if current chunk contains end marker - if (data === '.\r\n' || data === '.') { - hasEndMarker = true; - } else { - // For efficiency with large messages, only check the last few chunks - // Get the last 2 chunks to check for split markers - const lastChunks = session.emailDataChunks.slice(-2).join(''); - - hasEndMarker = lastChunks.endsWith('\r\n.\r\n') || - lastChunks.endsWith('\n.\r\n') || - lastChunks.endsWith('\r\n.\n') || - lastChunks.endsWith('\n.\n'); - } - - if (hasEndMarker) { - - SmtpLogger.debug(`End of data marker found for session ${session.id}`, { sessionId: session.id }); - - // End of data marker found - await this.handleEndOfData(socket, session); - } - } - - /** - * Handle raw data chunks during DATA mode (optimized for large messages) - * @param socket - Client socket - * @param data - Raw data chunk - */ - public async handleDataReceived(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise { - // Get the session - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Internal server error - session not found`); - return; - } - - // Special handling for ERR-02 test: detect MAIL FROM command during DATA mode - // This needs to work for both raw data chunks and line-based data - const trimmedData = data.trim(); - const looksLikeCommand = /^[A-Z]{4,}( |:)/i.test(trimmedData); - - if (looksLikeCommand && trimmedData.toUpperCase().startsWith('MAIL FROM')) { - // This is the command that ERR-02 test is expecting to fail with 503 - SmtpLogger.debug(`Received MAIL FROM command during DATA mode - responding with sequence error`); - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} Bad sequence of commands`); - return; - } - - // For all other data, process normally - return this.processEmailData(socket, data); - } - - /** - * Process email data chunks efficiently for large messages - * @param chunks - Array of email data chunks - * @returns Processed email data string - */ - private processEmailDataStreaming(chunks: string[]): string { - // For very large messages, use a more memory-efficient approach - const CHUNK_SIZE = 50; // Process 50 chunks at a time - let result = ''; - - // Process chunks in batches to reduce memory pressure - for (let batchStart = 0; batchStart < chunks.length; batchStart += CHUNK_SIZE) { - const batchEnd = Math.min(batchStart + CHUNK_SIZE, chunks.length); - const batchChunks = chunks.slice(batchStart, batchEnd); - - // Join this batch - let batchData = batchChunks.join(''); - - // Clear references to help GC - for (let i = 0; i < batchChunks.length; i++) { - batchChunks[i] = ''; - } - - result += batchData; - batchData = ''; // Clear reference - - // Force garbage collection hint (if available) - if (global.gc && batchStart % 200 === 0) { - global.gc(); - } - } - - // Remove trailing end-of-data marker: various formats - result = result - .replace(/\r\n\.\r\n$/, '') - .replace(/\n\.\r\n$/, '') - .replace(/\r\n\.\n$/, '') - .replace(/\n\.\n$/, '') - .replace(/^\.$/, ''); // Handle ONLY a lone dot as the entire content (not trailing dots) - - // Remove dot-stuffing (RFC 5321, section 4.5.2) - result = result.replace(/\r\n\.\./g, '\r\n.'); - - return result; - } - - /** - * Process a complete email - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Promise that resolves with the Email object - */ - public async processEmail(rawData: string, session: ISmtpSession): Promise { - // Clean up the raw email data - let cleanedData = rawData; - - // Remove trailing end-of-data marker: various formats - cleanedData = cleanedData - .replace(/\r\n\.\r\n$/, '') - .replace(/\n\.\r\n$/, '') - .replace(/\r\n\.\n$/, '') - .replace(/\n\.\n$/, '') - .replace(/^\.$/, ''); // Handle ONLY a lone dot as the entire content (not trailing dots) - - // Remove dot-stuffing (RFC 5321, section 4.5.2) - cleanedData = cleanedData.replace(/\r\n\.\./g, '\r\n.'); - - try { - // Parse email into Email object using cleaned data - const email = await this.parseEmailFromData(cleanedData, session); - - // Return the parsed email - return email; - } catch (error) { - SmtpLogger.error(`Failed to parse email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Create a minimal email object on error - const fallbackEmail = new Email({ - from: 'unknown@localhost', - to: 'unknown@localhost', - subject: 'Parse Error', - text: cleanedData - }); - return fallbackEmail; - } - } - - /** - * Parse email from raw data - * @param rawData - Raw email data - * @param session - SMTP session - * @returns Email object - */ - private async parseEmailFromData(rawData: string, session: ISmtpSession): Promise { - // Parse the raw email data to extract headers and body - const lines = rawData.split('\r\n'); - let headerEnd = -1; - - // Find where headers end - for (let i = 0; i < lines.length; i++) { - if (lines[i].trim() === '') { - headerEnd = i; - break; - } - } - - // Extract headers - let subject = 'No Subject'; - const headers: Record = {}; - - if (headerEnd > -1) { - for (let i = 0; i < headerEnd; i++) { - const line = lines[i]; - const colonIndex = line.indexOf(':'); - if (colonIndex > 0) { - const headerName = line.substring(0, colonIndex).trim().toLowerCase(); - const headerValue = line.substring(colonIndex + 1).trim(); - - if (headerName === 'subject') { - subject = headerValue; - } else { - headers[headerName] = headerValue; - } - } - } - } - - // Extract body - const body = headerEnd > -1 ? lines.slice(headerEnd + 1).join('\r\n') : rawData; - - // Create email with session information - const email = new Email({ - from: session.mailFrom || 'unknown@localhost', - to: session.rcptTo || ['unknown@localhost'], - subject, - text: body, - headers - }); - - return email; - } - - /** - * Process a complete email (legacy method) - * @param session - SMTP session - * @returns Promise that resolves with the result of the transaction - */ - public async processEmailLegacy(session: ISmtpSession): Promise { - try { - // Use the email data from session - const email = await this.parseEmailFromData(session.emailData || '', session); - - // Process the email based on the processing mode - const processingMode = session.processingMode || 'mta'; - - let result: ISmtpTransactionResult = { - success: false, - error: 'Email processing failed' - }; - - switch (processingMode) { - case 'mta': - // Process through the MTA system - try { - SmtpLogger.debug(`Processing email in MTA mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - - // Generate a message ID since queueEmail is not available - const options = this.smtpServer.getOptions(); - const hostname = options.hostname || SMTP_DEFAULTS.HOSTNAME; - const messageId = `${Date.now()}-${Math.floor(Math.random() * 1000000)}@${hostname}`; - - // Process the email through the emailServer - try { - // Process the email via the UnifiedEmailServer - // Pass the email object, session data, and specify the mode (mta, forward, or process) - // This connects SMTP reception to the overall email system - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session as any); - - SmtpLogger.info(`Email processed through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - - result = { - success: true, - messageId, - email - }; - } catch (emailError) { - SmtpLogger.error(`Failed to process email through UnifiedEmailServer: ${emailError instanceof Error ? emailError.message : String(emailError)}`, { - sessionId: session.id, - error: emailError instanceof Error ? emailError : new Error(String(emailError)), - messageId - }); - - // Default to success for now to pass tests, but log the error - result = { - success: true, - messageId, - email - }; - } - } catch (error) { - SmtpLogger.error(`Failed to queue email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - - result = { - success: false, - error: `Failed to queue email: ${error instanceof Error ? error.message : String(error)}` - }; - } - break; - - case 'forward': - // Forward email to another server - SmtpLogger.debug(`Processing email in FORWARD mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - - // Process the email via the UnifiedEmailServer in forward mode - try { - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session as any); - - SmtpLogger.info(`Email forwarded through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } catch (forwardError) { - SmtpLogger.error(`Failed to forward email: ${forwardError instanceof Error ? forwardError.message : String(forwardError)}`, { - sessionId: session.id, - error: forwardError instanceof Error ? forwardError : new Error(String(forwardError)), - messageId: email.getMessageId() - }); - - // For testing, still return success - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - break; - - case 'process': - // Process the email immediately - SmtpLogger.debug(`Processing email in PROCESS mode for session ${session.id}`, { - sessionId: session.id, - messageId: email.getMessageId() - }); - - // Process the email via the UnifiedEmailServer in process mode - try { - const processResult = await this.smtpServer.getEmailServer().processEmailByMode(email, session as any); - - SmtpLogger.info(`Email processed directly through UnifiedEmailServer: ${email.getMessageId()}`, { - sessionId: session.id, - messageId: email.getMessageId(), - recipients: email.to.join(', '), - success: true - }); - - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } catch (processError) { - SmtpLogger.error(`Failed to process email directly: ${processError instanceof Error ? processError.message : String(processError)}`, { - sessionId: session.id, - error: processError instanceof Error ? processError : new Error(String(processError)), - messageId: email.getMessageId() - }); - - // For testing, still return success - result = { - success: true, - messageId: email.getMessageId(), - email - }; - } - break; - - default: - SmtpLogger.warn(`Unknown processing mode: ${processingMode}`, { sessionId: session.id }); - result = { - success: false, - error: `Unknown processing mode: ${processingMode}` - }; - } - - return result; - } catch (error) { - SmtpLogger.error(`Failed to parse email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - - return { - success: false, - error: `Failed to parse email: ${error instanceof Error ? error.message : String(error)}` - }; - } - } - - /** - * Save an email to disk - * @param session - SMTP session - */ - public saveEmail(session: ISmtpSession): void { - // Email saving to disk is currently disabled in the refactored architecture - // This functionality can be re-enabled by adding a tempDir option to ISmtpServerOptions - SmtpLogger.debug(`Email saving to disk is disabled`, { - sessionId: session.id - }); - } - - /** - * Parse an email into an Email object - * @param session - SMTP session - * @returns Promise that resolves with the parsed Email object - */ - public async parseEmail(session: ISmtpSession): Promise { - try { - // Store raw data for testing and debugging - const rawData = session.emailData; - - // Try to parse with mailparser for better MIME support - const parsed = await plugins.mailparser.simpleParser(rawData); - - // Extract headers - const headers: Record = {}; - - // Add all headers from the parsed email - if (parsed.headers) { - // Convert headers to a standard object format - for (const [key, value] of parsed.headers.entries()) { - if (typeof value === 'string') { - headers[key.toLowerCase()] = value; - } else if (Array.isArray(value)) { - headers[key.toLowerCase()] = value.join(', '); - } - } - } - - // Get message ID or generate one - const messageId = parsed.messageId || - headers['message-id'] || - `<${Date.now()}.${Math.random().toString(36).substring(2)}@${this.smtpServer.getOptions().hostname}>`; - - // Get From, To, and Subject from parsed email or envelope - const from = parsed.from?.value?.[0]?.address || - session.envelope.mailFrom.address; - - // Handle multiple recipients appropriately - let to: string[] = []; - - // Try to get recipients from parsed email - if (parsed.to) { - // Handle both array and single object cases - if (Array.isArray(parsed.to)) { - to = parsed.to.map(addr => typeof addr === 'object' && addr !== null && 'address' in addr ? String(addr.address) : ''); - } else if (typeof parsed.to === 'object' && parsed.to !== null) { - // Handle object with value property (array or single address object) - if ('value' in parsed.to && Array.isArray(parsed.to.value)) { - to = parsed.to.value.map(addr => typeof addr === 'object' && addr !== null && 'address' in addr ? String(addr.address) : ''); - } else if ('address' in parsed.to) { - to = [String(parsed.to.address)]; - } - } - - // Filter out empty strings - to = to.filter(Boolean); - } - - // If no recipients found, fall back to envelope - if (to.length === 0) { - to = session.envelope.rcptTo.map(r => r.address); - } - - // Handle subject with special care for character encoding -const subject = parsed.subject || headers['subject'] || 'No Subject'; -SmtpLogger.debug(`Parsed email subject: ${subject}`, { subject }); - - // Create email object using the parsed content - const email = new Email({ - from: from, - to: to, - subject: subject, - text: parsed.text || '', - html: parsed.html || undefined, - // Include original envelope data as headers for accurate routing - headers: { - 'X-Original-Mail-From': session.envelope.mailFrom.address, - 'X-Original-Rcpt-To': session.envelope.rcptTo.map(r => r.address).join(', '), - 'Message-Id': messageId - } - }); - - // Add attachments if any - if (parsed.attachments && parsed.attachments.length > 0) { - SmtpLogger.debug(`Found ${parsed.attachments.length} attachments in email`, { - sessionId: session.id, - attachmentCount: parsed.attachments.length - }); - - for (const attachment of parsed.attachments) { - // Enhanced attachment logging for debugging - SmtpLogger.debug(`Processing attachment: ${attachment.filename}`, { - filename: attachment.filename, - contentType: attachment.contentType, - size: attachment.content?.length, - contentId: attachment.contentId || 'none', - contentDisposition: attachment.contentDisposition || 'none' - }); - - // Ensure we have valid content - if (!attachment.content || !Buffer.isBuffer(attachment.content)) { - SmtpLogger.warn(`Attachment ${attachment.filename} has invalid content, skipping`); - continue; - } - - // Fix up content type if missing but can be inferred from filename - let contentType = attachment.contentType || 'application/octet-stream'; - const filename = attachment.filename || 'attachment'; - - if (!contentType || contentType === 'application/octet-stream') { - if (filename.endsWith('.pdf')) { - contentType = 'application/pdf'; - } else if (filename.endsWith('.jpg') || filename.endsWith('.jpeg')) { - contentType = 'image/jpeg'; - } else if (filename.endsWith('.png')) { - contentType = 'image/png'; - } else if (filename.endsWith('.gif')) { - contentType = 'image/gif'; - } else if (filename.endsWith('.txt')) { - contentType = 'text/plain'; - } - } - - email.attachments.push({ - filename: filename, - content: attachment.content, - contentType: contentType, - contentId: attachment.contentId - }); - - SmtpLogger.debug(`Added attachment to email: ${filename}, type: ${contentType}, size: ${attachment.content.length} bytes`); - } - } else { - SmtpLogger.debug(`No attachments found in email via parser`, { sessionId: session.id }); - - // Additional check for attachments that might be missed by the parser - // Look for Content-Disposition headers in the raw data - const rawData = session.emailData; - const hasAttachmentDisposition = rawData.includes('Content-Disposition: attachment'); - - if (hasAttachmentDisposition) { - SmtpLogger.debug(`Found potential attachments in raw data, will handle in multipart processing`, { - sessionId: session.id - }); - } - } - - // Add received header - const timestamp = new Date().toUTCString(); - const receivedHeader = `from ${session.clientHostname || 'unknown'} (${session.remoteAddress}) by ${this.smtpServer.getOptions().hostname} with ESMTP id ${session.id}; ${timestamp}`; - email.addHeader('Received', receivedHeader); - - // Add all original headers - for (const [name, value] of Object.entries(headers)) { - if (!['from', 'to', 'subject', 'message-id'].includes(name)) { - email.addHeader(name, value); - } - } - - // Store raw data for testing and debugging - (email as any).rawData = rawData; - - SmtpLogger.debug(`Email parsed successfully: ${messageId}`, { - sessionId: session.id, - messageId, - hasHtml: !!parsed.html, - attachmentCount: parsed.attachments?.length || 0 - }); - - return email; - } catch (error) { - // If parsing fails, fall back to basic parsing - SmtpLogger.warn(`Advanced email parsing failed, falling back to basic parsing: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - - return this.parseEmailBasic(session); - } - } - - /** - * Basic fallback method for parsing emails - * @param session - SMTP session - * @returns The parsed Email object - */ - private parseEmailBasic(session: ISmtpSession): Email { - // Parse raw email text to extract headers - const rawData = session.emailData; - const headerEndIndex = rawData.indexOf('\r\n\r\n'); - - if (headerEndIndex === -1) { - // No headers/body separation, create basic email - const email = new Email({ - from: session.envelope.mailFrom.address, - to: session.envelope.rcptTo.map(r => r.address), - subject: 'Received via SMTP', - text: rawData - }); - - // Store raw data for testing - (email as any).rawData = rawData; - - return email; - } - - // Extract headers and body - const headersText = rawData.substring(0, headerEndIndex); - const bodyText = rawData.substring(headerEndIndex + 4); // Skip the \r\n\r\n separator - - // Parse headers with enhanced injection detection - const headers: Record = {}; - const headerLines = headersText.split('\r\n'); - let currentHeader = ''; - const criticalHeaders = new Set(); // Track critical headers for duplication detection - - for (const line of headerLines) { - // Check if this is a continuation of a previous header - if (line.startsWith(' ') || line.startsWith('\t')) { - if (currentHeader) { - headers[currentHeader] += ' ' + line.trim(); - } - continue; - } - - // This is a new header - const separatorIndex = line.indexOf(':'); - if (separatorIndex !== -1) { - const name = line.substring(0, separatorIndex).trim().toLowerCase(); - const value = line.substring(separatorIndex + 1).trim(); - - // Check for header injection attempts in header values - if (detectHeaderInjection(value, 'email-header')) { - SmtpLogger.warn('Header injection attempt detected in email header', { - headerName: name, - headerValue: value.substring(0, 100) + (value.length > 100 ? '...' : ''), - sessionId: session.id - }); - // Throw error to reject the email completely - throw new Error(`Header injection attempt detected in ${name} header`); - } - - // Enhanced security: Check for duplicate critical headers (potential injection) - const criticalHeaderNames = ['from', 'to', 'subject', 'date', 'message-id']; - if (criticalHeaderNames.includes(name)) { - if (criticalHeaders.has(name)) { - SmtpLogger.warn('Duplicate critical header detected - potential header injection', { - headerName: name, - existingValue: headers[name]?.substring(0, 50) + '...', - newValue: value.substring(0, 50) + '...', - sessionId: session.id - }); - // Throw error for duplicate critical headers - throw new Error(`Duplicate ${name} header detected - potential header injection`); - } - criticalHeaders.add(name); - } - - // Enhanced security: Check for envelope mismatch (spoofing attempt) - if (name === 'from' && session.envelope?.mailFrom?.address) { - const emailFromHeader = value.match(/<([^>]+)>/)?.[1] || value.trim(); - const envelopeFrom = session.envelope.mailFrom.address; - // Allow some flexibility but detect obvious spoofing attempts - if (emailFromHeader && envelopeFrom && - !emailFromHeader.toLowerCase().includes(envelopeFrom.toLowerCase()) && - !envelopeFrom.toLowerCase().includes(emailFromHeader.toLowerCase())) { - SmtpLogger.warn('Potential sender spoofing detected', { - envelopeFrom: envelopeFrom, - headerFrom: emailFromHeader, - sessionId: session.id - }); - // Note: This is logged but not blocked as legitimate use cases exist - } - } - - // Special handling for MIME-encoded headers (especially Subject) - if (name === 'subject' && value.includes('=?')) { - try { - // Use plugins.mailparser to decode the MIME-encoded subject - // This is a simplified approach - in a real system, you'd use a full MIME decoder - // For now, just log it for debugging - SmtpLogger.debug(`Found encoded subject: ${value}`, { encodedSubject: value }); - } catch (error) { - SmtpLogger.warn(`Failed to decode MIME-encoded subject: ${error instanceof Error ? error.message : String(error)}`); - } - } - - headers[name] = value; - currentHeader = name; - } - } - - // Look for multipart content - let isMultipart = false; - let boundary = ''; - let contentType = headers['content-type'] || ''; - - // Check for multipart content - if (contentType.includes('multipart/')) { - isMultipart = true; - - // Extract boundary - const boundaryMatch = contentType.match(/boundary="?([^";\r\n]+)"?/i); - if (boundaryMatch && boundaryMatch[1]) { - boundary = boundaryMatch[1]; - } - } - - // Extract common headers - const subject = headers['subject'] || 'No Subject'; - const from = headers['from'] || session.envelope.mailFrom.address; - const to = headers['to'] || session.envelope.rcptTo.map(r => r.address).join(', '); - const messageId = headers['message-id'] || `<${Date.now()}.${Math.random().toString(36).substring(2)}@${this.smtpServer.getOptions().hostname}>`; - - // Create email object - const email = new Email({ - from: from, - to: to.split(',').map(addr => addr.trim()), - subject: subject, - text: bodyText, - // Add original session envelope data for accurate routing as headers - headers: { - 'X-Original-Mail-From': session.envelope.mailFrom.address, - 'X-Original-Rcpt-To': session.envelope.rcptTo.map(r => r.address).join(', '), - 'Message-Id': messageId - } - }); - - // Handle multipart content if needed - if (isMultipart && boundary) { - this.handleMultipartContent(email, bodyText, boundary); - } - - // Add received header - const timestamp = new Date().toUTCString(); - const receivedHeader = `from ${session.clientHostname || 'unknown'} (${session.remoteAddress}) by ${this.smtpServer.getOptions().hostname} with ESMTP id ${session.id}; ${timestamp}`; - email.addHeader('Received', receivedHeader); - - // Add all original headers - for (const [name, value] of Object.entries(headers)) { - if (!['from', 'to', 'subject', 'message-id'].includes(name)) { - email.addHeader(name, value); - } - } - - // Store raw data for testing - (email as any).rawData = rawData; - - return email; - } - - /** - * Handle multipart content parsing - * @param email - Email object to update - * @param bodyText - Body text to parse - * @param boundary - MIME boundary - */ - private handleMultipartContent(email: Email, bodyText: string, boundary: string): void { - // Split the body by boundary - const parts = bodyText.split(`--${boundary}`); - - SmtpLogger.debug(`Handling multipart content with ${parts.length - 1} parts (boundary: ${boundary})`); - - // Process each part - for (let i = 1; i < parts.length; i++) { - const part = parts[i]; - - // Skip the end boundary marker - if (part.startsWith('--')) { - SmtpLogger.debug(`Found end boundary marker in part ${i}`); - continue; - } - - // Find the headers and content - const partHeaderEndIndex = part.indexOf('\r\n\r\n'); - if (partHeaderEndIndex === -1) { - SmtpLogger.debug(`No header/body separator found in part ${i}`); - continue; - } - - const partHeadersText = part.substring(0, partHeaderEndIndex); - const partContent = part.substring(partHeaderEndIndex + 4); - - // Parse part headers - const partHeaders: Record = {}; - const partHeaderLines = partHeadersText.split('\r\n'); - let currentHeader = ''; - - for (const line of partHeaderLines) { - // Check if this is a continuation of a previous header - if (line.startsWith(' ') || line.startsWith('\t')) { - if (currentHeader) { - partHeaders[currentHeader] += ' ' + line.trim(); - } - continue; - } - - // This is a new header - const separatorIndex = line.indexOf(':'); - if (separatorIndex !== -1) { - const name = line.substring(0, separatorIndex).trim().toLowerCase(); - const value = line.substring(separatorIndex + 1).trim(); - partHeaders[name] = value; - currentHeader = name; - } - } - - // Get content type - const contentType = partHeaders['content-type'] || ''; - - // Get encoding - const encoding = partHeaders['content-transfer-encoding'] || '7bit'; - - // Get disposition - const disposition = partHeaders['content-disposition'] || ''; - - // Log part information - SmtpLogger.debug(`Processing MIME part ${i}: type=${contentType}, encoding=${encoding}, disposition=${disposition}`); - - // Handle text/plain parts - if (contentType.includes('text/plain')) { - try { - // Decode content based on encoding - let decodedContent = partContent; - - if (encoding.toLowerCase() === 'base64') { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - try { - decodedContent = Buffer.from(cleanBase64, 'base64').toString('utf8'); - } catch (error) { - SmtpLogger.warn(`Failed to decode base64 text content: ${error instanceof Error ? error.message : String(error)}`); - } - } else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - } catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable content: ${error instanceof Error ? error.message : String(error)}`); - } - } - - email.text = decodedContent.trim(); - } catch (error) { - SmtpLogger.warn(`Error processing text/plain part: ${error instanceof Error ? error.message : String(error)}`); - email.text = partContent.trim(); - } - } - - // Handle text/html parts - if (contentType.includes('text/html')) { - try { - // Decode content based on encoding - let decodedContent = partContent; - - if (encoding.toLowerCase() === 'base64') { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - try { - decodedContent = Buffer.from(cleanBase64, 'base64').toString('utf8'); - } catch (error) { - SmtpLogger.warn(`Failed to decode base64 HTML content: ${error instanceof Error ? error.message : String(error)}`); - } - } else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - } catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable HTML content: ${error instanceof Error ? error.message : String(error)}`); - } - } - - email.html = decodedContent.trim(); - } catch (error) { - SmtpLogger.warn(`Error processing text/html part: ${error instanceof Error ? error.message : String(error)}`); - email.html = partContent.trim(); - } - } - - // Handle attachments - detect attachments by content disposition or by content-type - const isAttachment = - (disposition && disposition.toLowerCase().includes('attachment')) || - (!contentType.includes('text/plain') && !contentType.includes('text/html')); - - if (isAttachment) { - try { - // Extract filename from Content-Disposition or generate one based on content type - let filename = 'attachment'; - - if (disposition) { - const filenameMatch = disposition.match(/filename="?([^";\r\n]+)"?/i); - if (filenameMatch && filenameMatch[1]) { - filename = filenameMatch[1].trim(); - } - } else if (contentType) { - // If no filename but we have content type, generate a name with appropriate extension - const mainType = contentType.split(';')[0].trim().toLowerCase(); - - if (mainType === 'application/pdf') { - filename = `attachment_${Date.now()}.pdf`; - } else if (mainType === 'image/jpeg' || mainType === 'image/jpg') { - filename = `image_${Date.now()}.jpg`; - } else if (mainType === 'image/png') { - filename = `image_${Date.now()}.png`; - } else if (mainType === 'image/gif') { - filename = `image_${Date.now()}.gif`; - } else { - filename = `attachment_${Date.now()}.bin`; - } - } - - // Decode content based on encoding - let content: Buffer; - - if (encoding.toLowerCase() === 'base64') { - try { - // Remove line breaks from base64 content before decoding - const cleanBase64 = partContent.replace(/[\r\n]/g, ''); - content = Buffer.from(cleanBase64, 'base64'); - SmtpLogger.debug(`Successfully decoded base64 attachment: ${filename}, size: ${content.length} bytes`); - } catch (error) { - SmtpLogger.warn(`Failed to decode base64 attachment: ${error instanceof Error ? error.message : String(error)}`); - content = Buffer.from(partContent); - } - } else if (encoding.toLowerCase() === 'quoted-printable') { - try { - // Basic quoted-printable decoding - const decodedContent = partContent.replace(/=([0-9A-F]{2})/gi, (match, hex) => { - return String.fromCharCode(parseInt(hex, 16)); - }); - content = Buffer.from(decodedContent); - } catch (error) { - SmtpLogger.warn(`Failed to decode quoted-printable attachment: ${error instanceof Error ? error.message : String(error)}`); - content = Buffer.from(partContent); - } - } else { - // Default for 7bit, 8bit, or binary encoding - no decoding needed - content = Buffer.from(partContent); - } - - // Determine content type - use the one from headers or infer from filename - let finalContentType = contentType; - - if (!finalContentType || finalContentType === 'application/octet-stream') { - if (filename.endsWith('.pdf')) { - finalContentType = 'application/pdf'; - } else if (filename.endsWith('.jpg') || filename.endsWith('.jpeg')) { - finalContentType = 'image/jpeg'; - } else if (filename.endsWith('.png')) { - finalContentType = 'image/png'; - } else if (filename.endsWith('.gif')) { - finalContentType = 'image/gif'; - } else if (filename.endsWith('.txt')) { - finalContentType = 'text/plain'; - } else if (filename.endsWith('.html')) { - finalContentType = 'text/html'; - } - } - - // Add attachment to email - email.attachments.push({ - filename, - content, - contentType: finalContentType || 'application/octet-stream' - }); - - SmtpLogger.debug(`Added attachment: ${filename}, type: ${finalContentType}, size: ${content.length} bytes`); - } catch (error) { - SmtpLogger.error(`Failed to process attachment: ${error instanceof Error ? error.message : String(error)}`); - } - } - - // Check for nested multipart content - if (contentType.includes('multipart/')) { - try { - // Extract boundary - const nestedBoundaryMatch = contentType.match(/boundary="?([^";\r\n]+)"?/i); - if (nestedBoundaryMatch && nestedBoundaryMatch[1]) { - const nestedBoundary = nestedBoundaryMatch[1].trim(); - SmtpLogger.debug(`Found nested multipart content with boundary: ${nestedBoundary}`); - - // Process nested multipart - this.handleMultipartContent(email, partContent, nestedBoundary); - } - } catch (error) { - SmtpLogger.warn(`Error processing nested multipart content: ${error instanceof Error ? error.message : String(error)}`); - } - } - } - } - - /** - * Handle end of data marker received - * @param socket - Client socket - * @param session - SMTP session - */ - private async handleEndOfData(socket: plugins.net.Socket | plugins.tls.TLSSocket, session: ISmtpSession): Promise { - // Clear the data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - - try { - // Update session state - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.FINISHED); - - // Optionally save email to disk - this.saveEmail(session); - - // Process the email using legacy method - const result = await this.processEmailLegacy(session); - - if (result.success) { - // Send success response - this.sendResponse(socket, `${SmtpResponseCode.OK} OK message queued as ${result.messageId}`); - } else { - // Send error response - this.sendResponse(socket, `${SmtpResponseCode.TRANSACTION_FAILED} Failed to process email: ${result.error}`); - } - - // Reset session for new transaction - this.resetSession(session); - } catch (error) { - SmtpLogger.error(`Error processing email: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - error: error instanceof Error ? error : new Error(String(error)) - }); - - this.sendResponse(socket, `${SmtpResponseCode.LOCAL_ERROR} Error processing email: ${error instanceof Error ? error.message : String(error)}`); - this.resetSession(session); - } - } - - /** - * Reset session after email processing - * @param session - SMTP session - */ - private resetSession(session: ISmtpSession): void { - // Clear any data timeout - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - - // Reset data fields but keep authentication state - session.mailFrom = ''; - session.rcptTo = []; - session.emailData = ''; - session.emailDataChunks = []; - session.emailDataSize = 0; - session.envelope = { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }; - - // Reset state to after EHLO - this.smtpServer.getSessionManager().updateSessionState(session, SmtpState.AFTER_EHLO); - } - - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - private sendResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, response: string): void { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.logResponse(response, socket); - } catch (error) { - // Attempt to recover from specific transient errors - if (this.isRecoverableSocketError(error)) { - this.handleSocketError(socket, error, response); - } else { - // Log error for non-recoverable errors - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - } - } - } - - /** - * Check if a socket error is potentially recoverable - * @param error - The error that occurred - * @returns Whether the error is potentially recoverable - */ - private isRecoverableSocketError(error: unknown): boolean { - const recoverableErrorCodes = [ - 'EPIPE', // Broken pipe - 'ECONNRESET', // Connection reset by peer - 'ETIMEDOUT', // Connection timed out - 'ECONNABORTED' // Connection aborted - ]; - - return ( - error instanceof Error && - 'code' in error && - typeof (error as any).code === 'string' && - recoverableErrorCodes.includes((error as any).code) - ); - } - - /** - * Handle recoverable socket errors with retry logic - * @param socket - Client socket - * @param error - The error that occurred - * @param response - The response that failed to send - */ - private handleSocketError(socket: plugins.net.Socket | plugins.tls.TLSSocket, error: unknown, response: string): void { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - if (!session) { - SmtpLogger.error(`Session not found when handling socket error`); - if (!socket.destroyed) { - socket.destroy(); - } - return; - } - - // Get error details for logging - const errorMessage = error instanceof Error ? error.message : String(error); - const errorCode = error instanceof Error && 'code' in error ? (error as any).code : 'UNKNOWN'; - - SmtpLogger.warn(`Recoverable socket error during data handling (${errorCode}): ${errorMessage}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Check if socket is already destroyed - if (socket.destroyed) { - SmtpLogger.info(`Socket already destroyed, cannot retry data operation`); - return; - } - - // Check if socket is writeable - if (!socket.writable) { - SmtpLogger.info(`Socket no longer writable, aborting data recovery attempt`); - if (!socket.destroyed) { - socket.destroy(); - } - return; - } - - // Attempt to retry the write operation after a short delay - setTimeout(() => { - try { - if (!socket.destroyed && socket.writable) { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - SmtpLogger.info(`Successfully retried data send operation after error`); - } else { - SmtpLogger.warn(`Socket no longer available for data retry`); - if (!socket.destroyed) { - socket.destroy(); - } - } - } catch (retryError) { - SmtpLogger.error(`Data retry attempt failed: ${retryError instanceof Error ? retryError.message : String(retryError)}`); - if (!socket.destroyed) { - socket.destroy(); - } - } - }, 100); // Short delay before retry - } - - /** - * Handle email data (interface requirement) - */ - public async handleData( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - data: string, - session: ISmtpSession - ): Promise { - // Delegate to existing method - await this.handleDataReceived(socket, data); - } - - /** - * Clean up resources - */ - public destroy(): void { - // DataHandler doesn't have timers or event listeners to clean up - SmtpLogger.debug('DataHandler destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/index.ts b/ts/mail/delivery/smtpserver/index.ts deleted file mode 100644 index 7a0c448..0000000 --- a/ts/mail/delivery/smtpserver/index.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * SMTP Server Module Exports - * This file exports all components of the refactored SMTP server - */ - -// Export interfaces -export * from './interfaces.js'; - -// Export server classes -export { SmtpServer } from './smtp-server.js'; -export { SessionManager } from './session-manager.js'; -export { ConnectionManager } from './connection-manager.js'; -export { CommandHandler } from './command-handler.js'; -export { DataHandler } from './data-handler.js'; -export { TlsHandler } from './tls-handler.js'; -export { SecurityHandler } from './security-handler.js'; - -// Export constants -export * from './constants.js'; - -// Export utilities -export { SmtpLogger } from './utils/logging.js'; -export * from './utils/validation.js'; -export * from './utils/helpers.js'; - -// Export TLS and certificate utilities -export * from './certificate-utils.js'; -export * from './secure-server.js'; -export * from './starttls-handler.js'; - -// Factory function to create a complete SMTP server with default components -export { createSmtpServer } from './create-server.js'; \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/interfaces.ts b/ts/mail/delivery/smtpserver/interfaces.ts deleted file mode 100644 index a4afa61..0000000 --- a/ts/mail/delivery/smtpserver/interfaces.ts +++ /dev/null @@ -1,655 +0,0 @@ -/** - * SMTP Server Interfaces - * Defines all the interfaces used by the SMTP server implementation - */ - -import * as plugins from '../../../plugins.js'; -import type { Email } from '../../core/classes.email.js'; -import type { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; - -// Re-export types from other modules -import { SmtpState } from '../interfaces.js'; -import { SmtpCommand } from './constants.js'; -export { SmtpState, SmtpCommand }; -export type { IEnvelopeRecipient } from '../interfaces.js'; - -/** - * Interface for components that need cleanup - */ -export interface IDestroyable { - /** - * Clean up all resources (timers, listeners, etc) - */ - destroy(): void | Promise; -} - -/** - * SMTP authentication credentials - */ -export interface ISmtpAuth { - /** - * Username for authentication - */ - username: string; - - /** - * Password for authentication - */ - password: string; -} - -/** - * SMTP envelope (sender and recipients) - */ -export interface ISmtpEnvelope { - /** - * Mail from address - */ - mailFrom: { - address: string; - args?: Record; - }; - - /** - * Recipients list - */ - rcptTo: Array<{ - address: string; - args?: Record; - }>; -} - -/** - * SMTP session representing a client connection - */ -export interface ISmtpSession { - /** - * Unique session identifier - */ - id: string; - - /** - * Current state of the SMTP session - */ - state: SmtpState; - - /** - * Client's hostname from EHLO/HELO - */ - clientHostname: string | null; - - /** - * Whether TLS is active for this session - */ - secure: boolean; - - /** - * Authentication status - */ - authenticated: boolean; - - /** - * Authentication username if authenticated - */ - username?: string; - - /** - * Transaction envelope - */ - envelope: ISmtpEnvelope; - - /** - * When the session was created - */ - createdAt: Date; - - /** - * Last activity timestamp - */ - lastActivity: number; - - /** - * Client's IP address - */ - remoteAddress: string; - - /** - * Client's port - */ - remotePort: number; - - /** - * Additional session data - */ - data?: Record; - - /** - * Message size if SIZE extension is used - */ - messageSize?: number; - - /** - * Server capabilities advertised to client - */ - capabilities?: string[]; - - /** - * Buffer for incomplete data - */ - dataBuffer?: string; - - /** - * Flag to track if we're currently receiving DATA - */ - receivingData?: boolean; - - /** - * The raw email data being received - */ - rawData?: string; - - /** - * Greeting sent to client - */ - greeting?: string; - - /** - * Whether EHLO has been sent - */ - ehloSent?: boolean; - - /** - * Whether HELO has been sent - */ - heloSent?: boolean; - - /** - * TLS options for this session - */ - tlsOptions?: any; - - /** - * Whether TLS is being used - */ - useTLS?: boolean; - - /** - * Mail from address for this transaction - */ - mailFrom?: string; - - /** - * Recipients for this transaction - */ - rcptTo?: string[]; - - /** - * Email data being received - */ - emailData?: string; - - /** - * Chunks of email data - */ - emailDataChunks?: string[]; - - /** - * Timeout ID for data reception - */ - dataTimeoutId?: NodeJS.Timeout; - - /** - * Whether connection has ended - */ - connectionEnded?: boolean; - - /** - * Size of email data being received - */ - emailDataSize?: number; - - /** - * Processing mode for this session - */ - processingMode?: string; -} - -/** - * Session manager interface - */ -export interface ISessionManager extends IDestroyable { - /** - * Create a new session for a socket - */ - createSession(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure?: boolean): ISmtpSession; - - /** - * Get session by socket - */ - getSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): ISmtpSession | undefined; - - /** - * Update session state - */ - updateSessionState(session: ISmtpSession, newState: SmtpState): void; - - /** - * Remove a session - */ - removeSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - - /** - * Clear all sessions - */ - clearAllSessions(): void; - - /** - * Get all active sessions - */ - getAllSessions(): ISmtpSession[]; - - /** - * Get session count - */ - getSessionCount(): number; - - /** - * Update last activity for a session - */ - updateLastActivity(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; - - /** - * Check for timed out sessions - */ - checkTimeouts(timeoutMs: number): ISmtpSession[]; - - /** - * Update session activity timestamp - */ - updateSessionActivity(session: ISmtpSession): void; - - /** - * Replace socket in session (for TLS upgrade) - */ - replaceSocket(oldSocket: plugins.net.Socket | plugins.tls.TLSSocket, newSocket: plugins.net.Socket | plugins.tls.TLSSocket): boolean; -} - -/** - * Connection manager interface - */ -export interface IConnectionManager extends IDestroyable { - /** - * Handle a new connection - */ - handleConnection(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): Promise; - - /** - * Close all active connections - */ - closeAllConnections(): void; - - /** - * Get active connection count - */ - getConnectionCount(): number; - - /** - * Check if accepting new connections - */ - canAcceptConnection(): boolean; - - /** - * Handle new connection (legacy method name) - */ - handleNewConnection(socket: plugins.net.Socket): Promise; - - /** - * Handle new secure connection (legacy method name) - */ - handleNewSecureConnection(socket: plugins.tls.TLSSocket): Promise; - - /** - * Setup socket event handlers - */ - setupSocketEventHandlers(socket: plugins.net.Socket | plugins.tls.TLSSocket): void; -} - -/** - * Command handler interface - */ -export interface ICommandHandler extends IDestroyable { - /** - * Handle an SMTP command - */ - handleCommand( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - command: SmtpCommand, - args: string, - session: ISmtpSession - ): Promise; - - /** - * Get supported commands for current session state - */ - getSupportedCommands(session: ISmtpSession): SmtpCommand[]; - - /** - * Process command (legacy method name) - */ - processCommand(socket: plugins.net.Socket | plugins.tls.TLSSocket, command: string): Promise; -} - -/** - * Data handler interface - */ -export interface IDataHandler extends IDestroyable { - /** - * Handle email data - */ - handleData( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - data: string, - session: ISmtpSession - ): Promise; - - /** - * Process a complete email - */ - processEmail( - rawData: string, - session: ISmtpSession - ): Promise; - - /** - * Handle data received (legacy method name) - */ - handleDataReceived(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; - - /** - * Process email data (legacy method name) - */ - processEmailData(socket: plugins.net.Socket | plugins.tls.TLSSocket, data: string): Promise; -} - -/** - * TLS handler interface - */ -export interface ITlsHandler extends IDestroyable { - /** - * Handle STARTTLS command - */ - handleStartTls( - socket: plugins.net.Socket, - session: ISmtpSession - ): Promise; - - /** - * Check if TLS is available - */ - isTlsAvailable(): boolean; - - /** - * Get TLS options - */ - getTlsOptions(): plugins.tls.TlsOptions; - - /** - * Check if TLS is enabled - */ - isTlsEnabled(): boolean; -} - -/** - * Security handler interface - */ -export interface ISecurityHandler extends IDestroyable { - /** - * Check IP reputation - */ - checkIpReputation(socket: plugins.net.Socket | plugins.tls.TLSSocket): Promise; - - /** - * Validate email address - */ - isValidEmail(email: string): boolean; - - /** - * Authenticate user - */ - authenticate(auth: ISmtpAuth): Promise; -} - -/** - * SMTP server options - */ -export interface ISmtpServerOptions { - /** - * Port to listen on - */ - port: number; - - /** - * Hostname of the server - */ - hostname: string; - - /** - * Host to bind to (optional, defaults to 0.0.0.0) - */ - host?: string; - - /** - * Secure port for TLS connections - */ - securePort?: number; - - /** - * TLS/SSL private key (PEM format) - */ - key?: string; - - /** - * TLS/SSL certificate (PEM format) - */ - cert?: string; - - /** - * CA certificates for TLS (PEM format) - */ - ca?: string; - - /** - * Maximum size of messages in bytes - */ - maxSize?: number; - - /** - * Maximum number of concurrent connections - */ - maxConnections?: number; - - /** - * Authentication options - */ - auth?: { - /** - * Whether authentication is required - */ - required: boolean; - - /** - * Allowed authentication methods - */ - methods: ('PLAIN' | 'LOGIN' | 'OAUTH2')[]; - }; - - /** - * Socket timeout in milliseconds (default: 5 minutes / 300000ms) - */ - socketTimeout?: number; - - /** - * Initial connection timeout in milliseconds (default: 30 seconds / 30000ms) - */ - connectionTimeout?: number; - - /** - * Interval for checking idle sessions in milliseconds (default: 5 seconds / 5000ms) - * For testing, can be set lower (e.g. 1000ms) to detect timeouts more quickly - */ - cleanupInterval?: number; - - /** - * Maximum number of recipients allowed per message (default: 100) - */ - maxRecipients?: number; - - /** - * Maximum message size in bytes (default: 10MB / 10485760 bytes) - * This is advertised in the EHLO SIZE extension - */ - size?: number; - - /** - * Timeout for the DATA command in milliseconds (default: 60000ms / 1 minute) - * This controls how long to wait for the complete email data - */ - dataTimeout?: number; -} - -/** - * Result of SMTP transaction - */ -export interface ISmtpTransactionResult { - /** - * Whether the transaction was successful - */ - success: boolean; - - /** - * Error message if failed - */ - error?: string; - - /** - * Message ID if successful - */ - messageId?: string; - - /** - * Resulting email if successful - */ - email?: Email; -} - -/** - * Interface for SMTP session events - * These events are emitted by the session manager - */ -export interface ISessionEvents { - created: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - stateChanged: (session: ISmtpSession, previousState: SmtpState, newState: SmtpState) => void; - timeout: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - completed: (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void; - error: (session: ISmtpSession, error: Error) => void; -} - -/** - * SMTP Server interface - */ -export interface ISmtpServer extends IDestroyable { - /** - * Start the SMTP server - */ - listen(): Promise; - - /** - * Stop the SMTP server - */ - close(): Promise; - - /** - * Get the session manager - */ - getSessionManager(): ISessionManager; - - /** - * Get the connection manager - */ - getConnectionManager(): IConnectionManager; - - /** - * Get the command handler - */ - getCommandHandler(): ICommandHandler; - - /** - * Get the data handler - */ - getDataHandler(): IDataHandler; - - /** - * Get the TLS handler - */ - getTlsHandler(): ITlsHandler; - - /** - * Get the security handler - */ - getSecurityHandler(): ISecurityHandler; - - /** - * Get the server options - */ - getOptions(): ISmtpServerOptions; - - /** - * Get the email server reference - */ - getEmailServer(): UnifiedEmailServer; -} - -/** - * Configuration for creating SMTP server - */ -export interface ISmtpServerConfig { - /** - * Email server instance - */ - emailServer: UnifiedEmailServer; - - /** - * Server options - */ - options: ISmtpServerOptions; - - /** - * Optional custom session manager - */ - sessionManager?: ISessionManager; - - /** - * Optional custom connection manager - */ - connectionManager?: IConnectionManager; - - /** - * Optional custom command handler - */ - commandHandler?: ICommandHandler; - - /** - * Optional custom data handler - */ - dataHandler?: IDataHandler; - - /** - * Optional custom TLS handler - */ - tlsHandler?: ITlsHandler; - - /** - * Optional custom security handler - */ - securityHandler?: ISecurityHandler; -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/secure-server.ts b/ts/mail/delivery/smtpserver/secure-server.ts deleted file mode 100644 index f4b62e5..0000000 --- a/ts/mail/delivery/smtpserver/secure-server.ts +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Secure SMTP Server Utility Functions - * Provides helper functions for creating and managing secure TLS server - */ - -import * as plugins from '../../../plugins.js'; -import { - loadCertificatesFromString, - generateSelfSignedCertificates, - createTlsOptions, - type ICertificateData -} from './certificate-utils.js'; -import { SmtpLogger } from './utils/logging.js'; - -/** - * Create a secure TLS server for direct TLS connections - * @param options - TLS certificate options - * @returns A configured TLS server or undefined if TLS is not available - */ -export function createSecureTlsServer(options: { - key: string; - cert: string; - ca?: string; -}): plugins.tls.Server | undefined { - try { - // Log the creation attempt - SmtpLogger.info('Creating secure TLS server for direct connections'); - - // Load certificates from strings - let certificates: ICertificateData; - try { - certificates = loadCertificatesFromString({ - key: options.key, - cert: options.cert, - ca: options.ca - }); - - SmtpLogger.info('Successfully loaded TLS certificates for secure server'); - } catch (certificateError) { - SmtpLogger.warn(`Failed to load certificates, using self-signed: ${certificateError instanceof Error ? certificateError.message : String(certificateError)}`); - certificates = generateSelfSignedCertificates(); - } - - // Create server-side TLS options - const tlsOptions = createTlsOptions(certificates, true); - - // Log details for debugging - SmtpLogger.debug('Creating secure server with options', { - certificates: { - keyLength: certificates.key.length, - certLength: certificates.cert.length, - caLength: certificates.ca ? certificates.ca.length : 0 - }, - tlsOptions: { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - ciphers: tlsOptions.ciphers?.substring(0, 50) + '...' // Truncate long cipher list - } - }); - - // Create the TLS server - const server = new plugins.tls.Server(tlsOptions); - - // Set up error handlers - server.on('error', (err) => { - SmtpLogger.error(`Secure server error: ${err.message}`, { - component: 'secure-server', - error: err, - stack: err.stack - }); - }); - - // Log secure connections - server.on('secureConnection', (socket) => { - const protocol = socket.getProtocol(); - const cipher = socket.getCipher(); - - SmtpLogger.info('New direct TLS connection established', { - component: 'secure-server', - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - protocol: protocol || 'unknown', - cipher: cipher?.name || 'unknown' - }); - }); - - return server; - } catch (error) { - SmtpLogger.error(`Failed to create secure TLS server: ${error instanceof Error ? error.message : String(error)}`, { - component: 'secure-server', - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - - return undefined; - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/security-handler.ts b/ts/mail/delivery/smtpserver/security-handler.ts deleted file mode 100644 index 6963c78..0000000 --- a/ts/mail/delivery/smtpserver/security-handler.ts +++ /dev/null @@ -1,345 +0,0 @@ -/** - * SMTP Security Handler - * Responsible for security aspects including IP reputation checking, - * email validation, and authentication - */ - -import * as plugins from '../../../plugins.js'; -import type { ISmtpSession, ISmtpAuth } from './interfaces.js'; -import type { ISecurityHandler, ISmtpServer } from './interfaces.js'; -import { SmtpLogger } from './utils/logging.js'; -import { SecurityEventType, SecurityLogLevel } from './constants.js'; -import { isValidEmail } from './utils/validation.js'; -import { getSocketDetails, getTlsDetails } from './utils/helpers.js'; -import { IPReputationChecker } from '../../../security/classes.ipreputationchecker.js'; - -/** - * Interface for IP denylist entry - */ -interface IIpDenylistEntry { - ip: string; - reason: string; - expiresAt?: number; -} - -/** - * Handles security aspects for SMTP server - */ -export class SecurityHandler implements ISecurityHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer: ISmtpServer; - - /** - * IP reputation checker service - */ - private ipReputationService: IPReputationChecker; - - /** - * Simple in-memory IP denylist - */ - private ipDenylist: IIpDenylistEntry[] = []; - - /** - * Cleanup interval timer - */ - private cleanupInterval: NodeJS.Timeout | null = null; - - /** - * Creates a new security handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer) { - this.smtpServer = smtpServer; - - // Initialize IP reputation checker - this.ipReputationService = new IPReputationChecker(); - - // Clean expired denylist entries periodically - this.cleanupInterval = setInterval(() => this.cleanExpiredDenylistEntries(), 60000); // Every minute - } - - /** - * Check IP reputation for a connection - * @param socket - Client socket - * @returns Promise that resolves to true if IP is allowed, false if blocked - */ - public async checkIpReputation(socket: plugins.net.Socket | plugins.tls.TLSSocket): Promise { - const socketDetails = getSocketDetails(socket); - const ip = socketDetails.remoteAddress; - - // Check local denylist first - if (this.isIpDenylisted(ip)) { - // Log the blocked connection - this.logSecurityEvent( - SecurityEventType.IP_REPUTATION, - SecurityLogLevel.WARN, - `Connection blocked from denylisted IP: ${ip}`, - { reason: this.getDenylistReason(ip) } - ); - - return false; - } - - // Check with IP reputation service - if (!this.ipReputationService) { - return true; - } - - try { - // Check with IP reputation service - const reputationResult = await this.ipReputationService.checkReputation(ip); - - // Block if score is below HIGH_RISK threshold (20) or if it's spam/proxy/tor/vpn - const isBlocked = reputationResult.score < 20 || - reputationResult.isSpam || - reputationResult.isTor || - reputationResult.isProxy; - - if (isBlocked) { - // Add to local denylist temporarily - const reason = reputationResult.isSpam ? 'spam' : - reputationResult.isTor ? 'tor' : - reputationResult.isProxy ? 'proxy' : - `low reputation score: ${reputationResult.score}`; - this.addToDenylist(ip, reason, 3600000); // 1 hour - - // Log the blocked connection - this.logSecurityEvent( - SecurityEventType.IP_REPUTATION, - SecurityLogLevel.WARN, - `Connection blocked by reputation service: ${ip}`, - { - reason, - score: reputationResult.score, - isSpam: reputationResult.isSpam, - isTor: reputationResult.isTor, - isProxy: reputationResult.isProxy, - isVPN: reputationResult.isVPN - } - ); - - return false; - } - - // Log the allowed connection - this.logSecurityEvent( - SecurityEventType.IP_REPUTATION, - SecurityLogLevel.INFO, - `IP reputation check passed: ${ip}`, - { - score: reputationResult.score, - country: reputationResult.country, - org: reputationResult.org - } - ); - - return true; - } catch (error) { - // Log the error - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - ip, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Allow the connection on error (fail open) - return true; - } - } - - /** - * Validate an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ - public isValidEmail(email: string): boolean { - return isValidEmail(email); - } - - /** - * Validate authentication credentials - * @param auth - Authentication credentials - * @returns Promise that resolves to true if authenticated - */ - public async authenticate(auth: ISmtpAuth): Promise { - const { username, password } = auth; - // Get auth options from server - const options = this.smtpServer.getOptions(); - const authOptions = options.auth; - - // Check if authentication is enabled - if (!authOptions) { - this.logSecurityEvent( - SecurityEventType.AUTHENTICATION, - SecurityLogLevel.WARN, - 'Authentication attempt when auth is disabled', - { username } - ); - - return false; - } - - // Note: Method validation and TLS requirement checks would need to be done - // at the caller level since the interface doesn't include session/method info - - try { - let authenticated = false; - - // Use custom validation function if provided - if ((authOptions as any).validateUser) { - authenticated = await (authOptions as any).validateUser(username, password); - } else { - // Default behavior - no authentication - authenticated = false; - } - - // Log the authentication result - this.logSecurityEvent( - SecurityEventType.AUTHENTICATION, - authenticated ? SecurityLogLevel.INFO : SecurityLogLevel.WARN, - authenticated ? 'Authentication successful' : 'Authentication failed', - { username } - ); - - return authenticated; - } catch (error) { - // Log authentication error - this.logSecurityEvent( - SecurityEventType.AUTHENTICATION, - SecurityLogLevel.ERROR, - `Authentication error: ${error instanceof Error ? error.message : String(error)}`, - { username, error: error instanceof Error ? error.message : String(error) } - ); - - return false; - } - } - - /** - * Log a security event - * @param event - Event type - * @param level - Log level - * @param details - Event details - */ - public logSecurityEvent(event: string, level: string, message: string, details: Record): void { - SmtpLogger.logSecurityEvent( - level as SecurityLogLevel, - event as SecurityEventType, - message, - details, - details.ip, - details.domain, - details.success - ); - } - - /** - * Add an IP to the denylist - * @param ip - IP address - * @param reason - Reason for denylisting - * @param duration - Duration in milliseconds (optional, indefinite if not specified) - */ - private addToDenylist(ip: string, reason: string, duration?: number): void { - // Remove existing entry if present - this.ipDenylist = this.ipDenylist.filter(entry => entry.ip !== ip); - - // Create new entry - const entry: IIpDenylistEntry = { - ip, - reason, - expiresAt: duration ? Date.now() + duration : undefined - }; - - // Add to denylist - this.ipDenylist.push(entry); - - // Log the action - this.logSecurityEvent( - SecurityEventType.ACCESS_CONTROL, - SecurityLogLevel.INFO, - `Added IP to denylist: ${ip}`, - { - ip, - reason, - duration: duration ? `${duration / 1000} seconds` : 'indefinite' - } - ); - } - - /** - * Check if an IP is denylisted - * @param ip - IP address - * @returns Whether the IP is denylisted - */ - private isIpDenylisted(ip: string): boolean { - const entry = this.ipDenylist.find(e => e.ip === ip); - - if (!entry) { - return false; - } - - // Check if entry has expired - if (entry.expiresAt && entry.expiresAt < Date.now()) { - // Remove expired entry - this.ipDenylist = this.ipDenylist.filter(e => e !== entry); - return false; - } - - return true; - } - - /** - * Get the reason an IP was denylisted - * @param ip - IP address - * @returns Reason for denylisting or undefined if not denylisted - */ - private getDenylistReason(ip: string): string | undefined { - const entry = this.ipDenylist.find(e => e.ip === ip); - return entry?.reason; - } - - /** - * Clean expired denylist entries - */ - private cleanExpiredDenylistEntries(): void { - const now = Date.now(); - const initialCount = this.ipDenylist.length; - - this.ipDenylist = this.ipDenylist.filter(entry => { - return !entry.expiresAt || entry.expiresAt > now; - }); - - const removedCount = initialCount - this.ipDenylist.length; - - if (removedCount > 0) { - this.logSecurityEvent( - SecurityEventType.ACCESS_CONTROL, - SecurityLogLevel.INFO, - `Cleaned up ${removedCount} expired denylist entries`, - { remainingCount: this.ipDenylist.length } - ); - } - } - - /** - * Clean up resources - */ - public destroy(): void { - // Clear the cleanup interval - if (this.cleanupInterval) { - clearInterval(this.cleanupInterval); - this.cleanupInterval = null; - } - - // Clear the denylist - this.ipDenylist = []; - - // Clean up IP reputation service if it has a destroy method - if (this.ipReputationService && typeof (this.ipReputationService as any).destroy === 'function') { - (this.ipReputationService as any).destroy(); - } - - SmtpLogger.debug('SecurityHandler destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/session-manager.ts b/ts/mail/delivery/smtpserver/session-manager.ts deleted file mode 100644 index b7c1cb2..0000000 --- a/ts/mail/delivery/smtpserver/session-manager.ts +++ /dev/null @@ -1,557 +0,0 @@ -/** - * SMTP Session Manager - * Responsible for creating, managing, and cleaning up SMTP sessions - */ - -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import type { ISmtpSession, ISmtpEnvelope } from './interfaces.js'; -import type { ISessionManager, ISessionEvents } from './interfaces.js'; -import { SMTP_DEFAULTS } from './constants.js'; -import { generateSessionId, getSocketDetails } from './utils/helpers.js'; -import { SmtpLogger } from './utils/logging.js'; - -/** - * Manager for SMTP sessions - * Handles session creation, tracking, timeout management, and cleanup - */ -export class SessionManager implements ISessionManager { - /** - * Map of socket ID to session - */ - private sessions: Map = new Map(); - - /** - * Map of socket to socket ID - */ - private socketIds: Map = new Map(); - - /** - * SMTP server options - */ - private options: { - socketTimeout: number; - connectionTimeout: number; - cleanupInterval: number; - }; - - /** - * Event listeners - */ - private eventListeners: { - created?: Set<(session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void>; - stateChanged?: Set<(session: ISmtpSession, previousState: SmtpState, newState: SmtpState) => void>; - timeout?: Set<(session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void>; - completed?: Set<(session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void>; - error?: Set<(session: ISmtpSession, error: Error) => void>; - } = {}; - - /** - * Timer for cleanup interval - */ - private cleanupTimer: NodeJS.Timeout | null = null; - - /** - * Creates a new session manager - * @param options - Session manager options - */ - constructor(options: { - socketTimeout?: number; - connectionTimeout?: number; - cleanupInterval?: number; - } = {}) { - this.options = { - socketTimeout: options.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - connectionTimeout: options.connectionTimeout || SMTP_DEFAULTS.CONNECTION_TIMEOUT, - cleanupInterval: options.cleanupInterval || SMTP_DEFAULTS.CLEANUP_INTERVAL - }; - - // Start the cleanup timer - this.startCleanupTimer(); - } - - /** - * Creates a new session for a socket connection - * @param socket - Client socket - * @param secure - Whether the connection is secure (TLS) - * @returns New SMTP session - */ - public createSession(socket: plugins.net.Socket | plugins.tls.TLSSocket, secure: boolean): ISmtpSession { - const sessionId = generateSessionId(); - const socketDetails = getSocketDetails(socket); - - // Create a new session - const session: ISmtpSession = { - id: sessionId, - state: SmtpState.GREETING, - clientHostname: '', - mailFrom: '', - rcptTo: [], - emailData: '', - emailDataChunks: [], - emailDataSize: 0, - useTLS: secure || false, - connectionEnded: false, - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - createdAt: new Date(), - secure: secure || false, - authenticated: false, - envelope: { - mailFrom: { address: '', args: {} }, - rcptTo: [] - }, - lastActivity: Date.now() - }; - - // Store session with unique ID - const socketKey = this.getSocketKey(socket); - this.socketIds.set(socket, socketKey); - this.sessions.set(socketKey, session); - - // Set socket timeout - socket.setTimeout(this.options.socketTimeout); - - // Emit session created event - this.emitEvent('created', session, socket); - - // Log session creation - SmtpLogger.info(`Created SMTP session ${sessionId}`, { - sessionId, - remoteAddress: session.remoteAddress, - remotePort: socketDetails.remotePort, - secure: session.secure - }); - - return session; - } - - /** - * Updates the session state - * @param session - SMTP session - * @param newState - New state - */ - public updateSessionState(session: ISmtpSession, newState: SmtpState): void { - if (session.state === newState) { - return; - } - - const previousState = session.state; - session.state = newState; - - // Update activity timestamp - this.updateSessionActivity(session); - - // Emit state changed event - this.emitEvent('stateChanged', session, previousState, newState); - - // Log state change - SmtpLogger.debug(`Session ${session.id} state changed from ${previousState} to ${newState}`, { - sessionId: session.id, - previousState, - newState, - remoteAddress: session.remoteAddress - }); - } - - /** - * Updates the session's last activity timestamp - * @param session - SMTP session - */ - public updateSessionActivity(session: ISmtpSession): void { - session.lastActivity = Date.now(); - } - - /** - * Removes a session - * @param socket - Client socket - */ - public removeSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const socketKey = this.socketIds.get(socket); - if (!socketKey) { - return; - } - - const session = this.sessions.get(socketKey); - if (session) { - // Mark the session as ended - session.connectionEnded = true; - - // Clear any data timeout if it exists - if (session.dataTimeoutId) { - clearTimeout(session.dataTimeoutId); - session.dataTimeoutId = undefined; - } - - // Emit session completed event - this.emitEvent('completed', session, socket); - - // Log session removal - SmtpLogger.info(`Removed SMTP session ${session.id}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - finalState: session.state - }); - } - - // Remove from maps - this.sessions.delete(socketKey); - this.socketIds.delete(socket); - } - - /** - * Gets a session for a socket - * @param socket - Client socket - * @returns SMTP session or undefined if not found - */ - public getSession(socket: plugins.net.Socket | plugins.tls.TLSSocket): ISmtpSession | undefined { - const socketKey = this.socketIds.get(socket); - if (!socketKey) { - return undefined; - } - - return this.sessions.get(socketKey); - } - - /** - * Cleans up idle sessions - */ - public cleanupIdleSessions(): void { - const now = Date.now(); - let timedOutCount = 0; - - for (const [socketKey, session] of this.sessions.entries()) { - if (session.connectionEnded) { - // Session already marked as ended, but still in map - this.sessions.delete(socketKey); - continue; - } - - // Calculate how long the session has been idle - const lastActivity = session.lastActivity || 0; - const idleTime = now - lastActivity; - - // Use appropriate timeout based on session state - const timeout = session.state === SmtpState.DATA_RECEIVING - ? this.options.socketTimeout * 2 // Double timeout for data receiving - : session.state === SmtpState.GREETING - ? this.options.connectionTimeout // Initial connection timeout - : this.options.socketTimeout; // Standard timeout for other states - - // Check if session has timed out - if (idleTime > timeout) { - // Find the socket for this session - let timedOutSocket: plugins.net.Socket | plugins.tls.TLSSocket | undefined; - - for (const [socket, key] of this.socketIds.entries()) { - if (key === socketKey) { - timedOutSocket = socket; - break; - } - } - - if (timedOutSocket) { - // Emit timeout event - this.emitEvent('timeout', session, timedOutSocket); - - // Log timeout - SmtpLogger.warn(`Session ${session.id} timed out after ${Math.round(idleTime / 1000)}s of inactivity`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - state: session.state, - idleTime - }); - - // End the socket connection - try { - timedOutSocket.end(); - } catch (error) { - SmtpLogger.error(`Error ending timed out socket: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - } - - // Remove from maps - this.sessions.delete(socketKey); - this.socketIds.delete(timedOutSocket); - timedOutCount++; - } - } - } - - if (timedOutCount > 0) { - SmtpLogger.info(`Cleaned up ${timedOutCount} timed out sessions`, { - totalSessions: this.sessions.size - }); - } - } - - /** - * Gets the current number of active sessions - * @returns Number of active sessions - */ - public getSessionCount(): number { - return this.sessions.size; - } - - /** - * Clears all sessions (used when shutting down) - */ - public clearAllSessions(): void { - // Log the action - SmtpLogger.info(`Clearing all sessions (count: ${this.sessions.size})`); - - // Clear the sessions and socket IDs maps - this.sessions.clear(); - this.socketIds.clear(); - - // Stop the cleanup timer - this.stopCleanupTimer(); - } - - /** - * Register an event listener - * @param event - Event name - * @param listener - Event listener function - */ - public on(event: K, listener: ISessionEvents[K]): void { - switch (event) { - case 'created': - if (!this.eventListeners.created) { - this.eventListeners.created = new Set(); - } - this.eventListeners.created.add(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - break; - case 'stateChanged': - if (!this.eventListeners.stateChanged) { - this.eventListeners.stateChanged = new Set(); - } - this.eventListeners.stateChanged.add(listener as (session: ISmtpSession, previousState: SmtpState, newState: SmtpState) => void); - break; - case 'timeout': - if (!this.eventListeners.timeout) { - this.eventListeners.timeout = new Set(); - } - this.eventListeners.timeout.add(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - break; - case 'completed': - if (!this.eventListeners.completed) { - this.eventListeners.completed = new Set(); - } - this.eventListeners.completed.add(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - break; - case 'error': - if (!this.eventListeners.error) { - this.eventListeners.error = new Set(); - } - this.eventListeners.error.add(listener as (session: ISmtpSession, error: Error) => void); - break; - } - } - - /** - * Remove an event listener - * @param event - Event name - * @param listener - Event listener function - */ - public off(event: K, listener: ISessionEvents[K]): void { - switch (event) { - case 'created': - if (this.eventListeners.created) { - this.eventListeners.created.delete(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - } - break; - case 'stateChanged': - if (this.eventListeners.stateChanged) { - this.eventListeners.stateChanged.delete(listener as (session: ISmtpSession, previousState: SmtpState, newState: SmtpState) => void); - } - break; - case 'timeout': - if (this.eventListeners.timeout) { - this.eventListeners.timeout.delete(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - } - break; - case 'completed': - if (this.eventListeners.completed) { - this.eventListeners.completed.delete(listener as (session: ISmtpSession, socket: plugins.net.Socket | plugins.tls.TLSSocket) => void); - } - break; - case 'error': - if (this.eventListeners.error) { - this.eventListeners.error.delete(listener as (session: ISmtpSession, error: Error) => void); - } - break; - } - } - - /** - * Emit an event to registered listeners - * @param event - Event name - * @param args - Event arguments - */ - private emitEvent(event: K, ...args: any[]): void { - let listeners: Set | undefined; - - switch (event) { - case 'created': - listeners = this.eventListeners.created; - break; - case 'stateChanged': - listeners = this.eventListeners.stateChanged; - break; - case 'timeout': - listeners = this.eventListeners.timeout; - break; - case 'completed': - listeners = this.eventListeners.completed; - break; - case 'error': - listeners = this.eventListeners.error; - break; - } - - if (!listeners) { - return; - } - - for (const listener of listeners) { - try { - (listener as Function)(...args); - } catch (error) { - SmtpLogger.error(`Error in session event listener for ${String(event)}: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - } - } - } - - /** - * Start the cleanup timer - */ - private startCleanupTimer(): void { - if (this.cleanupTimer) { - return; - } - - this.cleanupTimer = setInterval(() => { - this.cleanupIdleSessions(); - }, this.options.cleanupInterval); - - // Prevent the timer from keeping the process alive - if (this.cleanupTimer.unref) { - this.cleanupTimer.unref(); - } - } - - /** - * Stop the cleanup timer - */ - private stopCleanupTimer(): void { - if (this.cleanupTimer) { - clearInterval(this.cleanupTimer); - this.cleanupTimer = null; - } - } - - /** - * Replace socket mapping for STARTTLS upgrades - * @param oldSocket - Original plain socket - * @param newSocket - New TLS socket - * @returns Whether the replacement was successful - */ - public replaceSocket(oldSocket: plugins.net.Socket | plugins.tls.TLSSocket, newSocket: plugins.net.Socket | plugins.tls.TLSSocket): boolean { - const socketKey = this.socketIds.get(oldSocket); - if (!socketKey) { - SmtpLogger.warn('Cannot replace socket - original socket not found in session manager'); - return false; - } - - const session = this.sessions.get(socketKey); - if (!session) { - SmtpLogger.warn('Cannot replace socket - session not found for socket key'); - return false; - } - - // Remove old socket mapping - this.socketIds.delete(oldSocket); - - // Add new socket mapping - this.socketIds.set(newSocket, socketKey); - - // Set socket timeout for new socket - newSocket.setTimeout(this.options.socketTimeout); - - SmtpLogger.info(`Socket replaced for session ${session.id} (STARTTLS upgrade)`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - oldSocketType: oldSocket.constructor.name, - newSocketType: newSocket.constructor.name - }); - - return true; - } - - /** - * Gets a unique key for a socket - * @param socket - Client socket - * @returns Socket key - */ - private getSocketKey(socket: plugins.net.Socket | plugins.tls.TLSSocket): string { - const details = getSocketDetails(socket); - return `${details.remoteAddress}:${details.remotePort}-${Date.now()}`; - } - - /** - * Get all active sessions - */ - public getAllSessions(): ISmtpSession[] { - return Array.from(this.sessions.values()); - } - - /** - * Update last activity for a session by socket - */ - public updateLastActivity(socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const session = this.getSession(socket); - if (session) { - this.updateSessionActivity(session); - } - } - - /** - * Check for timed out sessions - */ - public checkTimeouts(timeoutMs: number): ISmtpSession[] { - const now = Date.now(); - const timedOutSessions: ISmtpSession[] = []; - - for (const session of this.sessions.values()) { - if (now - session.lastActivity > timeoutMs) { - timedOutSessions.push(session); - } - } - - return timedOutSessions; - } - - /** - * Clean up resources - */ - public destroy(): void { - // Clear the cleanup timer - if (this.cleanupTimer) { - clearInterval(this.cleanupTimer); - this.cleanupTimer = null; - } - - // Clear all sessions - this.clearAllSessions(); - - // Clear event listeners - this.eventListeners = {}; - - SmtpLogger.debug('SessionManager destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/smtp-server.ts b/ts/mail/delivery/smtpserver/smtp-server.ts deleted file mode 100644 index 27f1dc8..0000000 --- a/ts/mail/delivery/smtpserver/smtp-server.ts +++ /dev/null @@ -1,804 +0,0 @@ -/** - * SMTP Server - * Core implementation for the refactored SMTP server - */ - -import * as plugins from '../../../plugins.js'; -import { SmtpState } from './interfaces.js'; -import type { ISmtpServerOptions } from './interfaces.js'; -import type { ISmtpServer, ISmtpServerConfig, ISessionManager, IConnectionManager, ICommandHandler, IDataHandler, ITlsHandler, ISecurityHandler } from './interfaces.js'; -import { SessionManager } from './session-manager.js'; -import { ConnectionManager } from './connection-manager.js'; -import { CommandHandler } from './command-handler.js'; -import { DataHandler } from './data-handler.js'; -import { TlsHandler } from './tls-handler.js'; -import { SecurityHandler } from './security-handler.js'; -import { SMTP_DEFAULTS } from './constants.js'; -import { mergeWithDefaults } from './utils/helpers.js'; -import { SmtpLogger } from './utils/logging.js'; -import { adaptiveLogger } from './utils/adaptive-logging.js'; -import { UnifiedEmailServer } from '../../routing/classes.unified.email.server.js'; - -/** - * SMTP Server implementation - * The main server class that coordinates all components - */ -export class SmtpServer implements ISmtpServer { - /** - * Email server reference - */ - private emailServer: UnifiedEmailServer; - - /** - * Session manager - */ - private sessionManager: ISessionManager; - - /** - * Connection manager - */ - private connectionManager: IConnectionManager; - - /** - * Command handler - */ - private commandHandler: ICommandHandler; - - /** - * Data handler - */ - private dataHandler: IDataHandler; - - /** - * TLS handler - */ - private tlsHandler: ITlsHandler; - - /** - * Security handler - */ - private securityHandler: ISecurityHandler; - - /** - * SMTP server options - */ - private options: ISmtpServerOptions; - - /** - * Net server instance - */ - private server: plugins.net.Server | null = null; - - /** - * Secure server instance - */ - private secureServer: plugins.tls.Server | null = null; - - /** - * Whether the server is running - */ - private running = false; - - /** - * Server recovery state - */ - private recoveryState = { - /** - * Whether recovery is in progress - */ - recovering: false, - - /** - * Number of consecutive connection failures - */ - connectionFailures: 0, - - /** - * Last recovery attempt timestamp - */ - lastRecoveryAttempt: 0, - - /** - * Recovery cooldown in milliseconds - */ - recoveryCooldown: 5000, - - /** - * Maximum recovery attempts before giving up - */ - maxRecoveryAttempts: 3, - - /** - * Current recovery attempt - */ - currentRecoveryAttempt: 0 - }; - - /** - * Creates a new SMTP server - * @param config - Server configuration - */ - constructor(config: ISmtpServerConfig) { - this.emailServer = config.emailServer; - this.options = mergeWithDefaults(config.options); - - // Create components - all components now receive the SMTP server instance - this.sessionManager = config.sessionManager || new SessionManager({ - socketTimeout: this.options.socketTimeout, - connectionTimeout: this.options.connectionTimeout, - cleanupInterval: this.options.cleanupInterval - }); - - this.securityHandler = config.securityHandler || new SecurityHandler(this); - this.tlsHandler = config.tlsHandler || new TlsHandler(this); - this.dataHandler = config.dataHandler || new DataHandler(this); - this.commandHandler = config.commandHandler || new CommandHandler(this); - this.connectionManager = config.connectionManager || new ConnectionManager(this); - } - - /** - * Start the SMTP server - * @returns Promise that resolves when server is started - */ - public async listen(): Promise { - if (this.running) { - throw new Error('SMTP server is already running'); - } - - try { - // Create the server - this.server = plugins.net.createServer((socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - this.connectionManager.handleNewConnection(socket); - } else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Allow connection on error (fail open) - this.connectionManager.handleNewConnection(socket); - }); - }); - - // Set up error handling with recovery - this.server.on('error', (err) => { - SmtpLogger.error(`SMTP server error: ${err.message}`, { error: err }); - - // Try to recover from specific errors - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('standard', err); - } - }); - - // Start listening - await new Promise((resolve, reject) => { - if (!this.server) { - reject(new Error('Server not initialized')); - return; - } - - this.server.listen(this.options.port, this.options.host, () => { - SmtpLogger.info(`SMTP server listening on ${this.options.host || '0.0.0.0'}:${this.options.port}`); - resolve(); - }); - - this.server.on('error', reject); - }); - - // Start secure server if configured - if (this.options.securePort && this.tlsHandler.isTlsEnabled()) { - try { - // Import the secure server creation utility from our new module - // This gives us better certificate handling and error resilience - const { createSecureTlsServer } = await import('./secure-server.js'); - - // Create secure server with the certificates - // This uses a more robust approach to certificate loading and validation - this.secureServer = createSecureTlsServer({ - key: this.options.key, - cert: this.options.cert, - ca: this.options.ca - }); - - SmtpLogger.info(`Created secure TLS server for port ${this.options.securePort}`); - - if (this.secureServer) { - // Use explicit error handling for secure connections - this.secureServer.on('tlsClientError', (err, tlsSocket) => { - SmtpLogger.error(`TLS client error: ${err.message}`, { - error: err, - remoteAddress: tlsSocket.remoteAddress, - remotePort: tlsSocket.remotePort, - stack: err.stack - }); - // No need to destroy, the error event will handle that - }); - - // Register the secure connection handler - this.secureServer.on('secureConnection', (socket) => { - SmtpLogger.info(`New secure connection from ${socket.remoteAddress}:${socket.remotePort}`, { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name - }); - - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - // Pass the connection to the connection manager - this.connectionManager.handleNewSecureConnection(socket); - } else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - - // Allow connection on error (fail open) - this.connectionManager.handleNewSecureConnection(socket); - }); - }); - - // Global error handler for the secure server with recovery - this.secureServer.on('error', (err) => { - SmtpLogger.error(`SMTP secure server error: ${err.message}`, { - error: err, - stack: err.stack - }); - - // Try to recover from specific errors - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('secure', err); - } - }); - - // Start listening on secure port - await new Promise((resolve, reject) => { - if (!this.secureServer) { - reject(new Error('Secure server not initialized')); - return; - } - - this.secureServer.listen(this.options.securePort, this.options.host, () => { - SmtpLogger.info(`SMTP secure server listening on ${this.options.host || '0.0.0.0'}:${this.options.securePort}`); - resolve(); - }); - - // Only use error event for startup issues - this.secureServer.once('error', reject); - }); - } else { - SmtpLogger.warn('Failed to create secure server, TLS may not be properly configured'); - } - } catch (error) { - SmtpLogger.error(`Error setting up secure server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - } - } - - this.running = true; - } catch (error) { - SmtpLogger.error(`Failed to start SMTP server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Clean up on error - this.close(); - - throw error; - } - } - - /** - * Stop the SMTP server - * @returns Promise that resolves when server is stopped - */ - public async close(): Promise { - if (!this.running) { - return; - } - - SmtpLogger.info('Stopping SMTP server'); - - try { - // Close all active connections - this.connectionManager.closeAllConnections(); - - // Clear all sessions - this.sessionManager.clearAllSessions(); - - // Clean up adaptive logger to prevent hanging timers - adaptiveLogger.destroy(); - - // Destroy all components to clean up their resources - await this.destroy(); - - // Close servers - const closePromises: Promise[] = []; - - if (this.server) { - closePromises.push( - new Promise((resolve, reject) => { - if (!this.server) { - resolve(); - return; - } - - this.server.close((err) => { - if (err) { - reject(err); - } else { - resolve(); - } - }); - }) - ); - } - - if (this.secureServer) { - closePromises.push( - new Promise((resolve, reject) => { - if (!this.secureServer) { - resolve(); - return; - } - - this.secureServer.close((err) => { - if (err) { - reject(err); - } else { - resolve(); - } - }); - }) - ); - } - - // Add timeout to prevent hanging on close - await Promise.race([ - Promise.all(closePromises), - new Promise((resolve) => { - setTimeout(() => { - SmtpLogger.warn('Server close timed out after 3 seconds, forcing shutdown'); - resolve(); - }, 3000); - }) - ]); - - this.server = null; - this.secureServer = null; - this.running = false; - - SmtpLogger.info('SMTP server stopped'); - } catch (error) { - SmtpLogger.error(`Error stopping SMTP server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)) - }); - - throw error; - } - } - - /** - * Get the session manager - * @returns Session manager instance - */ - public getSessionManager(): ISessionManager { - return this.sessionManager; - } - - /** - * Get the connection manager - * @returns Connection manager instance - */ - public getConnectionManager(): IConnectionManager { - return this.connectionManager; - } - - /** - * Get the command handler - * @returns Command handler instance - */ - public getCommandHandler(): ICommandHandler { - return this.commandHandler; - } - - /** - * Get the data handler - * @returns Data handler instance - */ - public getDataHandler(): IDataHandler { - return this.dataHandler; - } - - /** - * Get the TLS handler - * @returns TLS handler instance - */ - public getTlsHandler(): ITlsHandler { - return this.tlsHandler; - } - - /** - * Get the security handler - * @returns Security handler instance - */ - public getSecurityHandler(): ISecurityHandler { - return this.securityHandler; - } - - /** - * Get the server options - * @returns SMTP server options - */ - public getOptions(): ISmtpServerOptions { - return this.options; - } - - /** - * Get the email server reference - * @returns Email server instance - */ - public getEmailServer(): UnifiedEmailServer { - return this.emailServer; - } - - /** - * Check if the server is running - * @returns Whether the server is running - */ - public isRunning(): boolean { - return this.running; - } - - /** - * Check if we should attempt to recover from an error - * @param error - The error that occurred - * @returns Whether recovery should be attempted - */ - private shouldAttemptRecovery(error: Error): boolean { - // Skip recovery if we're already in recovery mode - if (this.recoveryState.recovering) { - return false; - } - - // Check if we've reached the maximum number of recovery attempts - if (this.recoveryState.currentRecoveryAttempt >= this.recoveryState.maxRecoveryAttempts) { - SmtpLogger.warn('Maximum recovery attempts reached, not attempting further recovery'); - return false; - } - - // Check if enough time has passed since the last recovery attempt - const now = Date.now(); - if (now - this.recoveryState.lastRecoveryAttempt < this.recoveryState.recoveryCooldown) { - SmtpLogger.warn('Recovery cooldown period not elapsed, skipping recovery attempt'); - return false; - } - - // Recoverable errors include: - // - EADDRINUSE: Address already in use (port conflict) - // - ECONNRESET: Connection reset by peer - // - EPIPE: Broken pipe - // - ETIMEDOUT: Connection timed out - const recoverableErrors = [ - 'EADDRINUSE', - 'ECONNRESET', - 'EPIPE', - 'ETIMEDOUT', - 'ECONNABORTED', - 'EPROTO', - 'EMFILE' // Too many open files - ]; - - // Check if this is a recoverable error - const errorCode = (error as any).code; - return recoverableErrors.includes(errorCode); - } - - /** - * Attempt to recover the server after a critical error - * @param serverType - The type of server to recover ('standard' or 'secure') - * @param error - The error that triggered recovery - */ - private async attemptServerRecovery(serverType: 'standard' | 'secure', error: Error): Promise { - // Set recovery flag to prevent multiple simultaneous recovery attempts - if (this.recoveryState.recovering) { - SmtpLogger.warn('Recovery already in progress, skipping new recovery attempt'); - return; - } - - this.recoveryState.recovering = true; - this.recoveryState.lastRecoveryAttempt = Date.now(); - this.recoveryState.currentRecoveryAttempt++; - - SmtpLogger.info(`Attempting server recovery for ${serverType} server after error: ${error.message}`, { - attempt: this.recoveryState.currentRecoveryAttempt, - maxAttempts: this.recoveryState.maxRecoveryAttempts, - errorCode: (error as any).code - }); - - try { - // Determine which server to restart - const isStandardServer = serverType === 'standard'; - - // Close the affected server - if (isStandardServer && this.server) { - await new Promise((resolve) => { - if (!this.server) { - resolve(); - return; - } - - // First try a clean shutdown - this.server.close((err) => { - if (err) { - SmtpLogger.warn(`Error during server close in recovery: ${err.message}`); - } - resolve(); - }); - - // Set a timeout to force close - setTimeout(() => { - resolve(); - }, 3000); - }); - - this.server = null; - } else if (!isStandardServer && this.secureServer) { - await new Promise((resolve) => { - if (!this.secureServer) { - resolve(); - return; - } - - // First try a clean shutdown - this.secureServer.close((err) => { - if (err) { - SmtpLogger.warn(`Error during secure server close in recovery: ${err.message}`); - } - resolve(); - }); - - // Set a timeout to force close - setTimeout(() => { - resolve(); - }, 3000); - }); - - this.secureServer = null; - } - - // Short delay before restarting - await new Promise((resolve) => setTimeout(resolve, 1000)); - - // Clean up any lingering connections - this.connectionManager.closeAllConnections(); - this.sessionManager.clearAllSessions(); - - // Restart the affected server - if (isStandardServer) { - // Create and start the standard server - this.server = plugins.net.createServer((socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - this.connectionManager.handleNewConnection(socket); - } else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Allow connection on error (fail open) - this.connectionManager.handleNewConnection(socket); - }); - }); - - // Set up error handling with recovery - this.server.on('error', (err) => { - SmtpLogger.error(`SMTP server error after recovery: ${err.message}`, { error: err }); - - // Try to recover again if needed - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('standard', err); - } - }); - - // Start listening again - await new Promise((resolve, reject) => { - if (!this.server) { - reject(new Error('Server not initialized during recovery')); - return; - } - - this.server.listen(this.options.port, this.options.host, () => { - SmtpLogger.info(`SMTP server recovered and listening on ${this.options.host || '0.0.0.0'}:${this.options.port}`); - resolve(); - }); - - // Only use error event for startup issues during recovery - this.server.once('error', (err) => { - SmtpLogger.error(`Failed to restart server during recovery: ${err.message}`); - reject(err); - }); - }); - } else if (this.options.securePort && this.tlsHandler.isTlsEnabled()) { - // Try to recreate the secure server - try { - // Import the secure server creation utility - const { createSecureTlsServer } = await import('./secure-server.js'); - - // Create secure server with the certificates - this.secureServer = createSecureTlsServer({ - key: this.options.key, - cert: this.options.cert, - ca: this.options.ca - }); - - if (this.secureServer) { - SmtpLogger.info(`Created secure TLS server for port ${this.options.securePort} during recovery`); - - // Use explicit error handling for secure connections - this.secureServer.on('tlsClientError', (err, tlsSocket) => { - SmtpLogger.error(`TLS client error after recovery: ${err.message}`, { - error: err, - remoteAddress: tlsSocket.remoteAddress, - remotePort: tlsSocket.remotePort, - stack: err.stack - }); - }); - - // Register the secure connection handler - this.secureServer.on('secureConnection', (socket) => { - // Check IP reputation before handling connection - this.securityHandler.checkIpReputation(socket) - .then(allowed => { - if (allowed) { - // Pass the connection to the connection manager - this.connectionManager.handleNewSecureConnection(socket); - } else { - // Close connection if IP is not allowed - socket.destroy(); - } - }) - .catch(error => { - SmtpLogger.error(`IP reputation check error after recovery: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Allow connection on error (fail open) - this.connectionManager.handleNewSecureConnection(socket); - }); - }); - - // Global error handler for the secure server with recovery - this.secureServer.on('error', (err) => { - SmtpLogger.error(`SMTP secure server error after recovery: ${err.message}`, { - error: err, - stack: err.stack - }); - - // Try to recover again if needed - if (this.shouldAttemptRecovery(err)) { - this.attemptServerRecovery('secure', err); - } - }); - - // Start listening on secure port again - await new Promise((resolve, reject) => { - if (!this.secureServer) { - reject(new Error('Secure server not initialized during recovery')); - return; - } - - this.secureServer.listen(this.options.securePort, this.options.host, () => { - SmtpLogger.info(`SMTP secure server recovered and listening on ${this.options.host || '0.0.0.0'}:${this.options.securePort}`); - resolve(); - }); - - // Only use error event for startup issues during recovery - this.secureServer.once('error', (err) => { - SmtpLogger.error(`Failed to restart secure server during recovery: ${err.message}`); - reject(err); - }); - }); - } else { - SmtpLogger.warn('Failed to create secure server during recovery'); - } - } catch (error) { - SmtpLogger.error(`Error setting up secure server during recovery: ${error instanceof Error ? error.message : String(error)}`); - } - } - - // Recovery successful - SmtpLogger.info('Server recovery completed successfully'); - - } catch (recoveryError) { - SmtpLogger.error(`Server recovery failed: ${recoveryError instanceof Error ? recoveryError.message : String(recoveryError)}`, { - error: recoveryError instanceof Error ? recoveryError : new Error(String(recoveryError)), - attempt: this.recoveryState.currentRecoveryAttempt, - maxAttempts: this.recoveryState.maxRecoveryAttempts - }); - } finally { - // Reset recovery flag - this.recoveryState.recovering = false; - } - } - - /** - * Clean up all component resources - */ - public async destroy(): Promise { - SmtpLogger.info('Destroying SMTP server components'); - - // Destroy all components in parallel - const destroyPromises: Promise[] = []; - - if (this.sessionManager && typeof this.sessionManager.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.sessionManager.destroy())); - } - - if (this.connectionManager && typeof this.connectionManager.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.connectionManager.destroy())); - } - - if (this.commandHandler && typeof this.commandHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.commandHandler.destroy())); - } - - if (this.dataHandler && typeof this.dataHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.dataHandler.destroy())); - } - - if (this.tlsHandler && typeof this.tlsHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.tlsHandler.destroy())); - } - - if (this.securityHandler && typeof this.securityHandler.destroy === 'function') { - destroyPromises.push(Promise.resolve(this.securityHandler.destroy())); - } - - await Promise.all(destroyPromises); - - // Destroy the adaptive logger singleton to clean up its timer - const { adaptiveLogger } = await import('./utils/adaptive-logging.js'); - if (adaptiveLogger && typeof adaptiveLogger.destroy === 'function') { - adaptiveLogger.destroy(); - } - - // Clear recovery state - this.recoveryState = { - recovering: false, - connectionFailures: 0, - lastRecoveryAttempt: 0, - recoveryCooldown: 5000, - maxRecoveryAttempts: 3, - currentRecoveryAttempt: 0 - }; - - SmtpLogger.info('All SMTP server components destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/starttls-handler.ts b/ts/mail/delivery/smtpserver/starttls-handler.ts deleted file mode 100644 index 3baa82b..0000000 --- a/ts/mail/delivery/smtpserver/starttls-handler.ts +++ /dev/null @@ -1,262 +0,0 @@ -/** - * STARTTLS Implementation - * Provides an improved implementation for STARTTLS upgrades - */ - -import * as plugins from '../../../plugins.js'; -import { SmtpLogger } from './utils/logging.js'; -import { - loadCertificatesFromString, - createTlsOptions, - type ICertificateData -} from './certificate-utils.js'; -import { getSocketDetails } from './utils/helpers.js'; -import type { ISmtpSession, ISessionManager, IConnectionManager } from './interfaces.js'; -import { SmtpState } from '../interfaces.js'; - -/** - * Enhanced STARTTLS handler for more reliable TLS upgrades - */ -export async function performStartTLS( - socket: plugins.net.Socket, - options: { - key: string; - cert: string; - ca?: string; - session?: ISmtpSession; - sessionManager?: ISessionManager; - connectionManager?: IConnectionManager; - onSuccess?: (tlsSocket: plugins.tls.TLSSocket) => void; - onFailure?: (error: Error) => void; - updateSessionState?: (session: ISmtpSession, state: SmtpState) => void; - } -): Promise { - return new Promise((resolve) => { - try { - const socketDetails = getSocketDetails(socket); - - SmtpLogger.info('Starting enhanced STARTTLS upgrade process', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - - // Create a proper socket cleanup function - const cleanupSocket = () => { - // Remove all listeners to prevent memory leaks - socket.removeAllListeners('data'); - socket.removeAllListeners('error'); - socket.removeAllListeners('close'); - socket.removeAllListeners('end'); - socket.removeAllListeners('drain'); - }; - - // Prepare the socket for TLS upgrade - socket.setNoDelay(true); - - // Critical: make sure there's no pending data before TLS handshake - socket.pause(); - - // Add error handling for the base socket - const handleSocketError = (err: Error) => { - SmtpLogger.error(`Socket error during STARTTLS preparation: ${err.message}`, { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: err, - stack: err.stack - }); - - if (options.onFailure) { - options.onFailure(err); - } - - // Resolve with undefined to indicate failure - resolve(undefined); - }; - - socket.once('error', handleSocketError); - - // Load certificates - let certificates: ICertificateData; - try { - certificates = loadCertificatesFromString({ - key: options.key, - cert: options.cert, - ca: options.ca - }); - } catch (certError) { - SmtpLogger.error(`Certificate error during STARTTLS: ${certError instanceof Error ? certError.message : String(certError)}`); - - if (options.onFailure) { - options.onFailure(certError instanceof Error ? certError : new Error(String(certError))); - } - - resolve(undefined); - return; - } - - // Create TLS options optimized for STARTTLS - const tlsOptions = createTlsOptions(certificates, true); - - // Create secure context - let secureContext; - try { - secureContext = plugins.tls.createSecureContext(tlsOptions); - } catch (contextError) { - SmtpLogger.error(`Failed to create secure context: ${contextError instanceof Error ? contextError.message : String(contextError)}`); - - if (options.onFailure) { - options.onFailure(contextError instanceof Error ? contextError : new Error(String(contextError))); - } - - resolve(undefined); - return; - } - - // Log STARTTLS upgrade attempt - SmtpLogger.debug('Attempting TLS socket upgrade with options', { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - handshakeTimeout: tlsOptions.handshakeTimeout - }); - - // Use a safer approach to create the TLS socket - const handshakeTimeout = 30000; // 30 seconds timeout for TLS handshake - let handshakeTimeoutId: NodeJS.Timeout | undefined; - - // Create the TLS socket using a conservative approach for STARTTLS - const tlsSocket = new plugins.tls.TLSSocket(socket, { - isServer: true, - secureContext, - // Server-side options (simpler is more reliable for STARTTLS) - requestCert: false, - rejectUnauthorized: false - }); - - // Set up error handling for the TLS socket - tlsSocket.once('error', (err) => { - if (handshakeTimeoutId) { - clearTimeout(handshakeTimeoutId); - } - - SmtpLogger.error(`TLS error during STARTTLS: ${err.message}`, { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: err, - stack: err.stack - }); - - // Clean up socket listeners - cleanupSocket(); - - if (options.onFailure) { - options.onFailure(err); - } - - // Destroy the socket to ensure we don't have hanging connections - tlsSocket.destroy(); - resolve(undefined); - }); - - // Set up handshake timeout manually for extra safety - handshakeTimeoutId = setTimeout(() => { - SmtpLogger.error('TLS handshake timed out', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - - // Clean up socket listeners - cleanupSocket(); - - if (options.onFailure) { - options.onFailure(new Error('TLS handshake timed out')); - } - - // Destroy the socket to ensure we don't have hanging connections - tlsSocket.destroy(); - resolve(undefined); - }, handshakeTimeout); - - // Set up handler for successful TLS negotiation - tlsSocket.once('secure', () => { - if (handshakeTimeoutId) { - clearTimeout(handshakeTimeoutId); - } - - const protocol = tlsSocket.getProtocol(); - const cipher = tlsSocket.getCipher(); - - SmtpLogger.info('TLS upgrade successful via STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - protocol: protocol || 'unknown', - cipher: cipher?.name || 'unknown' - }); - - // Update socket mapping in session manager - if (options.sessionManager) { - const socketReplaced = options.sessionManager.replaceSocket(socket, tlsSocket); - if (!socketReplaced) { - SmtpLogger.error('Failed to replace socket in session manager after STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - } - } - - // Re-attach event handlers from connection manager - if (options.connectionManager) { - try { - options.connectionManager.setupSocketEventHandlers(tlsSocket); - SmtpLogger.debug('Successfully re-attached connection manager event handlers to TLS socket', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort - }); - } catch (handlerError) { - SmtpLogger.error('Failed to re-attach event handlers to TLS socket after STARTTLS', { - remoteAddress: socketDetails.remoteAddress, - remotePort: socketDetails.remotePort, - error: handlerError instanceof Error ? handlerError : new Error(String(handlerError)) - }); - } - } - - // Update session if provided - if (options.session) { - // Update session properties to indicate TLS is active - options.session.useTLS = true; - options.session.secure = true; - - // Reset session state as required by RFC 3207 - // After STARTTLS, client must issue a new EHLO - if (options.updateSessionState) { - options.updateSessionState(options.session, SmtpState.GREETING); - } - } - - // Call success callback if provided - if (options.onSuccess) { - options.onSuccess(tlsSocket); - } - - // Success - return the TLS socket - resolve(tlsSocket); - }); - - // Resume the socket after we've set up all handlers - // This allows the TLS handshake to proceed - socket.resume(); - - } catch (error) { - SmtpLogger.error(`Unexpected error in STARTTLS: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - - if (options.onFailure) { - options.onFailure(error instanceof Error ? error : new Error(String(error))); - } - - resolve(undefined); - } - }); -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/tls-handler.ts b/ts/mail/delivery/smtpserver/tls-handler.ts deleted file mode 100644 index 20007e0..0000000 --- a/ts/mail/delivery/smtpserver/tls-handler.ts +++ /dev/null @@ -1,346 +0,0 @@ -/** - * SMTP TLS Handler - * Responsible for handling TLS-related SMTP functionality - */ - -import * as plugins from '../../../plugins.js'; -import type { ITlsHandler, ISmtpServer, ISmtpSession } from './interfaces.js'; -import { SmtpResponseCode, SecurityEventType, SecurityLogLevel } from './constants.js'; -import { SmtpLogger } from './utils/logging.js'; -import { getSocketDetails, getTlsDetails } from './utils/helpers.js'; -import { - loadCertificatesFromString, - generateSelfSignedCertificates, - createTlsOptions, - type ICertificateData -} from './certificate-utils.js'; -import { SmtpState } from '../interfaces.js'; - -/** - * Handles TLS functionality for SMTP server - */ -export class TlsHandler implements ITlsHandler { - /** - * Reference to the SMTP server instance - */ - private smtpServer: ISmtpServer; - - /** - * Certificate data - */ - private certificates: ICertificateData; - - /** - * TLS options - */ - private options: plugins.tls.TlsOptions; - - /** - * Creates a new TLS handler - * @param smtpServer - SMTP server instance - */ - constructor(smtpServer: ISmtpServer) { - this.smtpServer = smtpServer; - - // Initialize certificates - const serverOptions = this.smtpServer.getOptions(); - try { - // Try to load certificates from provided options - this.certificates = loadCertificatesFromString({ - key: serverOptions.key, - cert: serverOptions.cert, - ca: serverOptions.ca - }); - - SmtpLogger.info('Successfully loaded TLS certificates'); - } catch (error) { - SmtpLogger.warn(`Failed to load certificates from options, using self-signed: ${error instanceof Error ? error.message : String(error)}`); - - // Fall back to self-signed certificates for testing - this.certificates = generateSelfSignedCertificates(); - } - - // Initialize TLS options - this.options = createTlsOptions(this.certificates); - } - - /** - * Handle STARTTLS command - * @param socket - Client socket - */ - public async handleStartTls(socket: plugins.net.Socket, session: ISmtpSession): Promise { - - // Check if already using TLS - if (session.useTLS) { - this.sendResponse(socket, `${SmtpResponseCode.BAD_SEQUENCE} TLS already active`); - return null; - } - - // Check if we have the necessary TLS certificates - if (!this.isTlsEnabled()) { - this.sendResponse(socket, `${SmtpResponseCode.TLS_UNAVAILABLE_TEMP} TLS not available`); - return null; - } - - // Send ready for TLS response - this.sendResponse(socket, `${SmtpResponseCode.SERVICE_READY} Ready to start TLS`); - - // Upgrade the connection to TLS - try { - const tlsSocket = await this.startTLS(socket); - return tlsSocket; - } catch (error) { - SmtpLogger.error(`STARTTLS negotiation failed: ${error instanceof Error ? error.message : String(error)}`, { - sessionId: session.id, - remoteAddress: session.remoteAddress, - error: error instanceof Error ? error : new Error(String(error)) - }); - - // Log security event - SmtpLogger.logSecurityEvent( - SecurityLogLevel.ERROR, - SecurityEventType.TLS_NEGOTIATION, - 'STARTTLS negotiation failed', - { error: error instanceof Error ? error.message : String(error) }, - session.remoteAddress - ); - - return null; - } - } - - /** - * Upgrade a connection to TLS - * @param socket - Client socket - */ - public async startTLS(socket: plugins.net.Socket): Promise { - // Get the session for this socket - const session = this.smtpServer.getSessionManager().getSession(socket); - - try { - // Import the enhanced STARTTLS handler - // This uses a more robust approach to TLS upgrades - const { performStartTLS } = await import('./starttls-handler.js'); - - SmtpLogger.info('Using enhanced STARTTLS implementation'); - - // Use the enhanced STARTTLS handler with better error handling and socket management - const serverOptions = this.smtpServer.getOptions(); - const tlsSocket = await performStartTLS(socket, { - key: serverOptions.key, - cert: serverOptions.cert, - ca: serverOptions.ca, - session: session, - sessionManager: this.smtpServer.getSessionManager(), - connectionManager: this.smtpServer.getConnectionManager(), - // Callback for successful upgrade - onSuccess: (secureSocket) => { - SmtpLogger.info('TLS connection successfully established via enhanced STARTTLS', { - remoteAddress: secureSocket.remoteAddress, - remotePort: secureSocket.remotePort, - protocol: secureSocket.getProtocol() || 'unknown', - cipher: secureSocket.getCipher()?.name || 'unknown' - }); - - // Log security event - SmtpLogger.logSecurityEvent( - SecurityLogLevel.INFO, - SecurityEventType.TLS_NEGOTIATION, - 'STARTTLS successful with enhanced implementation', - { - protocol: secureSocket.getProtocol(), - cipher: secureSocket.getCipher()?.name - }, - secureSocket.remoteAddress, - undefined, - true - ); - }, - // Callback for failed upgrade - onFailure: (error) => { - SmtpLogger.error(`Enhanced STARTTLS failed: ${error.message}`, { - sessionId: session?.id, - remoteAddress: socket.remoteAddress, - error - }); - - // Log security event - SmtpLogger.logSecurityEvent( - SecurityLogLevel.ERROR, - SecurityEventType.TLS_NEGOTIATION, - 'Enhanced STARTTLS failed', - { error: error.message }, - socket.remoteAddress, - undefined, - false - ); - }, - // Function to update session state - updateSessionState: this.smtpServer.getSessionManager().updateSessionState?.bind(this.smtpServer.getSessionManager()) - }); - - // If STARTTLS failed with the enhanced implementation, log the error - if (!tlsSocket) { - SmtpLogger.warn('Enhanced STARTTLS implementation failed to create TLS socket', { - sessionId: session?.id, - remoteAddress: socket.remoteAddress - }); - throw new Error('Failed to create TLS socket'); - } - - return tlsSocket; - } catch (error) { - // Log STARTTLS failure - SmtpLogger.error(`Failed to upgrade connection to TLS: ${error instanceof Error ? error.message : String(error)}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - - // Log security event - SmtpLogger.logSecurityEvent( - SecurityLogLevel.ERROR, - SecurityEventType.TLS_NEGOTIATION, - 'Failed to upgrade connection to TLS', - { - error: error instanceof Error ? error.message : String(error), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }, - socket.remoteAddress, - undefined, - false - ); - - // Destroy the socket on error - socket.destroy(); - throw error; - } - } - - /** - * Create a secure server - * @returns TLS server instance or undefined if TLS is not enabled - */ - public createSecureServer(): plugins.tls.Server | undefined { - if (!this.isTlsEnabled()) { - return undefined; - } - - try { - SmtpLogger.info('Creating secure TLS server'); - - // Log certificate info - SmtpLogger.debug('Using certificates for secure server', { - keyLength: this.certificates.key.length, - certLength: this.certificates.cert.length, - caLength: this.certificates.ca ? this.certificates.ca.length : 0 - }); - - // Create TLS options using our certificate utilities - // This ensures proper PEM format handling and protocol negotiation - const tlsOptions = createTlsOptions(this.certificates, true); // Use server options - - SmtpLogger.info('Creating TLS server with options', { - minVersion: tlsOptions.minVersion, - maxVersion: tlsOptions.maxVersion, - handshakeTimeout: tlsOptions.handshakeTimeout - }); - - // Create a server with wider TLS compatibility - const server = new plugins.tls.Server(tlsOptions); - - // Add error handling - server.on('error', (err) => { - SmtpLogger.error(`TLS server error: ${err.message}`, { - error: err, - stack: err.stack - }); - }); - - // Log TLS details for each connection - server.on('secureConnection', (socket) => { - SmtpLogger.info('New secure connection established', { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort - }); - }); - - return server; - } catch (error) { - SmtpLogger.error(`Failed to create secure server: ${error instanceof Error ? error.message : String(error)}`, { - error: error instanceof Error ? error : new Error(String(error)), - stack: error instanceof Error ? error.stack : 'No stack trace available' - }); - - return undefined; - } - } - - /** - * Check if TLS is enabled - * @returns Whether TLS is enabled - */ - public isTlsEnabled(): boolean { - const options = this.smtpServer.getOptions(); - return !!(options.key && options.cert); - } - - /** - * Send a response to the client - * @param socket - Client socket - * @param response - Response message - */ - private sendResponse(socket: plugins.net.Socket | plugins.tls.TLSSocket, response: string): void { - // Check if socket is still writable before attempting to write - if (socket.destroyed || socket.readyState !== 'open' || !socket.writable) { - SmtpLogger.debug(`Skipping response to closed/destroyed socket: ${response}`, { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - destroyed: socket.destroyed, - readyState: socket.readyState, - writable: socket.writable - }); - return; - } - - try { - socket.write(`${response}\r\n`); - SmtpLogger.logResponse(response, socket); - } catch (error) { - SmtpLogger.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`, { - response, - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - error: error instanceof Error ? error : new Error(String(error)) - }); - - socket.destroy(); - } - } - - /** - * Check if TLS is available (interface requirement) - */ - public isTlsAvailable(): boolean { - return this.isTlsEnabled(); - } - - /** - * Get TLS options (interface requirement) - */ - public getTlsOptions(): plugins.tls.TlsOptions { - return this.options; - } - - /** - * Clean up resources - */ - public destroy(): void { - // Clear any cached certificates or TLS contexts - // TlsHandler doesn't have timers but may have cached resources - SmtpLogger.debug('TlsHandler destroyed'); - } -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/utils/adaptive-logging.ts b/ts/mail/delivery/smtpserver/utils/adaptive-logging.ts deleted file mode 100644 index 24880fb..0000000 --- a/ts/mail/delivery/smtpserver/utils/adaptive-logging.ts +++ /dev/null @@ -1,514 +0,0 @@ -/** - * Adaptive SMTP Logging System - * Automatically switches between logging modes based on server load (active connections) - * to maintain performance during high-concurrency scenarios - */ - -import * as plugins from '../../../../plugins.js'; -import { logger } from '../../../../logger.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -import type { ISmtpSession } from '../interfaces.js'; -import type { LogLevel, ISmtpLogOptions } from './logging.js'; - -/** - * Log modes based on server load - */ -export enum LogMode { - VERBOSE = 'VERBOSE', // < 20 connections: Full detailed logging - REDUCED = 'REDUCED', // 20-40 connections: Limited command/response logging, full error logging - MINIMAL = 'MINIMAL' // 40+ connections: Aggregated logging only, critical errors only -} - -/** - * Configuration for adaptive logging thresholds - */ -export interface IAdaptiveLogConfig { - verboseThreshold: number; // Switch to REDUCED mode above this connection count - reducedThreshold: number; // Switch to MINIMAL mode above this connection count - aggregationInterval: number; // How often to flush aggregated logs (ms) - maxAggregatedEntries: number; // Max entries to hold before forced flush -} - -/** - * Aggregated log entry for batching similar events - */ -interface IAggregatedLogEntry { - type: 'connection' | 'command' | 'response' | 'error'; - count: number; - firstSeen: number; - lastSeen: number; - sample: { - message: string; - level: LogLevel; - options?: ISmtpLogOptions; - }; -} - -/** - * Connection metadata for aggregation tracking - */ -interface IConnectionTracker { - activeConnections: number; - peakConnections: number; - totalConnections: number; - connectionsPerSecond: number; - lastConnectionTime: number; -} - -/** - * Adaptive SMTP Logger that scales logging based on server load - */ -export class AdaptiveSmtpLogger { - private static instance: AdaptiveSmtpLogger; - private currentMode: LogMode = LogMode.VERBOSE; - private config: IAdaptiveLogConfig; - private aggregatedEntries: Map = new Map(); - private aggregationTimer: NodeJS.Timeout | null = null; - private connectionTracker: IConnectionTracker = { - activeConnections: 0, - peakConnections: 0, - totalConnections: 0, - connectionsPerSecond: 0, - lastConnectionTime: Date.now() - }; - - private constructor(config?: Partial) { - this.config = { - verboseThreshold: 20, - reducedThreshold: 40, - aggregationInterval: 30000, // 30 seconds - maxAggregatedEntries: 100, - ...config - }; - - this.startAggregationTimer(); - } - - /** - * Get singleton instance - */ - public static getInstance(config?: Partial): AdaptiveSmtpLogger { - if (!AdaptiveSmtpLogger.instance) { - AdaptiveSmtpLogger.instance = new AdaptiveSmtpLogger(config); - } - return AdaptiveSmtpLogger.instance; - } - - /** - * Update active connection count and adjust log mode if needed - */ - public updateConnectionCount(activeConnections: number): void { - this.connectionTracker.activeConnections = activeConnections; - this.connectionTracker.peakConnections = Math.max( - this.connectionTracker.peakConnections, - activeConnections - ); - - const newMode = this.determineLogMode(activeConnections); - if (newMode !== this.currentMode) { - this.switchLogMode(newMode); - } - } - - /** - * Track new connection for rate calculation - */ - public trackConnection(): void { - this.connectionTracker.totalConnections++; - const now = Date.now(); - const timeDiff = (now - this.connectionTracker.lastConnectionTime) / 1000; - if (timeDiff > 0) { - this.connectionTracker.connectionsPerSecond = 1 / timeDiff; - } - this.connectionTracker.lastConnectionTime = now; - } - - /** - * Get current logging mode - */ - public getCurrentMode(): LogMode { - return this.currentMode; - } - - /** - * Get connection statistics - */ - public getConnectionStats(): IConnectionTracker { - return { ...this.connectionTracker }; - } - - /** - * Log a message with adaptive behavior - */ - public log(level: LogLevel, message: string, options: ISmtpLogOptions = {}): void { - // Always log structured data - const errorInfo = options.error ? { - errorMessage: options.error.message, - errorStack: options.error.stack, - errorName: options.error.name - } : {}; - - const logData = { - component: 'smtp-server', - logMode: this.currentMode, - activeConnections: this.connectionTracker.activeConnections, - ...options, - ...errorInfo - }; - - if (logData.error) { - delete logData.error; - } - - logger.log(level, message, logData); - - // Adaptive console logging based on mode - switch (this.currentMode) { - case LogMode.VERBOSE: - // Full console logging - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - break; - - case LogMode.REDUCED: - // Only errors and warnings to console - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - break; - - case LogMode.MINIMAL: - // Only critical errors to console - if (level === 'error' && (message.includes('critical') || message.includes('security') || message.includes('crash'))) { - console[level](`[SMTP] ${message}`, logData); - } - break; - } - } - - /** - * Log command with adaptive behavior - */ - public logCommand(command: string, socket: plugins.net.Socket | plugins.tls.TLSSocket, session?: ISmtpSession): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - - switch (this.currentMode) { - case LogMode.VERBOSE: - this.log('info', `Command received: ${command}`, { - ...clientInfo, - command: command.split(' ')[0]?.toUpperCase() - }); - console.log(`← ${command}`); - break; - - case LogMode.REDUCED: - // Aggregate commands instead of logging each one - this.aggregateEntry('command', 'info', `Command: ${command.split(' ')[0]?.toUpperCase()}`, clientInfo); - // Only show error commands - if (command.toUpperCase().startsWith('QUIT') || command.includes('error')) { - console.log(`← ${command}`); - } - break; - - case LogMode.MINIMAL: - // Only aggregate, no console output unless it's an error command - this.aggregateEntry('command', 'info', `Command: ${command.split(' ')[0]?.toUpperCase()}`, clientInfo); - break; - } - } - - /** - * Log response with adaptive behavior - */ - public logResponse(response: string, socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket - }; - - const responseCode = response.substring(0, 3); - const isError = responseCode.startsWith('4') || responseCode.startsWith('5'); - - switch (this.currentMode) { - case LogMode.VERBOSE: - if (responseCode.startsWith('2') || responseCode.startsWith('3')) { - this.log('debug', `Response sent: ${response}`, clientInfo); - } else if (responseCode.startsWith('4')) { - this.log('warn', `Temporary error response: ${response}`, clientInfo); - } else if (responseCode.startsWith('5')) { - this.log('error', `Permanent error response: ${response}`, clientInfo); - } - console.log(`→ ${response}`); - break; - - case LogMode.REDUCED: - // Log errors normally, aggregate success responses - if (isError) { - if (responseCode.startsWith('4')) { - this.log('warn', `Temporary error response: ${response}`, clientInfo); - } else { - this.log('error', `Permanent error response: ${response}`, clientInfo); - } - console.log(`→ ${response}`); - } else { - this.aggregateEntry('response', 'debug', `Response: ${responseCode}xx`, clientInfo); - } - break; - - case LogMode.MINIMAL: - // Only log critical errors - if (responseCode.startsWith('5')) { - this.log('error', `Permanent error response: ${response}`, clientInfo); - console.log(`→ ${response}`); - } else { - this.aggregateEntry('response', 'debug', `Response: ${responseCode}xx`, clientInfo); - } - break; - } - } - - /** - * Log connection event with adaptive behavior - */ - public logConnection( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - eventType: 'connect' | 'close' | 'error', - session?: ISmtpSession, - error?: Error - ): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - - if (eventType === 'connect') { - this.trackConnection(); - } - - switch (this.currentMode) { - case LogMode.VERBOSE: - // Full connection logging - switch (eventType) { - case 'connect': - this.log('info', `New ${clientInfo.secure ? 'secure ' : ''}connection from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'close': - this.log('info', `Connection closed from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - case 'error': - this.log('error', `Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - break; - } - break; - - case LogMode.REDUCED: - // Aggregate normal connections, log errors - if (eventType === 'error') { - this.log('error', `Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - } else { - this.aggregateEntry('connection', 'info', `Connection ${eventType}`, clientInfo); - } - break; - - case LogMode.MINIMAL: - // Only aggregate, except for critical errors - if (eventType === 'error' && error && (error.message.includes('security') || error.message.includes('critical'))) { - this.log('error', `Critical connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - } else { - this.aggregateEntry('connection', 'info', `Connection ${eventType}`, clientInfo); - } - break; - } - } - - /** - * Log security event (always logged regardless of mode) - */ - public logSecurityEvent( - level: SecurityLogLevel, - type: SecurityEventType, - message: string, - details: Record, - ipAddress?: string, - domain?: string, - success?: boolean - ): void { - const logLevel: LogLevel = level === SecurityLogLevel.DEBUG ? 'debug' : - level === SecurityLogLevel.INFO ? 'info' : - level === SecurityLogLevel.WARN ? 'warn' : 'error'; - - // Security events are always logged in full detail - this.log(logLevel, message, { - component: 'smtp-security', - eventType: type, - success, - ipAddress, - domain, - ...details - }); - } - - /** - * Determine appropriate log mode based on connection count - */ - private determineLogMode(activeConnections: number): LogMode { - if (activeConnections >= this.config.reducedThreshold) { - return LogMode.MINIMAL; - } else if (activeConnections >= this.config.verboseThreshold) { - return LogMode.REDUCED; - } else { - return LogMode.VERBOSE; - } - } - - /** - * Switch to a new log mode - */ - private switchLogMode(newMode: LogMode): void { - const oldMode = this.currentMode; - this.currentMode = newMode; - - // Log the mode switch - console.log(`[SMTP] Adaptive logging switched from ${oldMode} to ${newMode} (${this.connectionTracker.activeConnections} active connections)`); - - this.log('info', `Adaptive logging mode changed to ${newMode}`, { - oldMode, - newMode, - activeConnections: this.connectionTracker.activeConnections, - peakConnections: this.connectionTracker.peakConnections, - totalConnections: this.connectionTracker.totalConnections - }); - - // If switching to more verbose mode, flush aggregated entries - if ((oldMode === LogMode.MINIMAL && newMode !== LogMode.MINIMAL) || - (oldMode === LogMode.REDUCED && newMode === LogMode.VERBOSE)) { - this.flushAggregatedEntries(); - } - } - - /** - * Add entry to aggregation buffer - */ - private aggregateEntry( - type: 'connection' | 'command' | 'response' | 'error', - level: LogLevel, - message: string, - options?: ISmtpLogOptions - ): void { - const key = `${type}:${message}`; - const now = Date.now(); - - if (this.aggregatedEntries.has(key)) { - const entry = this.aggregatedEntries.get(key)!; - entry.count++; - entry.lastSeen = now; - } else { - this.aggregatedEntries.set(key, { - type, - count: 1, - firstSeen: now, - lastSeen: now, - sample: { message, level, options } - }); - } - - // Force flush if we have too many entries - if (this.aggregatedEntries.size >= this.config.maxAggregatedEntries) { - this.flushAggregatedEntries(); - } - } - - /** - * Start the aggregation timer - */ - private startAggregationTimer(): void { - if (this.aggregationTimer) { - clearInterval(this.aggregationTimer); - } - - this.aggregationTimer = setInterval(() => { - this.flushAggregatedEntries(); - }, this.config.aggregationInterval); - - // Unref the timer so it doesn't keep the process alive - if (this.aggregationTimer && typeof this.aggregationTimer.unref === 'function') { - this.aggregationTimer.unref(); - } - } - - /** - * Flush aggregated entries to logs - */ - private flushAggregatedEntries(): void { - if (this.aggregatedEntries.size === 0) { - return; - } - - const summary: Record = {}; - let totalAggregated = 0; - - for (const [key, entry] of this.aggregatedEntries.entries()) { - summary[entry.type] = (summary[entry.type] || 0) + entry.count; - totalAggregated += entry.count; - - // Log a sample of high-frequency entries - if (entry.count >= 10) { - this.log(entry.sample.level, `${entry.sample.message} (aggregated: ${entry.count} occurrences)`, { - ...entry.sample.options, - aggregated: true, - occurrences: entry.count, - timeSpan: entry.lastSeen - entry.firstSeen - }); - } - } - - // Log aggregation summary - console.log(`[SMTP] Aggregated ${totalAggregated} log entries: ${JSON.stringify(summary)}`); - - this.log('info', 'Aggregated log summary', { - totalEntries: totalAggregated, - breakdown: summary, - logMode: this.currentMode, - activeConnections: this.connectionTracker.activeConnections - }); - - // Clear aggregated entries - this.aggregatedEntries.clear(); - } - - /** - * Cleanup resources - */ - public destroy(): void { - if (this.aggregationTimer) { - clearInterval(this.aggregationTimer); - this.aggregationTimer = null; - } - this.flushAggregatedEntries(); - } -} - -/** - * Default instance for easy access - */ -export const adaptiveLogger = AdaptiveSmtpLogger.getInstance(); \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/utils/helpers.ts b/ts/mail/delivery/smtpserver/utils/helpers.ts deleted file mode 100644 index ea8906f..0000000 --- a/ts/mail/delivery/smtpserver/utils/helpers.ts +++ /dev/null @@ -1,246 +0,0 @@ -/** - * SMTP Helper Functions - * Provides utility functions for SMTP server implementation - */ - -import * as plugins from '../../../../plugins.js'; -import { SMTP_DEFAULTS } from '../constants.js'; -import type { ISmtpSession, ISmtpServerOptions } from '../interfaces.js'; - -/** - * Formats a multi-line SMTP response according to RFC 5321 - * @param code - Response code - * @param lines - Response lines - * @returns Formatted SMTP response - */ -export function formatMultilineResponse(code: number, lines: string[]): string { - if (!lines || lines.length === 0) { - return `${code} `; - } - - if (lines.length === 1) { - return `${code} ${lines[0]}`; - } - - let response = ''; - for (let i = 0; i < lines.length - 1; i++) { - response += `${code}-${lines[i]}${SMTP_DEFAULTS.CRLF}`; - } - response += `${code} ${lines[lines.length - 1]}`; - - return response; -} - -/** - * Generates a unique session ID - * @returns Unique session ID - */ -export function generateSessionId(): string { - return `${Date.now()}-${Math.floor(Math.random() * 10000)}`; -} - -/** - * Safely parses an integer from string with a default value - * @param value - String value to parse - * @param defaultValue - Default value if parsing fails - * @returns Parsed integer or default value - */ -export function safeParseInt(value: string | undefined, defaultValue: number): number { - if (!value) { - return defaultValue; - } - - const parsed = parseInt(value, 10); - return isNaN(parsed) ? defaultValue : parsed; -} - -/** - * Safely gets the socket details - * @param socket - Socket to get details from - * @returns Socket details object - */ -export function getSocketDetails(socket: plugins.net.Socket | plugins.tls.TLSSocket): { - remoteAddress: string; - remotePort: number; - remoteFamily: string; - localAddress: string; - localPort: number; - encrypted: boolean; -} { - return { - remoteAddress: socket.remoteAddress || 'unknown', - remotePort: socket.remotePort || 0, - remoteFamily: socket.remoteFamily || 'unknown', - localAddress: socket.localAddress || 'unknown', - localPort: socket.localPort || 0, - encrypted: socket instanceof plugins.tls.TLSSocket - }; -} - -/** - * Gets TLS details if socket is TLS - * @param socket - Socket to get TLS details from - * @returns TLS details or undefined if not TLS - */ -export function getTlsDetails(socket: plugins.net.Socket | plugins.tls.TLSSocket): { - protocol?: string; - cipher?: string; - authorized?: boolean; -} | undefined { - if (!(socket instanceof plugins.tls.TLSSocket)) { - return undefined; - } - - return { - protocol: socket.getProtocol(), - cipher: socket.getCipher()?.name, - authorized: socket.authorized - }; -} - -/** - * Merges default options with provided options - * @param options - User provided options - * @returns Merged options with defaults - */ -export function mergeWithDefaults(options: Partial): ISmtpServerOptions { - return { - port: options.port || SMTP_DEFAULTS.SMTP_PORT, - key: options.key || '', - cert: options.cert || '', - hostname: options.hostname || SMTP_DEFAULTS.HOSTNAME, - host: options.host, - securePort: options.securePort, - ca: options.ca, - maxSize: options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE, - maxConnections: options.maxConnections || SMTP_DEFAULTS.MAX_CONNECTIONS, - socketTimeout: options.socketTimeout || SMTP_DEFAULTS.SOCKET_TIMEOUT, - connectionTimeout: options.connectionTimeout || SMTP_DEFAULTS.CONNECTION_TIMEOUT, - cleanupInterval: options.cleanupInterval || SMTP_DEFAULTS.CLEANUP_INTERVAL, - maxRecipients: options.maxRecipients || SMTP_DEFAULTS.MAX_RECIPIENTS, - size: options.size || SMTP_DEFAULTS.MAX_MESSAGE_SIZE, - dataTimeout: options.dataTimeout || SMTP_DEFAULTS.DATA_TIMEOUT, - auth: options.auth, - }; -} - -/** - * Creates a text response formatter for the SMTP server - * @param socket - Socket to send responses to - * @returns Function to send formatted response - */ -export function createResponseFormatter(socket: plugins.net.Socket | plugins.tls.TLSSocket): (response: string) => void { - return (response: string): void => { - try { - socket.write(`${response}${SMTP_DEFAULTS.CRLF}`); - console.log(`→ ${response}`); - } catch (error) { - console.error(`Error sending response: ${error instanceof Error ? error.message : String(error)}`); - socket.destroy(); - } - }; -} - -/** - * Extracts SMTP command name from a command line - * @param commandLine - Full command line - * @returns Command name in uppercase - */ -export function extractCommandName(commandLine: string): string { - if (!commandLine || typeof commandLine !== 'string') { - return ''; - } - - // Handle specific command patterns first - const ehloMatch = commandLine.match(/^(EHLO|HELO)\b/i); - if (ehloMatch) { - return ehloMatch[1].toUpperCase(); - } - - const mailMatch = commandLine.match(/^MAIL\b/i); - if (mailMatch) { - return 'MAIL'; - } - - const rcptMatch = commandLine.match(/^RCPT\b/i); - if (rcptMatch) { - return 'RCPT'; - } - - // Default handling - const parts = commandLine.trim().split(/\s+/); - return (parts[0] || '').toUpperCase(); -} - -/** - * Extracts SMTP command arguments from a command line - * @param commandLine - Full command line - * @returns Arguments string - */ -export function extractCommandArgs(commandLine: string): string { - if (!commandLine || typeof commandLine !== 'string') { - return ''; - } - - const command = extractCommandName(commandLine); - if (!command) { - return commandLine.trim(); - } - - // Special handling for specific commands - if (command === 'EHLO' || command === 'HELO') { - const match = commandLine.match(/^(?:EHLO|HELO)\s+(.+)$/i); - return match ? match[1].trim() : ''; - } - - if (command === 'MAIL') { - return commandLine.replace(/^MAIL\s+/i, ''); - } - - if (command === 'RCPT') { - return commandLine.replace(/^RCPT\s+/i, ''); - } - - // Default extraction - const firstSpace = commandLine.indexOf(' '); - if (firstSpace === -1) { - return ''; - } - - return commandLine.substring(firstSpace + 1).trim(); -} - -/** - * Sanitizes data for logging (hides sensitive info) - * @param data - Data to sanitize - * @returns Sanitized data - */ -export function sanitizeForLogging(data: any): any { - if (!data) { - return data; - } - - if (typeof data !== 'object') { - return data; - } - - const result: any = Array.isArray(data) ? [] : {}; - - for (const key in data) { - if (Object.prototype.hasOwnProperty.call(data, key)) { - // Sanitize sensitive fields - if (key.toLowerCase().includes('password') || - key.toLowerCase().includes('token') || - key.toLowerCase().includes('secret') || - key.toLowerCase().includes('credential')) { - result[key] = '********'; - } else if (typeof data[key] === 'object' && data[key] !== null) { - result[key] = sanitizeForLogging(data[key]); - } else { - result[key] = data[key]; - } - } - } - - return result; -} \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/utils/logging.ts b/ts/mail/delivery/smtpserver/utils/logging.ts deleted file mode 100644 index e45b398..0000000 --- a/ts/mail/delivery/smtpserver/utils/logging.ts +++ /dev/null @@ -1,246 +0,0 @@ -/** - * SMTP Logging Utilities - * Provides structured logging for SMTP server components - */ - -import * as plugins from '../../../../plugins.js'; -import { logger } from '../../../../logger.js'; -import { SecurityLogLevel, SecurityEventType } from '../constants.js'; -import type { ISmtpSession } from '../interfaces.js'; - -/** - * SMTP connection metadata to include in logs - */ -export interface IConnectionMetadata { - remoteAddress?: string; - remotePort?: number; - socketId?: string; - secure?: boolean; - sessionId?: string; -} - -/** - * Log levels for SMTP server - */ -export type LogLevel = 'debug' | 'info' | 'warn' | 'error'; - -/** - * Options for SMTP log - */ -export interface ISmtpLogOptions { - level?: LogLevel; - sessionId?: string; - sessionState?: string; - remoteAddress?: string; - remotePort?: number; - command?: string; - error?: Error; - [key: string]: any; -} - -/** - * SMTP logger - provides structured logging for SMTP server - */ -export class SmtpLogger { - /** - * Log a message with context - * @param level - Log level - * @param message - Log message - * @param options - Additional log options - */ - public static log(level: LogLevel, message: string, options: ISmtpLogOptions = {}): void { - // Extract error information if provided - const errorInfo = options.error ? { - errorMessage: options.error.message, - errorStack: options.error.stack, - errorName: options.error.name - } : {}; - - // Structure log data - const logData = { - component: 'smtp-server', - ...options, - ...errorInfo - }; - - // Remove error from log data to avoid duplication - if (logData.error) { - delete logData.error; - } - - // Log through the main logger - logger.log(level, message, logData); - - // Also console log for immediate visibility during development - if (level === 'error' || level === 'warn') { - console[level](`[SMTP] ${message}`, logData); - } - } - - /** - * Log debug level message - * @param message - Log message - * @param options - Additional log options - */ - public static debug(message: string, options: ISmtpLogOptions = {}): void { - this.log('debug', message, options); - } - - /** - * Log info level message - * @param message - Log message - * @param options - Additional log options - */ - public static info(message: string, options: ISmtpLogOptions = {}): void { - this.log('info', message, options); - } - - /** - * Log warning level message - * @param message - Log message - * @param options - Additional log options - */ - public static warn(message: string, options: ISmtpLogOptions = {}): void { - this.log('warn', message, options); - } - - /** - * Log error level message - * @param message - Log message - * @param options - Additional log options - */ - public static error(message: string, options: ISmtpLogOptions = {}): void { - this.log('error', message, options); - } - - /** - * Log command received from client - * @param command - The command string - * @param socket - The client socket - * @param session - The SMTP session - */ - public static logCommand(command: string, socket: plugins.net.Socket | plugins.tls.TLSSocket, session?: ISmtpSession): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - - this.info(`Command received: ${command}`, { - ...clientInfo, - command: command.split(' ')[0]?.toUpperCase() - }); - - // Also log to console for easy debugging - console.log(`← ${command}`); - } - - /** - * Log response sent to client - * @param response - The response string - * @param socket - The client socket - */ - public static logResponse(response: string, socket: plugins.net.Socket | plugins.tls.TLSSocket): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket - }; - - // Get the response code from the beginning of the response - const responseCode = response.substring(0, 3); - - // Log different levels based on response code - if (responseCode.startsWith('2') || responseCode.startsWith('3')) { - this.debug(`Response sent: ${response}`, clientInfo); - } else if (responseCode.startsWith('4')) { - this.warn(`Temporary error response: ${response}`, clientInfo); - } else if (responseCode.startsWith('5')) { - this.error(`Permanent error response: ${response}`, clientInfo); - } - - // Also log to console for easy debugging - console.log(`→ ${response}`); - } - - /** - * Log client connection event - * @param socket - The client socket - * @param eventType - Type of connection event (connect, close, error) - * @param session - The SMTP session - * @param error - Optional error object for error events - */ - public static logConnection( - socket: plugins.net.Socket | plugins.tls.TLSSocket, - eventType: 'connect' | 'close' | 'error', - session?: ISmtpSession, - error?: Error - ): void { - const clientInfo = { - remoteAddress: socket.remoteAddress, - remotePort: socket.remotePort, - secure: socket instanceof plugins.tls.TLSSocket, - sessionId: session?.id, - sessionState: session?.state - }; - - switch (eventType) { - case 'connect': - this.info(`New ${clientInfo.secure ? 'secure ' : ''}connection from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - - case 'close': - this.info(`Connection closed from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, clientInfo); - break; - - case 'error': - this.error(`Connection error from ${clientInfo.remoteAddress}:${clientInfo.remotePort}`, { - ...clientInfo, - error - }); - break; - } - } - - /** - * Log security event - * @param level - Security log level - * @param type - Security event type - * @param message - Log message - * @param details - Event details - * @param ipAddress - Client IP address - * @param domain - Optional domain involved - * @param success - Whether the security check was successful - */ - public static logSecurityEvent( - level: SecurityLogLevel, - type: SecurityEventType, - message: string, - details: Record, - ipAddress?: string, - domain?: string, - success?: boolean - ): void { - // Map security log level to system log level - const logLevel: LogLevel = level === SecurityLogLevel.DEBUG ? 'debug' : - level === SecurityLogLevel.INFO ? 'info' : - level === SecurityLogLevel.WARN ? 'warn' : 'error'; - - // Log the security event - this.log(logLevel, message, { - component: 'smtp-security', - eventType: type, - success, - ipAddress, - domain, - ...details - }); - } -} - -/** - * Default instance for backward compatibility - */ -export const smtpLogger = SmtpLogger; \ No newline at end of file diff --git a/ts/mail/delivery/smtpserver/utils/validation.ts b/ts/mail/delivery/smtpserver/utils/validation.ts deleted file mode 100644 index 5aae12b..0000000 --- a/ts/mail/delivery/smtpserver/utils/validation.ts +++ /dev/null @@ -1,436 +0,0 @@ -/** - * SMTP Validation Utilities - * Provides validation functions for SMTP server - */ - -import { SmtpState } from '../interfaces.js'; -import { SMTP_PATTERNS } from '../constants.js'; - -/** - * Header injection patterns to detect malicious input - * These patterns detect common header injection attempts - */ -const HEADER_INJECTION_PATTERNS = [ - /\r\n/, // CRLF sequence - /\n/, // LF alone - /\r/, // CR alone - /\x00/, // Null byte - /\x0A/, // Line feed hex - /\x0D/, // Carriage return hex - /%0A/i, // URL encoded LF - /%0D/i, // URL encoded CR - /%0a/i, // URL encoded LF lowercase - /%0d/i, // URL encoded CR lowercase - /\\\n/, // Escaped newline - /\\\r/, // Escaped carriage return - /(?:subject|from|to|cc|bcc|reply-to|return-path|received|delivered-to|x-.*?):/i // Email headers -]; - -/** - * Detects header injection attempts in input strings - * @param input - The input string to check - * @param context - The context where this input is being used ('smtp-command' or 'email-header') - * @returns true if header injection is detected, false otherwise - */ -export function detectHeaderInjection(input: string, context: 'smtp-command' | 'email-header' = 'smtp-command'): boolean { - if (!input || typeof input !== 'string') { - return false; - } - - // Check for control characters and CRLF sequences (always dangerous) - const controlCharPatterns = [ - /\r\n/, // CRLF sequence - /\n/, // LF alone - /\r/, // CR alone - /\x00/, // Null byte - /\x0A/, // Line feed hex - /\x0D/, // Carriage return hex - /%0A/i, // URL encoded LF - /%0D/i, // URL encoded CR - /%0a/i, // URL encoded LF lowercase - /%0d/i, // URL encoded CR lowercase - /\\\n/, // Escaped newline - /\\\r/, // Escaped carriage return - ]; - - // Check control characters (always dangerous in any context) - if (controlCharPatterns.some(pattern => pattern.test(input))) { - return true; - } - - // For email headers, also check for header injection patterns - if (context === 'email-header') { - const headerPatterns = [ - /(?:subject|from|to|cc|bcc|reply-to|return-path|received|delivered-to|x-.*?):/i // Email headers - ]; - return headerPatterns.some(pattern => pattern.test(input)); - } - - // For SMTP commands, don't flag normal command syntax like "TO:" as header injection - return false; -} - -/** - * Sanitizes input by removing or escaping potentially dangerous characters - * @param input - The input string to sanitize - * @returns Sanitized string - */ -export function sanitizeInput(input: string): string { - if (!input || typeof input !== 'string') { - return ''; - } - - // Remove control characters and potential injection sequences - return input - .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '') // Remove control chars except \t, \n, \r - .replace(/\r\n/g, ' ') // Replace CRLF with space - .replace(/[\r\n]/g, ' ') // Replace individual CR/LF with space - .replace(/%0[aAdD]/gi, '') // Remove URL encoded CRLF - .trim(); -} -import { SmtpLogger } from './logging.js'; - -/** - * Validates an email address - * @param email - Email address to validate - * @returns Whether the email address is valid - */ -export function isValidEmail(email: string): boolean { - if (!email || typeof email !== 'string') { - return false; - } - - // Basic pattern check - if (!SMTP_PATTERNS.EMAIL.test(email)) { - return false; - } - - // Additional validation for common invalid patterns - const [localPart, domain] = email.split('@'); - - // Check for double dots - if (email.includes('..')) { - return false; - } - - // Check domain doesn't start or end with dot - if (domain && (domain.startsWith('.') || domain.endsWith('.'))) { - return false; - } - - // Check local part length (max 64 chars per RFC) - if (localPart && localPart.length > 64) { - return false; - } - - // Check domain length (max 253 chars per RFC - accounting for trailing dot) - if (domain && domain.length > 253) { - return false; - } - - return true; -} - -/** - * Validates the MAIL FROM command syntax - * @param args - Arguments string from the MAIL FROM command - * @returns Object with validation result and extracted data - */ -export function validateMailFrom(args: string): { - isValid: boolean; - address?: string; - params?: Record; - errorMessage?: string; -} { - if (!args) { - return { isValid: false, errorMessage: 'Missing arguments' }; - } - - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in MAIL FROM command', { args }); - return { isValid: false, errorMessage: 'Invalid syntax - illegal characters detected' }; - } - - // Handle "MAIL FROM:" already in the args - let cleanArgs = args; - if (args.toUpperCase().startsWith('MAIL FROM')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } else if (args.toUpperCase().startsWith('FROM:')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } - - // Handle empty sender case '<>' - if (cleanArgs === '<>') { - return { isValid: true, address: '', params: {} }; - } - - // According to test expectations, validate that the address is enclosed in angle brackets - // Check for angle brackets and RFC-compliance - if (cleanArgs.includes('<') && cleanArgs.includes('>')) { - const startBracket = cleanArgs.indexOf('<'); - const endBracket = cleanArgs.indexOf('>', startBracket); - - if (startBracket !== -1 && endBracket !== -1 && startBracket < endBracket) { - const emailPart = cleanArgs.substring(startBracket + 1, endBracket).trim(); - const paramsString = cleanArgs.substring(endBracket + 1).trim(); - - // Handle empty sender case '<>' again - if (emailPart === '') { - return { isValid: true, address: '', params: {} }; - } - - // During testing, we should validate the email format - // Check for basic email format (something@somewhere) - if (!isValidEmail(emailPart)) { - return { isValid: false, errorMessage: 'Invalid email address format' }; - } - - // Parse parameters if they exist - const params: Record = {}; - if (paramsString) { - const paramRegex = /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g; - let match; - - while ((match = paramRegex.exec(paramsString)) !== null) { - const name = match[1].toUpperCase(); - const value = match[2] || ''; - params[name] = value; - } - } - - return { isValid: true, address: emailPart, params }; - } - } - - // If no angle brackets, the format is invalid for MAIL FROM - // Tests expect us to reject formats without angle brackets - - // For better compliance with tests, check if the argument might contain an email without brackets - if (isValidEmail(cleanArgs)) { - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; - } - - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; -} - -/** - * Validates the RCPT TO command syntax - * @param args - Arguments string from the RCPT TO command - * @returns Object with validation result and extracted data - */ -export function validateRcptTo(args: string): { - isValid: boolean; - address?: string; - params?: Record; - errorMessage?: string; -} { - if (!args) { - return { isValid: false, errorMessage: 'Missing arguments' }; - } - - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in RCPT TO command', { args }); - return { isValid: false, errorMessage: 'Invalid syntax - illegal characters detected' }; - } - - // Handle "RCPT TO:" already in the args - let cleanArgs = args; - if (args.toUpperCase().startsWith('RCPT TO')) { - const colonIndex = args.indexOf(':'); - if (colonIndex !== -1) { - cleanArgs = args.substring(colonIndex + 1).trim(); - } - } else if (args.toUpperCase().startsWith('TO:')) { - cleanArgs = args.substring(3).trim(); - } - - // According to test expectations, validate that the address is enclosed in angle brackets - // Check for angle brackets and RFC-compliance - if (cleanArgs.includes('<') && cleanArgs.includes('>')) { - const startBracket = cleanArgs.indexOf('<'); - const endBracket = cleanArgs.indexOf('>', startBracket); - - if (startBracket !== -1 && endBracket !== -1 && startBracket < endBracket) { - const emailPart = cleanArgs.substring(startBracket + 1, endBracket).trim(); - const paramsString = cleanArgs.substring(endBracket + 1).trim(); - - // During testing, we should validate the email format - // Check for basic email format (something@somewhere) - if (!isValidEmail(emailPart)) { - return { isValid: false, errorMessage: 'Invalid email address format' }; - } - - // Parse parameters if they exist - const params: Record = {}; - if (paramsString) { - const paramRegex = /\s+([A-Za-z0-9][A-Za-z0-9\-]*)(?:=([^\s]+))?/g; - let match; - - while ((match = paramRegex.exec(paramsString)) !== null) { - const name = match[1].toUpperCase(); - const value = match[2] || ''; - params[name] = value; - } - } - - return { isValid: true, address: emailPart, params }; - } - } - - // If no angle brackets, the format is invalid for RCPT TO - // Tests expect us to reject formats without angle brackets - - // For better compliance with tests, check if the argument might contain an email without brackets - if (isValidEmail(cleanArgs)) { - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; - } - - return { isValid: false, errorMessage: 'Invalid syntax - angle brackets required' }; -} - -/** - * Validates the EHLO command syntax - * @param args - Arguments string from the EHLO command - * @returns Object with validation result and extracted data - */ -export function validateEhlo(args: string): { - isValid: boolean; - hostname?: string; - errorMessage?: string; -} { - if (!args) { - return { isValid: false, errorMessage: 'Missing domain name' }; - } - - // Check for header injection attempts - if (detectHeaderInjection(args)) { - SmtpLogger.warn('Header injection attempt detected in EHLO command', { args }); - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - - // Extract hostname from EHLO command if present in args - let hostname = args; - const match = args.match(/^(?:EHLO|HELO)\s+([^\s]+)$/i); - if (match) { - hostname = match[1]; - } - - // Check for empty hostname - if (!hostname || hostname.trim() === '') { - return { isValid: false, errorMessage: 'Missing domain name' }; - } - - // Basic validation - Be very permissive with domain names to handle various client implementations - // RFC 5321 allows a broad range of clients to connect, so validation should be lenient - - // Only check for characters that would definitely cause issues - const invalidChars = ['<', '>', '"', '\'', '\\', '\n', '\r']; - if (invalidChars.some(char => hostname.includes(char))) { - // During automated testing, we check for invalid character validation - // For production we could consider accepting these with proper cleanup - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - - // Support IP addresses in square brackets (e.g., [127.0.0.1] or [IPv6:2001:db8::1]) - if (hostname.startsWith('[') && hostname.endsWith(']')) { - // Be permissive with IP literals - many clients use non-standard formats - // Just check for closing bracket and basic format - return { isValid: true, hostname }; - } - - // RFC 5321 states we should accept anything as a domain name for EHLO - // Clients may send domain literals, IP addresses, or any other identification - // As long as it follows the basic format and doesn't have clearly invalid characters - // we should accept it to be compatible with a wide range of clients - - // The test expects us to reject 'invalid@domain', but RFC doesn't strictly require this - // For testing purposes, we'll include a basic check to validate email-like formats - if (hostname.includes('@')) { - // Reject email-like formats for EHLO/HELO command - return { isValid: false, errorMessage: 'Invalid domain name format' }; - } - - // Special handling for test with special characters - // The test "EHLO spec!al@#$chars" is expected to pass with either response: - // 1. Accept it (since RFC doesn't prohibit special chars in domain names) - // 2. Reject it with a 501 error (for implementations with stricter validation) - if (/[!@#$%^&*()+=\[\]{}|;:',<>?~`]/.test(hostname)) { - // For test compatibility, let's be permissive and accept special characters - // RFC 5321 doesn't explicitly prohibit these characters, and some implementations accept them - SmtpLogger.debug(`Allowing hostname with special characters for test: ${hostname}`); - return { isValid: true, hostname }; - } - - // Hostname validation can be very tricky - many clients don't follow RFCs exactly - // Better to be permissive than to reject valid clients - return { isValid: true, hostname }; -} - -/** - * Validates command in the current SMTP state - * @param command - SMTP command - * @param currentState - Current SMTP state - * @returns Whether the command is valid in the current state - */ -export function isValidCommandSequence(command: string, currentState: SmtpState): boolean { - const upperCommand = command.toUpperCase(); - - // Some commands are valid in any state - if (upperCommand === 'QUIT' || upperCommand === 'RSET' || upperCommand === 'NOOP' || upperCommand === 'HELP') { - return true; - } - - // State-specific validation - switch (currentState) { - case SmtpState.GREETING: - return upperCommand === 'EHLO' || upperCommand === 'HELO'; - - case SmtpState.AFTER_EHLO: - return upperCommand === 'MAIL' || upperCommand === 'STARTTLS' || upperCommand === 'AUTH' || upperCommand === 'EHLO' || upperCommand === 'HELO'; - - case SmtpState.MAIL_FROM: - case SmtpState.RCPT_TO: - if (upperCommand === 'RCPT') { - return true; - } - return currentState === SmtpState.RCPT_TO && upperCommand === 'DATA'; - - case SmtpState.DATA: - // In DATA state, only the data content is accepted, not commands - return false; - - case SmtpState.DATA_RECEIVING: - // In DATA_RECEIVING state, only the data content is accepted, not commands - return false; - - case SmtpState.FINISHED: - // After data is received, only new transactions or session end - return upperCommand === 'MAIL' || upperCommand === 'QUIT' || upperCommand === 'RSET'; - - default: - return false; - } -} - -/** - * Validates if a hostname is valid according to RFC 5321 - * @param hostname - Hostname to validate - * @returns Whether the hostname is valid - */ -export function isValidHostname(hostname: string): boolean { - if (!hostname || typeof hostname !== 'string') { - return false; - } - - // Basic hostname validation - // This is a simplified check, full RFC compliance would be more complex - return /^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$/.test(hostname); -} \ No newline at end of file diff --git a/ts/mail/routing/classes.unified.email.server.ts b/ts/mail/routing/classes.unified.email.server.ts index 21a370d..0df0dbf 100644 --- a/ts/mail/routing/classes.unified.email.server.ts +++ b/ts/mail/routing/classes.unified.email.server.ts @@ -46,7 +46,6 @@ import { Email } from '../core/classes.email.js'; import { DomainRegistry } from './classes.domain.registry.js'; import { DnsManager } from './classes.dns.manager.js'; import { BounceManager, BounceType, BounceCategory } from '../core/classes.bouncemanager.js'; -import { createSmtpServer } from '../delivery/smtpserver/index.js'; import { createPooledSmtpClient } from '../delivery/smtpclient/create-client.js'; import type { SmtpClient } from '../delivery/smtpclient/smtp-client.js'; import { MultiModeDeliverySystem, type IMultiModeDeliveryOptions } from '../delivery/classes.delivery.system.js'; @@ -391,13 +390,6 @@ export class UnifiedEmailServer extends EventEmitter { await this.checkAndRotateDkimKeys(); logger.log('info', 'DKIM key rotation check completed'); - // Skip server creation in socket-handler mode - if (this.options.useSocketHandler) { - logger.log('info', 'UnifiedEmailServer started in socket-handler mode (no port listening)'); - this.emit('started'); - return; - } - // Ensure we have the necessary TLS options const hasTlsConfig = this.options.tls?.keyPath && this.options.tls?.certPath; @@ -485,54 +477,6 @@ export class UnifiedEmailServer extends EventEmitter { } } - /** - * Handle a socket from smartproxy in socket-handler mode - * @param socket The socket to handle - * @param port The port this connection is for (25, 587, 465) - */ - public async handleSocket(socket: plugins.net.Socket | plugins.tls.TLSSocket, port: number): Promise { - if (!this.options.useSocketHandler) { - logger.log('error', 'handleSocket called but useSocketHandler is not enabled'); - socket.destroy(); - return; - } - - logger.log('info', `Handling socket for port ${port}`); - - // Create a temporary SMTP server instance for this connection - // We need a full server instance because the SMTP protocol handler needs all components - const smtpServerOptions = { - port, - hostname: this.options.hostname, - key: this.options.tls?.keyPath ? plugins.fs.readFileSync(this.options.tls.keyPath, 'utf8') : undefined, - cert: this.options.tls?.certPath ? plugins.fs.readFileSync(this.options.tls.certPath, 'utf8') : undefined - }; - - // Create the SMTP server instance - const smtpServer = createSmtpServer(this, smtpServerOptions); - - // Get the connection manager from the server - const connectionManager = (smtpServer as any).connectionManager; - - if (!connectionManager) { - logger.log('error', 'Could not get connection manager from SMTP server'); - socket.destroy(); - return; - } - - // Determine if this is a secure connection - // Port 465 uses implicit TLS, so the socket is already secure - const isSecure = port === 465 || socket instanceof plugins.tls.TLSSocket; - - // Pass the socket to the connection manager - try { - await connectionManager.handleConnection(socket, isSecure); - } catch (error) { - logger.log('error', `Error handling socket connection: ${error.message}`); - socket.destroy(); - } - } - /** * Stop the unified email server */ @@ -639,6 +583,11 @@ export class UnifiedEmailServer extends EventEmitter { session.user = { username: authenticatedUser }; } + // Attach pre-computed security results from Rust in-process pipeline + if (data.securityResults) { + (session as any)._precomputedSecurityResults = data.securityResults; + } + // Process the email through the routing system await this.processEmailByMode(rawMessageBuffer, session); @@ -691,24 +640,34 @@ export class UnifiedEmailServer extends EventEmitter { } /** - * Verify inbound email security (DKIM/SPF/DMARC) using the Rust bridge. - * Falls back gracefully if the bridge is not running. + * Verify inbound email security (DKIM/SPF/DMARC) using pre-computed Rust results + * or falling back to IPC call if no pre-computed results are available. */ private async verifyInboundSecurity(email: Email, session: IExtendedSmtpSession): Promise { try { - const rawMessage = session.emailData || email.toRFC822String(); - const result = await this.rustBridge.verifyEmail({ - rawMessage, - ip: session.remoteAddress, - heloDomain: session.clientHostname || '', - hostname: this.options.hostname, - mailFrom: session.envelope?.mailFrom?.address || session.mailFrom || '', - }); + // Check for pre-computed results from Rust in-process security pipeline + const precomputed = (session as any)._precomputedSecurityResults; + let result: any; + + if (precomputed) { + logger.log('info', 'Using pre-computed security results from Rust in-process pipeline'); + result = precomputed; + } else { + // Fallback: IPC round-trip to Rust (for backward compat / handleSocket mode) + const rawMessage = session.emailData || email.toRFC822String(); + result = await this.rustBridge.verifyEmail({ + rawMessage, + ip: session.remoteAddress, + heloDomain: session.clientHostname || '', + hostname: this.options.hostname, + mailFrom: session.envelope?.mailFrom?.address || session.mailFrom || '', + }); + } // Apply DKIM result headers if (result.dkim && result.dkim.length > 0) { const dkimSummary = result.dkim - .map(d => `${d.status}${d.domain ? ` (${d.domain})` : ''}`) + .map((d: any) => `${d.status}${d.domain ? ` (${d.domain})` : ''}`) .join(', '); email.addHeader('X-DKIM-Result', dkimSummary); } @@ -737,6 +696,31 @@ export class UnifiedEmailServer extends EventEmitter { } } + // Apply content scan results (from pre-computed pipeline) + if (result.contentScan) { + const scan = result.contentScan; + if (scan.threatScore > 0) { + email.addHeader('X-Spam-Score', String(scan.threatScore)); + if (scan.threatType) { + email.addHeader('X-Spam-Type', scan.threatType); + } + if (scan.threatScore >= 50) { + email.mightBeSpam = true; + logger.log('warn', `Content scan threat score ${scan.threatScore} (${scan.threatType}) — marking as potential spam`); + } + } + } + + // Apply IP reputation results (from pre-computed pipeline) + if (result.ipReputation) { + const rep = result.ipReputation; + email.addHeader('X-IP-Reputation-Score', String(rep.score)); + if (rep.is_spam) { + email.mightBeSpam = true; + logger.log('warn', `IP ${rep.ip} flagged by reputation check (score=${rep.score}) — marking as potential spam`); + } + } + logger.log('info', `Inbound security verified for email from ${session.remoteAddress}: DKIM=${result.dkim?.[0]?.status ?? 'none'}, SPF=${result.spf?.result ?? 'none'}, DMARC=${result.dmarc?.action ?? 'none'}`); } catch (err) { logger.log('warn', `Inbound security verification failed: ${(err as Error).message} — accepting email`);