From 15a45089aaa482cf75df6b379ad2b0c2e107c021 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Tue, 10 Feb 2026 21:19:13 +0000 Subject: [PATCH] feat(security): migrate content scanning and bounce detection to Rust security bridge; add scanContent IPC command and Rust content scanner with tests; update TS RustSecurityBridge and callers, and adjust CI package references --- .gitea/workflows/npm-publish.yml | 16 +- changelog.md | 10 + dist_ts/mail/core/classes.bouncemanager.d.ts | 15 - dist_ts/mail/core/classes.bouncemanager.js | 234 +------- dist_ts/security/classes.contentscanner.d.ts | 52 +- dist_ts/security/classes.contentscanner.js | 439 +++------------ .../security/classes.ipreputationchecker.js | 7 +- .../security/classes.rustsecuritybridge.d.ts | 15 +- .../security/classes.rustsecuritybridge.js | 6 +- readme.plan.md | 212 +------ rust/Cargo.lock | 1 + rust/crates/mailer-bin/src/main.rs | 21 +- rust/crates/mailer-security/Cargo.toml | 1 + .../mailer-security/src/content_scanner.rs | 515 +++++++++++++++++ rust/crates/mailer-security/src/lib.rs | 1 + test/test.bouncemanager.ts | 11 + test/test.contentscanner.ts | 11 + ts/00_commitinfo_data.ts | 2 +- ts/mail/core/classes.bouncemanager.ts | 253 +-------- ts/security/classes.contentscanner.ts | 525 ++++-------------- ts/security/classes.rustsecuritybridge.ts | 27 + 21 files changed, 844 insertions(+), 1530 deletions(-) create mode 100644 rust/crates/mailer-security/src/content_scanner.rs diff --git a/.gitea/workflows/npm-publish.yml b/.gitea/workflows/npm-publish.yml index d4abc2b..ae225d5 100644 --- a/.gitea/workflows/npm-publish.yml +++ b/.gitea/workflows/npm-publish.yml @@ -84,7 +84,7 @@ jobs: mailer --version || echo "Note: Binary execution may fail in CI environment" echo "" echo "Checking installed files:" - npm ls -g @serve.zone/mailer || true + npm ls -g @push.rocks/smartmta || true - name: Publish to npm env: @@ -93,10 +93,10 @@ jobs: echo "Publishing to npm registry..." npm publish --access public echo "" - echo "✅ Successfully published @serve.zone/mailer to npm!" + echo "✅ Successfully published @push.rocks/smartmta to npm!" echo "" echo "Package info:" - npm view @serve.zone/mailer + npm view @push.rocks/smartmta - name: Verify npm package run: | @@ -104,10 +104,10 @@ jobs: sleep 30 echo "" echo "Verifying published package..." - npm view @serve.zone/mailer + npm view @push.rocks/smartmta echo "" echo "Testing installation from npm:" - npm install -g @serve.zone/mailer + npm install -g @push.rocks/smartmta echo "" echo "Package installed successfully!" which mailer || echo "Binary location check skipped" @@ -118,12 +118,12 @@ jobs: echo " npm Publish Complete!" echo "================================================" echo "" - echo "✅ Package: @serve.zone/mailer" + echo "✅ Package: @push.rocks/smartmta" echo "✅ Version: ${{ steps.version.outputs.version }}" echo "" echo "Installation:" - echo " npm install -g @serve.zone/mailer" + echo " npm install -g @push.rocks/smartmta" echo "" echo "Registry:" - echo " https://www.npmjs.com/package/@serve.zone/mailer" + echo " https://www.npmjs.com/package/@push.rocks/smartmta" echo "" diff --git a/changelog.md b/changelog.md index 4cbb32c..62d6b1c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Changelog +## 2026-02-10 - 2.1.0 - feat(security) +migrate content scanning and bounce detection to Rust security bridge; add scanContent IPC command and Rust content scanner with tests; update TS RustSecurityBridge and callers, and adjust CI package references + +- Add Rust content scanner implementation (rust/crates/mailer-security/src/content_scanner.rs) with pattern-based detection and unit tests (~515 lines) +- Expose new IPC command 'scanContent' in mailer-bin and marshal results via JSON for the RustSecurityBridge +- Update TypeScript RustSecurityBridge with scanContent typing and method, and replace local JS detection logic (bounce/content) to call Rust bridge +- Update tests to start/stop the RustSecurityBridge and rely on Rust-based detection (test updates in test.bouncemanager.ts and test.contentscanner.ts) +- Update CI workflow messages and package references from @serve.zone/mailer to @push.rocks/smartmta +- Add regex dependency to rust mailer-security workspace (Cargo.toml / Cargo.lock updated) + ## 2026-02-10 - 2.0.1 - fix(docs/readme) update README: clarify APIs, document RustSecurityBridge, update examples and architecture diagram diff --git a/dist_ts/mail/core/classes.bouncemanager.d.ts b/dist_ts/mail/core/classes.bouncemanager.d.ts index 73cf3cb..33d671d 100644 --- a/dist_ts/mail/core/classes.bouncemanager.d.ts +++ b/dist_ts/mail/core/classes.bouncemanager.d.ts @@ -165,21 +165,6 @@ export declare class BounceManager { type: BounceType; category: BounceCategory; } | null; - /** - * Analyze SMTP response and diagnostic codes to determine bounce type - * @param smtpResponse SMTP response string - * @param diagnosticCode Diagnostic code from bounce - * @param statusCode Status code from bounce - * @returns Detected bounce type and category - */ - private detectBounceType; - /** - * Check if text matches any pattern for a bounce type - * @param text Text to check against patterns - * @param bounceType Bounce type to get patterns for - * @returns Whether the text matches any pattern - */ - private matchesPattern; /** * Get all known hard bounced addresses * @returns Array of hard bounced email addresses diff --git a/dist_ts/mail/core/classes.bouncemanager.js b/dist_ts/mail/core/classes.bouncemanager.js index a9dd7d9..fce89fd 100644 --- a/dist_ts/mail/core/classes.bouncemanager.js +++ b/dist_ts/mail/core/classes.bouncemanager.js @@ -2,6 +2,7 @@ import * as plugins from '../../plugins.js'; import * as paths from '../../paths.js'; import { logger } from '../../logger.js'; import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; +import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; import { LRUCache } from 'lru-cache'; /** * Bounce types for categorizing the reasons for bounces @@ -37,109 +38,6 @@ export var BounceCategory; BounceCategory["AUTO_RESPONSE"] = "auto_response"; BounceCategory["UNKNOWN"] = "unknown"; })(BounceCategory || (BounceCategory = {})); -/** - * Email bounce patterns to identify bounce types in SMTP responses and bounce messages - */ -const BOUNCE_PATTERNS = { - // Hard bounce patterns - [BounceType.INVALID_RECIPIENT]: [ - /no such user/i, - /user unknown/i, - /does not exist/i, - /invalid recipient/i, - /unknown recipient/i, - /no mailbox/i, - /user not found/i, - /recipient address rejected/i, - /550 5\.1\.1/i - ], - [BounceType.DOMAIN_NOT_FOUND]: [ - /domain not found/i, - /unknown domain/i, - /no such domain/i, - /host not found/i, - /domain invalid/i, - /550 5\.1\.2/i - ], - [BounceType.MAILBOX_FULL]: [ - /mailbox full/i, - /over quota/i, - /quota exceeded/i, - /552 5\.2\.2/i - ], - [BounceType.MAILBOX_INACTIVE]: [ - /mailbox disabled/i, - /mailbox inactive/i, - /account disabled/i, - /mailbox not active/i, - /account suspended/i - ], - [BounceType.BLOCKED]: [ - /blocked/i, - /rejected/i, - /denied/i, - /blacklisted/i, - /prohibited/i, - /refused/i, - /550 5\.7\./i - ], - [BounceType.SPAM_RELATED]: [ - /spam/i, - /bulk mail/i, - /content rejected/i, - /message rejected/i, - /550 5\.7\.1/i - ], - // Soft bounce patterns - [BounceType.SERVER_UNAVAILABLE]: [ - /server unavailable/i, - /service unavailable/i, - /try again later/i, - /try later/i, - /451 4\.3\./i, - /421 4\.3\./i - ], - [BounceType.TEMPORARY_FAILURE]: [ - /temporary failure/i, - /temporary error/i, - /temporary problem/i, - /try again/i, - /451 4\./i - ], - [BounceType.QUOTA_EXCEEDED]: [ - /quota temporarily exceeded/i, - /mailbox temporarily full/i, - /452 4\.2\.2/i - ], - [BounceType.NETWORK_ERROR]: [ - /network error/i, - /connection error/i, - /connection timed out/i, - /routing error/i, - /421 4\.4\./i - ], - [BounceType.TIMEOUT]: [ - /timed out/i, - /timeout/i, - /450 4\.4\.2/i - ], - // Auto-responses - [BounceType.AUTO_RESPONSE]: [ - /auto[- ]reply/i, - /auto[- ]response/i, - /vacation/i, - /out of office/i, - /away from office/i, - /on vacation/i, - /automatic reply/i - ], - [BounceType.CHALLENGE_RESPONSE]: [ - /challenge[- ]response/i, - /verify your email/i, - /confirm your email/i, - /email verification/i - ] -}; /** * Manager for handling email bounces */ @@ -206,11 +104,16 @@ export class BounceManager { retryCount: bounceData.retryCount || 0, nextRetryTime: bounceData.nextRetryTime }; - // Determine bounce type and category if not provided + // Determine bounce type and category via Rust bridge if not provided if (!bounceData.bounceType || bounceData.bounceType === BounceType.UNKNOWN) { - const bounceInfo = this.detectBounceType(bounce.smtpResponse || '', bounce.diagnosticCode || '', bounce.statusCode || ''); - bounce.bounceType = bounceInfo.type; - bounce.bounceCategory = bounceInfo.category; + const bridge = RustSecurityBridge.getInstance(); + const rustResult = await bridge.detectBounce({ + smtpResponse: bounce.smtpResponse, + diagnosticCode: bounce.diagnosticCode, + statusCode: bounce.statusCode, + }); + bounce.bounceType = rustResult.bounce_type; + bounce.bounceCategory = rustResult.category; } // Process the bounce based on category switch (bounce.bounceCategory) { @@ -626,121 +529,6 @@ export class BounceManager { getBounceInfo(email) { return this.bounceCache.get(email.toLowerCase()) || null; } - /** - * Analyze SMTP response and diagnostic codes to determine bounce type - * @param smtpResponse SMTP response string - * @param diagnosticCode Diagnostic code from bounce - * @param statusCode Status code from bounce - * @returns Detected bounce type and category - */ - detectBounceType(smtpResponse, diagnosticCode, statusCode) { - // Combine all text for comprehensive pattern matching - const fullText = `${smtpResponse} ${diagnosticCode} ${statusCode}`.toLowerCase(); - // Check for auto-responses first - if (this.matchesPattern(fullText, BounceType.AUTO_RESPONSE) || - this.matchesPattern(fullText, BounceType.CHALLENGE_RESPONSE)) { - return { - type: BounceType.AUTO_RESPONSE, - category: BounceCategory.AUTO_RESPONSE - }; - } - // Check for hard bounces - for (const bounceType of [ - BounceType.INVALID_RECIPIENT, - BounceType.DOMAIN_NOT_FOUND, - BounceType.MAILBOX_FULL, - BounceType.MAILBOX_INACTIVE, - BounceType.BLOCKED, - BounceType.SPAM_RELATED, - BounceType.POLICY_RELATED - ]) { - if (this.matchesPattern(fullText, bounceType)) { - return { - type: bounceType, - category: BounceCategory.HARD - }; - } - } - // Check for soft bounces - for (const bounceType of [ - BounceType.SERVER_UNAVAILABLE, - BounceType.TEMPORARY_FAILURE, - BounceType.QUOTA_EXCEEDED, - BounceType.NETWORK_ERROR, - BounceType.TIMEOUT - ]) { - if (this.matchesPattern(fullText, bounceType)) { - return { - type: bounceType, - category: BounceCategory.SOFT - }; - } - } - // Handle DSN (Delivery Status Notification) status codes - if (statusCode) { - // Format: class.subject.detail - const parts = statusCode.split('.'); - if (parts.length >= 2) { - const statusClass = parts[0]; - const statusSubject = parts[1]; - // 5.X.X is permanent failure (hard bounce) - if (statusClass === '5') { - // Try to determine specific type based on subject - if (statusSubject === '1') { - return { type: BounceType.INVALID_RECIPIENT, category: BounceCategory.HARD }; - } - else if (statusSubject === '2') { - return { type: BounceType.MAILBOX_FULL, category: BounceCategory.HARD }; - } - else if (statusSubject === '7') { - return { type: BounceType.BLOCKED, category: BounceCategory.HARD }; - } - else { - return { type: BounceType.UNKNOWN, category: BounceCategory.HARD }; - } - } - // 4.X.X is temporary failure (soft bounce) - if (statusClass === '4') { - // Try to determine specific type based on subject - if (statusSubject === '2') { - return { type: BounceType.QUOTA_EXCEEDED, category: BounceCategory.SOFT }; - } - else if (statusSubject === '3') { - return { type: BounceType.SERVER_UNAVAILABLE, category: BounceCategory.SOFT }; - } - else if (statusSubject === '4') { - return { type: BounceType.NETWORK_ERROR, category: BounceCategory.SOFT }; - } - else { - return { type: BounceType.TEMPORARY_FAILURE, category: BounceCategory.SOFT }; - } - } - } - } - // Default to unknown - return { - type: BounceType.UNKNOWN, - category: BounceCategory.UNKNOWN - }; - } - /** - * Check if text matches any pattern for a bounce type - * @param text Text to check against patterns - * @param bounceType Bounce type to get patterns for - * @returns Whether the text matches any pattern - */ - matchesPattern(text, bounceType) { - const patterns = BOUNCE_PATTERNS[bounceType]; - if (!patterns) { - return false; - } - for (const pattern of patterns) { - if (pattern.test(text)) { - return true; - } - } - return false; - } /** * Get all known hard bounced addresses * @returns Array of hard bounced email addresses @@ -778,4 +566,4 @@ export class BounceManager { return removed; } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.bouncemanager.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.bouncemanager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC;;GAEG;AACH,MAAM,CAAN,IAAY,UAqBX;AArBD,WAAY,UAAU;IACpB,oCAAoC;IACpC,qDAAuC,CAAA;IACvC,mDAAqC,CAAA;IACrC,2CAA6B,CAAA;IAC7B,mDAAqC,CAAA;IACrC,iCAAmB,CAAA;IACnB,2CAA6B,CAAA;IAC7B,+CAAiC,CAAA;IAEjC,oCAAoC;IACpC,uDAAyC,CAAA;IACzC,qDAAuC,CAAA;IACvC,+CAAiC,CAAA;IACjC,6CAA+B,CAAA;IAC/B,iCAAmB,CAAA;IAEnB,gBAAgB;IAChB,6CAA+B,CAAA;IAC/B,uDAAyC,CAAA;IACzC,iCAAmB,CAAA;AACrB,CAAC,EArBW,UAAU,KAAV,UAAU,QAqBrB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,+BAAa,CAAA;IACb,iDAA+B,CAAA;IAC/B,qCAAmB,CAAA;AACrB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAwBD;;GAEG;AACH,MAAM,eAAe,GAAG;IACtB,uBAAuB;IACvB,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QAC9B,eAAe;QACf,eAAe;QACf,iBAAiB;QACjB,oBAAoB;QACpB,oBAAoB;QACpB,aAAa;QACb,iBAAiB;QACjB,6BAA6B;QAC7B,cAAc;KACf;IACD,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QAC7B,mBAAmB;QACnB,iBAAiB;QACjB,iBAAiB;QACjB,iBAAiB;QACjB,iBAAiB;QACjB,cAAc;KACf;IACD,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACzB,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,cAAc;KACf;IACD,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QAC7B,mBAAmB;QACnB,mBAAmB;QACnB,mBAAmB;QACnB,qBAAqB;QACrB,oBAAoB;KACrB;IACD,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACpB,UAAU;QACV,WAAW;QACX,SAAS;QACT,cAAc;QACd,aAAa;QACb,UAAU;QACV,aAAa;KACd;IACD,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QACzB,OAAO;QACP,YAAY;QACZ,mBAAmB;QACnB,mBAAmB;QACnB,cAAc;KACf;IAED,uBAAuB;IACvB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QAC/B,qBAAqB;QACrB,sBAAsB;QACtB,kBAAkB;QAClB,YAAY;QACZ,aAAa;QACb,aAAa;KACd;IACD,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QAC9B,oBAAoB;QACpB,kBAAkB;QAClB,oBAAoB;QACpB,YAAY;QACZ,UAAU;KACX;IACD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QAC3B,6BAA6B;QAC7B,2BAA2B;QAC3B,cAAc;KACf;IACD,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAC1B,gBAAgB;QAChB,mBAAmB;QACnB,uBAAuB;QACvB,gBAAgB;QAChB,aAAa;KACd;IACD,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACpB,YAAY;QACZ,UAAU;QACV,cAAc;KACf;IAED,iBAAiB;IACjB,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAC1B,gBAAgB;QAChB,mBAAmB;QACnB,WAAW;QACX,gBAAgB;QAChB,mBAAmB;QACnB,cAAc;QACd,kBAAkB;KACnB;IACD,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QAC/B,wBAAwB;QACxB,oBAAoB;QACpB,qBAAqB;QACrB,qBAAqB;KACtB;CACF,CAAC;AAYF;;GAEG;AACH,MAAM,OAAO,aAAa;IACxB,0CAA0C;IAClC,aAAa,GAAkB;QACrC,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;QAC3C,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,WAAW;QAC1C,aAAa,EAAE,CAAC;KACjB,CAAC;IAEF,0BAA0B;IAClB,WAAW,GAAmB,EAAE,CAAC;IAEzC,oFAAoF;IAC5E,WAAW,CAKhB;IAEH,gEAAgE;IACxD,eAAe,GAIlB,IAAI,GAAG,EAAE,CAAC;IAEP,cAAc,CAAO,CAAC,0BAA0B;IAExD,YAAY,OAKX;QACC,mCAAmC;QACnC,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,GAAG;gBACnB,GAAG,IAAI,CAAC,aAAa;gBACrB,GAAG,OAAO,CAAC,aAAa;aACzB,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,IAAI,CAAC,WAAW,GAAG,IAAI,QAAQ,CAAc;YAC3C,GAAG,EAAE,OAAO,EAAE,YAAY,IAAI,KAAK;YACnC,GAAG,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,kBAAkB;SACvE,CAAC,CAAC;QAEH,kCAAkC;QAClC,IAAI,CAAC,cAAc,GAAG,OAAO,EAAE,cAAc,CAAC;QAE9C,qCAAqC;QACrC,wDAAwD;QACxD,qDAAqD;QACrD,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,+CAA+C,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,aAAa,CAAC,UAAiC;QAC1D,IAAI,CAAC;YACH,iCAAiC;YACjC,MAAM,MAAM,GAAiB;gBAC3B,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;gBACtC,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/D,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,UAAU,EAAE,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO;gBACvD,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,cAAc,CAAC,OAAO;gBACnE,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;gBAC7C,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,SAAS,EAAE,KAAK;gBAChB,eAAe,EAAE,UAAU,CAAC,eAAe;gBAC3C,UAAU,EAAE,UAAU,CAAC,UAAU,IAAI,CAAC;gBACtC,aAAa,EAAE,UAAU,CAAC,aAAa;aACxC,CAAC;YAEF,qDAAqD;YACrD,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACtC,MAAM,CAAC,YAAY,IAAI,EAAE,EACzB,MAAM,CAAC,cAAc,IAAI,EAAE,EAC3B,MAAM,CAAC,UAAU,IAAI,EAAE,CACxB,CAAC;gBAEF,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;gBACpC,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC9C,CAAC;YAED,uCAAuC;YACvC,QAAQ,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC9B,KAAK,cAAc,CAAC,IAAI;oBACtB,+CAA+C;oBAC/C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBACpC,MAAM;gBAER,KAAK,cAAc,CAAC,IAAI;oBACtB,kDAAkD;oBAClD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBACpC,MAAM;gBAER,KAAK,cAAc,CAAC,aAAa;oBAC/B,oDAAoD;oBACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;oBACrE,MAAM;gBAER;oBACE,8CAA8C;oBAC9C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,MAAM,CAAC,SAAS,EAAE,EAAE;wBAChE,UAAU,EAAE,MAAM,CAAC,UAAU;wBAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CAAC;oBACH,MAAM;YACV,CAAC;YAED,0BAA0B;YAC1B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE9B,0BAA0B;YAC1B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAE/B,iBAAiB;YACjB,MAAM,CAAC,GAAG,CACR,MAAM,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAC/D,2BAA2B,MAAM,CAAC,cAAc,eAAe,MAAM,CAAC,SAAS,EAAE,EACjF;gBACE,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,cAAc;aAChC,CACF,CAAC;YAEF,4BAA4B;YAC5B,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;oBAClD,CAAC,CAAC,gBAAgB,CAAC,IAAI;oBACvB,CAAC,CAAC,gBAAgB,CAAC,IAAI;gBACzB,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,0BAA0B,MAAM,CAAC,cAAc,uBAAuB;gBAC/E,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,OAAO,EAAE;oBACP,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,UAAU,EAAE,MAAM,CAAC,UAAU;iBAC9B;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,EAAE;gBAC/D,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,UAAU;aACX,CAAC,CAAC;YACH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,SAAiB,EACjB,YAAoB,EACpB,UAKI,EAAE;QAEN,uCAAuC;QACvC,MAAM,UAAU,GAA0B;YACxC,SAAS;YACT,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;YAC5B,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/B,YAAY;YACZ,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QAEF,8BAA8B;QAC9B,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAAC,WAAkB;QAChD,IAAI,CAAC;YACH,yCAAyC;YACzC,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;YAEnC,wDAAwD;YACxD,MAAM,eAAe,GAAG,kHAAkH,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEzJ,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,6CAA6C;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,sDAAsD;YACtD,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAE3B,+CAA+C;YAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,oHAAoH,CAAC,CAAC;YACxJ,IAAI,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxC,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC;YAED,0BAA0B;YAC1B,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAChF,IAAI,eAAe,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7C,CAAC;YAED,2BAA2B;YAC3B,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACrE,IAAI,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClC,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACrC,CAAC;YAED,6FAA6F;YAC7F,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,wEAAwE;gBACxE,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;gBACrH,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,sEAAsE,CAAC,CAAC;gBAE/G,IAAI,sBAAsB,IAAI,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxD,SAAS,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;gBACxC,CAAC;qBAAM,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzD,SAAS,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;YAED,iDAAiD;YACjD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sDAAsD,EAAE;oBACzE,OAAO;oBACP,MAAM,EAAE,WAAW,CAAC,IAAI;iBACzB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YACd,CAAC;YAED,2CAA2C;YAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClF,IAAI,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxC,iBAAiB,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/C,CAAC;YAED,qBAAqB;YACrB,MAAM,UAAU,GAA0B;gBACxC,SAAS;gBACT,MAAM,EAAE,WAAW,CAAC,IAAI;gBACxB,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/B,OAAO,EAAE,WAAW,CAAC,UAAU,EAAE;gBACjC,cAAc;gBACd,UAAU;gBACV,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,OAAO,EAAE,EAAE;aACZ,CAAC;YAEF,8BAA8B;YAC9B,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACjD,kDAAkD;QAClD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,gBAAgB,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,CAAC;QAE5F,kCAAkC;QAClC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAE/B,4BAA4B;QAC5B,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEpC,iCAAiC;QACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE;YAC9E,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACjD,sCAAsC;QACtC,IAAI,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,MAAM,CAAC,SAAS,2BAA2B,CAAC,CAAC;YAE5F,2CAA2C;YAC3C,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC;YAC5C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACpC,OAAO;QACT,CAAC;QAED,qDAAqD;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CACpB,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,EAC/F,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC5B,CAAC;QAEF,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAE1C,oDAAoD;QACpD,IAAI,CAAC,oBAAoB,CACvB,MAAM,CAAC,SAAS,EAChB,gBAAgB,MAAM,CAAC,UAAU,EAAE,EACnC,MAAM,CAAC,aAAa,CACrB,CAAC;QAEF,yBAAyB;QACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,MAAM,CAAC,UAAU,QAAQ,MAAM,CAAC,SAAS,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE;YACpI,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,SAAS,EAAE,MAAM,CAAC,aAAa;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACI,oBAAoB,CACzB,KAAa,EACb,MAAc,EACd,SAAkB;QAElB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE;YAC5C,MAAM;YACN,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,SAAS;SACV,CAAC,CAAC;QAEH,uCAAuC;QACvC,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gDAAgD,KAAK,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACjG,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,KAAK,sBAAsB,EAAE;YACvD,MAAM;YACN,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW;SACvE,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,KAAa;QAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QAEpE,IAAI,UAAU,EAAE,CAAC;YACf,uCAAuC;YACvC,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kDAAkD,KAAK,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACnG,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,wBAAwB,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,KAAa;QACpC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE7D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,mCAAmC;QACnC,IAAI,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;YAChE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC5C,uCAAuC;YACvC,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yDAAyD,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,KAAa;QAKrC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE7D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,mCAAmC;QACnC,IAAI,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;YAChE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC5C,uCAAuC;YACvC,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yDAAyD,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAEnF,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,sBAAsB;gBACtB,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,sCAAsC,EAAE,eAAe,CAAC,CAAC;YACzF,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CACpE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC;YACH,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,IAAI,cAAc,GAAG,KAAK,CAAC;YAE3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,yCAAyC;gBACzC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;gBAE9F,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBACN,iDAAiD;oBACjD,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CAAC;oBAE5F,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;wBAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;wBAC9D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC3B,cAAc,GAAG,IAAI,CAAC;wBAEtB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8DAA8D,CAAC,CAAC;oBACrF,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,8CAA8C;gBAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CAAC;gBAE5F,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;oBAC9D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;gBAExC,wBAAwB;gBACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,IAAI,YAAY,GAAG,CAAC,CAAC;gBAErB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;oBAC3D,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;wBAC3C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACnC,YAAY,EAAE,CAAC;oBACjB,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,GAAG,CAAC,IAAI,cAAc,EAAE,CAAC;oBACvC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,YAAY,wCAAwC,CAAC,CAAC;oBACpF,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACnC,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,IAAI,CAAC,eAAe,CAAC,IAAI,gCAAgC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACjD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAEnD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,sBAAsB;gBACtB,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,0BAA0B,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACxF,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAClC,KAAK,CAAC,OAAO,EACb,QAAQ,EACR,SAAS,EACT,GAAG,MAAM,CAAC,EAAE,OAAO,CACpB,CAAC;gBAEF,0BAA0B;gBAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACxE,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC;gBAEhE,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iCAAiC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,iBAAiB,CAAC,MAAoB;QAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,QAAQ,EAAE,CAAC;YACb,8BAA8B;YAC9B,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC;YACvC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;YAClC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,yBAAyB;YACzB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE;gBAC1B,UAAU,EAAE,MAAM,CAAC,SAAS;gBAC5B,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,MAAM,CAAC,UAAU;gBACvB,QAAQ,EAAE,MAAM,CAAC,cAAc;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAa;QAMhC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACK,gBAAgB,CACtB,YAAoB,EACpB,cAAsB,EACtB,UAAkB;QAKlB,sDAAsD;QACtD,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,cAAc,IAAI,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjF,iCAAiC;QACjC,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC;YACvD,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACjE,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,aAAa;gBAC9B,QAAQ,EAAE,cAAc,CAAC,aAAa;aACvC,CAAC;QACJ,CAAC;QAED,yBAAyB;QACzB,KAAK,MAAM,UAAU,IAAI;YACvB,UAAU,CAAC,iBAAiB;YAC5B,UAAU,CAAC,gBAAgB;YAC3B,UAAU,CAAC,YAAY;YACvB,UAAU,CAAC,gBAAgB;YAC3B,UAAU,CAAC,OAAO;YAClB,UAAU,CAAC,YAAY;YACvB,UAAU,CAAC,cAAc;SAC1B,EAAE,CAAC;YACF,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC9C,OAAO;oBACL,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,cAAc,CAAC,IAAI;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,yBAAyB;QACzB,KAAK,MAAM,UAAU,IAAI;YACvB,UAAU,CAAC,kBAAkB;YAC7B,UAAU,CAAC,iBAAiB;YAC5B,UAAU,CAAC,cAAc;YACzB,UAAU,CAAC,aAAa;YACxB,UAAU,CAAC,OAAO;SACnB,EAAE,CAAC;YACF,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC9C,OAAO;oBACL,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,cAAc,CAAC,IAAI;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,yDAAyD;QACzD,IAAI,UAAU,EAAE,CAAC;YACf,+BAA+B;YAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAE/B,2CAA2C;gBAC3C,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;oBACxB,kDAAkD;oBAClD,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBAC1B,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAC/E,CAAC;yBAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBACjC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAC1E,CAAC;yBAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBACjC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBACrE,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBACrE,CAAC;gBACH,CAAC;gBAED,2CAA2C;gBAC3C,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;oBACxB,kDAAkD;oBAClD,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBAC1B,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,cAAc,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAC5E,CAAC;yBAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBACjC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,kBAAkB,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAChF,CAAC;yBAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;wBACjC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,aAAa,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAC3E,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC;oBAC/E,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,qBAAqB;QACrB,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,OAAO;YACxB,QAAQ,EAAE,cAAc,CAAC,OAAO;SACjC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,cAAc,CAAC,IAAY,EAAE,UAAsB;QACzD,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;QAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC;QACf,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,IAAI,CAAC,QAAQ,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC1C,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,kBAAkB;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,SAAiB;QAC5C,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAClD,IAAI,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;gBACjC,OAAO,EAAE,CAAC;gBACV,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.bouncemanager.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.bouncemanager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/classes.contentscanner.d.ts b/dist_ts/security/classes.contentscanner.d.ts index ed09821..41c55d7 100644 --- a/dist_ts/security/classes.contentscanner.d.ts +++ b/dist_ts/security/classes.contentscanner.d.ts @@ -54,9 +54,6 @@ export declare class ContentScanner { private static instance; private scanCache; private options; - private static readonly MALICIOUS_PATTERNS; - private static readonly EXECUTABLE_EXTENSIONS; - private static readonly MACRO_DOCUMENT_EXTENSIONS; /** * Default options for the content scanner */ @@ -73,7 +70,9 @@ export declare class ContentScanner { */ static getInstance(options?: IContentScannerOptions): ContentScanner; /** - * Scan an email for malicious content + * Scan an email for malicious content. + * Delegates text/subject/html/filename pattern scanning to Rust. + * Binary attachment scanning (PE headers, VBA macros) stays in TS. * @param email The email to scan * @returns Scan result */ @@ -85,41 +84,19 @@ export declare class ContentScanner { */ private generateCacheKey; /** - * Scan email subject for threats - * @param subject The subject to scan - * @param result The scan result to update - */ - private scanSubject; - /** - * Scan plain text content for threats - * @param text The text content to scan - * @param result The scan result to update - */ - private scanTextContent; - /** - * Scan HTML content for threats - * @param html The HTML content to scan - * @param result The scan result to update - */ - private scanHtmlContent; - /** - * Scan an attachment for threats + * Scan attachment binary content for PE headers and VBA macros. + * This stays in TS because it accesses raw Buffer data (too large for IPC). * @param attachment The attachment to scan * @param result The scan result to update */ - private scanAttachment; + private scanAttachmentBinary; /** - * Extract links from HTML content - * @param html HTML content - * @returns Array of extracted links + * Apply custom rules (runtime-configured patterns) to the email. + * These stay in TS because they are configured at runtime. + * @param email The email to check + * @param result The scan result to update */ - private extractLinksFromHtml; - /** - * Extract plain text from HTML - * @param html HTML content - * @returns Extracted text - */ - private extractTextFromHtml; + private applyCustomRules; /** * Extract text from a binary buffer for scanning * @param buffer Binary content @@ -128,17 +105,10 @@ export declare class ContentScanner { private extractTextFromBuffer; /** * Check if an Office document likely contains macros - * This is a simplified check - real implementation would use specialized libraries * @param attachment The attachment to check * @returns Whether the file likely contains macros */ private likelyContainsMacros; - /** - * Map a pattern category to a threat type - * @param category The pattern category - * @returns The corresponding threat type - */ - private mapCategoryToThreatType; /** * Log a high threat finding to the security logger * @param email The email containing the threat diff --git a/dist_ts/security/classes.contentscanner.js b/dist_ts/security/classes.contentscanner.js index 382472a..481b1dd 100644 --- a/dist_ts/security/classes.contentscanner.js +++ b/dist_ts/security/classes.contentscanner.js @@ -3,6 +3,7 @@ import * as paths from '../paths.js'; import { logger } from '../logger.js'; import { Email } from '../mail/core/classes.email.js'; import { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js'; +import { RustSecurityBridge } from './classes.rustsecuritybridge.js'; import { LRUCache } from 'lru-cache'; /** * Threat categories @@ -27,67 +28,6 @@ export class ContentScanner { static instance; scanCache; options; - // Predefined patterns for common threats - static MALICIOUS_PATTERNS = { - // Phishing patterns - phishing: [ - /(?:verify|confirm|update|login).*(?:account|password|details)/i, - /urgent.*(?:action|attention|required)/i, - /(?:paypal|apple|microsoft|amazon|google|bank).*(?:verify|confirm|suspend)/i, - /your.*(?:account).*(?:suspended|compromised|locked)/i, - /\b(?:password reset|security alert|security notice)\b/i - ], - // Spam indicators - spam: [ - /\b(?:viagra|cialis|enlargement|diet pill|lose weight fast|cheap meds)\b/i, - /\b(?:million dollars|lottery winner|prize claim|inheritance|rich widow)\b/i, - /\b(?:earn from home|make money fast|earn \$\d{3,}\/day)\b/i, - /\b(?:limited time offer|act now|exclusive deal|only \d+ left)\b/i, - /\b(?:forex|stock tip|investment opportunity|cryptocurrency|bitcoin)\b/i - ], - // Malware indicators in text - malware: [ - /(?:attached file|see attachment).*(?:invoice|receipt|statement|document)/i, - /open.*(?:the attached|this attachment)/i, - /(?:enable|allow).*(?:macros|content|editing)/i, - /download.*(?:attachment|file|document)/i, - /\b(?:ransomware protection|virus alert|malware detected)\b/i - ], - // Suspicious links - suspiciousLinks: [ - /https?:\/\/bit\.ly\//i, - /https?:\/\/goo\.gl\//i, - /https?:\/\/t\.co\//i, - /https?:\/\/tinyurl\.com\//i, - /https?:\/\/(?:\d{1,3}\.){3}\d{1,3}/i, // IP address URLs - /https?:\/\/.*\.(?:xyz|top|club|gq|cf)\//i, // Suspicious TLDs - /(?:login|account|signin|auth).*\.(?!gov|edu|com|org|net)\w+\.\w+/i, // Login pages on unusual domains - ], - // XSS and script injection - scriptInjection: [ - /.*<\/script>/is, - /javascript:/i, - /on(?:click|load|mouse|error|focus|blur)=".*"/i, - /document\.(?:cookie|write|location)/i, - /eval\s*\(/i - ], - // Sensitive data patterns - sensitiveData: [ - /\b(?:\d{3}-\d{2}-\d{4}|\d{9})\b/, // SSN - /\b\d{13,16}\b/, // Credit card numbers - /\b(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})\b/ // Possible Base64 - ] - }; - // Common executable extensions - static EXECUTABLE_EXTENSIONS = [ - '.exe', '.dll', '.bat', '.cmd', '.msi', '.ts', '.vbs', '.ps1', - '.sh', '.jar', '.py', '.com', '.scr', '.pif', '.hta', '.cpl', - '.reg', '.vba', '.lnk', '.wsf', '.msi', '.msp', '.mst' - ]; - // Document formats that may contain macros - static MACRO_DOCUMENT_EXTENSIONS = [ - '.doc', '.docm', '.xls', '.xlsm', '.ppt', '.pptm', '.dotm', '.xlsb', '.ppam', '.potm' - ]; /** * Default options for the content scanner */ @@ -134,7 +74,9 @@ export class ContentScanner { return ContentScanner.instance; } /** - * Scan an email for malicious content + * Scan an email for malicious content. + * Delegates text/subject/html/filename pattern scanning to Rust. + * Binary attachment scanning (PE headers, VBA macros) stays in TS. * @param email The email to scan * @returns Scan result */ @@ -148,36 +90,32 @@ export class ContentScanner { logger.log('info', `Using cached scan result for email ${email.getMessageId()}`); return cachedResult; } - // Initialize scan result + // Delegate text/subject/html/filename scanning to Rust + const bridge = RustSecurityBridge.getInstance(); + const rustResult = await bridge.scanContent({ + subject: this.options.scanSubject ? email.subject : undefined, + textBody: this.options.scanBody ? email.text : undefined, + htmlBody: this.options.scanBody ? email.html : undefined, + attachmentNames: this.options.scanAttachmentNames + ? email.attachments?.map(a => a.filename) ?? [] + : [], + }); const result = { isClean: true, - threatScore: 0, - scannedElements: [], - timestamp: Date.now() + threatScore: rustResult.threatScore, + threatType: rustResult.threatType ?? undefined, + threatDetails: rustResult.threatDetails ?? undefined, + scannedElements: rustResult.scannedElements, + timestamp: Date.now(), }; - // List of scan promises - const scanPromises = []; - // Scan subject - if (this.options.scanSubject && email.subject) { - scanPromises.push(this.scanSubject(email.subject, result)); - } - // Scan body content - if (this.options.scanBody) { - if (email.text) { - scanPromises.push(this.scanTextContent(email.text, result)); - } - if (email.html) { - scanPromises.push(this.scanHtmlContent(email.html, result)); - } - } - // Scan attachments - if (this.options.scanAttachments && email.attachments && email.attachments.length > 0) { + // Attachment binary scanning stays in TS (PE headers, macro detection) + if (this.options.scanAttachments && email.attachments?.length > 0) { for (const attachment of email.attachments) { - scanPromises.push(this.scanAttachment(attachment, result)); + this.scanAttachmentBinary(attachment, result); } } - // Run all scans in parallel - await Promise.all(scanPromises); + // Apply custom rules (TS-only, runtime-configured) + this.applyCustomRules(email, result); // Determine if the email is clean based on threat score result.isClean = result.threatScore < this.options.minThreatScore; // Save to cache @@ -198,7 +136,7 @@ export class ContentScanner { }); // Return a safe default with error indication return { - isClean: true, // Let it pass if scanner fails (configure as desired) + isClean: true, threatScore: 0, scannedElements: ['error'], timestamp: Date.now(), @@ -228,282 +166,64 @@ export class ContentScanner { return `email:${plugins.crypto.createHash('sha256').update(contentToHash).digest('hex')}`; } /** - * Scan email subject for threats - * @param subject The subject to scan - * @param result The scan result to update - */ - async scanSubject(subject, result) { - result.scannedElements.push('subject'); - // Check against phishing patterns - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.phishing) { - if (pattern.test(subject)) { - result.threatScore += 25; - result.threatType = ThreatCategory.PHISHING; - result.threatDetails = `Subject contains potential phishing indicators: ${subject}`; - return; - } - } - // Check against spam patterns - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.spam) { - if (pattern.test(subject)) { - result.threatScore += 15; - result.threatType = ThreatCategory.SPAM; - result.threatDetails = `Subject contains potential spam indicators: ${subject}`; - return; - } - } - // Check custom rules - for (const rule of this.options.customRules) { - const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); - if (pattern.test(subject)) { - result.threatScore += rule.score; - result.threatType = rule.type; - result.threatDetails = rule.description; - return; - } - } - } - /** - * Scan plain text content for threats - * @param text The text content to scan - * @param result The scan result to update - */ - async scanTextContent(text, result) { - result.scannedElements.push('text'); - // Check suspicious links - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.suspiciousLinks) { - if (pattern.test(text)) { - result.threatScore += 20; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SUSPICIOUS_LINK ? 0 : 20)) { - result.threatType = ThreatCategory.SUSPICIOUS_LINK; - result.threatDetails = `Text contains suspicious links`; - } - } - } - // Check phishing - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.phishing) { - if (pattern.test(text)) { - result.threatScore += 25; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.PHISHING ? 0 : 25)) { - result.threatType = ThreatCategory.PHISHING; - result.threatDetails = `Text contains potential phishing indicators`; - } - } - } - // Check spam - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.spam) { - if (pattern.test(text)) { - result.threatScore += 15; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SPAM ? 0 : 15)) { - result.threatType = ThreatCategory.SPAM; - result.threatDetails = `Text contains potential spam indicators`; - } - } - } - // Check malware indicators - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.malware) { - if (pattern.test(text)) { - result.threatScore += 30; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.MALWARE ? 0 : 30)) { - result.threatType = ThreatCategory.MALWARE; - result.threatDetails = `Text contains potential malware indicators`; - } - } - } - // Check sensitive data - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.sensitiveData) { - if (pattern.test(text)) { - result.threatScore += 25; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SENSITIVE_DATA ? 0 : 25)) { - result.threatType = ThreatCategory.SENSITIVE_DATA; - result.threatDetails = `Text contains potentially sensitive data patterns`; - } - } - } - // Check custom rules - for (const rule of this.options.customRules) { - const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); - if (pattern.test(text)) { - result.threatScore += rule.score; - if (!result.threatType || result.threatScore > 20) { - result.threatType = rule.type; - result.threatDetails = rule.description; - } - } - } - } - /** - * Scan HTML content for threats - * @param html The HTML content to scan - * @param result The scan result to update - */ - async scanHtmlContent(html, result) { - result.scannedElements.push('html'); - // Check for script injection - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.scriptInjection) { - if (pattern.test(html)) { - result.threatScore += 40; - if (!result.threatType || result.threatType !== ThreatCategory.XSS) { - result.threatType = ThreatCategory.XSS; - result.threatDetails = `HTML contains potentially malicious script content`; - } - } - } - // Extract text content from HTML for further scanning - const textContent = this.extractTextFromHtml(html); - if (textContent) { - // We'll leverage the text scanning but not double-count threat score - const tempResult = { - isClean: true, - threatScore: 0, - scannedElements: [], - timestamp: Date.now() - }; - await this.scanTextContent(textContent, tempResult); - // Only add additional threat types if they're more severe - if (tempResult.threatType && tempResult.threatScore > 0) { - // Add half of the text content score to avoid double counting - result.threatScore += Math.floor(tempResult.threatScore / 2); - // Adopt the threat type if more severe or no existing type - if (!result.threatType || tempResult.threatScore > result.threatScore) { - result.threatType = tempResult.threatType; - result.threatDetails = tempResult.threatDetails; - } - } - } - // Extract and check links from HTML - const links = this.extractLinksFromHtml(html); - if (links.length > 0) { - // Check for suspicious links - let suspiciousLinks = 0; - for (const link of links) { - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.suspiciousLinks) { - if (pattern.test(link)) { - suspiciousLinks++; - break; - } - } - } - if (suspiciousLinks > 0) { - // Add score based on percentage of suspicious links - const suspiciousPercentage = (suspiciousLinks / links.length) * 100; - const additionalScore = Math.min(40, Math.floor(suspiciousPercentage / 2.5)); - result.threatScore += additionalScore; - if (!result.threatType || additionalScore > 20) { - result.threatType = ThreatCategory.SUSPICIOUS_LINK; - result.threatDetails = `HTML contains ${suspiciousLinks} suspicious links out of ${links.length} total links`; - } - } - } - } - /** - * Scan an attachment for threats + * Scan attachment binary content for PE headers and VBA macros. + * This stays in TS because it accesses raw Buffer data (too large for IPC). * @param attachment The attachment to scan * @param result The scan result to update */ - async scanAttachment(attachment, result) { - const filename = attachment.filename.toLowerCase(); - result.scannedElements.push(`attachment:${filename}`); - // Skip large attachments if configured - if (attachment.content && attachment.content.length > this.options.maxAttachmentSizeToScan) { - logger.log('info', `Skipping scan of large attachment: ${filename} (${attachment.content.length} bytes)`); + scanAttachmentBinary(attachment, result) { + if (!attachment.content) { return; } - // Check filename for executable extensions - if (this.options.blockExecutables) { - for (const ext of ContentScanner.EXECUTABLE_EXTENSIONS) { - if (filename.endsWith(ext)) { - result.threatScore += 70; // High score for executable attachments - result.threatType = ThreatCategory.EXECUTABLE; - result.threatDetails = `Attachment has a potentially dangerous extension: ${filename}`; - return; // No need to scan contents if filename already flagged - } - } + // Skip large attachments + if (attachment.content.length > this.options.maxAttachmentSizeToScan) { + return; } - // Check for Office documents with macros - if (this.options.blockMacros) { - for (const ext of ContentScanner.MACRO_DOCUMENT_EXTENSIONS) { - if (filename.endsWith(ext)) { - // For Office documents, check if they contain macros - // This is a simplified check - a real implementation would use specialized libraries - // to detect macros in Office documents - if (attachment.content && this.likelyContainsMacros(attachment)) { - result.threatScore += 60; - result.threatType = ThreatCategory.MALICIOUS_MACRO; - result.threatDetails = `Attachment appears to contain macros: ${filename}`; - return; - } - } - } + const filename = attachment.filename.toLowerCase(); + // Check for PE headers (Windows executables disguised with non-.exe extensions) + if (attachment.content.length > 64 && + attachment.content[0] === 0x4D && + attachment.content[1] === 0x5A) { // 'MZ' header + result.threatScore += 80; + result.threatType = ThreatCategory.EXECUTABLE; + result.threatDetails = `Attachment contains executable code: ${filename}`; + return; } - // Perform basic content analysis if we have content buffer - if (attachment.content) { - // Convert to string for scanning, with a limit to prevent memory issues - const textContent = this.extractTextFromBuffer(attachment.content); - if (textContent) { - // Scan for malicious patterns in attachment content - for (const category in ContentScanner.MALICIOUS_PATTERNS) { - const patterns = ContentScanner.MALICIOUS_PATTERNS[category]; - for (const pattern of patterns) { - if (pattern.test(textContent)) { - result.threatScore += 30; - if (!result.threatType) { - result.threatType = this.mapCategoryToThreatType(category); - result.threatDetails = `Attachment content contains suspicious patterns: ${filename}`; - } - break; - } - } - } - } - // Check for PE headers (Windows executables) - if (attachment.content.length > 64 && - attachment.content[0] === 0x4D && - attachment.content[1] === 0x5A) { // 'MZ' header - result.threatScore += 80; - result.threatType = ThreatCategory.EXECUTABLE; - result.threatDetails = `Attachment contains executable code: ${filename}`; - } + // Check for VBA macro indicators in Office documents + if (this.options.blockMacros && this.likelyContainsMacros(attachment)) { + result.threatScore += 60; + result.threatType = ThreatCategory.MALICIOUS_MACRO; + result.threatDetails = `Attachment appears to contain macros: ${filename}`; } } /** - * Extract links from HTML content - * @param html HTML content - * @returns Array of extracted links + * Apply custom rules (runtime-configured patterns) to the email. + * These stay in TS because they are configured at runtime. + * @param email The email to check + * @param result The scan result to update */ - extractLinksFromHtml(html) { - const links = []; - // Simple regex-based extraction - a real implementation might use a proper HTML parser - const matches = html.match(/href=["'](https?:\/\/[^"']+)["']/gi); - if (matches) { - for (const match of matches) { - const linkMatch = match.match(/href=["'](https?:\/\/[^"']+)["']/i); - if (linkMatch && linkMatch[1]) { - links.push(linkMatch[1]); + applyCustomRules(email, result) { + if (!this.options.customRules.length) { + return; + } + const textsToCheck = []; + if (email.subject) + textsToCheck.push(email.subject); + if (email.text) + textsToCheck.push(email.text); + if (email.html) + textsToCheck.push(email.html); + for (const rule of this.options.customRules) { + const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); + for (const text of textsToCheck) { + if (pattern.test(text)) { + result.threatScore += rule.score; + result.threatType = rule.type; + result.threatDetails = rule.description; + return; } } } - return links; - } - /** - * Extract plain text from HTML - * @param html HTML content - * @returns Extracted text - */ - extractTextFromHtml(html) { - // Remove HTML tags and decode entities - simplified version - return html - .replace(/]*>.*?<\/style>/gs, '') - .replace(/]*>.*?<\/script>/gs, '') - .replace(/<[^>]+>/g, ' ') - .replace(/ /g, ' ') - .replace(/</g, '<') - .replace(/>/g, '>') - .replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, "'") - .replace(/\s+/g, ' ') - .trim(); } /** * Extract text from a binary buffer for scanning @@ -527,13 +247,10 @@ export class ContentScanner { } /** * Check if an Office document likely contains macros - * This is a simplified check - real implementation would use specialized libraries * @param attachment The attachment to check * @returns Whether the file likely contains macros */ likelyContainsMacros(attachment) { - // Simple heuristic: look for VBA/macro related strings - // This is a simplified approach and not comprehensive const content = this.extractTextFromBuffer(attachment.content); const macroIndicators = [ /vbaProject\.bin/i, @@ -554,22 +271,6 @@ export class ContentScanner { } return false; } - /** - * Map a pattern category to a threat type - * @param category The pattern category - * @returns The corresponding threat type - */ - mapCategoryToThreatType(category) { - switch (category) { - case 'phishing': return ThreatCategory.PHISHING; - case 'spam': return ThreatCategory.SPAM; - case 'malware': return ThreatCategory.MALWARE; - case 'suspiciousLinks': return ThreatCategory.SUSPICIOUS_LINK; - case 'scriptInjection': return ThreatCategory.XSS; - case 'sensitiveData': return ThreatCategory.SENSITIVE_DATA; - default: return ThreatCategory.BLACKLISTED_CONTENT; - } - } /** * Log a high threat finding to the security logger * @param email The email containing the threat @@ -634,4 +335,4 @@ export class ContentScanner { } } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.contentscanner.js","sourceRoot":"","sources":["../../ts/security/classes.contentscanner.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.contentscanner.js","sourceRoot":"","sources":["../../ts/security/classes.contentscanner.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/classes.ipreputationchecker.js b/dist_ts/security/classes.ipreputationchecker.js index 98ada87..dd1ce60 100644 --- a/dist_ts/security/classes.ipreputationchecker.js +++ b/dist_ts/security/classes.ipreputationchecker.js @@ -113,7 +113,10 @@ export class IPReputationChecker { ip, stack: error.stack }); - return this.createErrorResult(ip, error.message); + const errorResult = this.createErrorResult(ip, error.message); + // Cache error results to avoid repeated failing lookups + this.reputationCache.set(ip, errorResult); + return errorResult; } } createErrorResult(ip, errorMessage) { @@ -257,4 +260,4 @@ export class IPReputationChecker { } } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.ipreputationchecker.js","sourceRoot":"","sources":["../../ts/security/classes.ipreputationchecker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.ipreputationchecker.js","sourceRoot":"","sources":["../../ts/security/classes.ipreputationchecker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/classes.rustsecuritybridge.d.ts b/dist_ts/security/classes.rustsecuritybridge.d.ts index ce02847..9975a10 100644 --- a/dist_ts/security/classes.rustsecuritybridge.d.ts +++ b/dist_ts/security/classes.rustsecuritybridge.d.ts @@ -48,6 +48,12 @@ interface IReputationResult { listed_count: number; total_checked: number; } +interface IContentScanResult { + threatScore: number; + threatType: string | null; + threatDetails: string | null; + scannedElements: string[]; +} interface IVersionInfo { bin: string; core: string; @@ -88,6 +94,13 @@ export declare class RustSecurityBridge { diagnosticCode?: string; statusCode?: string; }): Promise; + /** Scan email content for threats (phishing, spam, malware, etc.). */ + scanContent(opts: { + subject?: string; + textBody?: string; + htmlBody?: string; + attachmentNames?: string[]; + }): Promise; /** Check IP reputation via DNSBL. */ checkIpReputation(ip: string): Promise; /** Verify DKIM signatures on a raw email message. */ @@ -123,4 +136,4 @@ export declare class RustSecurityBridge { mailFrom: string; }): Promise; } -export type { IDkimVerificationResult, ISpfResult, IDmarcResult, IEmailSecurityResult, IValidationResult, IBounceDetection, IReputationResult as IRustReputationResult, IVersionInfo, }; +export type { IDkimVerificationResult, ISpfResult, IDmarcResult, IEmailSecurityResult, IValidationResult, IBounceDetection, IContentScanResult, IReputationResult as IRustReputationResult, IVersionInfo, }; diff --git a/dist_ts/security/classes.rustsecuritybridge.js b/dist_ts/security/classes.rustsecuritybridge.js index fc74496..122385e 100644 --- a/dist_ts/security/classes.rustsecuritybridge.js +++ b/dist_ts/security/classes.rustsecuritybridge.js @@ -112,6 +112,10 @@ export class RustSecurityBridge { async detectBounce(opts) { return this.bridge.sendCommand('detectBounce', opts); } + /** Scan email content for threats (phishing, spam, malware, etc.). */ + async scanContent(opts) { + return this.bridge.sendCommand('scanContent', opts); + } /** Check IP reputation via DNSBL. */ async checkIpReputation(ip) { return this.bridge.sendCommand('checkIpReputation', { ip }); @@ -138,4 +142,4 @@ export class RustSecurityBridge { return this.bridge.sendCommand('verifyEmail', opts); } } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0c2VjdXJpdHlicmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9zZWN1cml0eS9jbGFzc2VzLnJ1c3RzZWN1cml0eWJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNyQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBa0h0Qyw4RUFBOEU7QUFDOUUscUVBQXFFO0FBQ3JFLDhFQUE4RTtBQUU5RTs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDckIsTUFBTSxDQUFDLFFBQVEsR0FBOEIsSUFBSSxDQUFDO0lBRWxELE1BQU0sQ0FBcUU7SUFDM0UsUUFBUSxHQUFHLEtBQUssQ0FBQztJQUV6QjtRQUNFLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBa0I7WUFDOUQsVUFBVSxFQUFFLFlBQVk7WUFDeEIsT0FBTyxFQUFFLENBQUMsY0FBYyxDQUFDO1lBQ3pCLGdCQUFnQixFQUFFLE1BQU07WUFDeEIsY0FBYyxFQUFFLE1BQU07WUFDdEIsVUFBVSxFQUFFO2dCQUNWLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFlBQVksQ0FBQztnQkFDOUQsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7Z0JBQzlFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFDO2FBQzdFO1lBQ0QsZ0JBQWdCLEVBQUUsS0FBSztT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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0c2VjdXJpdHlicmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9zZWN1cml0eS9jbGFzc2VzLnJ1c3RzZWN1cml0eWJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNyQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBa0l0Qyw4RUFBOEU7QUFDOUUscUVBQXFFO0FBQ3JFLDhFQUE4RTtBQUU5RTs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDckIsTUFBTSxDQUFDLFFBQVEsR0FBOEIsSUFBSSxDQUFDO0lBRWxELE1BQU0sQ0FBcUU7SUFDM0UsUUFBUSxHQUFHLEtBQUssQ0FBQztJQUV6QjtRQUNFLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBa0I7WUFDOUQsVUFBVSxFQUFFLFlBQVk7WUFDeEIsT0FBTyxFQUFFLENBQUMsY0FBYyxDQUFDO1lBQ3pCLGdCQUFnQixFQUFFLE1BQU07WUFDeEIsY0FBYyxFQUFFLE1BQU07WUFDdEIsVUFBVSxFQUFFO2dCQUNWLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFlBQVksQ0FBQztnQkFDOUQsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7Z0JBQzlFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFDO2FBQzdFO1lBQ0QsZ0JBQWdCLEVBQUUsS0FBSztTQUN4QixDQUFDLENBQUM7UUFFSCwyQkFBMkI7UUFDM0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtZQUMzQixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQztZQUNyQixNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSwrQkFBK0IsQ0FBQyxDQUFDO1FBQ3RELENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBbUIsRUFBRSxNQUFxQixFQUFFLEVBQUU7WUFDcEUsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUM7WUFDdEIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUscUNBQXFDLElBQUksWUFBWSxNQUFNLEdBQUcsQ0FBQyxDQUFDO1FBQ3JGLENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7WUFDeEMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLElBQUksRUFBRSxDQUFDLENBQUM7UUFDL0MsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsNENBQTRDO0lBQ3JDLE1BQU0sQ0FBQyxXQUFXO1FBQ3ZCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNqQyxrQkFBa0IsQ0FBQyxRQUFRLEdBQUcsSUFBSSxrQkFBa0IsRUFBRSxDQUFDO1FBQ3pELENBQUM7UUFDRCxPQUFPLGtCQUFrQixDQUFDLFFBQVEsQ0FBQztJQUNyQyxDQUFDO0lBRUQsNEVBQTRFO0lBQzVFLElBQVcsT0FBTztRQUNoQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztJQUVELDBFQUEwRTtJQUMxRSxZQUFZO0lBQ1osMEVBQTBFO0lBRTFFOzs7T0FHRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2xCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUNELElBQUksQ0FBQztZQUNILE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNyQyxJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUNuQixJQUFJLEVBQUUsRUFBRSxDQUFDO2dCQUNQLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLDhCQUE4QixDQUFDLENBQUM7WUFDckQsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLG9FQUFvRSxDQUFDLENBQUM7WUFDM0YsQ0FBQztZQUNELE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSx5Q0FBMEMsR0FBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDdkYsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUVELDZCQUE2QjtJQUN0QixLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDbkIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUM7WUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFDO1lBQ3RCLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLDhCQUE4QixDQUFDLENBQUM7UUFDckQsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSx3Q0FBeUMsR0FBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDeEYsQ0FBQztJQUNILENBQUM7SUFFRCwwRUFBMEU7SUFDMUUsa0RBQWtEO0lBQ2xELDBFQUEwRTtJQUUxRSw2QkFBNkI7SUFDdEIsS0FBSyxDQUFDLElBQUk7UUFDZixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxFQUFTLENBQUMsQ0FBQztRQUM3RCxPQUFPLEdBQUcsRUFBRSxJQUFJLEtBQUssSUFBSSxDQUFDO0lBQzVCLENBQUM7SUFFRCxtREFBbUQ7SUFDNUMsS0FBSyxDQUFDLFVBQVU7UUFDckIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBUyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELGlDQUFpQztJQUMxQixLQUFLLENBQUMsYUFBYSxDQUFDLEtBQWE7UUFDdEMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCwrREFBK0Q7SUFDeEQsS0FBSyxDQUFDLFlBQVksQ0FBQyxJQUl6QjtRQUNDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsY0FBYyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxzRUFBc0U7SUFDL0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUt4QjtRQUNDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRCxxQ0FBcUM7SUFDOUIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLEVBQVU7UUFDdkMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxtQkFBbUIsRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVELHFEQUFxRDtJQUM5QyxLQUFLLENBQUMsVUFBVSxDQUFDLFVBQWtCO1FBQ3hDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsK0JBQStCO0lBQ3hCLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFLckI7UUFDQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsOEJBQThCO0lBQ3ZCLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFLckI7UUFDQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsV0FBVyxDQUFDLElBTXhCO1FBQ0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdEQsQ0FBQyJ9 \ No newline at end of file diff --git a/readme.plan.md b/readme.plan.md index d1d71e8..72b909d 100644 --- a/readme.plan.md +++ b/readme.plan.md @@ -1,198 +1,24 @@ -# Mailer Implementation Plan & Progress +# Rust Migration Plan -## Project Goals +## Completed Phases -Build a Deno-based mail server package (`@serve.zone/mailer`) with: -1. CLI interface similar to nupst/spark -2. SMTP server and client (ported from dcrouter) -3. HTTP REST API (Mailgun-compatible) -4. Automatic DNS management via Cloudflare -5. Systemd daemon service -6. Binary distribution via npm +### Phase 3: Rust Primary Backend (DKIM/SPF/DMARC/IP Reputation) +- Rust is the mandatory security backend — no TS fallbacks +- All DKIM signing/verification, SPF, DMARC, IP reputation through Rust bridge -## Completed Work +### Phase 5: BounceManager + ContentScanner +- BounceManager bounce detection delegated to Rust `detectBounce` IPC command +- ContentScanner pattern matching delegated to new Rust `scanContent` IPC command +- New module: `rust/crates/mailer-security/src/content_scanner.rs` (10 Rust tests) +- ~215 lines removed from BounceManager, ~350 lines removed from ContentScanner +- Binary attachment scanning (PE headers, VBA macros) stays in TS +- Custom rules (runtime-configured) stay in TS +- Net change: ~-560 TS lines, +265 Rust lines -### ✅ Phase 1: Project Structure -- [x] Created Deno-based project structure (deno.json, package.json) -- [x] Set up bin/ wrappers for npm binary distribution -- [x] Created compilation scripts (compile-all.sh) -- [x] Set up install scripts (install-binary.js) -- [x] Created TypeScript source directory structure +## Deferred -### ✅ Phase 2: Mail Implementation (Ported from dcrouter) -- [x] Copied and adapted mail/core/ (Email, EmailValidator, BounceManager, TemplateManager) -- [x] Copied and adapted mail/delivery/ (SMTP client, SMTP server, queues, rate limiting) -- [x] Copied and adapted mail/routing/ (EmailRouter, DomainRegistry, DnsManager) -- [x] Copied and adapted mail/security/ (DKIM, SPF, DMARC) -- [x] Fixed all imports from .js to .ts extensions -- [x] Created stub modules for dcrouter dependencies (storage, security, deliverability, errors) - -### ✅ Phase 3: Supporting Modules -- [x] Created logger module (simple console logging) -- [x] Created paths module (project paths) -- [x] Created plugins.ts (Deno dependencies + Node.js compatibility) -- [x] Added required npm dependencies (lru-cache, mailaddress-validator, cloudflare) - -### ✅ Phase 4: DNS Management -- [x] Created DnsManager class with DNS record generation -- [x] Created CloudflareClient for automatic DNS setup -- [x] Added DNS validation functionality - -### ✅ Phase 5: HTTP API -- [x] Created ApiServer class with basic routing -- [x] Implemented Mailgun-compatible endpoint structure -- [x] Added authentication and rate limiting stubs - -### ✅ Phase 6: Configuration Management -- [x] Created ConfigManager for JSON-based config storage -- [x] Added domain configuration support -- [x] Implemented config load/save functionality - -### ✅ Phase 7: Daemon Service -- [x] Created DaemonManager to coordinate SMTP server and API server -- [x] Added start/stop functionality -- [x] Integrated with ConfigManager - -### ✅ Phase 8: CLI Interface -- [x] Created MailerCli class with command routing -- [x] Implemented service commands (start/stop/restart/status/enable/disable) -- [x] Implemented domain commands (add/remove/list) -- [x] Implemented DNS commands (setup/validate/show) -- [x] Implemented send command -- [x] Implemented config commands (show/set) -- [x] Added help and version commands - -### ✅ Phase 9: Documentation -- [x] Created comprehensive README.md -- [x] Documented all CLI commands -- [x] Documented HTTP API endpoints -- [x] Provided configuration examples -- [x] Documented DNS requirements -- [x] Created changelog - -## Next Steps (Remaining Work) - -### Testing & Debugging -1. Fix remaining import/dependency issues -2. Test compilation with `deno compile` -3. Test CLI commands end-to-end -4. Test SMTP sending/receiving -5. Test HTTP API endpoints -6. Write unit tests - -### Systemd Integration -1. Create systemd service file -2. Implement service enable/disable -3. Add service status checking -4. Test daemon auto-restart - -### Cloudflare Integration -1. Test actual Cloudflare API calls -2. Handle Cloudflare errors gracefully -3. Add zone detection -4. Verify DNS record creation - -### Production Readiness -1. Add proper error handling throughout -2. Implement logging to files -3. Add rate limiting implementation -4. Implement API key authentication -5. Add TLS certificate management -6. Implement email queue persistence - -### Advanced Features -1. Webhook support for incoming emails -2. Email template system -3. Analytics and reporting -4. SMTP credential management -5. Email event tracking -6. Bounce handling - -## Known Issues - -1. Some npm dependencies may need version adjustments -2. Deno crypto APIs may need adaptation for DKIM signing -3. Buffer vs Uint8Array conversions may be needed -4. Some dcrouter-specific code may need further adaptation - -## File Structure Overview - -``` -mailer/ -├── README.md ✅ Complete -├── license ✅ Complete -├── changelog.md ✅ Complete -├── deno.json ✅ Complete -├── package.json ✅ Complete -├── mod.ts ✅ Complete -│ -├── bin/ -│ └── mailer-wrapper.js ✅ Complete -│ -├── scripts/ -│ ├── compile-all.sh ✅ Complete -│ └── install-binary.js ✅ Complete -│ -└── ts/ - ├── 00_commitinfo_data.ts ✅ Complete - ├── index.ts ✅ Complete - ├── cli.ts ✅ Complete - ├── plugins.ts ✅ Complete - ├── logger.ts ✅ Complete - ├── paths.ts ✅ Complete - ├── classes.mailer.ts ✅ Complete - │ - ├── cli/ - │ ├── index.ts ✅ Complete - │ └── mailer-cli.ts ✅ Complete - │ - ├── api/ - │ ├── index.ts ✅ Complete - │ ├── api-server.ts ✅ Complete - │ └── routes/ ✅ Structure ready - │ - ├── dns/ - │ ├── index.ts ✅ Complete - │ ├── dns-manager.ts ✅ Complete - │ └── cloudflare-client.ts ✅ Complete - │ - ├── daemon/ - │ ├── index.ts ✅ Complete - │ └── daemon-manager.ts ✅ Complete - │ - ├── config/ - │ ├── index.ts ✅ Complete - │ └── config-manager.ts ✅ Complete - │ - ├── storage/ - │ └── index.ts ✅ Stub complete - │ - ├── security/ - │ └── index.ts ✅ Stub complete - │ - ├── deliverability/ - │ └── index.ts ✅ Stub complete - │ - ├── errors/ - │ └── index.ts ✅ Stub complete - │ - └── mail/ ✅ Ported from dcrouter - ├── core/ ✅ Complete - ├── delivery/ ✅ Complete - ├── routing/ ✅ Complete - └── security/ ✅ Complete -``` - -## Summary - -The mailer package structure is **95% complete**. All major components have been implemented: -- Project structure and build system ✅ -- Mail implementation ported from dcrouter ✅ -- CLI interface ✅ -- DNS management ✅ -- HTTP API ✅ -- Configuration system ✅ -- Daemon management ✅ -- Documentation ✅ - -**Remaining work**: Testing, debugging dependency issues, systemd integration, and production hardening. +| Component | Rationale | +|-----------|-----------| +| EmailValidator | Already thin; uses smartmail; minimal gain | +| DNS record generation | Pure string building; zero benefit from Rust | +| MIME building (`toRFC822String`) | Sync in TS, async via IPC; too much blast radius | diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 20af019..70a1b7a 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1054,6 +1054,7 @@ dependencies = [ "mail-auth", "mailer-core", "psl", + "regex", "ring", "rustls-pki-types", "serde", diff --git a/rust/crates/mailer-bin/src/main.rs b/rust/crates/mailer-bin/src/main.rs index ee44fe2..ce3abd4 100644 --- a/rust/crates/mailer-bin/src/main.rs +++ b/rust/crates/mailer-bin/src/main.rs @@ -1,4 +1,4 @@ -//! mailer-bin: CLI and IPC binary for the @serve.zone/mailer Rust crates. +//! mailer-bin: CLI and IPC binary for the @push.rocks/smartmta Rust crates. //! //! Supports two modes: //! 1. **CLI mode** — traditional subcommands for testing and standalone use @@ -560,6 +560,25 @@ async fn handle_ipc_request(req: &IpcRequest) -> IpcResponse { } } + "scanContent" => { + let subject = req.params.get("subject").and_then(|v| v.as_str()); + let text_body = req.params.get("textBody").and_then(|v| v.as_str()); + let html_body = req.params.get("htmlBody").and_then(|v| v.as_str()); + let attachment_names: Vec = req.params.get("attachmentNames") + .and_then(|v| v.as_array()) + .map(|a| a.iter().filter_map(|v| v.as_str().map(String::from)).collect()) + .unwrap_or_default(); + let result = mailer_security::content_scanner::scan_content( + subject, text_body, html_body, &attachment_names + ); + IpcResponse { + id: req.id.clone(), + success: true, + result: Some(serde_json::to_value(&result).unwrap()), + error: None, + } + } + "checkSpf" => { let ip_str = req.params.get("ip").and_then(|v| v.as_str()).unwrap_or(""); let helo = req diff --git a/rust/crates/mailer-security/Cargo.toml b/rust/crates/mailer-security/Cargo.toml index 385a3b9..263a815 100644 --- a/rust/crates/mailer-security/Cargo.toml +++ b/rust/crates/mailer-security/Cargo.toml @@ -17,3 +17,4 @@ hickory-resolver.workspace = true ipnet.workspace = true rustls-pki-types.workspace = true psl.workspace = true +regex.workspace = true diff --git a/rust/crates/mailer-security/src/content_scanner.rs b/rust/crates/mailer-security/src/content_scanner.rs new file mode 100644 index 0000000..bf542e1 --- /dev/null +++ b/rust/crates/mailer-security/src/content_scanner.rs @@ -0,0 +1,515 @@ +//! Content scanning for email threat detection. +//! +//! Provides pattern-based scanning of email subjects, text bodies, HTML bodies, +//! and attachment filenames for phishing, spam, malware, suspicious links, +//! script injection, and sensitive data patterns. + +use regex::Regex; +use serde::Serialize; +use std::sync::LazyLock; + +// --------------------------------------------------------------------------- +// Result types +// --------------------------------------------------------------------------- + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct ContentScanResult { + pub threat_score: u32, + pub threat_type: Option, + pub threat_details: Option, + pub scanned_elements: Vec, +} + +// --------------------------------------------------------------------------- +// Pattern definitions (compiled once via LazyLock) +// --------------------------------------------------------------------------- + +static PHISHING_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"(?i)(?:verify|confirm|update|login).*(?:account|password|details)").unwrap(), + Regex::new(r"(?i)urgent.*(?:action|attention|required)").unwrap(), + Regex::new(r"(?i)(?:paypal|apple|microsoft|amazon|google|bank).*(?:verify|confirm|suspend)").unwrap(), + Regex::new(r"(?i)your.*(?:account).*(?:suspended|compromised|locked)").unwrap(), + Regex::new(r"(?i)\b(?:password reset|security alert|security notice)\b").unwrap(), + ] +}); + +static SPAM_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"(?i)\b(?:viagra|cialis|enlargement|diet pill|lose weight fast|cheap meds)\b").unwrap(), + Regex::new(r"(?i)\b(?:million dollars|lottery winner|prize claim|inheritance|rich widow)\b").unwrap(), + Regex::new(r"(?i)\b(?:earn from home|make money fast|earn \$\d{3,}/day)\b").unwrap(), + Regex::new(r"(?i)\b(?:limited time offer|act now|exclusive deal|only \d+ left)\b").unwrap(), + Regex::new(r"(?i)\b(?:forex|stock tip|investment opportunity|cryptocurrency|bitcoin)\b").unwrap(), + ] +}); + +static MALWARE_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"(?i)(?:attached file|see attachment).*(?:invoice|receipt|statement|document)").unwrap(), + Regex::new(r"(?i)open.*(?:the attached|this attachment)").unwrap(), + Regex::new(r"(?i)(?:enable|allow).*(?:macros|content|editing)").unwrap(), + Regex::new(r"(?i)download.*(?:attachment|file|document)").unwrap(), + Regex::new(r"(?i)\b(?:ransomware protection|virus alert|malware detected)\b").unwrap(), + ] +}); + +static SUSPICIOUS_LINK_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"(?i)https?://bit\.ly/").unwrap(), + Regex::new(r"(?i)https?://goo\.gl/").unwrap(), + Regex::new(r"(?i)https?://t\.co/").unwrap(), + Regex::new(r"(?i)https?://tinyurl\.com/").unwrap(), + Regex::new(r"(?i)https?://(?:\d{1,3}\.){3}\d{1,3}").unwrap(), + Regex::new(r"(?i)https?://.*\.(?:xyz|top|club|gq|cf)/").unwrap(), + Regex::new(r"(?i)(?:login|account|signin|auth).*\.(?:xyz|top|club|gq|cf|tk|ml|ga|pw|ws|buzz)\b").unwrap(), + ] +}); + +static SCRIPT_INJECTION_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"(?is).*").unwrap(), + Regex::new(r"(?i)javascript:").unwrap(), + Regex::new(r#"(?i)on(?:click|load|mouse|error|focus|blur)=".*""#).unwrap(), + Regex::new(r"(?i)document\.(?:cookie|write|location)").unwrap(), + Regex::new(r"(?i)eval\s*\(").unwrap(), + ] +}); + +static SENSITIVE_DATA_PATTERNS: LazyLock> = LazyLock::new(|| { + vec![ + Regex::new(r"\b(?:\d{3}-\d{2}-\d{4}|\d{9})\b").unwrap(), + Regex::new(r"\b\d{13,16}\b").unwrap(), + Regex::new(r"\b(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})\b").unwrap(), + ] +}); + +/// Link extraction from HTML href attributes. +static HREF_PATTERN: LazyLock = LazyLock::new(|| { + Regex::new(r#"(?i)href=["'](https?://[^"']+)["']"#).unwrap() +}); + +/// Executable file extensions that are considered dangerous. +static EXECUTABLE_EXTENSIONS: LazyLock> = LazyLock::new(|| { + vec![ + ".exe", ".dll", ".bat", ".cmd", ".msi", ".vbs", ".ps1", + ".sh", ".jar", ".py", ".com", ".scr", ".pif", ".hta", ".cpl", + ".reg", ".vba", ".lnk", ".wsf", ".msp", ".mst", + ] +}); + +/// Document extensions that may contain macros. +static MACRO_DOCUMENT_EXTENSIONS: LazyLock> = LazyLock::new(|| { + vec![ + ".doc", ".docm", ".xls", ".xlsm", ".ppt", ".pptm", + ".dotm", ".xlsb", ".ppam", ".potm", + ] +}); + +// --------------------------------------------------------------------------- +// HTML helpers +// --------------------------------------------------------------------------- + +/// Strip HTML tags and decode common entities to produce plain text. +fn extract_text_from_html(html: &str) -> String { + // Remove style and script blocks first + let no_style = Regex::new(r"(?is)]*>.*?").unwrap(); + let no_script = Regex::new(r"(?is)]*>.*?").unwrap(); + let no_tags = Regex::new(r"<[^>]+>").unwrap(); + + let text = no_style.replace_all(html, " "); + let text = no_script.replace_all(&text, " "); + let text = no_tags.replace_all(&text, " "); + + text.replace(" ", " ") + .replace("<", "<") + .replace(">", ">") + .replace("&", "&") + .replace(""", "\"") + .replace("'", "'") + .split_whitespace() + .collect::>() + .join(" ") +} + +/// Extract all href links from HTML. +fn extract_links_from_html(html: &str) -> Vec { + HREF_PATTERN + .captures_iter(html) + .filter_map(|cap| cap.get(1).map(|m| m.as_str().to_string())) + .collect() +} + +// --------------------------------------------------------------------------- +// Scoring helpers +// --------------------------------------------------------------------------- + +fn matches_any(text: &str, patterns: &[Regex]) -> bool { + patterns.iter().any(|p| p.is_match(text)) +} + +// --------------------------------------------------------------------------- +// Main scan entry point +// --------------------------------------------------------------------------- + +/// Scan email content for threats. +/// +/// This mirrors the TypeScript ContentScanner logic — scanning the subject, +/// text body, HTML body, and attachment filenames against predefined patterns. +/// Returns an aggregate threat score and the highest-severity threat type. +pub fn scan_content( + subject: Option<&str>, + text_body: Option<&str>, + html_body: Option<&str>, + attachment_names: &[String], +) -> ContentScanResult { + let mut score: u32 = 0; + let mut threat_type: Option = None; + let mut threat_details: Option = None; + let mut scanned: Vec = Vec::new(); + + // Helper: upgrade threat info only if the new finding is more severe. + macro_rules! record { + ($new_score:expr, $ttype:expr, $details:expr) => { + score += $new_score; + // Always adopt the threat type from the highest-scoring match. + threat_type = Some($ttype.to_string()); + threat_details = Some($details.to_string()); + }; + } + + // ── Subject scanning ────────────────────────────────────────────── + if let Some(subj) = subject { + scanned.push("subject".into()); + + if matches_any(subj, &PHISHING_PATTERNS) { + record!(25, "phishing", format!("Subject contains potential phishing indicators: {}", subj)); + } else if matches_any(subj, &SPAM_PATTERNS) { + record!(15, "spam", format!("Subject contains potential spam indicators: {}", subj)); + } + } + + // ── Text body scanning ──────────────────────────────────────────── + if let Some(text) = text_body { + scanned.push("text".into()); + + // Check each category and accumulate score (same order as TS) + for pat in SUSPICIOUS_LINK_PATTERNS.iter() { + if pat.is_match(text) { + score += 20; + if threat_type.as_deref() != Some("suspicious_link") { + threat_type = Some("suspicious_link".into()); + threat_details = Some("Text contains suspicious links".into()); + } + } + } + + for pat in PHISHING_PATTERNS.iter() { + if pat.is_match(text) { + score += 25; + threat_type = Some("phishing".into()); + threat_details = Some("Text contains potential phishing indicators".into()); + } + } + + for pat in SPAM_PATTERNS.iter() { + if pat.is_match(text) { + score += 15; + if threat_type.is_none() { + threat_type = Some("spam".into()); + threat_details = Some("Text contains potential spam indicators".into()); + } + } + } + + for pat in MALWARE_PATTERNS.iter() { + if pat.is_match(text) { + score += 30; + threat_type = Some("malware".into()); + threat_details = Some("Text contains potential malware indicators".into()); + } + } + + for pat in SENSITIVE_DATA_PATTERNS.iter() { + if pat.is_match(text) { + score += 25; + if threat_type.is_none() { + threat_type = Some("sensitive_data".into()); + threat_details = Some("Text contains potentially sensitive data patterns".into()); + } + } + } + } + + // ── HTML body scanning ──────────────────────────────────────────── + if let Some(html) = html_body { + scanned.push("html".into()); + + // Script injection check + for pat in SCRIPT_INJECTION_PATTERNS.iter() { + if pat.is_match(html) { + score += 40; + if threat_type.as_deref() != Some("xss") { + threat_type = Some("xss".into()); + threat_details = Some("HTML contains potentially malicious script content".into()); + } + } + } + + // Extract text from HTML and scan (half score to avoid double counting) + let text_content = extract_text_from_html(html); + if !text_content.is_empty() { + let mut html_text_score: u32 = 0; + let mut html_text_type: Option = None; + let mut html_text_details: Option = None; + + // Re-run text patterns on extracted HTML text + for pat in SUSPICIOUS_LINK_PATTERNS.iter() { + if pat.is_match(&text_content) { + html_text_score += 20; + html_text_type = Some("suspicious_link".into()); + html_text_details = Some("Text contains suspicious links".into()); + } + } + for pat in PHISHING_PATTERNS.iter() { + if pat.is_match(&text_content) { + html_text_score += 25; + html_text_type = Some("phishing".into()); + html_text_details = Some("Text contains potential phishing indicators".into()); + } + } + for pat in SPAM_PATTERNS.iter() { + if pat.is_match(&text_content) { + html_text_score += 15; + if html_text_type.is_none() { + html_text_type = Some("spam".into()); + html_text_details = Some("Text contains potential spam indicators".into()); + } + } + } + for pat in MALWARE_PATTERNS.iter() { + if pat.is_match(&text_content) { + html_text_score += 30; + html_text_type = Some("malware".into()); + html_text_details = Some("Text contains potential malware indicators".into()); + } + } + for pat in SENSITIVE_DATA_PATTERNS.iter() { + if pat.is_match(&text_content) { + html_text_score += 25; + if html_text_type.is_none() { + html_text_type = Some("sensitive_data".into()); + html_text_details = Some("Text contains potentially sensitive data patterns".into()); + } + } + } + + if html_text_score > 0 { + // Add half of the text content score to avoid double counting + score += html_text_score / 2; + if let Some(t) = html_text_type { + if threat_type.is_none() || html_text_score > score { + threat_type = Some(t); + threat_details = html_text_details; + } + } + } + } + + // Extract and check links from HTML + let links = extract_links_from_html(html); + if !links.is_empty() { + let mut suspicious_count = 0u32; + for link in &links { + if matches_any(link, &SUSPICIOUS_LINK_PATTERNS) { + suspicious_count += 1; + } + } + + if suspicious_count > 0 { + let pct = (suspicious_count as f64 / links.len() as f64) * 100.0; + let additional = std::cmp::min(40, (pct / 2.5) as u32); + score += additional; + + if additional > 20 || threat_type.is_none() { + threat_type = Some("suspicious_link".into()); + threat_details = Some(format!( + "HTML contains {} suspicious links out of {} total links", + suspicious_count, + links.len() + )); + } + } + } + } + + // ── Attachment filename scanning ────────────────────────────────── + for name in attachment_names { + let lower = name.to_lowercase(); + scanned.push(format!("attachment:{}", lower)); + + // Check executable extensions + for ext in EXECUTABLE_EXTENSIONS.iter() { + if lower.ends_with(ext) { + score += 70; + threat_type = Some("executable".into()); + threat_details = Some(format!( + "Attachment has a potentially dangerous extension: {}", + name + )); + break; + } + } + + // Check macro document extensions + for ext in MACRO_DOCUMENT_EXTENSIONS.iter() { + if lower.ends_with(ext) { + // Flag macro-capable documents (lower score than executables) + score += 20; + if threat_type.is_none() { + threat_type = Some("malicious_macro".into()); + threat_details = Some(format!( + "Attachment is a macro-capable document: {}", + name + )); + } + break; + } + } + } + + ContentScanResult { + threat_score: score, + threat_type, + threat_details, + scanned_elements: scanned, + } +} + +// --------------------------------------------------------------------------- +// Tests +// --------------------------------------------------------------------------- + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_clean_content() { + let result = scan_content( + Some("Project Update"), + Some("The project is on track."), + None, + &[], + ); + assert_eq!(result.threat_score, 0); + assert!(result.threat_type.is_none()); + } + + #[test] + fn test_phishing_subject() { + let result = scan_content( + Some("URGENT: Verify your bank account details immediately"), + None, + None, + &[], + ); + assert!(result.threat_score >= 25); + assert_eq!(result.threat_type.as_deref(), Some("phishing")); + } + + #[test] + fn test_spam_body() { + let result = scan_content( + None, + Some("Win a million dollars in the lottery winner contest!"), + None, + &[], + ); + assert!(result.threat_score >= 15); + assert_eq!(result.threat_type.as_deref(), Some("spam")); + } + + #[test] + fn test_suspicious_links() { + let result = scan_content( + None, + Some("Check out https://bit.ly/2x3F5 for more info"), + None, + &[], + ); + assert!(result.threat_score >= 20); + assert_eq!(result.threat_type.as_deref(), Some("suspicious_link")); + } + + #[test] + fn test_script_injection() { + let result = scan_content( + None, + None, + Some("

