@social-mail/social-mail-web-server 1.16.53 → 1.16.55
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpReceiver.d.ts","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"SmtpReceiver.d.ts","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;AAKhF,OAAO,QAAQ,aAAa,CAAC;IAEzB,UAAU,iBAAiB;QACvB,KAAK,EAAE,eAAe,CAAC;QACvB,OAAO,EAAE,mBAAmB,CAAC;KAChC;CACJ;AAyDD,MAAM,CAAC,OAAO,OAAO,YAAY;WAEf,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,IAAI,SAAK;CAoBxE"}
|
package/dist/SmtpReceiver.js
CHANGED
|
@@ -2,6 +2,7 @@ import * as smtpServer from "smtp-server";
|
|
|
2
2
|
import MailReceiverService from "./server/smtp/services/MailReceiverService.js";
|
|
3
3
|
import { globalServices } from "./globalServices.js";
|
|
4
4
|
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
5
|
+
import SmtpError from "./server/smtp/services/SmtpError.js";
|
|
5
6
|
const chain = (promise, callback) => {
|
|
6
7
|
promise.then((resolved) => callback(void 0, resolved), (error) => {
|
|
7
8
|
ServerLogger.error(error);
|
|
@@ -14,9 +15,9 @@ const defaults = {
|
|
|
14
15
|
authOptional: true,
|
|
15
16
|
size: 50 * 1024 * 1024,
|
|
16
17
|
onMailFrom(address, session, callback) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
if (!session.secure) {
|
|
19
|
+
callback(new SmtpError("TLS Needed", 503));
|
|
20
|
+
}
|
|
20
21
|
// check blocked...
|
|
21
22
|
chain(session.service.acceptFrom(address), callback);
|
|
22
23
|
},
|
|
@@ -46,6 +47,7 @@ export default class SmtpReceiver {
|
|
|
46
47
|
static create(options, port = 25) {
|
|
47
48
|
return new Promise((resolve, reject) => {
|
|
48
49
|
options = { ...defaults, ...(options ?? {}) };
|
|
50
|
+
options.hideREQUIRETLS = false;
|
|
49
51
|
const server = new smtpServer.SMTPServer(options);
|
|
50
52
|
try {
|
|
51
53
|
server.listen(port, "0.0.0.0", () => {
|
package/dist/SmtpReceiver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpReceiver.js","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,YAAY,MAAM,uDAAuD,CAAC;
|
|
1
|
+
{"version":3,"file":"SmtpReceiver.js","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@social-mail/social-mail-web-server",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.55",
|
|
4
4
|
"description": "## Phase 1",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"pg-pool": "^3.10.1",
|
|
56
56
|
"qrcode": "^1.5.3",
|
|
57
57
|
"semver": "^7.6.2",
|
|
58
|
-
"smtp-server": "^3.
|
|
58
|
+
"smtp-server": "^3.19.1",
|
|
59
59
|
"socket.io": "^4.7.2",
|
|
60
60
|
"stripe": "^17.3.1",
|
|
61
61
|
"tldts": "7.0.13",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@types/pg": "^8.10.2",
|
|
80
80
|
"@types/pg-cursor": "^2.7.0",
|
|
81
81
|
"@types/qrcode": "^1.5.1",
|
|
82
|
-
"@types/smtp-server": "^3.5.
|
|
82
|
+
"@types/smtp-server": "^3.5.13",
|
|
83
83
|
"@types/tmp": "^0.2.3",
|
|
84
84
|
"@types/ws": "^8.5.10",
|
|
85
85
|
"@typescript-eslint/eslint-plugin": "^6.6.0",
|
package/src/SmtpReceiver.ts
CHANGED
|
@@ -4,6 +4,7 @@ import * as smtpServer from "smtp-server";
|
|
|
4
4
|
import MailReceiverService from "./server/smtp/services/MailReceiverService.js";
|
|
5
5
|
import { globalServices } from "./globalServices.js";
|
|
6
6
|
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
7
|
+
import SmtpError from "./server/smtp/services/SmtpError.js";
|
|
7
8
|
|
|
8
9
|
declare module "smtp-server" {
|
|
9
10
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
@@ -31,9 +32,9 @@ const defaults = {
|
|
|
31
32
|
|
|
32
33
|
onMailFrom(address, session, callback): void {
|
|
33
34
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
if (!session.secure) {
|
|
36
|
+
callback(new SmtpError("TLS Needed", 503));
|
|
37
|
+
}
|
|
37
38
|
|
|
38
39
|
// check blocked...
|
|
39
40
|
chain(session.service.acceptFrom(address), callback);
|
|
@@ -52,7 +53,7 @@ const defaults = {
|
|
|
52
53
|
},
|
|
53
54
|
|
|
54
55
|
onData(stream, session, callback) {
|
|
55
|
-
chain(session.service.acceptData(stream), callback);
|
|
56
|
+
chain(session.service.acceptData(stream), callback as any);
|
|
56
57
|
},
|
|
57
58
|
|
|
58
59
|
allowInsecureAuth: false,
|
|
@@ -73,6 +74,7 @@ export default class SmtpReceiver {
|
|
|
73
74
|
public static create(options: smtpServer.SMTPServerOptions, port = 25) {
|
|
74
75
|
return new Promise<smtpServer.SMTPServer>((resolve, reject) => {
|
|
75
76
|
options = { ... defaults , ... (options ?? {})};
|
|
77
|
+
(options as any).hideREQUIRETLS = false;
|
|
76
78
|
const server = new smtpServer.SMTPServer(options);
|
|
77
79
|
try {
|
|
78
80
|
server.listen(port, "0.0.0.0", () => {
|