Haraka 3.0.3 → 3.0.4
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/.eslintrc.yaml +5 -9
- package/.prettierrc.yml +1 -0
- package/CONTRIBUTORS.md +11 -0
- package/Changes.md +1365 -1214
- package/Plugins.md +117 -105
- package/README.md +4 -13
- package/bin/haraka +197 -298
- package/config/auth_flat_file.ini +1 -0
- package/config/dhparams.pem +8 -0
- package/config/mail_from.is_resolvable.ini +4 -2
- package/config/me +1 -0
- package/config/outbound.ini +0 -2
- package/config/plugins +36 -35
- package/config/smtp.ini +0 -1
- package/config/smtp.json +17 -0
- package/config/tls_cert.pem +23 -0
- package/config/tls_key.pem +28 -0
- package/connection.js +46 -73
- package/contrib/bsd-rc.d/haraka +3 -1
- package/contrib/plugin2npm.sh +6 -36
- package/docs/CoreConfig.md +2 -2
- package/docs/Logging.md +7 -21
- package/docs/Outbound.md +104 -201
- package/docs/Plugins.md +2 -2
- package/docs/Transaction.md +59 -82
- package/docs/plugins/queue/smtp_proxy.md +5 -10
- package/docs/plugins/tls.md +29 -9
- package/endpoint.js +16 -13
- package/haraka.js +10 -14
- package/host_pool.js +5 -5
- package/line_socket.js +3 -4
- package/logger.js +44 -28
- package/outbound/client_pool.js +27 -23
- package/outbound/config.js +4 -6
- package/outbound/fsync_writestream.js +1 -1
- package/outbound/hmail.js +178 -218
- package/outbound/index.js +86 -99
- package/outbound/qfile.js +1 -1
- package/outbound/queue.js +51 -44
- package/outbound/timer_queue.js +3 -2
- package/outbound/tls.js +19 -7
- package/package.json +59 -48
- package/plugins/.eslintrc.yaml +0 -6
- package/plugins/auth/auth_base.js +4 -2
- package/plugins/auth/auth_proxy.js +14 -12
- package/plugins/auth/auth_vpopmaild.js +1 -1
- package/plugins/block_me.js +1 -1
- package/plugins/data.signatures.js +2 -4
- package/plugins/early_talker.js +2 -1
- package/plugins/mail_from.is_resolvable.js +65 -135
- package/plugins/queue/deliver.js +4 -5
- package/plugins/queue/lmtp.js +11 -14
- package/plugins/queue/qmail-queue.js +2 -2
- package/plugins/queue/quarantine.js +2 -2
- package/plugins/queue/rabbitmq.js +16 -17
- package/plugins/queue/smtp_forward.js +3 -3
- package/plugins/queue/smtp_proxy.js +10 -1
- package/plugins/queue/test.js +2 -2
- package/plugins/rcpt_to.host_list_base.js +5 -5
- package/plugins/rcpt_to.in_host_list.js +2 -2
- package/plugins/relay.js +6 -7
- package/plugins/reseed_rng.js +1 -1
- package/plugins/status.js +37 -33
- package/plugins/tls.js +2 -2
- package/plugins/xclient.js +3 -2
- package/plugins.js +50 -54
- package/run_tests +3 -30
- package/server.js +190 -190
- package/smtp_client.js +30 -23
- package/{tests → test}/config/plugins +0 -2
- package/{tests → test}/config/smtp.ini +1 -1
- package/test/config/tls/example.com/_.example.com.key +28 -0
- package/test/config/tls/example.com/example.com.crt +25 -0
- package/test/connection.js +302 -0
- package/test/endpoint.js +94 -0
- package/{tests → test}/fixtures/line_socket.js +1 -1
- package/{tests → test}/fixtures/util_hmailitem.js +19 -25
- package/{tests → test}/host_pool.js +42 -57
- package/test/logger.js +258 -0
- package/test/outbound/hmail.js +141 -0
- package/test/outbound/index.js +220 -0
- package/test/outbound/qfile.js +126 -0
- package/test/outbound_bounce_net_errors.js +142 -0
- package/{tests → test}/outbound_bounce_rfc3464.js +110 -122
- package/test/plugins/auth/auth_base.js +484 -0
- package/test/plugins/auth/auth_vpopmaild.js +83 -0
- package/test/plugins/early_talker.js +104 -0
- package/test/plugins/mail_from.is_resolvable.js +35 -0
- package/test/plugins/queue/smtp_forward.js +206 -0
- package/test/plugins/rcpt_to.host_list_base.js +122 -0
- package/test/plugins/rcpt_to.in_host_list.js +193 -0
- package/test/plugins/relay.js +303 -0
- package/test/plugins/status.js +130 -0
- package/test/plugins/tls.js +70 -0
- package/test/plugins.js +228 -0
- package/test/rfc1869.js +73 -0
- package/test/server.js +491 -0
- package/test/smtp_client.js +299 -0
- package/test/tls_socket.js +273 -0
- package/test/transaction.js +270 -0
- package/tls_socket.js +202 -252
- package/transaction.js +8 -23
- package/CONTRIBUTING.md +0 -1
- package/bin/dkimverify +0 -40
- package/config/access.domains +0 -13
- package/config/attachment.ctype.regex +0 -2
- package/config/attachment.filename.regex +0 -1
- package/config/avg.ini +0 -5
- package/config/bounce.ini +0 -15
- package/config/data.headers.ini +0 -61
- package/config/dkim/dkim_key_gen.sh +0 -78
- package/config/dkim_sign.ini +0 -4
- package/config/dkim_verify.ini +0 -7
- package/config/dnsbl.ini +0 -23
- package/config/greylist.ini +0 -43
- package/config/helo.checks.ini +0 -52
- package/config/messagesniffer.ini +0 -18
- package/config/spamassassin.ini +0 -56
- package/dkim.js +0 -614
- package/docs/plugins/avg.md +0 -35
- package/docs/plugins/bounce.md +0 -69
- package/docs/plugins/clamd.md +0 -147
- package/docs/plugins/esets.md +0 -8
- package/docs/plugins/greylist.md +0 -90
- package/docs/plugins/helo.checks.md +0 -135
- package/docs/plugins/messagesniffer.md +0 -163
- package/docs/plugins/spamassassin.md +0 -180
- package/outbound/mx_lookup.js +0 -70
- package/plugins/auth/auth_ldap.js +0 -3
- package/plugins/avg.js +0 -162
- package/plugins/backscatterer.js +0 -25
- package/plugins/bounce.js +0 -381
- package/plugins/clamd.js +0 -382
- package/plugins/data.uribl.js +0 -4
- package/plugins/dkim_sign.js +0 -395
- package/plugins/dkim_verify.js +0 -62
- package/plugins/dns_list_base.js +0 -221
- package/plugins/dnsbl.js +0 -146
- package/plugins/dnswl.js +0 -58
- package/plugins/esets.js +0 -71
- package/plugins/graph.js +0 -5
- package/plugins/greylist.js +0 -645
- package/plugins/helo.checks.js +0 -533
- package/plugins/messagesniffer.js +0 -381
- package/plugins/rcpt_to.ldap.js +0 -3
- package/plugins/rcpt_to.max_count.js +0 -24
- package/plugins/spamassassin.js +0 -384
- package/tests/config/dkim/example.com/dns +0 -29
- package/tests/config/dkim/example.com/private +0 -6
- package/tests/config/dkim/example.com/public +0 -4
- package/tests/config/dkim/example.com/selector +0 -1
- package/tests/config/dkim.private.key +0 -6
- package/tests/config/dkim_sign.ini +0 -4
- package/tests/config/helo.checks.ini +0 -52
- package/tests/connection.js +0 -327
- package/tests/endpoint.js +0 -128
- package/tests/fixtures/vm_harness.js +0 -59
- package/tests/logger.js +0 -327
- package/tests/outbound/hmail.js +0 -112
- package/tests/outbound/index.js +0 -324
- package/tests/outbound/qfile.js +0 -67
- package/tests/outbound_bounce_net_errors.js +0 -173
- package/tests/plugins/auth/auth_base.js +0 -463
- package/tests/plugins/auth/auth_vpopmaild.js +0 -91
- package/tests/plugins/bounce.js +0 -307
- package/tests/plugins/clamd.js +0 -224
- package/tests/plugins/deprecated/relay_acl.js +0 -140
- package/tests/plugins/deprecated/relay_all.js +0 -59
- package/tests/plugins/dkim_sign.js +0 -315
- package/tests/plugins/dkim_signer.js +0 -108
- package/tests/plugins/dns_list_base.js +0 -259
- package/tests/plugins/dnsbl.js +0 -101
- package/tests/plugins/early_talker.js +0 -115
- package/tests/plugins/greylist.js +0 -58
- package/tests/plugins/helo.checks.js +0 -525
- package/tests/plugins/mail_from.is_resolvable.js +0 -116
- package/tests/plugins/queue/smtp_forward.js +0 -221
- package/tests/plugins/rcpt_to.host_list_base.js +0 -132
- package/tests/plugins/rcpt_to.in_host_list.js +0 -218
- package/tests/plugins/relay.js +0 -339
- package/tests/plugins/spamassassin.js +0 -171
- package/tests/plugins/status.js +0 -138
- package/tests/plugins/tls.js +0 -84
- package/tests/plugins.js +0 -247
- package/tests/rfc1869.js +0 -61
- package/tests/server.js +0 -510
- package/tests/smtp_client/auth.js +0 -105
- package/tests/smtp_client/basic.js +0 -101
- package/tests/smtp_client.js +0 -80
- package/tests/tls_socket.js +0 -333
- package/tests/transaction.js +0 -284
- /package/docs/{plugins → deprecated}/dkim_sign.md +0 -0
- /package/docs/{plugins → deprecated}/dkim_verify.md +0 -0
- /package/docs/{plugins → deprecated}/dnsbl.md +0 -0
- /package/docs/{plugins → deprecated}/dnswl.md +0 -0
- /package/{tests → test}/.eslintrc.yaml +0 -0
- /package/{tests → test}/config/auth_flat_file.ini +0 -0
- /package/{tests → test}/config/dhparams.pem +0 -0
- /package/{tests → test}/config/host_list +0 -0
- /package/{tests → test}/config/outbound_tls_cert.pem +0 -0
- /package/{tests → test}/config/outbound_tls_key.pem +0 -0
- /package/{tests → test}/config/smtp_forward.ini +0 -0
- /package/{tests → test}/config/tls/ec.pem +0 -0
- /package/{tests → test}/config/tls/haraka.local.pem +0 -0
- /package/{tests → test}/config/tls/mismatched.pem +0 -0
- /package/{tests → test}/config/tls.ini +0 -0
- /package/{tests → test}/config/tls_cert.pem +0 -0
- /package/{tests → test}/config/tls_key.pem +0 -0
- /package/{tests → test}/fixtures/todo_qfile.txt +0 -0
- /package/{tests → test}/installation/config/test-plugin-flat +0 -0
- /package/{tests → test}/installation/config/test-plugin.ini +0 -0
- /package/{tests → test}/installation/config/tls.ini +0 -0
- /package/{tests → test}/installation/node_modules/load_first/index.js +0 -0
- /package/{tests → test}/installation/node_modules/load_first/package.json +0 -0
- /package/{tests → test}/installation/node_modules/test-plugin/config/test-plugin-flat +0 -0
- /package/{tests → test}/installation/node_modules/test-plugin/config/test-plugin.ini +0 -0
- /package/{tests → test}/installation/node_modules/test-plugin/package.json +0 -0
- /package/{tests → test}/installation/node_modules/test-plugin/test-plugin.js +0 -0
- /package/{tests → test}/installation/plugins/base_plugin.js +0 -0
- /package/{tests → test}/installation/plugins/folder_plugin/index.js +0 -0
- /package/{tests → test}/installation/plugins/folder_plugin/package.json +0 -0
- /package/{tests → test}/installation/plugins/inherits.js +0 -0
- /package/{tests → test}/installation/plugins/load_first.js +0 -0
- /package/{tests → test}/installation/plugins/plugin.js +0 -0
- /package/{tests → test}/installation/plugins/tls.js +0 -0
- /package/{tests → test}/loud/config/dhparams.pem +0 -0
- /package/{tests → test}/loud/config/tls/goobered.pem +0 -0
- /package/{tests → test}/loud/config/tls.ini +0 -0
- /package/{tests → test}/mail_specimen/base64-root-part.txt +0 -0
- /package/{tests → test}/mail_specimen/varied-fold-lengths-preserve-data.txt +0 -0
- /package/{tests → test}/queue/1507509981169_1507509981169_0_61403_e0Y0Ym_1_fixed +0 -0
- /package/{tests → test}/queue/1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka +0 -0
- /package/{tests → test}/queue/1508269674999_1508269674999_0_34002_socVUF_1_haraka +0 -0
- /package/{tests → test}/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka +0 -0
- /package/{tests → test}/queue/multibyte +0 -0
- /package/{tests → test}/queue/plain +0 -0
- /package/{tests → test}/queue/zero-length +0 -0
- /package/{tests → test}/test-queue/delete-me +0 -0
|
@@ -0,0 +1,299 @@
|
|
|
1
|
+
const assert = require('node:assert')
|
|
2
|
+
const path = require('node:path');
|
|
3
|
+
|
|
4
|
+
const fixtures = require('haraka-test-fixtures');
|
|
5
|
+
const message = require('haraka-email-message')
|
|
6
|
+
|
|
7
|
+
const smtp_client = require('../smtp_client');
|
|
8
|
+
const test_socket = require('./fixtures/line_socket')
|
|
9
|
+
|
|
10
|
+
function getClientOpts (socket) {
|
|
11
|
+
return { port: 25, host: 'localhost', connect_timeout: 30, idle_timeout: 30, socket }
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
describe('smtp_client', () => {
|
|
15
|
+
|
|
16
|
+
it('testUpgradeIsCalledOnSTARTTLS', () => {
|
|
17
|
+
|
|
18
|
+
const plugin = new fixtures.plugin('queue/smtp_forward');
|
|
19
|
+
|
|
20
|
+
// switch config directory to 'test/config'
|
|
21
|
+
plugin.config = plugin.config.module_config(path.resolve('test'));
|
|
22
|
+
|
|
23
|
+
plugin.register();
|
|
24
|
+
|
|
25
|
+
const cmds = {};
|
|
26
|
+
let upgradeArgs = {};
|
|
27
|
+
|
|
28
|
+
const socket = {
|
|
29
|
+
setTimeout: arg => { },
|
|
30
|
+
setKeepAlive: arg => { },
|
|
31
|
+
on: (eventName, callback) => {
|
|
32
|
+
cmds[eventName] = callback;
|
|
33
|
+
},
|
|
34
|
+
upgrade: arg => {
|
|
35
|
+
upgradeArgs = arg;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const client = new smtp_client.smtp_client(getClientOpts(socket));
|
|
40
|
+
client.load_tls_config({ key: Buffer.from('OutboundTlsKeyLoaded')});
|
|
41
|
+
|
|
42
|
+
client.command = 'starttls';
|
|
43
|
+
cmds.line('250 Hello client.example.com\r\n');
|
|
44
|
+
|
|
45
|
+
const { StringDecoder } = require('string_decoder');
|
|
46
|
+
const decoder = new StringDecoder('utf8');
|
|
47
|
+
|
|
48
|
+
const cent = Buffer.from(upgradeArgs.key);
|
|
49
|
+
assert.equal(decoder.write(cent), 'OutboundTlsKeyLoaded');
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
it('startTLS', () => {
|
|
53
|
+
|
|
54
|
+
let cmd = '';
|
|
55
|
+
|
|
56
|
+
const socket = {
|
|
57
|
+
setTimeout: arg => { },
|
|
58
|
+
setKeepAlive: arg => { },
|
|
59
|
+
on: (eventName, callback) => { },
|
|
60
|
+
upgrade: arg => { },
|
|
61
|
+
write: arg => { cmd = arg; }
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const client = new smtp_client.smtp_client(getClientOpts(socket));
|
|
65
|
+
client.tls_options = {};
|
|
66
|
+
|
|
67
|
+
client.secured = false;
|
|
68
|
+
client.response = [ 'STARTTLS' ]
|
|
69
|
+
|
|
70
|
+
smtp_client.onCapabilitiesOutbound(client, false, undefined, { 'enable_tls': true });
|
|
71
|
+
|
|
72
|
+
assert.equal(cmd, 'STARTTLS\r\n');
|
|
73
|
+
})
|
|
74
|
+
|
|
75
|
+
describe('auth', () => {
|
|
76
|
+
|
|
77
|
+
beforeEach((done) => {
|
|
78
|
+
smtp_client.get_client({ notes: {}}, (client) => {
|
|
79
|
+
this.client = client
|
|
80
|
+
done()
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
socket: test_socket.connect(),
|
|
84
|
+
}
|
|
85
|
+
)
|
|
86
|
+
})
|
|
87
|
+
|
|
88
|
+
it('authenticates during SMTP conversation', (done) => {
|
|
89
|
+
|
|
90
|
+
const message_stream = new message.stream(
|
|
91
|
+
{ main : { spool_after : 1024 } }, "123456789"
|
|
92
|
+
);
|
|
93
|
+
|
|
94
|
+
const data = [];
|
|
95
|
+
let reading_body = false;
|
|
96
|
+
data.push('220 hi');
|
|
97
|
+
|
|
98
|
+
this.client.on('greeting', command => {
|
|
99
|
+
assert.equal(this.client.response[0], 'hi');
|
|
100
|
+
assert.equal('EHLO', command);
|
|
101
|
+
this.client.send_command(command, 'example.com');
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
data.push('EHLO example.com');
|
|
105
|
+
data.push('250 hello');
|
|
106
|
+
|
|
107
|
+
this.client.on('helo', () => {
|
|
108
|
+
assert.equal(this.client.response[0], 'hello');
|
|
109
|
+
this.client.send_command('AUTH', 'PLAIN AHRlc3QAdGVzdHBhc3M=');
|
|
110
|
+
this.client.send_command('MAIL', 'FROM: me@example.com');
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
data.push('AUTH PLAIN AHRlc3QAdGVzdHBhc3M='); // test/testpass
|
|
114
|
+
data.push('235 Authentication successful.');
|
|
115
|
+
|
|
116
|
+
data.push('MAIL FROM: me@example.com');
|
|
117
|
+
data.push('250 sender ok');
|
|
118
|
+
|
|
119
|
+
this.client.on('mail', () => {
|
|
120
|
+
assert.equal(this.client.response[0], 'sender ok');
|
|
121
|
+
this.client.send_command('RCPT', 'TO: you@example.com');
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
data.push('RCPT TO: you@example.com');
|
|
125
|
+
data.push('250 recipient ok');
|
|
126
|
+
|
|
127
|
+
this.client.on('rcpt', () => {
|
|
128
|
+
assert.equal(this.client.response[0], 'recipient ok');
|
|
129
|
+
this.client.send_command('DATA');
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
data.push('DATA');
|
|
133
|
+
data.push('354 go ahead');
|
|
134
|
+
|
|
135
|
+
this.client.on('data', () => {
|
|
136
|
+
assert.equal(this.client.response[0], 'go ahead');
|
|
137
|
+
this.client.start_data(message_stream);
|
|
138
|
+
message_stream.on('end', () => {
|
|
139
|
+
this.client.socket.write('.\r\n');
|
|
140
|
+
});
|
|
141
|
+
message_stream.add_line('Header: test\r\n');
|
|
142
|
+
message_stream.add_line('\r\n');
|
|
143
|
+
message_stream.add_line('hi\r\n');
|
|
144
|
+
message_stream.add_line_end();
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
data.push('.');
|
|
148
|
+
data.push('250 message queued');
|
|
149
|
+
|
|
150
|
+
this.client.on('dot', () => {
|
|
151
|
+
assert.equal(this.client.response[0], 'message queued');
|
|
152
|
+
this.client.send_command('QUIT');
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
data.push('QUIT');
|
|
156
|
+
data.push('221 goodbye');
|
|
157
|
+
|
|
158
|
+
this.client.on('quit', () => {
|
|
159
|
+
assert.equal(this.client.response[0], 'goodbye');
|
|
160
|
+
done()
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
this.client.socket.write = function (line) {
|
|
164
|
+
if (data.length == 0) {
|
|
165
|
+
assert.ok(false);
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
assert.equal(`${data.shift()}\r\n`, line);
|
|
169
|
+
if (reading_body && line == '.\r\n') {
|
|
170
|
+
reading_body = false;
|
|
171
|
+
}
|
|
172
|
+
if (!reading_body) {
|
|
173
|
+
if (line == 'DATA\r\n') {
|
|
174
|
+
reading_body = true;
|
|
175
|
+
}
|
|
176
|
+
while (true) {
|
|
177
|
+
const line2 = data.shift();
|
|
178
|
+
this.emit('line', `${line2}\r\n`);
|
|
179
|
+
if (line2[3] == ' ') break;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
return true;
|
|
184
|
+
};
|
|
185
|
+
|
|
186
|
+
this.client.socket.emit('line', data.shift());
|
|
187
|
+
})
|
|
188
|
+
})
|
|
189
|
+
|
|
190
|
+
describe('basic', () => {
|
|
191
|
+
|
|
192
|
+
beforeEach((done) => {
|
|
193
|
+
smtp_client.get_client({notes: {}}, (client) => {
|
|
194
|
+
this.client = client
|
|
195
|
+
done()
|
|
196
|
+
},
|
|
197
|
+
{
|
|
198
|
+
socket: test_socket.connect(),
|
|
199
|
+
})
|
|
200
|
+
})
|
|
201
|
+
|
|
202
|
+
it('conducts a SMTP session', (done) => {
|
|
203
|
+
|
|
204
|
+
const message_stream = new message.stream(
|
|
205
|
+
{ main : { spool_after : 1024 } }, '123456789'
|
|
206
|
+
);
|
|
207
|
+
|
|
208
|
+
const data = [];
|
|
209
|
+
let reading_body = false;
|
|
210
|
+
data.push('220 hi');
|
|
211
|
+
|
|
212
|
+
this.client.on('greeting', command => {
|
|
213
|
+
assert.equal(this.client.response[0], 'hi');
|
|
214
|
+
assert.equal('EHLO', command);
|
|
215
|
+
this.client.send_command(command, 'example.com');
|
|
216
|
+
});
|
|
217
|
+
|
|
218
|
+
data.push('EHLO example.com');
|
|
219
|
+
data.push('250 hello');
|
|
220
|
+
|
|
221
|
+
this.client.on('helo', () => {
|
|
222
|
+
assert.equal(this.client.response[0], 'hello');
|
|
223
|
+
this.client.send_command('MAIL', 'FROM: me@example.com');
|
|
224
|
+
});
|
|
225
|
+
|
|
226
|
+
data.push('MAIL FROM: me@example.com');
|
|
227
|
+
data.push('250 sender ok');
|
|
228
|
+
|
|
229
|
+
this.client.on('mail', () => {
|
|
230
|
+
assert.equal(this.client.response[0], 'sender ok');
|
|
231
|
+
this.client.send_command('RCPT', 'TO: you@example.com');
|
|
232
|
+
});
|
|
233
|
+
|
|
234
|
+
data.push('RCPT TO: you@example.com');
|
|
235
|
+
data.push('250 recipient ok');
|
|
236
|
+
|
|
237
|
+
this.client.on('rcpt', () => {
|
|
238
|
+
assert.equal(this.client.response[0], 'recipient ok');
|
|
239
|
+
this.client.send_command('DATA');
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
data.push('DATA');
|
|
243
|
+
data.push('354 go ahead');
|
|
244
|
+
|
|
245
|
+
this.client.on('data', () => {
|
|
246
|
+
assert.equal(this.client.response[0], 'go ahead');
|
|
247
|
+
this.client.start_data(message_stream);
|
|
248
|
+
message_stream.on('end', () => {
|
|
249
|
+
this.client.socket.write('.\r\n');
|
|
250
|
+
});
|
|
251
|
+
message_stream.add_line('Header: test\r\n');
|
|
252
|
+
message_stream.add_line('\r\n');
|
|
253
|
+
message_stream.add_line('hi\r\n');
|
|
254
|
+
message_stream.add_line_end();
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
data.push('.');
|
|
258
|
+
data.push('250 message queued');
|
|
259
|
+
|
|
260
|
+
this.client.on('dot', () => {
|
|
261
|
+
assert.equal(this.client.response[0], 'message queued');
|
|
262
|
+
this.client.send_command('QUIT');
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
data.push('QUIT');
|
|
266
|
+
data.push('221 goodbye');
|
|
267
|
+
|
|
268
|
+
this.client.on('quit', () => {
|
|
269
|
+
assert.equal(this.client.response[0], 'goodbye');
|
|
270
|
+
done()
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
this.client.socket.write = function (line) {
|
|
274
|
+
if (data.length == 0) {
|
|
275
|
+
assert.ok(false);
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
assert.equal(`${data.shift() }\r\n`, line);
|
|
279
|
+
if (reading_body && line == '.\r\n') {
|
|
280
|
+
reading_body = false;
|
|
281
|
+
}
|
|
282
|
+
if (reading_body) return true;
|
|
283
|
+
|
|
284
|
+
if (line == 'DATA\r\n') {
|
|
285
|
+
reading_body = true;
|
|
286
|
+
}
|
|
287
|
+
while (true) {
|
|
288
|
+
const line2 = data.shift();
|
|
289
|
+
this.emit('line', `${line2 }\r\n`);
|
|
290
|
+
if (line2[3] == ' ') break;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
return true;
|
|
294
|
+
};
|
|
295
|
+
|
|
296
|
+
this.client.socket.emit('line', data.shift());
|
|
297
|
+
})
|
|
298
|
+
})
|
|
299
|
+
})
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
const assert = require('node:assert')
|
|
2
|
+
const fs = require('node:fs/promises')
|
|
3
|
+
const path = require('node:path')
|
|
4
|
+
const os = require('node:os')
|
|
5
|
+
|
|
6
|
+
const _setup = (done) => {
|
|
7
|
+
this.socket = require('../tls_socket');
|
|
8
|
+
|
|
9
|
+
// use test/config instead of ./config
|
|
10
|
+
this.socket.config = this.socket.config.module_config(path.resolve('test'));
|
|
11
|
+
done();
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
describe('tls_socket', () => {
|
|
15
|
+
beforeEach(_setup)
|
|
16
|
+
|
|
17
|
+
it('loads', () => {
|
|
18
|
+
assert.ok(this.socket);
|
|
19
|
+
})
|
|
20
|
+
it('exports createConnection', () => {
|
|
21
|
+
assert.equal(typeof this.socket.createConnection, 'function');
|
|
22
|
+
})
|
|
23
|
+
it('exports createServer', () => {
|
|
24
|
+
// console.log(this.socket);
|
|
25
|
+
assert.equal(typeof this.socket.createServer, 'function');
|
|
26
|
+
})
|
|
27
|
+
it('exports shutdown', () => {
|
|
28
|
+
// console.log(this.socket);
|
|
29
|
+
assert.equal(typeof this.socket.shutdown, 'function');
|
|
30
|
+
})
|
|
31
|
+
|
|
32
|
+
describe('createServer', () => {
|
|
33
|
+
beforeEach(_setup)
|
|
34
|
+
|
|
35
|
+
it('returns a net.Server', () => {
|
|
36
|
+
const server = this.socket.createServer(sock => {
|
|
37
|
+
// TODO: socket test?
|
|
38
|
+
})
|
|
39
|
+
assert.ok(server)
|
|
40
|
+
})
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
describe('load_tls_ini', () => {
|
|
44
|
+
beforeEach(_setup)
|
|
45
|
+
|
|
46
|
+
it('tls.ini loads', () => {
|
|
47
|
+
assert.ok(this.socket.load_tls_ini().main !== undefined);
|
|
48
|
+
assert.ok(this.socket.certsByHost['*'].key);
|
|
49
|
+
// console.log(this.socket.cfg);
|
|
50
|
+
// console.log(this.socket.certsByHost);
|
|
51
|
+
})
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
describe('get_loud_certs_dir', () => {
|
|
55
|
+
beforeEach(_setup)
|
|
56
|
+
|
|
57
|
+
it('loads certs from test/loud/config/tls', async () => {
|
|
58
|
+
this.socket.config = this.socket.config.module_config(path.resolve('test', 'loud'));
|
|
59
|
+
this.socket.load_tls_ini()
|
|
60
|
+
const certs = await this.socket.get_certs_dir('tls')
|
|
61
|
+
assert.ok(certs);
|
|
62
|
+
})
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
describe('get_certs_dir', () => {
|
|
66
|
+
beforeEach(_setup)
|
|
67
|
+
|
|
68
|
+
it('loads certs from test/config/tls', async () => {
|
|
69
|
+
this.socket.config = this.socket.config.module_config(path.resolve('test'));
|
|
70
|
+
this.socket.load_tls_ini()
|
|
71
|
+
try {
|
|
72
|
+
const certs = await this.socket.get_certs_dir('tls')
|
|
73
|
+
assert.ok(certs['*'])
|
|
74
|
+
assert.ok(certs['mail.haraka.io'])
|
|
75
|
+
assert.ok(certs['haraka.local'])
|
|
76
|
+
assert.ok(certs['*.example.com'])
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
assert.ifError(err);
|
|
80
|
+
}
|
|
81
|
+
})
|
|
82
|
+
})
|
|
83
|
+
|
|
84
|
+
describe('getSocketOpts', () => {
|
|
85
|
+
beforeEach(_setup)
|
|
86
|
+
|
|
87
|
+
it('gets socket opts for *', async () => {
|
|
88
|
+
const certs = await this.socket.get_certs_dir('tls')
|
|
89
|
+
this.socket.getSocketOpts('*').then(opts => {
|
|
90
|
+
// console.log(opts);
|
|
91
|
+
assert.ok(opts.key);
|
|
92
|
+
assert.ok(opts.cert);
|
|
93
|
+
})
|
|
94
|
+
})
|
|
95
|
+
})
|
|
96
|
+
|
|
97
|
+
describe('ensureDhparams', () => {
|
|
98
|
+
beforeEach(_setup)
|
|
99
|
+
it('generates a missing dhparams file', () => {
|
|
100
|
+
this.socket.load_tls_ini();
|
|
101
|
+
this.socket.ensureDhparams((err, dhparams) => {
|
|
102
|
+
// console.log(dhparams);
|
|
103
|
+
assert.ifError(err);
|
|
104
|
+
assert.ok(dhparams);
|
|
105
|
+
})
|
|
106
|
+
})
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
describe('load_tls_ini2', () => {
|
|
110
|
+
beforeEach((done) => {
|
|
111
|
+
this.socket = require('../tls_socket');
|
|
112
|
+
delete process.env.HARAKA_TEST_DIR;
|
|
113
|
+
done();
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('loads missing tls.ini default config', () => {
|
|
117
|
+
this.socket.config = this.socket.config.module_config(path.resolve('non-exist'));
|
|
118
|
+
assert.deepEqual(this.socket.load_tls_ini(),
|
|
119
|
+
{
|
|
120
|
+
main: {
|
|
121
|
+
requestCert: true,
|
|
122
|
+
rejectUnauthorized: false,
|
|
123
|
+
honorCipherOrder: true,
|
|
124
|
+
requestOCSP: false,
|
|
125
|
+
// enableOCSPStapling: false,
|
|
126
|
+
requireAuthorized: [],
|
|
127
|
+
mutual_tls: false,
|
|
128
|
+
no_starttls_ports: [],
|
|
129
|
+
},
|
|
130
|
+
redis: { disable_for_failed_hosts: false },
|
|
131
|
+
no_tls_hosts: {},
|
|
132
|
+
mutual_auth_hosts: {},
|
|
133
|
+
mutual_auth_hosts_exclude: {},
|
|
134
|
+
});
|
|
135
|
+
})
|
|
136
|
+
|
|
137
|
+
it('loads tls.ini from test dir', () => {
|
|
138
|
+
this.socket.config = this.socket.config.module_config(path.resolve('test'));
|
|
139
|
+
assert.deepEqual(this.socket.load_tls_ini(), {
|
|
140
|
+
main: {
|
|
141
|
+
requestCert: true,
|
|
142
|
+
rejectUnauthorized: false,
|
|
143
|
+
honorCipherOrder: true,
|
|
144
|
+
requestOCSP: false,
|
|
145
|
+
key: 'tls_key.pem',
|
|
146
|
+
cert: 'tls_cert.pem',
|
|
147
|
+
dhparam: 'dhparams.pem',
|
|
148
|
+
ciphers: 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384',
|
|
149
|
+
minVersion: 'TLSv1',
|
|
150
|
+
requireAuthorized: [2465, 2587],
|
|
151
|
+
mutual_tls: false,
|
|
152
|
+
no_starttls_ports: [2525],
|
|
153
|
+
},
|
|
154
|
+
redis: { disable_for_failed_hosts: false },
|
|
155
|
+
no_tls_hosts: {},
|
|
156
|
+
mutual_auth_hosts: {},
|
|
157
|
+
mutual_auth_hosts_exclude: {},
|
|
158
|
+
outbound: {
|
|
159
|
+
key: 'outbound_tls_key.pem',
|
|
160
|
+
cert: 'outbound_tls_cert.pem',
|
|
161
|
+
ciphers: 'ECDHE-RSA-AES256-GCM-SHA384',
|
|
162
|
+
minVersion: 'TLSv1',
|
|
163
|
+
dhparam: 'dhparams.pem',
|
|
164
|
+
rejectUnauthorized: false,
|
|
165
|
+
requestCert: false,
|
|
166
|
+
honorCipherOrder: false,
|
|
167
|
+
force_tls_hosts: ['first.example.com', 'second.example.net'],
|
|
168
|
+
}
|
|
169
|
+
})
|
|
170
|
+
})
|
|
171
|
+
})
|
|
172
|
+
|
|
173
|
+
describe('parse_x509', () => {
|
|
174
|
+
beforeEach(_setup)
|
|
175
|
+
|
|
176
|
+
it('returns empty object on empty input', async () => {
|
|
177
|
+
const res = await this.socket.parse_x509()
|
|
178
|
+
assert.deepEqual(res, {});
|
|
179
|
+
})
|
|
180
|
+
|
|
181
|
+
it('returns key from BEGIN PRIVATE KEY block', async () => {
|
|
182
|
+
const res = await this.socket.parse_x509('-BEGIN PRIVATE KEY-\nhello\n--END PRIVATE KEY--\n-its me-\n');
|
|
183
|
+
assert.deepEqual(
|
|
184
|
+
res.keys[0].toString(),
|
|
185
|
+
'-BEGIN PRIVATE KEY-\nhello\n--END PRIVATE KEY--',
|
|
186
|
+
);
|
|
187
|
+
assert.deepEqual(res.cert, undefined);
|
|
188
|
+
})
|
|
189
|
+
|
|
190
|
+
it('returns key from BEGIN RSA PRIVATE KEY block', async () => {
|
|
191
|
+
const res = await this.socket.parse_x509('-BEGIN RSA PRIVATE KEY-\nhello\n--END RSA PRIVATE KEY--\n-its me-\n');
|
|
192
|
+
assert.deepEqual(
|
|
193
|
+
res.keys[0].toString(),
|
|
194
|
+
'-BEGIN RSA PRIVATE KEY-\nhello\n--END RSA PRIVATE KEY--',
|
|
195
|
+
);
|
|
196
|
+
assert.deepEqual(res.cert, undefined);
|
|
197
|
+
})
|
|
198
|
+
|
|
199
|
+
it.skip('returns a key and certificate chain', async () => {
|
|
200
|
+
// doesn't work, b/c parse now parses and needs non-snipped
|
|
201
|
+
const str = `-----BEGIN RSA PRIVATE KEY-----
|
|
202
|
+
MIIEogIBAAKCAQEAoDGOlvw6lQptaNwqxYsW4aJCPIgvjYw3qA9Y0qykp8I8PapT
|
|
203
|
+
ercA8BsInrZg5+3wt2PT1+REprBvv6xfHyQ08o/udsSCBRf4Awadp0fxzUulENNi
|
|
204
|
+
3wWuuPy0WgaE4jam7tWItDBeEhXkEfcMTr9XkFxenuTcNw9O1+E8TtNP9KMmJDAe
|
|
205
|
+
<snip>
|
|
206
|
+
F+T5AoGAMRH1+JrjTpPYcs1hOyHMWnxkHv7fsJMJY/KN2NPoTlI4d4V1W5xyCZ0D
|
|
207
|
+
rl7RlVdVTQdZ9VjkWVjJcafNSmNyQEK4IQsaczwOU59IPhC/nUAyRgeoRbKWPQ4r
|
|
208
|
+
mj3g7uX9f07j34c01mH1zLgDa24LO9SW7B5ZbYYu4DORk7005B4=
|
|
209
|
+
-----END RSA PRIVATE KEY-----
|
|
210
|
+
-----BEGIN CERTIFICATE-----
|
|
211
|
+
MIIFVzCCBD+gAwIBAgISA/5ofbB6cUAp/PrYaBxTITF2MA0GCSqGSIb3DQEBCwUA
|
|
212
|
+
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
|
|
213
|
+
<snip>
|
|
214
|
+
kOk4JdlpuBSPwx9wNAEYF15/4LDyev+tyAg7GxCZ9MW53leOxF+j2NQgc4kRIdQc
|
|
215
|
+
DYsruShsnwn4HErJKQAfE5Aq77UM32hfKzMb2PH6Ebw0TB2NCLVocOULAGTw4NPO
|
|
216
|
+
wBpsGsIFUxeDHZvhKohZyNqLrj7gR+XlKRKM
|
|
217
|
+
-----END CERTIFICATE-----
|
|
218
|
+
|
|
219
|
+
-----BEGIN CERTIFICATE-----
|
|
220
|
+
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
|
|
221
|
+
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
|
|
222
|
+
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
|
|
223
|
+
<snip>
|
|
224
|
+
HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
|
|
225
|
+
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
|
|
226
|
+
nLRbwHOoq7hHwg==
|
|
227
|
+
-----END CERTIFICATE-----
|
|
228
|
+
|
|
229
|
+
-----BEGIN CERTIFICATE-----
|
|
230
|
+
MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
|
|
231
|
+
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
|
232
|
+
DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
|
|
233
|
+
<snip>
|
|
234
|
+
WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
|
|
235
|
+
he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
|
|
236
|
+
Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
|
|
237
|
+
-----END CERTIFICATE-----`
|
|
238
|
+
const res = await this.socket.parse_x509(str);
|
|
239
|
+
assert.deepEqual(res.key.length, 446);
|
|
240
|
+
assert.deepEqual(res.cert.length, 1195);
|
|
241
|
+
})
|
|
242
|
+
|
|
243
|
+
it('returns cert and key from EC pem', async () => {
|
|
244
|
+
const fp = await fs.readFile(path.join('test','config','tls','ec.pem'))
|
|
245
|
+
const res = await this.socket.parse_x509(fp.toString())
|
|
246
|
+
assert.deepEqual(
|
|
247
|
+
res.keys[0].toString().split(os.EOL).join('\n'),
|
|
248
|
+
`-----BEGIN EC PRIVATE KEY-----
|
|
249
|
+
MHcCAQEEIIDhiI5q6l7txfMJ6kIEYjK12EFcHLvDIkfWIwzdZBsloAoGCCqGSM49
|
|
250
|
+
AwEHoUQDQgAEZg2nHEFy9nquFPF3DQyQE28e/ytjXeb4nD/8U+L4KHKFtglaX3R4
|
|
251
|
+
uZ+5JcwfcDghpL4Z8h4ouUD/xqe957e2+g==
|
|
252
|
+
-----END EC PRIVATE KEY-----`
|
|
253
|
+
);
|
|
254
|
+
assert.deepEqual(
|
|
255
|
+
res.chain[0].toString().split(os.EOL).join('\n'),
|
|
256
|
+
`-----BEGIN CERTIFICATE-----
|
|
257
|
+
MIICaTCCAg+gAwIBAgIUEDa9VX16wCdo97WvIk7jyEBz1wQwCgYIKoZIzj0EAwIw
|
|
258
|
+
gYkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdT
|
|
259
|
+
ZWF0dGxlMRQwEgYDVQQKDAtIYXJha2EgTWFpbDEXMBUGA1UEAwwObWFpbC5oYXJh
|
|
260
|
+
a2EuaW8xJDAiBgkqhkiG9w0BCQEWFWhhcmFrYS5tYWlsQGdtYWlsLmNvbTAeFw0y
|
|
261
|
+
MTEwMTQwNjQxMTlaFw0yMjEwMTQwNjQxMTlaMIGJMQswCQYDVQQGEwJVUzETMBEG
|
|
262
|
+
A1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEUMBIGA1UECgwLSGFy
|
|
263
|
+
YWthIE1haWwxFzAVBgNVBAMMDm1haWwuaGFyYWthLmlvMSQwIgYJKoZIhvcNAQkB
|
|
264
|
+
FhVoYXJha2EubWFpbEBnbWFpbC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
|
|
265
|
+
AARmDaccQXL2eq4U8XcNDJATbx7/K2Nd5vicP/xT4vgocoW2CVpfdHi5n7klzB9w
|
|
266
|
+
OCGkvhnyHii5QP/Gp73nt7b6o1MwUTAdBgNVHQ4EFgQU094ROMLHmLEspT4ZoCfX
|
|
267
|
+
Rz0mR/YwHwYDVR0jBBgwFoAU094ROMLHmLEspT4ZoCfXRz0mR/YwDwYDVR0TAQH/
|
|
268
|
+
BAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEAsmshzvMDjmYDHyGRrKdMmsnnESFd
|
|
269
|
+
GMtfRXYIv0AZe7ICIGD2Sta9LL0zZ44ARGXhh+sPjxd78I/+0FdIPsofr2I+
|
|
270
|
+
-----END CERTIFICATE-----`);
|
|
271
|
+
})
|
|
272
|
+
})
|
|
273
|
+
})
|