Hello

"), + &[], + ); + assert!(result.threat_score >= 40); + assert_eq!(result.threat_type.as_deref(), Some("xss")); + } + + #[test] + fn test_executable_attachment() { + let result = scan_content( + None, + None, + None, + &["update.exe".into()], + ); + assert!(result.threat_score >= 70); + assert_eq!(result.threat_type.as_deref(), Some("executable")); + } + + #[test] + fn test_macro_document() { + let result = scan_content( + None, + None, + None, + &["report.docm".into()], + ); + assert!(result.threat_score >= 20); + assert_eq!(result.threat_type.as_deref(), Some("malicious_macro")); + } + + #[test] + fn test_malware_indicators() { + let result = scan_content( + None, + Some("Please enable macros to view this document properly."), + None, + &[], + ); + assert!(result.threat_score >= 30); + assert_eq!(result.threat_type.as_deref(), Some("malware")); + } + + #[test] + fn test_html_link_extraction() { + let result = scan_content( + None, + None, + Some(r#"click and here"#), + &[], + ); + assert!(result.threat_score > 0); + } + + #[test] + fn test_compound_threats() { + let result = scan_content( + Some("URGENT: Verify your account details immediately"), + Some("Your account will be suspended unless you verify at https://bit.ly/2x3F5"), + Some(r#"verify"#), + &["verification.exe".into()], + ); + assert!(result.threat_score > 70); + } +} diff --git a/rust/crates/mailer-security/src/lib.rs b/rust/crates/mailer-security/src/lib.rs index 65f6022..c2ef4ed 100644 --- a/rust/crates/mailer-security/src/lib.rs +++ b/rust/crates/mailer-security/src/lib.rs @@ -1,5 +1,6 @@ //! mailer-security: DKIM, SPF, DMARC verification, and IP reputation checking. +pub mod content_scanner; pub mod dkim; pub mod dmarc; pub mod error; diff --git a/test/test.bouncemanager.ts b/test/test.bouncemanager.ts index b236b17..0385bcd 100644 --- a/test/test.bouncemanager.ts +++ b/test/test.bouncemanager.ts @@ -1,6 +1,13 @@ import { tap, expect } from '@git.zone/tstest/tapbundle'; import { BounceManager, BounceType, BounceCategory } from '../ts/mail/core/classes.bouncemanager.js'; import { Email } from '../ts/mail/core/classes.email.js'; +import { RustSecurityBridge } from '../ts/security/classes.rustsecuritybridge.js'; + +tap.test('setup - start Rust security bridge', async () => { + const bridge = RustSecurityBridge.getInstance(); + const ok = await bridge.start(); + expect(ok).toEqual(true); +}); /** * Test the BounceManager class @@ -189,6 +196,10 @@ tap.test('BounceManager - should handle retries for soft bounces', async () => { expect(info.expiresAt).toBeUndefined(); // Permanent }); +tap.test('cleanup - stop Rust security bridge', async () => { + await RustSecurityBridge.getInstance().stop(); +}); + tap.test('stop', async () => { await tap.stopForcefully(); }); diff --git a/test/test.contentscanner.ts b/test/test.contentscanner.ts index f4e30df..8511aba 100644 --- a/test/test.contentscanner.ts +++ b/test/test.contentscanner.ts @@ -1,6 +1,13 @@ import { tap, expect } from '@git.zone/tstest/tapbundle'; import { ContentScanner, ThreatCategory } from '../ts/security/classes.contentscanner.js'; import { Email } from '../ts/mail/core/classes.email.js'; +import { RustSecurityBridge } from '../ts/security/classes.rustsecuritybridge.js'; + +tap.test('setup - start Rust security bridge', async () => { + const bridge = RustSecurityBridge.getInstance(); + const ok = await bridge.start(); + expect(ok).toEqual(true); +}); // Test instantiation tap.test('ContentScanner - should be instantiable', async () => { @@ -258,6 +265,10 @@ tap.test('ContentScanner - should classify threat levels correctly', async () => expect(ContentScanner.getThreatLevel(80)).toEqual('high'); }); +tap.test('cleanup - stop Rust security bridge', async () => { + await RustSecurityBridge.getInstance().stop(); +}); + tap.test('stop', async () => { await tap.stopForcefully(); }); diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 8e3a27c..1186d55 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.0.1', + version: '2.1.0', description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.' } diff --git a/ts/mail/core/classes.bouncemanager.ts b/ts/mail/core/classes.bouncemanager.ts index a1652f4..a94e4ac 100644 --- a/ts/mail/core/classes.bouncemanager.ts +++ b/ts/mail/core/classes.bouncemanager.ts @@ -2,6 +2,7 @@ import * as plugins from '../../plugins.js'; import * as paths from '../../paths.js'; import { logger } from '../../logger.js'; import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; +import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; import { LRUCache } from 'lru-cache'; import type { Email } from './classes.email.js'; @@ -63,112 +64,6 @@ export interface BounceRecord { nextRetryTime?: number; } -/** - * Email bounce patterns to identify bounce types in SMTP responses and bounce messages - */ -const BOUNCE_PATTERNS = { - // Hard bounce patterns - [BounceType.INVALID_RECIPIENT]: [ - /no such user/i, - /user unknown/i, - /does not exist/i, - /invalid recipient/i, - /unknown recipient/i, - /no mailbox/i, - /user not found/i, - /recipient address rejected/i, - /550 5\.1\.1/i - ], - [BounceType.DOMAIN_NOT_FOUND]: [ - /domain not found/i, - /unknown domain/i, - /no such domain/i, - /host not found/i, - /domain invalid/i, - /550 5\.1\.2/i - ], - [BounceType.MAILBOX_FULL]: [ - /mailbox full/i, - /over quota/i, - /quota exceeded/i, - /552 5\.2\.2/i - ], - [BounceType.MAILBOX_INACTIVE]: [ - /mailbox disabled/i, - /mailbox inactive/i, - /account disabled/i, - /mailbox not active/i, - /account suspended/i - ], - [BounceType.BLOCKED]: [ - /blocked/i, - /rejected/i, - /denied/i, - /blacklisted/i, - /prohibited/i, - /refused/i, - /550 5\.7\./i - ], - [BounceType.SPAM_RELATED]: [ - /spam/i, - /bulk mail/i, - /content rejected/i, - /message rejected/i, - /550 5\.7\.1/i - ], - - // Soft bounce patterns - [BounceType.SERVER_UNAVAILABLE]: [ - /server unavailable/i, - /service unavailable/i, - /try again later/i, - /try later/i, - /451 4\.3\./i, - /421 4\.3\./i - ], - [BounceType.TEMPORARY_FAILURE]: [ - /temporary failure/i, - /temporary error/i, - /temporary problem/i, - /try again/i, - /451 4\./i - ], - [BounceType.QUOTA_EXCEEDED]: [ - /quota temporarily exceeded/i, - /mailbox temporarily full/i, - /452 4\.2\.2/i - ], - [BounceType.NETWORK_ERROR]: [ - /network error/i, - /connection error/i, - /connection timed out/i, - /routing error/i, - /421 4\.4\./i - ], - [BounceType.TIMEOUT]: [ - /timed out/i, - /timeout/i, - /450 4\.4\.2/i - ], - - // Auto-responses - [BounceType.AUTO_RESPONSE]: [ - /auto[- ]reply/i, - /auto[- ]response/i, - /vacation/i, - /out of office/i, - /away from office/i, - /on vacation/i, - /automatic reply/i - ], - [BounceType.CHALLENGE_RESPONSE]: [ - /challenge[- ]response/i, - /verify your email/i, - /confirm your email/i, - /email verification/i - ] -}; - /** * Retry strategy configuration for soft bounces */ @@ -269,16 +164,16 @@ export class BounceManager { nextRetryTime: bounceData.nextRetryTime }; - // Determine bounce type and category if not provided + // Determine bounce type and category via Rust bridge if not provided if (!bounceData.bounceType || bounceData.bounceType === BounceType.UNKNOWN) { - const bounceInfo = this.detectBounceType( - bounce.smtpResponse || '', - bounce.diagnosticCode || '', - bounce.statusCode || '' - ); - - bounce.bounceType = bounceInfo.type; - bounce.bounceCategory = bounceInfo.category; + const bridge = RustSecurityBridge.getInstance(); + const rustResult = await bridge.detectBounce({ + smtpResponse: bounce.smtpResponse, + diagnosticCode: bounce.diagnosticCode, + statusCode: bounce.statusCode, + }); + bounce.bounceType = rustResult.bounce_type as BounceType; + bounce.bounceCategory = rustResult.category as BounceCategory; } // Process the bounce based on category @@ -791,134 +686,6 @@ export class BounceManager { return this.bounceCache.get(email.toLowerCase()) || null; } - /** - * Analyze SMTP response and diagnostic codes to determine bounce type - * @param smtpResponse SMTP response string - * @param diagnosticCode Diagnostic code from bounce - * @param statusCode Status code from bounce - * @returns Detected bounce type and category - */ - private detectBounceType( - smtpResponse: string, - diagnosticCode: string, - statusCode: string - ): { - type: BounceType; - category: BounceCategory; - } { - // Combine all text for comprehensive pattern matching - const fullText = `${smtpResponse} ${diagnosticCode} ${statusCode}`.toLowerCase(); - - // Check for auto-responses first - if (this.matchesPattern(fullText, BounceType.AUTO_RESPONSE) || - this.matchesPattern(fullText, BounceType.CHALLENGE_RESPONSE)) { - return { - type: BounceType.AUTO_RESPONSE, - category: BounceCategory.AUTO_RESPONSE - }; - } - - // Check for hard bounces - for (const bounceType of [ - BounceType.INVALID_RECIPIENT, - BounceType.DOMAIN_NOT_FOUND, - BounceType.MAILBOX_FULL, - BounceType.MAILBOX_INACTIVE, - BounceType.BLOCKED, - BounceType.SPAM_RELATED, - BounceType.POLICY_RELATED - ]) { - if (this.matchesPattern(fullText, bounceType)) { - return { - type: bounceType, - category: BounceCategory.HARD - }; - } - } - - // Check for soft bounces - for (const bounceType of [ - BounceType.SERVER_UNAVAILABLE, - BounceType.TEMPORARY_FAILURE, - BounceType.QUOTA_EXCEEDED, - BounceType.NETWORK_ERROR, - BounceType.TIMEOUT - ]) { - if (this.matchesPattern(fullText, bounceType)) { - return { - type: bounceType, - category: BounceCategory.SOFT - }; - } - } - - // Handle DSN (Delivery Status Notification) status codes - if (statusCode) { - // Format: class.subject.detail - const parts = statusCode.split('.'); - if (parts.length >= 2) { - const statusClass = parts[0]; - const statusSubject = parts[1]; - - // 5.X.X is permanent failure (hard bounce) - if (statusClass === '5') { - // Try to determine specific type based on subject - if (statusSubject === '1') { - return { type: BounceType.INVALID_RECIPIENT, category: BounceCategory.HARD }; - } else if (statusSubject === '2') { - return { type: BounceType.MAILBOX_FULL, category: BounceCategory.HARD }; - } else if (statusSubject === '7') { - return { type: BounceType.BLOCKED, category: BounceCategory.HARD }; - } else { - return { type: BounceType.UNKNOWN, category: BounceCategory.HARD }; - } - } - - // 4.X.X is temporary failure (soft bounce) - if (statusClass === '4') { - // Try to determine specific type based on subject - if (statusSubject === '2') { - return { type: BounceType.QUOTA_EXCEEDED, category: BounceCategory.SOFT }; - } else if (statusSubject === '3') { - return { type: BounceType.SERVER_UNAVAILABLE, category: BounceCategory.SOFT }; - } else if (statusSubject === '4') { - return { type: BounceType.NETWORK_ERROR, category: BounceCategory.SOFT }; - } else { - return { type: BounceType.TEMPORARY_FAILURE, category: BounceCategory.SOFT }; - } - } - } - } - - // Default to unknown - return { - type: BounceType.UNKNOWN, - category: BounceCategory.UNKNOWN - }; - } - - /** - * Check if text matches any pattern for a bounce type - * @param text Text to check against patterns - * @param bounceType Bounce type to get patterns for - * @returns Whether the text matches any pattern - */ - private matchesPattern(text: string, bounceType: BounceType): boolean { - const patterns = BOUNCE_PATTERNS[bounceType]; - - if (!patterns) { - return false; - } - - for (const pattern of patterns) { - if (pattern.test(text)) { - return true; - } - } - - return false; - } - /** * Get all known hard bounced addresses * @returns Array of hard bounced email addresses diff --git a/ts/security/classes.contentscanner.ts b/ts/security/classes.contentscanner.ts index 094ce15..4146f25 100644 --- a/ts/security/classes.contentscanner.ts +++ b/ts/security/classes.contentscanner.ts @@ -4,6 +4,7 @@ import { logger } from '../logger.js'; import { Email } from '../mail/core/classes.email.js'; import type { IAttachment } from '../mail/core/classes.email.js'; import { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js'; +import { RustSecurityBridge } from './classes.rustsecuritybridge.js'; import { LRUCache } from 'lru-cache'; /** @@ -65,75 +66,6 @@ export class ContentScanner { private scanCache: LRUCache; private options: Required; - // Predefined patterns for common threats - private static readonly MALICIOUS_PATTERNS = { - // Phishing patterns - phishing: [ - /(?:verify|confirm|update|login).*(?:account|password|details)/i, - /urgent.*(?:action|attention|required)/i, - /(?:paypal|apple|microsoft|amazon|google|bank).*(?:verify|confirm|suspend)/i, - /your.*(?:account).*(?:suspended|compromised|locked)/i, - /\b(?:password reset|security alert|security notice)\b/i - ], - - // Spam indicators - spam: [ - /\b(?:viagra|cialis|enlargement|diet pill|lose weight fast|cheap meds)\b/i, - /\b(?:million dollars|lottery winner|prize claim|inheritance|rich widow)\b/i, - /\b(?:earn from home|make money fast|earn \$\d{3,}\/day)\b/i, - /\b(?:limited time offer|act now|exclusive deal|only \d+ left)\b/i, - /\b(?:forex|stock tip|investment opportunity|cryptocurrency|bitcoin)\b/i - ], - - // Malware indicators in text - malware: [ - /(?:attached file|see attachment).*(?:invoice|receipt|statement|document)/i, - /open.*(?:the attached|this attachment)/i, - /(?:enable|allow).*(?:macros|content|editing)/i, - /download.*(?:attachment|file|document)/i, - /\b(?:ransomware protection|virus alert|malware detected)\b/i - ], - - // Suspicious links - suspiciousLinks: [ - /https?:\/\/bit\.ly\//i, - /https?:\/\/goo\.gl\//i, - /https?:\/\/t\.co\//i, - /https?:\/\/tinyurl\.com\//i, - /https?:\/\/(?:\d{1,3}\.){3}\d{1,3}/i, // IP address URLs - /https?:\/\/.*\.(?:xyz|top|club|gq|cf)\//i, // Suspicious TLDs - /(?:login|account|signin|auth).*\.(?!gov|edu|com|org|net)\w+\.\w+/i, // Login pages on unusual domains - ], - - // XSS and script injection - scriptInjection: [ - /.*<\/script>/is, - /javascript:/i, - /on(?:click|load|mouse|error|focus|blur)=".*"/i, - /document\.(?:cookie|write|location)/i, - /eval\s*\(/i - ], - - // Sensitive data patterns - sensitiveData: [ - /\b(?:\d{3}-\d{2}-\d{4}|\d{9})\b/, // SSN - /\b\d{13,16}\b/, // Credit card numbers - /\b(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})\b/ // Possible Base64 - ] - }; - - // Common executable extensions - private static readonly EXECUTABLE_EXTENSIONS = [ - '.exe', '.dll', '.bat', '.cmd', '.msi', '.ts', '.vbs', '.ps1', - '.sh', '.jar', '.py', '.com', '.scr', '.pif', '.hta', '.cpl', - '.reg', '.vba', '.lnk', '.wsf', '.msi', '.msp', '.mst' - ]; - - // Document formats that may contain macros - private static readonly MACRO_DOCUMENT_EXTENSIONS = [ - '.doc', '.docm', '.xls', '.xlsm', '.ppt', '.pptm', '.dotm', '.xlsb', '.ppam', '.potm' - ]; - /** * Default options for the content scanner */ @@ -185,7 +117,9 @@ export class ContentScanner { } /** - * Scan an email for malicious content + * Scan an email for malicious content. + * Delegates text/subject/html/filename pattern scanning to Rust. + * Binary attachment scanning (PE headers, VBA macros) stays in TS. * @param email The email to scan * @returns Scan result */ @@ -193,74 +127,67 @@ export class ContentScanner { try { // Generate a cache key from the email const cacheKey = this.generateCacheKey(email); - + // Check cache first const cachedResult = this.scanCache.get(cacheKey); if (cachedResult) { logger.log('info', `Using cached scan result for email ${email.getMessageId()}`); return cachedResult; } - - // Initialize scan result + + // Delegate text/subject/html/filename scanning to Rust + const bridge = RustSecurityBridge.getInstance(); + const rustResult = await bridge.scanContent({ + subject: this.options.scanSubject ? email.subject : undefined, + textBody: this.options.scanBody ? email.text : undefined, + htmlBody: this.options.scanBody ? email.html : undefined, + attachmentNames: this.options.scanAttachmentNames + ? email.attachments?.map(a => a.filename) ?? [] + : [], + }); + const result: IScanResult = { isClean: true, - threatScore: 0, - scannedElements: [], - timestamp: Date.now() + threatScore: rustResult.threatScore, + threatType: rustResult.threatType ?? undefined, + threatDetails: rustResult.threatDetails ?? undefined, + scannedElements: rustResult.scannedElements, + timestamp: Date.now(), }; - - // List of scan promises - const scanPromises: Array> = []; - - // Scan subject - if (this.options.scanSubject && email.subject) { - scanPromises.push(this.scanSubject(email.subject, result)); - } - - // Scan body content - if (this.options.scanBody) { - if (email.text) { - scanPromises.push(this.scanTextContent(email.text, result)); - } - - if (email.html) { - scanPromises.push(this.scanHtmlContent(email.html, result)); - } - } - - // Scan attachments - if (this.options.scanAttachments && email.attachments && email.attachments.length > 0) { + + // Attachment binary scanning stays in TS (PE headers, macro detection) + if (this.options.scanAttachments && email.attachments?.length > 0) { for (const attachment of email.attachments) { - scanPromises.push(this.scanAttachment(attachment, result)); + this.scanAttachmentBinary(attachment, result); } } - - // Run all scans in parallel - await Promise.all(scanPromises); - + + // Apply custom rules (TS-only, runtime-configured) + this.applyCustomRules(email, result); + // Determine if the email is clean based on threat score result.isClean = result.threatScore < this.options.minThreatScore; - + // Save to cache this.scanCache.set(cacheKey, result); - + // Log high threat findings if (result.threatScore >= this.options.highThreatScore) { this.logHighThreatFound(email, result); } else if (!result.isClean) { this.logThreatFound(email, result); } - + return result; } catch (error) { logger.log('error', `Error scanning email: ${error.message}`, { messageId: email.getMessageId(), error: error.stack }); - + // Return a safe default with error indication return { - isClean: true, // Let it pass if scanner fails (configure as desired) + isClean: true, threatScore: 0, scannedElements: ['error'], timestamp: Date.now(), @@ -269,7 +196,7 @@ export class ContentScanner { }; } } - + /** * Generate a cache key from an email * @param email The email to generate a key for @@ -280,7 +207,7 @@ export class ContentScanner { if (email.getMessageId()) { return `email:${email.getMessageId()}`; } - + // Fallback to a hash of key content const contentToHash = [ email.from, @@ -289,321 +216,75 @@ export class ContentScanner { email.html?.substring(0, 1000) || '', email.attachments?.length || 0 ].join(':'); - + return `email:${plugins.crypto.createHash('sha256').update(contentToHash).digest('hex')}`; } - + /** - * Scan email subject for threats - * @param subject The subject to scan - * @param result The scan result to update - */ - private async scanSubject(subject: string, result: IScanResult): Promise { - result.scannedElements.push('subject'); - - // Check against phishing patterns - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.phishing) { - if (pattern.test(subject)) { - result.threatScore += 25; - result.threatType = ThreatCategory.PHISHING; - result.threatDetails = `Subject contains potential phishing indicators: ${subject}`; - return; - } - } - - // Check against spam patterns - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.spam) { - if (pattern.test(subject)) { - result.threatScore += 15; - result.threatType = ThreatCategory.SPAM; - result.threatDetails = `Subject contains potential spam indicators: ${subject}`; - return; - } - } - - // Check custom rules - for (const rule of this.options.customRules) { - const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); - if (pattern.test(subject)) { - result.threatScore += rule.score; - result.threatType = rule.type; - result.threatDetails = rule.description; - return; - } - } - } - - /** - * Scan plain text content for threats - * @param text The text content to scan - * @param result The scan result to update - */ - private async scanTextContent(text: string, result: IScanResult): Promise { - result.scannedElements.push('text'); - - // Check suspicious links - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.suspiciousLinks) { - if (pattern.test(text)) { - result.threatScore += 20; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SUSPICIOUS_LINK ? 0 : 20)) { - result.threatType = ThreatCategory.SUSPICIOUS_LINK; - result.threatDetails = `Text contains suspicious links`; - } - } - } - - // Check phishing - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.phishing) { - if (pattern.test(text)) { - result.threatScore += 25; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.PHISHING ? 0 : 25)) { - result.threatType = ThreatCategory.PHISHING; - result.threatDetails = `Text contains potential phishing indicators`; - } - } - } - - // Check spam - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.spam) { - if (pattern.test(text)) { - result.threatScore += 15; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SPAM ? 0 : 15)) { - result.threatType = ThreatCategory.SPAM; - result.threatDetails = `Text contains potential spam indicators`; - } - } - } - - // Check malware indicators - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.malware) { - if (pattern.test(text)) { - result.threatScore += 30; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.MALWARE ? 0 : 30)) { - result.threatType = ThreatCategory.MALWARE; - result.threatDetails = `Text contains potential malware indicators`; - } - } - } - - // Check sensitive data - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.sensitiveData) { - if (pattern.test(text)) { - result.threatScore += 25; - if (!result.threatType || result.threatScore > (result.threatType === ThreatCategory.SENSITIVE_DATA ? 0 : 25)) { - result.threatType = ThreatCategory.SENSITIVE_DATA; - result.threatDetails = `Text contains potentially sensitive data patterns`; - } - } - } - - // Check custom rules - for (const rule of this.options.customRules) { - const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); - if (pattern.test(text)) { - result.threatScore += rule.score; - if (!result.threatType || result.threatScore > 20) { - result.threatType = rule.type; - result.threatDetails = rule.description; - } - } - } - } - - /** - * Scan HTML content for threats - * @param html The HTML content to scan - * @param result The scan result to update - */ - private async scanHtmlContent(html: string, result: IScanResult): Promise { - result.scannedElements.push('html'); - - // Check for script injection - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.scriptInjection) { - if (pattern.test(html)) { - result.threatScore += 40; - if (!result.threatType || result.threatType !== ThreatCategory.XSS) { - result.threatType = ThreatCategory.XSS; - result.threatDetails = `HTML contains potentially malicious script content`; - } - } - } - - // Extract text content from HTML for further scanning - const textContent = this.extractTextFromHtml(html); - if (textContent) { - // We'll leverage the text scanning but not double-count threat score - const tempResult: IScanResult = { - isClean: true, - threatScore: 0, - scannedElements: [], - timestamp: Date.now() - }; - - await this.scanTextContent(textContent, tempResult); - - // Only add additional threat types if they're more severe - if (tempResult.threatType && tempResult.threatScore > 0) { - // Add half of the text content score to avoid double counting - result.threatScore += Math.floor(tempResult.threatScore / 2); - - // Adopt the threat type if more severe or no existing type - if (!result.threatType || tempResult.threatScore > result.threatScore) { - result.threatType = tempResult.threatType; - result.threatDetails = tempResult.threatDetails; - } - } - } - - // Extract and check links from HTML - const links = this.extractLinksFromHtml(html); - if (links.length > 0) { - // Check for suspicious links - let suspiciousLinks = 0; - for (const link of links) { - for (const pattern of ContentScanner.MALICIOUS_PATTERNS.suspiciousLinks) { - if (pattern.test(link)) { - suspiciousLinks++; - break; - } - } - } - - if (suspiciousLinks > 0) { - // Add score based on percentage of suspicious links - const suspiciousPercentage = (suspiciousLinks / links.length) * 100; - const additionalScore = Math.min(40, Math.floor(suspiciousPercentage / 2.5)); - result.threatScore += additionalScore; - - if (!result.threatType || additionalScore > 20) { - result.threatType = ThreatCategory.SUSPICIOUS_LINK; - result.threatDetails = `HTML contains ${suspiciousLinks} suspicious links out of ${links.length} total links`; - } - } - } - } - - /** - * Scan an attachment for threats + * Scan attachment binary content for PE headers and VBA macros. + * This stays in TS because it accesses raw Buffer data (too large for IPC). * @param attachment The attachment to scan * @param result The scan result to update */ - private async scanAttachment(attachment: IAttachment, result: IScanResult): Promise { - const filename = attachment.filename.toLowerCase(); - result.scannedElements.push(`attachment:${filename}`); - - // Skip large attachments if configured - if (attachment.content && attachment.content.length > this.options.maxAttachmentSizeToScan) { - logger.log('info', `Skipping scan of large attachment: ${filename} (${attachment.content.length} bytes)`); + private scanAttachmentBinary(attachment: IAttachment, result: IScanResult): void { + if (!attachment.content) { return; } - - // Check filename for executable extensions - if (this.options.blockExecutables) { - for (const ext of ContentScanner.EXECUTABLE_EXTENSIONS) { - if (filename.endsWith(ext)) { - result.threatScore += 70; // High score for executable attachments - result.threatType = ThreatCategory.EXECUTABLE; - result.threatDetails = `Attachment has a potentially dangerous extension: ${filename}`; - return; // No need to scan contents if filename already flagged - } - } + + // Skip large attachments + if (attachment.content.length > this.options.maxAttachmentSizeToScan) { + return; } - - // Check for Office documents with macros - if (this.options.blockMacros) { - for (const ext of ContentScanner.MACRO_DOCUMENT_EXTENSIONS) { - if (filename.endsWith(ext)) { - // For Office documents, check if they contain macros - // This is a simplified check - a real implementation would use specialized libraries - // to detect macros in Office documents - if (attachment.content && this.likelyContainsMacros(attachment)) { - result.threatScore += 60; - result.threatType = ThreatCategory.MALICIOUS_MACRO; - result.threatDetails = `Attachment appears to contain macros: ${filename}`; - return; - } - } - } + + const filename = attachment.filename.toLowerCase(); + + // Check for PE headers (Windows executables disguised with non-.exe extensions) + if (attachment.content.length > 64 && + attachment.content[0] === 0x4D && + attachment.content[1] === 0x5A) { // 'MZ' header + result.threatScore += 80; + result.threatType = ThreatCategory.EXECUTABLE; + result.threatDetails = `Attachment contains executable code: ${filename}`; + return; } - - // Perform basic content analysis if we have content buffer - if (attachment.content) { - // Convert to string for scanning, with a limit to prevent memory issues - const textContent = this.extractTextFromBuffer(attachment.content); - - if (textContent) { - // Scan for malicious patterns in attachment content - for (const category in ContentScanner.MALICIOUS_PATTERNS) { - const patterns = ContentScanner.MALICIOUS_PATTERNS[category]; - for (const pattern of patterns) { - if (pattern.test(textContent)) { - result.threatScore += 30; - - if (!result.threatType) { - result.threatType = this.mapCategoryToThreatType(category); - result.threatDetails = `Attachment content contains suspicious patterns: ${filename}`; - } - - break; - } - } - } - } - - // Check for PE headers (Windows executables) - if (attachment.content.length > 64 && - attachment.content[0] === 0x4D && - attachment.content[1] === 0x5A) { // 'MZ' header - result.threatScore += 80; - result.threatType = ThreatCategory.EXECUTABLE; - result.threatDetails = `Attachment contains executable code: ${filename}`; - } + + // Check for VBA macro indicators in Office documents + if (this.options.blockMacros && this.likelyContainsMacros(attachment)) { + result.threatScore += 60; + result.threatType = ThreatCategory.MALICIOUS_MACRO; + result.threatDetails = `Attachment appears to contain macros: ${filename}`; } } - + /** - * Extract links from HTML content - * @param html HTML content - * @returns Array of extracted links + * Apply custom rules (runtime-configured patterns) to the email. + * These stay in TS because they are configured at runtime. + * @param email The email to check + * @param result The scan result to update */ - private extractLinksFromHtml(html: string): string[] { - const links: string[] = []; - - // Simple regex-based extraction - a real implementation might use a proper HTML parser - const matches = html.match(/href=["'](https?:\/\/[^"']+)["']/gi); - if (matches) { - for (const match of matches) { - const linkMatch = match.match(/href=["'](https?:\/\/[^"']+)["']/i); - if (linkMatch && linkMatch[1]) { - links.push(linkMatch[1]); + private applyCustomRules(email: Email, result: IScanResult): void { + if (!this.options.customRules.length) { + return; + } + + const textsToCheck: string[] = []; + if (email.subject) textsToCheck.push(email.subject); + if (email.text) textsToCheck.push(email.text); + if (email.html) textsToCheck.push(email.html); + + for (const rule of this.options.customRules) { + const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); + for (const text of textsToCheck) { + if (pattern.test(text)) { + result.threatScore += rule.score; + result.threatType = rule.type; + result.threatDetails = rule.description; + return; } } } - - return links; } - - /** - * Extract plain text from HTML - * @param html HTML content - * @returns Extracted text - */ - private extractTextFromHtml(html: string): string { - // Remove HTML tags and decode entities - simplified version - return html - .replace(/]*>.*?<\/style>/gs, '') - .replace(/]*>.*?<\/script>/gs, '') - .replace(/<[^>]+>/g, ' ') - .replace(/ /g, ' ') - .replace(/</g, '<') - .replace(/>/g, '>') - .replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, "'") - .replace(/\s+/g, ' ') - .trim(); - } - + /** * Extract text from a binary buffer for scanning * @param buffer Binary content @@ -614,7 +295,7 @@ export class ContentScanner { // Limit the amount we convert to avoid memory issues const sampleSize = Math.min(buffer.length, 100 * 1024); // 100KB max sample const sample = buffer.slice(0, sampleSize); - + // Try to convert to string, filtering out non-printable chars return sample.toString('utf8') .replace(/[\x00-\x09\x0B-\x1F\x7F-\x9F]/g, '') // Remove control chars @@ -624,16 +305,13 @@ export class ContentScanner { return ''; } } - + /** * Check if an Office document likely contains macros - * This is a simplified check - real implementation would use specialized libraries * @param attachment The attachment to check * @returns Whether the file likely contains macros */ private likelyContainsMacros(attachment: IAttachment): boolean { - // Simple heuristic: look for VBA/macro related strings - // This is a simplified approach and not comprehensive const content = this.extractTextFromBuffer(attachment.content); const macroIndicators = [ /vbaProject\.bin/i, @@ -647,33 +325,16 @@ export class ContentScanner { /\bShell\(/i, /\bCreateObject\(/i ]; - + for (const indicator of macroIndicators) { if (indicator.test(content)) { return true; } } - + return false; } - - /** - * Map a pattern category to a threat type - * @param category The pattern category - * @returns The corresponding threat type - */ - private mapCategoryToThreatType(category: string): string { - switch (category) { - case 'phishing': return ThreatCategory.PHISHING; - case 'spam': return ThreatCategory.SPAM; - case 'malware': return ThreatCategory.MALWARE; - case 'suspiciousLinks': return ThreatCategory.SUSPICIOUS_LINK; - case 'scriptInjection': return ThreatCategory.XSS; - case 'sensitiveData': return ThreatCategory.SENSITIVE_DATA; - default: return ThreatCategory.BLACKLISTED_CONTENT; - } - } - + /** * Log a high threat finding to the security logger * @param email The email containing the threat diff --git a/ts/security/classes.rustsecuritybridge.ts b/ts/security/classes.rustsecuritybridge.ts index 5ccb78f..150d85e 100644 --- a/ts/security/classes.rustsecuritybridge.ts +++ b/ts/security/classes.rustsecuritybridge.ts @@ -59,6 +59,13 @@ interface IReputationResult { total_checked: number; } +interface IContentScanResult { + threatScore: number; + threatType: string | null; + threatDetails: string | null; + scannedElements: string[]; +} + interface IVersionInfo { bin: string; core: string; @@ -102,6 +109,15 @@ type TMailerCommands = { params: { ip: string; heloDomain: string; hostname?: string; mailFrom: string }; result: ISpfResult; }; + scanContent: { + params: { + subject?: string; + textBody?: string; + htmlBody?: string; + attachmentNames?: string[]; + }; + result: IContentScanResult; + }; verifyEmail: { params: { rawMessage: string; @@ -243,6 +259,16 @@ export class RustSecurityBridge { return this.bridge.sendCommand('detectBounce', opts); } + /** Scan email content for threats (phishing, spam, malware, etc.). */ + public async scanContent(opts: { + subject?: string; + textBody?: string; + htmlBody?: string; + attachmentNames?: string[]; + }): Promise { + return this.bridge.sendCommand('scanContent', opts); + } + /** Check IP reputation via DNSBL. */ public async checkIpReputation(ip: string): Promise { return this.bridge.sendCommand('checkIpReputation', { ip }); @@ -298,6 +324,7 @@ export type { IEmailSecurityResult, IValidationResult, IBounceDetection, + IContentScanResult, IReputationResult as IRustReputationResult, IVersionInfo, };