@social-mail/social-mail-web-server 1.5.442 → 1.5.444
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/server/services/encryption/EncryptionService.js +7 -7
- 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 +2 -2
- package/dist/server/smtp/services/CachedEmailService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/services/encryption/EncryptionService.ts +8 -8
- package/src/server/smtp/services/CachedEmailService.ts +5 -4
|
@@ -11,25 +11,25 @@ const cache = new Map();
|
|
|
11
11
|
let EncryptionService = class EncryptionService {
|
|
12
12
|
constructor() {
|
|
13
13
|
this.general = {
|
|
14
|
-
encrypt: (text) => this.encrypt(text, globalEnv.publicKey),
|
|
15
|
-
decrypt: (text) => this.decrypt(text, globalEnv.publicKey)
|
|
14
|
+
encrypt: (text) => this.encrypt(text, globalEnv.publicKey, "base64url"),
|
|
15
|
+
decrypt: (text) => this.decrypt(text, globalEnv.publicKey, "base64url")
|
|
16
16
|
};
|
|
17
17
|
this.secure = {
|
|
18
18
|
encrypt: (text) => this.encrypt(text, globalEnv.secretKey),
|
|
19
19
|
decrypt: (text) => this.decrypt(text, globalEnv.secretKey)
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
encrypt(text, secretKey = globalEnv.secretKey) {
|
|
22
|
+
encrypt(text, secretKey = globalEnv.secretKey, encoding = "hex") {
|
|
23
23
|
const { key, encryptionIV } = this.createKey(secretKey);
|
|
24
24
|
const cipher = crypto.createCipheriv("aes-256-cbc", key, encryptionIV);
|
|
25
|
-
return (cipher.update(text, "utf8",
|
|
26
|
-
+ cipher.final(
|
|
25
|
+
return (cipher.update(text, "utf8", encoding)
|
|
26
|
+
+ cipher.final(encoding)).replaceAll("=", "*");
|
|
27
27
|
}
|
|
28
|
-
decrypt(text, secretKey = globalEnv.secretKey) {
|
|
28
|
+
decrypt(text, secretKey = globalEnv.secretKey, encoding = "hex") {
|
|
29
29
|
const { key, encryptionIV } = this.createKey(secretKey);
|
|
30
30
|
text = text.replaceAll("*", "=");
|
|
31
31
|
const decipher = crypto.createDecipheriv("aes-256-cbc", key, encryptionIV);
|
|
32
|
-
return
|
|
32
|
+
return decipher.update(text, encoding, "utf8") + decipher.final("utf8");
|
|
33
33
|
}
|
|
34
34
|
createKey(secretKey) {
|
|
35
35
|
let result = cache.get(secretKey);
|
|
@@ -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,
|
|
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;AAG/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,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE;QAC/E,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,SAAS,CAAC,EAAE,MAAM,CAAA;KACrB;
|
|
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;AAG/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,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE;QAC/E,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,SAAS,CAAC,EAAE,MAAM,CAAA;KACrB;IA8ED,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"}
|
|
@@ -39,7 +39,7 @@ let CachedEmailService = class CachedEmailService {
|
|
|
39
39
|
.first();
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
|
|
42
|
+
if (!logFile) {
|
|
43
43
|
logFile = await this.db.emailLogs
|
|
44
44
|
.where({ emailID }, (p) => (x) => x.mimeFileEmails.some((mf) => mf.emailID === p.emailID))
|
|
45
45
|
.first();
|
|
@@ -76,7 +76,7 @@ let CachedEmailService = class CachedEmailService {
|
|
|
76
76
|
return htmlFile;
|
|
77
77
|
};
|
|
78
78
|
const ef = await this.cacheService.get({
|
|
79
|
-
key: `cached-email-html-
|
|
79
|
+
key: `cached-email-html-a8-${emailID}-${emailAddressID}-${signedFileLogID}`,
|
|
80
80
|
factory,
|
|
81
81
|
ttl: TimeSpan.fromDays(30)
|
|
82
82
|
});
|
|
@@ -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;AAIhE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAcnC,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAK9E;QAEG,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEtE,IAAI,OAAiB,CAAC;YAEtB,IAAI,eAAe,EAAE,CAAC;gBAClB,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS;qBAC5B,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,eAAe,CAAC;qBACvE,KAAK,EAAE,CAAC;YACjB,CAAC;iBAAM,CAAC;gBAEJ,IAAI,cAAc,EAAE,CAAC;oBAEjB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAC,EACtF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,CAAC,CAAC,cAAc;2BAC5C,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;2BACvB,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS;2BAC3B,CAAC,CAAC,eAAe,KAAK,IAAI,CAChC,CAAC,KAAK,EAAE,CAAC;oBACd,IAAI,GAAG,EAAE,CAAC;wBACN,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;wBACtC,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS;6BAC5B,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,eAAe,CAAC;6BACvE,KAAK,EAAE,CAAC;oBACjB,CAAC;gBACL,CAAC;
|
|
1
|
+
{"version":3,"file":"CachedEmailService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/CachedEmailService.ts"],"names":[],"mappings":"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"}
|