@social-mail/social-mail-web-server 1.8.373 → 1.8.374

package/package.json

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

package/src/common/globalEnv.ts

@@ -44,9 +44,10 @@ export const globalEnv = {
     ips: (process.env.SOCIAL_MAIL_IPS ?? "").split(",").map((x) => x.trim()).filter((x) => x),
     senderEmailForNotification: process.env.SOCIAL_MAIL_SENDER_EMAIL_FOR_NOTIFICATION,
     cdn,
-    hosts:{
-        cdnOrHost: cdn ?? host,
-        emailContentHost: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT || ""
+    cdnOrHost: cdn ?? host,
+    emailContentProxy: {
+        host: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT || null,
+        encryptionKey: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT_PUBLIC_KEY || process.env.SOCIAL_MAIL_PUBLIC_KEY
     },
     path: process.env.SOCIAL_MAIL_PATH || "/",
     links: {

package/src/server/services/channels/ChannelUrlService.ts

@@ -28,7 +28,7 @@ export default class ChannelUrlService {
         eDomain
     }: IFileUrlOptions): string {
         const cid = this.ecs.general.encrypt(file.fileContentID.toString());
-        return `https://${globalEnv.hosts.cdnOrHost}/social-mail/video-player/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
+        return `https://${globalEnv.cdnOrHost}/social-mail/video-player/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
     }
 
     toWebMUrl({
@@ -38,7 +38,7 @@ export default class ChannelUrlService {
     }: IFileUrlOptions): string {
         const cid = this.ecs.general.encrypt(file.fileContentID.toString());
         if (eDomain) {
-            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
+            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);
@@ -78,7 +78,7 @@ export default class ChannelUrlService {
             name = `${file.name}.i1-${ext}`;
         }
         if (eDomain) {
-            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
+            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);
@@ -98,7 +98,7 @@ export default class ChannelUrlService {
         const method = "view";
         const name = file.name;
         if(eDomain) {
-            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
+            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);

package/src/server/services/encryption/EncryptionService.ts

@@ -7,6 +7,11 @@ const cache = new Map<string, { key, encryptionIV }>();
 @RegisterSingleton
 export default class EncryptionService {
 
+    global = {
+        encrypt: (text: string, publicKey, host: string) => this.encrypt(text, publicKey, "base64url", host),
+        decrypt: (text: string, publicKey,  host: string) => this.decrypt(text, publicKey, "base64url", host)
+    };
+
     general = {
         encrypt: (text: string) => this.encrypt(text, globalEnv.publicKey, "base64url"),
         decrypt: (text: string) => this.decrypt(text, globalEnv.publicKey, "base64url")
@@ -17,23 +22,24 @@ export default class EncryptionService {
         decrypt: (text: string) => this.decrypt(text, globalEnv.secretKey)
     };
 
-    private encrypt(text: string, secretKey = globalEnv.secretKey, encoding: Encoding = "hex") {
-        const { key, encryptionIV}  = this.createKey(secretKey);
+    private encrypt(text: string, secretKey = globalEnv.secretKey, encoding: Encoding = "hex", host = globalEnv.host) {
+        const { key, encryptionIV}  = this.createKey(secretKey, host);
         const cipher = crypto.createCipheriv("aes-256-cbc", key, encryptionIV);
         return (cipher.update(text, "utf-8", encoding)
                 + cipher.final(encoding)).replaceAll("=", "*");
     }
 
-    private decrypt(text: string, secretKey = globalEnv.secretKey, encoding: Encoding = "hex") {
-        const { key, encryptionIV}  = this.createKey(secretKey);
+    private decrypt(text: string, secretKey = globalEnv.secretKey, encoding: Encoding = "hex", host = globalEnv.host) {
+        const { key, encryptionIV}  = this.createKey(secretKey, host);
         text = text.replaceAll("*" , "=");
         const decipher = crypto.createDecipheriv("aes-256-cbc", key, encryptionIV);
         return decipher.update(text, encoding, "utf-8") + decipher.final("utf-8");
     }
 
-    private createKey(secretKey: string) {
+    private createKey(secretKey: string, host) {
 
-        let result = cache.get(secretKey);
+        const cacheKey = `${host}:${secretKey}`;
+        let result = cache.get(cacheKey);
         if(!result) {
             const key = crypto.createHash("sha512")
                 .update(secretKey)
@@ -41,12 +47,12 @@ export default class EncryptionService {
                 .substring(0, 32);
 
             const encryptionIV = crypto.createHash("sha512")
-                .update(globalEnv.host)
+                .update(host)
                 .digest("hex")
                 .substring(0, 16);
             result = { key, encryptionIV };
-            cache.set(secretKey, result);
-            setTimeout(() => cache.delete(secretKey), 60000);
+            cache.set(cacheKey, result);
+            setTimeout(() => cache.delete(cacheKey), 60000);
         }
         return result;
     }

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

@@ -34,7 +34,6 @@ export default class CachedEmailService {
 
         const factory = async () => {
 
-            const ei = this.encryptionService.general.encrypt(emailID.toString());
 
             let logFile: EmailLog;
 
@@ -70,10 +69,16 @@ export default class CachedEmailService {
             }
             const htmlService = ServiceProvider.resolve(this, BlogContentTransformer);
             if (status !== "draft") {
-                const { emailContentHost } = globalEnv.hosts;
-                const prefix = emailContentHost
-                    ? `/api/emails/d/${ei}/${emailID}/`
-                    : `https://${emailContentHost}/api/emails/d/${ei}/${emailID}/`;
+                let ei;
+                let prefix;
+                const { host, encryptionKey } = globalEnv.emailContentProxy;
+                if (host) {
+                    ei = this.encryptionService.global.encrypt(emailID.toString(), encryptionKey, host);
+                    prefix = `https://${host}/api/emails/d/${ei}/${emailID}/`;
+                } else {
+                    ei = this.encryptionService.general.encrypt(emailID.toString());
+                    prefix = `/api/emails/d/${ei}/${emailID}/`;
+                }
                 html = await htmlService.sanitizeExternalResources({
                     html,
                     emailID,

package/src/server/workflows/smtp/MailDispatcherService.ts

@@ -109,9 +109,9 @@ export default class MailDispatcherService {
 
                 const downloadLink = /^video\//i.test(ea.contentType)
                     ? (listID
-                        ? `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/webm-branded/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`
-                        : `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/webm/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`)
-                    : `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/view/${postID}/${ea.appFileID}/2-${fileName}`;
+                        ? `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/webm-branded/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`
+                        : `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/webm/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`)
+                    : `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/view/${postID}/${ea.appFileID}/2-${fileName}`;
 
                 return {
                     content: downloadLink,