@social-mail/social-mail-web-server 1.7.91 → 1.7.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.91",
+  "version": "1.7.92",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/protocols/core/ReactionExtractor.ts

@@ -14,14 +14,20 @@ export const ReactionExtractor = {
         headers: string | {[key: string]: any}
     }, attachmentsLoader: () => Promise<{ contentType: string }[]>, forceFullMatch = true) {
         try {
-            let inReplyTo = null;
+            let inReplyTo = null as string;
+            let emailID = null as string;
             let engagement: string;
-            const index = email.subject.indexOf(":");
+            let index = email.subject.indexOf(":");
             if (index !== -1 && index <= 50) {
                 engagement = email.subject.substring(0, index);
                 inReplyTo = email.subject.substring(index + 1);
+                index = inReplyTo.indexOf(":");
+                if (index !== -1) {
+                    emailID = inReplyTo.substring(0, index);
+                    inReplyTo = inReplyTo.substring(index+1);
+                }
                 if (/\p{Emoji}/u.test(engagement)) {
-                    return { engagement, inReplyTo };
+                    return { engagement, inReplyTo, emailID };
                 }
             }
 
@@ -40,7 +46,7 @@ export const ReactionExtractor = {
             engagement = matches[0];
 
             if (engagement === textBody) {
-                return { engagement };
+                return { engagement, inReplyTo, emailID };
             }
 
             /**

package/src/server/smtp/services/EmailSerializerService.ts

@@ -27,6 +27,7 @@ import { ReactionExtractor } from "../../../protocols/core/ReactionExtractor.js"
 import { stripBrackets } from "../../../common/stripBrackets.js";
 import SmtpError from "./SmtpError.js";
 import { SmtpStatusCodes } from "../client/SmtpStatusCodes.js";
+import { Base36 } from "../../../common/Base36.js";
 // import PostReceiveWorkflow from "../../workflows/post-receive/PostReceiveWorkflow.js";
 // import UpdateEmailReferences from "../../workflows/incoming/UpdateEmailReferences.js";
 
@@ -366,6 +367,8 @@ export default class EmailSerializerService {
 
         let engagement = null;
 
+        let verifyParentID = null;
+
         if (received) {
             // check for engagements...
             const e1 = await ReactionExtractor.extractWithInReplyTo({
@@ -377,6 +380,7 @@ export default class EmailSerializerService {
             engagement = e1.engagement;
             if (!inReplyTo) {
                 inReplyTo = e1.inReplyTo;
+                verifyParentID = Base36.decode(e1.emailID) as any;
             }
         }
 
@@ -386,6 +390,13 @@ export default class EmailSerializerService {
                 .orderBy(void 0,(p) => (x) => x.emailID)
                 .first();
             if (original) {
+
+                if (verifyParentID) {
+                    if(verifyParentID !== original.emailID) {
+                        throw new SmtpError("Unable to process this email.", SmtpStatusCodes.DeliveryNotPermitted);
+                    }
+                }
+
                 parentID = original.emailID;
                 inReplyTo = null;
             }