@remit/mailbox-service 0.0.99 → 0.0.101
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/package.json +1 -1
- package/src/body-sync.ts +16 -113
- package/src/classification-backfill.test.ts +543 -0
- package/src/classification-backfill.ts +345 -0
- package/src/classify-message.test.ts +146 -0
- package/src/classify-message.ts +113 -0
- package/src/heuristics/authenticationResults.test.ts +189 -0
- package/src/heuristics/authenticationResults.ts +212 -0
- package/src/heuristics/classifyByHeaders.test.ts +313 -2
- package/src/heuristics/classifyByHeaders.ts +95 -27
- package/src/index.ts +16 -1
- package/src/message-category.ts +18 -0
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
|
+
import {
|
|
4
|
+
type AuthenticationResults,
|
|
5
|
+
parseAuthenticationResults,
|
|
6
|
+
} from "./authenticationResults.js";
|
|
7
|
+
|
|
8
|
+
const parse = (value: string): AuthenticationResults => {
|
|
9
|
+
const parsed = parseAuthenticationResults(value);
|
|
10
|
+
assert.ok(parsed, `expected ${JSON.stringify(value)} to parse`);
|
|
11
|
+
return parsed;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
const summary = (value: string): string[] =>
|
|
15
|
+
parse(value).results.map((r) =>
|
|
16
|
+
[`${r.method}=${r.result}`, ...r.properties].flat().join(" "),
|
|
17
|
+
);
|
|
18
|
+
|
|
19
|
+
describe("parseAuthenticationResults", () => {
|
|
20
|
+
it("reads the authserv-id and every resinfo", () => {
|
|
21
|
+
const parsed = parse(
|
|
22
|
+
"mx.example.com; dkim=pass header.d=acme.example; spf=pass smtp.mailfrom=acme.example; dmarc=pass header.from=acme.example",
|
|
23
|
+
);
|
|
24
|
+
assert.equal(parsed.authservId, "mx.example.com");
|
|
25
|
+
assert.deepEqual(summary("mx.example.com; dkim=pass header.d=a.example"), [
|
|
26
|
+
"dkim=pass header.d a.example",
|
|
27
|
+
]);
|
|
28
|
+
assert.deepEqual(
|
|
29
|
+
parsed.results.map((r) => r.method),
|
|
30
|
+
["dkim", "spf", "dmarc"],
|
|
31
|
+
);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("keeps a semicolon inside a comment within its own resinfo", () => {
|
|
35
|
+
assert.deepEqual(
|
|
36
|
+
summary(
|
|
37
|
+
"gw.example; dkim=fail (1024-bit key; unprotected) header.d=acme.example; dkim=fail header.d=relay.example; dmarc=fail (p=REJECT) header.from=acme.example",
|
|
38
|
+
),
|
|
39
|
+
[
|
|
40
|
+
"dkim=fail header.d acme.example",
|
|
41
|
+
"dkim=fail header.d relay.example",
|
|
42
|
+
"dmarc=fail header.from acme.example",
|
|
43
|
+
],
|
|
44
|
+
);
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it("never reads a result out of another method's comment", () => {
|
|
48
|
+
assert.deepEqual(
|
|
49
|
+
summary(
|
|
50
|
+
"mx.example.net; arc=fail (i=1 spf=pass; dkim=fail\r\n header.d=arcsigner.example; dmarc=fail); spf=pass smtp.mailfrom=acme.example;\r\n dmarc=fail header.from=acme.example",
|
|
51
|
+
),
|
|
52
|
+
[
|
|
53
|
+
"arc=fail",
|
|
54
|
+
"spf=pass smtp.mailfrom acme.example",
|
|
55
|
+
"dmarc=fail header.from acme.example",
|
|
56
|
+
],
|
|
57
|
+
);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it("strips nested comments and escaped parentheses", () => {
|
|
61
|
+
assert.deepEqual(
|
|
62
|
+
summary(
|
|
63
|
+
"mx.example (outer (inner; dkim=pass) \\) still; comment); dkim=fail (a (b; c) d) header.d=acme.example",
|
|
64
|
+
),
|
|
65
|
+
["dkim=fail header.d acme.example"],
|
|
66
|
+
);
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it("keeps a semicolon inside a quoted reason", () => {
|
|
70
|
+
assert.deepEqual(
|
|
71
|
+
summary(
|
|
72
|
+
'gw.example; dkim=fail reason="verification failed; body hash mismatch" header.d=acme.example; dmarc=fail header.from=acme.example',
|
|
73
|
+
),
|
|
74
|
+
[
|
|
75
|
+
"dkim=fail reason verification failed; body hash mismatch header.d acme.example",
|
|
76
|
+
"dmarc=fail header.from acme.example",
|
|
77
|
+
],
|
|
78
|
+
);
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it("lower-cases methods, results and property names", () => {
|
|
82
|
+
const parsed = parse(
|
|
83
|
+
"GW.EXAMPLE; DKIM=FAIL HEADER.D=EVIL.EXAMPLE; DMARC=FAIL",
|
|
84
|
+
);
|
|
85
|
+
assert.equal(parsed.authservId, "gw.example");
|
|
86
|
+
assert.deepEqual(
|
|
87
|
+
summary("GW.EXAMPLE; DKIM=FAIL HEADER.D=EVIL.EXAMPLE; DMARC=FAIL"),
|
|
88
|
+
["dkim=fail header.d EVIL.EXAMPLE", "dmarc=fail"],
|
|
89
|
+
);
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
it("accepts a comment before the method name", () => {
|
|
93
|
+
assert.deepEqual(
|
|
94
|
+
summary(
|
|
95
|
+
"mx.example.com; (a comment) dkim=pass header.d=acme.example; dmarc=fail",
|
|
96
|
+
),
|
|
97
|
+
["dkim=pass header.d acme.example", "dmarc=fail"],
|
|
98
|
+
);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
it("accepts whitespace around = and .", () => {
|
|
102
|
+
assert.deepEqual(
|
|
103
|
+
summary(
|
|
104
|
+
"mx.example.com; dkim = fail header . d = evil.example; dmarc=fail",
|
|
105
|
+
),
|
|
106
|
+
["dkim=fail header.d evil.example", "dmarc=fail"],
|
|
107
|
+
);
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
it("reads folded continuation lines", () => {
|
|
111
|
+
assert.deepEqual(
|
|
112
|
+
summary(
|
|
113
|
+
"mx.example.com;\r\n\tdkim=pass header.d=acme.example;\r\n\tdmarc=fail header.from=acme.example",
|
|
114
|
+
),
|
|
115
|
+
[
|
|
116
|
+
"dkim=pass header.d acme.example",
|
|
117
|
+
"dmarc=fail header.from acme.example",
|
|
118
|
+
],
|
|
119
|
+
);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
it("finds a result after hundreds of filler properties", () => {
|
|
123
|
+
const filler = Array.from(
|
|
124
|
+
{ length: 400 },
|
|
125
|
+
(_, n) => `x-filler.p${n}=v${n}`,
|
|
126
|
+
).join(" ");
|
|
127
|
+
const parsed = parse(
|
|
128
|
+
`mx.example.com; spf=none ${filler}; dkim=fail header.d=acme.example`,
|
|
129
|
+
);
|
|
130
|
+
assert.equal(parsed.results[0].properties.size, 400);
|
|
131
|
+
assert.equal(parsed.results[1].properties.get("header.d"), "acme.example");
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
it("reads a result that carries no properties", () => {
|
|
135
|
+
assert.deepEqual(summary("gw.example; dkim=fail; dmarc=fail"), [
|
|
136
|
+
"dkim=fail",
|
|
137
|
+
"dmarc=fail",
|
|
138
|
+
]);
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
it("reads method versions, an authres-version and a trailing semicolon", () => {
|
|
142
|
+
const parsed = parse("mx.example 1; dkim/1=pass header.d=acme.example;");
|
|
143
|
+
assert.equal(parsed.authservId, "mx.example");
|
|
144
|
+
assert.deepEqual(
|
|
145
|
+
summary("mx.example 1; dkim/1=pass header.d=acme.example;"),
|
|
146
|
+
["dkim=pass header.d acme.example"],
|
|
147
|
+
);
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
it("reads the explicit no-result form", () => {
|
|
151
|
+
assert.deepEqual(parse("mx.example.com; none"), {
|
|
152
|
+
authservId: "mx.example.com",
|
|
153
|
+
results: [],
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
it("reads a header that omits the authserv-id", () => {
|
|
158
|
+
const parsed = parse(
|
|
159
|
+
"spf=pass (sender IP is 192.0.2.1) smtp.mailfrom=acme.example; dkim=pass (signature was verified) header.d=acme.example;dmarc=pass action=none header.from=acme.example;compauth=pass reason=100",
|
|
160
|
+
);
|
|
161
|
+
assert.equal(parsed.authservId, "");
|
|
162
|
+
assert.deepEqual(
|
|
163
|
+
parsed.results.map((r) => `${r.method}=${r.result}`),
|
|
164
|
+
["spf=pass", "dkim=pass", "dmarc=pass", "compauth=pass"],
|
|
165
|
+
);
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
for (const [label, value] of [
|
|
169
|
+
["an empty header", " "],
|
|
170
|
+
["an authserv-id alone", "mx.example.com"],
|
|
171
|
+
["an authserv-id with an empty resinfo", "mx.example.com;"],
|
|
172
|
+
["an unterminated comment", "mx.example; dmarc=pass (oops"],
|
|
173
|
+
["an unbalanced closing parenthesis", "mx.example; dmarc=pass oops)"],
|
|
174
|
+
["an unterminated quoted string", 'mx.example; dkim=fail reason="oops'],
|
|
175
|
+
["a word with no value", "mx.example; dmarc=pass stray"],
|
|
176
|
+
["a key with no value", "mx.example; dmarc=pass header.from="],
|
|
177
|
+
["a resinfo with no method", "mx.example; header.d=acme.example"],
|
|
178
|
+
["a quoted result", 'mx.example; dmarc="pass"'],
|
|
179
|
+
[
|
|
180
|
+
"two words where a key belongs",
|
|
181
|
+
"mx.example; dmarc=pass extra header.from=a.example",
|
|
182
|
+
],
|
|
183
|
+
["no-result mixed with a result", "mx.example; none; dmarc=pass"],
|
|
184
|
+
] as const) {
|
|
185
|
+
it(`yields no result for ${label}`, () => {
|
|
186
|
+
assert.equal(parseAuthenticationResults(value), null);
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
});
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
export interface AuthenticationResult {
|
|
2
|
+
method: string;
|
|
3
|
+
result: string;
|
|
4
|
+
properties: ReadonlyMap<string, string>;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export interface AuthenticationResults {
|
|
8
|
+
authservId: string;
|
|
9
|
+
results: AuthenticationResult[];
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
type Token =
|
|
13
|
+
| { kind: "word"; text: string }
|
|
14
|
+
| { kind: "quoted"; text: string }
|
|
15
|
+
| { kind: "semicolon" }
|
|
16
|
+
| { kind: "equals" };
|
|
17
|
+
|
|
18
|
+
type ValueToken = Extract<Token, { kind: "word" | "quoted" }>;
|
|
19
|
+
|
|
20
|
+
const DELIMITERS = new Set([";", "=", "(", ")", '"']);
|
|
21
|
+
const KEYWORD = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
|
|
22
|
+
const METHOD = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[0-9]+)?$/;
|
|
23
|
+
const PROPERTY_KEY =
|
|
24
|
+
/^[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?)?$/;
|
|
25
|
+
const VERSION = /^[0-9]+$/;
|
|
26
|
+
|
|
27
|
+
const isWhitespace = (c: string): boolean =>
|
|
28
|
+
c === " " || c === "\t" || c === "\r" || c === "\n";
|
|
29
|
+
|
|
30
|
+
const skipComment = (input: string, start: number): number | null => {
|
|
31
|
+
let depth = 0;
|
|
32
|
+
for (let i = start; i < input.length; i++) {
|
|
33
|
+
const c = input[i];
|
|
34
|
+
if (c === "\\") {
|
|
35
|
+
i++;
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
if (c === "(") depth++;
|
|
39
|
+
if (c === ")") depth--;
|
|
40
|
+
if (depth === 0) return i + 1;
|
|
41
|
+
}
|
|
42
|
+
return null;
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
const readQuoted = (
|
|
46
|
+
input: string,
|
|
47
|
+
start: number,
|
|
48
|
+
): { text: string; end: number } | null => {
|
|
49
|
+
let text = "";
|
|
50
|
+
for (let i = start + 1; i < input.length; i++) {
|
|
51
|
+
const c = input[i];
|
|
52
|
+
if (c === "\\") {
|
|
53
|
+
if (i + 1 >= input.length) return null;
|
|
54
|
+
text += input[i + 1];
|
|
55
|
+
i++;
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (c === '"') return { text, end: i + 1 };
|
|
59
|
+
text += c;
|
|
60
|
+
}
|
|
61
|
+
return null;
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const tokenize = (input: string): Token[] | null => {
|
|
65
|
+
const tokens: Token[] = [];
|
|
66
|
+
let i = 0;
|
|
67
|
+
while (i < input.length) {
|
|
68
|
+
const c = input[i];
|
|
69
|
+
if (isWhitespace(c)) {
|
|
70
|
+
i++;
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
if (c === "(") {
|
|
74
|
+
const end = skipComment(input, i);
|
|
75
|
+
if (end === null) return null;
|
|
76
|
+
i = end;
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
if (c === ")") return null;
|
|
80
|
+
if (c === ";") {
|
|
81
|
+
tokens.push({ kind: "semicolon" });
|
|
82
|
+
i++;
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (c === "=") {
|
|
86
|
+
tokens.push({ kind: "equals" });
|
|
87
|
+
i++;
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
if (c === '"') {
|
|
91
|
+
const quoted = readQuoted(input, i);
|
|
92
|
+
if (!quoted) return null;
|
|
93
|
+
tokens.push({ kind: "quoted", text: quoted.text });
|
|
94
|
+
i = quoted.end;
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
let end = i;
|
|
98
|
+
while (
|
|
99
|
+
end < input.length &&
|
|
100
|
+
!isWhitespace(input[end]) &&
|
|
101
|
+
!DELIMITERS.has(input[end])
|
|
102
|
+
) {
|
|
103
|
+
end++;
|
|
104
|
+
}
|
|
105
|
+
tokens.push({ kind: "word", text: input.slice(i, end) });
|
|
106
|
+
i = end;
|
|
107
|
+
}
|
|
108
|
+
return tokens;
|
|
109
|
+
};
|
|
110
|
+
|
|
111
|
+
const splitStatements = (tokens: Token[]): Token[][] => {
|
|
112
|
+
const statements: Token[][] = [[]];
|
|
113
|
+
for (const token of tokens) {
|
|
114
|
+
if (token.kind === "semicolon") {
|
|
115
|
+
statements.push([]);
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
statements[statements.length - 1].push(token);
|
|
119
|
+
}
|
|
120
|
+
return statements;
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
const isValue = (token: Token | undefined): token is ValueToken =>
|
|
124
|
+
token !== undefined && (token.kind === "word" || token.kind === "quoted");
|
|
125
|
+
|
|
126
|
+
const joinsKey = (previous: string, next: string): boolean =>
|
|
127
|
+
previous.endsWith(".") ||
|
|
128
|
+
previous.endsWith("/") ||
|
|
129
|
+
next.startsWith(".") ||
|
|
130
|
+
next.startsWith("/");
|
|
131
|
+
|
|
132
|
+
const readPairs = (statement: Token[]): [string, ValueToken][] | null => {
|
|
133
|
+
const pairs: [string, ValueToken][] = [];
|
|
134
|
+
let key: string[] = [];
|
|
135
|
+
for (let i = 0; i < statement.length; i++) {
|
|
136
|
+
const token = statement[i];
|
|
137
|
+
if (token.kind === "equals") {
|
|
138
|
+
const value = statement[i + 1];
|
|
139
|
+
if (key.length === 0 || !isValue(value)) return null;
|
|
140
|
+
pairs.push([key.join("").toLowerCase(), value]);
|
|
141
|
+
key = [];
|
|
142
|
+
i++;
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
if (token.kind !== "word") return null;
|
|
146
|
+
const previous = key[key.length - 1];
|
|
147
|
+
if (previous !== undefined && !joinsKey(previous, token.text)) return null;
|
|
148
|
+
key.push(token.text);
|
|
149
|
+
}
|
|
150
|
+
if (key.length > 0) return null;
|
|
151
|
+
return pairs;
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
const parseResult = (statement: Token[]): AuthenticationResult | null => {
|
|
155
|
+
const pairs = readPairs(statement);
|
|
156
|
+
if (!pairs || pairs.length === 0) return null;
|
|
157
|
+
const [[methodKey, resultToken], ...rest] = pairs;
|
|
158
|
+
if (!METHOD.test(methodKey)) return null;
|
|
159
|
+
if (resultToken.kind !== "word") return null;
|
|
160
|
+
const result = resultToken.text.toLowerCase();
|
|
161
|
+
if (!KEYWORD.test(result)) return null;
|
|
162
|
+
|
|
163
|
+
const properties = new Map<string, string>();
|
|
164
|
+
for (const [key, value] of rest) {
|
|
165
|
+
if (!PROPERTY_KEY.test(key)) return null;
|
|
166
|
+
if (!properties.has(key)) properties.set(key, value.text);
|
|
167
|
+
}
|
|
168
|
+
return { method: methodKey.split("/")[0], result, properties };
|
|
169
|
+
};
|
|
170
|
+
|
|
171
|
+
const parseAuthservId = (statement: Token[]): string | null => {
|
|
172
|
+
const [id, version, ...extra] = statement;
|
|
173
|
+
if (!isValue(id) || extra.length > 0) return null;
|
|
174
|
+
if (version !== undefined) {
|
|
175
|
+
if (version.kind !== "word" || !VERSION.test(version.text)) return null;
|
|
176
|
+
}
|
|
177
|
+
const authservId = id.text.toLowerCase();
|
|
178
|
+
return authservId.length > 0 ? authservId : null;
|
|
179
|
+
};
|
|
180
|
+
|
|
181
|
+
const isNoResult = (statement: Token[]): boolean =>
|
|
182
|
+
statement.length === 1 &&
|
|
183
|
+
statement[0].kind === "word" &&
|
|
184
|
+
statement[0].text.toLowerCase() === "none";
|
|
185
|
+
|
|
186
|
+
export const parseAuthenticationResults = (
|
|
187
|
+
value: string,
|
|
188
|
+
): AuthenticationResults | null => {
|
|
189
|
+
const tokens = tokenize(value);
|
|
190
|
+
if (!tokens) return null;
|
|
191
|
+
|
|
192
|
+
const [head, ...tail] = splitStatements(tokens);
|
|
193
|
+
const headIsResult = head.some((token) => token.kind === "equals");
|
|
194
|
+
const authservId = headIsResult ? "" : parseAuthservId(head);
|
|
195
|
+
if (authservId === null) return null;
|
|
196
|
+
|
|
197
|
+
const statements = (headIsResult ? [head, ...tail] : tail).filter(
|
|
198
|
+
(statement) => statement.length > 0,
|
|
199
|
+
);
|
|
200
|
+
if (statements.length === 0) return null;
|
|
201
|
+
if (statements.length === 1 && isNoResult(statements[0])) {
|
|
202
|
+
return { authservId, results: [] };
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
const results: AuthenticationResult[] = [];
|
|
206
|
+
for (const statement of statements) {
|
|
207
|
+
const result = parseResult(statement);
|
|
208
|
+
if (!result) return null;
|
|
209
|
+
results.push(result);
|
|
210
|
+
}
|
|
211
|
+
return { authservId, results };
|
|
212
|
+
};
|