@social-mail/social-mail-web-server 1.8.372 → 1.8.374
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/globalEnv.d.ts +4 -0
- package/dist/common/globalEnv.d.ts.map +1 -1
- package/dist/common/globalEnv.js +4 -0
- package/dist/common/globalEnv.js.map +1 -1
- package/dist/server/services/encryption/EncryptionService.d.ts +4 -0
- package/dist/server/services/encryption/EncryptionService.d.ts.map +1 -1
- package/dist/server/services/encryption/EncryptionService.js +14 -9
- package/dist/server/services/encryption/EncryptionService.js.map +1 -1
- package/dist/server/smtp/services/CachedEmailService.d.ts.map +1 -1
- package/dist/server/smtp/services/CachedEmailService.js +13 -2
- package/dist/server/smtp/services/CachedEmailService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/globalEnv.ts +4 -0
- package/src/server/services/encryption/EncryptionService.ts +15 -9
- package/src/server/smtp/services/CachedEmailService.ts +12 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BlB,4EAA4E;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2B1B,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyF7F,CAAC;AAeF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}
|
package/dist/common/globalEnv.js
CHANGED
|
@@ -35,6 +35,10 @@ export const globalEnv = {
|
|
|
35
35
|
senderEmailForNotification: process.env.SOCIAL_MAIL_SENDER_EMAIL_FOR_NOTIFICATION,
|
|
36
36
|
cdn,
|
|
37
37
|
cdnOrHost: cdn ?? host,
|
|
38
|
+
emailContentProxy: {
|
|
39
|
+
host: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT || null,
|
|
40
|
+
encryptionKey: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT_PUBLIC_KEY || process.env.SOCIAL_MAIL_PUBLIC_KEY
|
|
41
|
+
},
|
|
38
42
|
path: process.env.SOCIAL_MAIL_PATH || "/",
|
|
39
43
|
links: {
|
|
40
44
|
login: process.env.SOCIAL_MAIL_LINKS_LOGIN || process.env.SOCIAL_MAIL_EXTERNAL_LOGIN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
export default class EncryptionService {
|
|
2
|
+
global: {
|
|
3
|
+
encrypt: (text: string, publicKey: any, host: string) => string;
|
|
4
|
+
decrypt: (text: string, publicKey: any, host: string) => string;
|
|
5
|
+
};
|
|
2
6
|
general: {
|
|
3
7
|
encrypt: (text: string) => string;
|
|
4
8
|
decrypt: (text: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EncryptionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAElC,OAAO;wBACa,MAAM;wBACN,MAAM;MACxB;IAEF,MAAM;wBACc,MAAM;wBACN,MAAM;MACxB;IAEF,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"EncryptionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAElC,MAAM;wBACc,MAAM,wBAAmB,MAAM;wBAC/B,MAAM,wBAAoB,MAAM;MAClD;IAEF,OAAO;wBACa,MAAM;wBACN,MAAM;MACxB;IAEF,MAAM;wBACc,MAAM;wBACN,MAAM;MACxB;IAEF,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,SAAS;CAoBpB"}
|
|
@@ -10,6 +10,10 @@ import crypto from "node:crypto";
|
|
|
10
10
|
const cache = new Map();
|
|
11
11
|
let EncryptionService = class EncryptionService {
|
|
12
12
|
constructor() {
|
|
13
|
+
this.global = {
|
|
14
|
+
encrypt: (text, publicKey, host) => this.encrypt(text, publicKey, "base64url", host),
|
|
15
|
+
decrypt: (text, publicKey, host) => this.decrypt(text, publicKey, "base64url", host)
|
|
16
|
+
};
|
|
13
17
|
this.general = {
|
|
14
18
|
encrypt: (text) => this.encrypt(text, globalEnv.publicKey, "base64url"),
|
|
15
19
|
decrypt: (text) => this.decrypt(text, globalEnv.publicKey, "base64url")
|
|
@@ -19,32 +23,33 @@ let EncryptionService = class EncryptionService {
|
|
|
19
23
|
decrypt: (text) => this.decrypt(text, globalEnv.secretKey)
|
|
20
24
|
};
|
|
21
25
|
}
|
|
22
|
-
encrypt(text, secretKey = globalEnv.secretKey, encoding = "hex") {
|
|
23
|
-
const { key, encryptionIV } = this.createKey(secretKey);
|
|
26
|
+
encrypt(text, secretKey = globalEnv.secretKey, encoding = "hex", host = globalEnv.host) {
|
|
27
|
+
const { key, encryptionIV } = this.createKey(secretKey, host);
|
|
24
28
|
const cipher = crypto.createCipheriv("aes-256-cbc", key, encryptionIV);
|
|
25
29
|
return (cipher.update(text, "utf-8", encoding)
|
|
26
30
|
+ cipher.final(encoding)).replaceAll("=", "*");
|
|
27
31
|
}
|
|
28
|
-
decrypt(text, secretKey = globalEnv.secretKey, encoding = "hex") {
|
|
29
|
-
const { key, encryptionIV } = this.createKey(secretKey);
|
|
32
|
+
decrypt(text, secretKey = globalEnv.secretKey, encoding = "hex", host = globalEnv.host) {
|
|
33
|
+
const { key, encryptionIV } = this.createKey(secretKey, host);
|
|
30
34
|
text = text.replaceAll("*", "=");
|
|
31
35
|
const decipher = crypto.createDecipheriv("aes-256-cbc", key, encryptionIV);
|
|
32
36
|
return decipher.update(text, encoding, "utf-8") + decipher.final("utf-8");
|
|
33
37
|
}
|
|
34
|
-
createKey(secretKey) {
|
|
35
|
-
|
|
38
|
+
createKey(secretKey, host) {
|
|
39
|
+
const cacheKey = `${host}:${secretKey}`;
|
|
40
|
+
let result = cache.get(cacheKey);
|
|
36
41
|
if (!result) {
|
|
37
42
|
const key = crypto.createHash("sha512")
|
|
38
43
|
.update(secretKey)
|
|
39
44
|
.digest("hex")
|
|
40
45
|
.substring(0, 32);
|
|
41
46
|
const encryptionIV = crypto.createHash("sha512")
|
|
42
|
-
.update(
|
|
47
|
+
.update(host)
|
|
43
48
|
.digest("hex")
|
|
44
49
|
.substring(0, 16);
|
|
45
50
|
result = { key, encryptionIV };
|
|
46
|
-
cache.set(
|
|
47
|
-
setTimeout(() => cache.delete(
|
|
51
|
+
cache.set(cacheKey, result);
|
|
52
|
+
setTimeout(() => cache.delete(cacheKey), 60000);
|
|
48
53
|
}
|
|
49
54
|
return result;
|
|
50
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EncryptionService.js","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,MAAoB,MAAM,aAAa,CAAC;AAE/C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAiC,CAAC;AAGxC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QAEX,YAAO,GAAG;YACN,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,WAAW,CAAC;YAC/E,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,WAAW,CAAC;SAClF,CAAC;QAEF,WAAM,GAAG;YACL,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;YAClE,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;SACrE,CAAC;
|
|
1
|
+
{"version":3,"file":"EncryptionService.js","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAEhE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"CachedEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAY,MAAM,+BAA+B,CAAC;AAEhE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAK/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAGnC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,eAAe,EAAE,eAAe,CAAC;IAGjC,YAAY,EAAE,YAAY,CAAC;IAG3B,iBAAiB,EAAE,iBAAiB,CAAC;IAE/B,mBAAmB,CAAC,EAAE,OAAO,EAAE,MAAoB,EAAE,EAAE;QACzD,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAA;KAClB,EAAE,IAAI,GAAE,MAAW,EAAE,YAAY,MAAS;IAyE3C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;IAwChC,WAAW,CAAC,KAAK,EAAE,KAAK;IAKxB,YAAY,CAAC,OAAO,EAAE,MAAM;IAe5B,GAAG,CAAC,OAAO,KAAA;CAIpB"}
|
|
@@ -17,10 +17,10 @@ import CacheService from "../../services/cache/CacheService.js";
|
|
|
17
17
|
import EmailLogService from "../../services/email-logs/EmailLogService.js";
|
|
18
18
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
19
19
|
import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
|
|
20
|
+
import { globalEnv } from "../../../common/globalEnv.js";
|
|
20
21
|
let CachedEmailService = class CachedEmailService {
|
|
21
22
|
async getHtmlForRecipient({ emailID, status = "published" }, blog = "", senderDomain = void 0) {
|
|
22
23
|
const factory = async () => {
|
|
23
|
-
const ei = this.encryptionService.general.encrypt(emailID.toString());
|
|
24
24
|
let logFile;
|
|
25
25
|
if (!logFile) {
|
|
26
26
|
logFile = await this.db.emailLogs
|
|
@@ -51,12 +51,23 @@ let CachedEmailService = class CachedEmailService {
|
|
|
51
51
|
}
|
|
52
52
|
const htmlService = ServiceProvider.resolve(this, BlogContentTransformer);
|
|
53
53
|
if (status !== "draft") {
|
|
54
|
+
let ei;
|
|
55
|
+
let prefix;
|
|
56
|
+
const { host, encryptionKey } = globalEnv.emailContentProxy;
|
|
57
|
+
if (host) {
|
|
58
|
+
ei = this.encryptionService.global.encrypt(emailID.toString(), encryptionKey, host);
|
|
59
|
+
prefix = `https://${host}/api/emails/d/${ei}/${emailID}/`;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
ei = this.encryptionService.general.encrypt(emailID.toString());
|
|
63
|
+
prefix = `/api/emails/d/${ei}/${emailID}/`;
|
|
64
|
+
}
|
|
54
65
|
html = await htmlService.sanitizeExternalResources({
|
|
55
66
|
html,
|
|
56
67
|
emailID,
|
|
57
68
|
messageID: void 0,
|
|
58
69
|
senderDomain,
|
|
59
|
-
prefix
|
|
70
|
+
prefix,
|
|
60
71
|
blog
|
|
61
72
|
});
|
|
62
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedEmailService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAEhE,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAE/E,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"CachedEmailService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"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"}
|