starred/webmail
1
0
Fork 0
mirror of https://github.com/bulwarkmail/webmail.git synced 2026-11-02 08:15:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: write the SIO-Label header without a doubled space after the colon

Browse Source
This commit is contained in:
Linus Rath
2026-11-01 06:01:20 +01:00
parent 624f8dd3e1
commit 9c60140e49
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/__tests__/classification-labels.test.ts
+2 -1
View File
@@ -58,7 +58,8 @@ describe('SIO-Label', () => {
it('writes Sensitivity and the extra header only when the label sets them', () => {
expect(labelHeaderProperties(confidential, 'X-Classification')).toEqual({
'header:SIO-Label:asRaw': sioLabelValue(confidential),
// Without the leading space: the server writes "SIO-Label: " itself.
'header:SIO-Label:asRaw': 'marking="CONFIDENTIAL"; fgcolor=#000000; bgcolor=#d97706',
'header:Sensitivity:asText': 'Company-Confidential',
'header:X-Classification:asText': 'Confidential',
});
lib/classification/labels.ts
+4 -3
View File
@@ -64,7 +64,7 @@ function percentEncode(value: string): string {
/** The marking parameter(s): quoted when ASCII, RFC 2231 (with continuations when long) otherwise. */
function markingParameters(marking: string): string[] {
const clean = marking.replace(/["\\\r\n]/g, '');
// eslint-disable-next-line no-control-regex
if (/^[\x20-\x7e]*$/.test(clean)) return [`marking="${clean}"`];
const encoded = percentEncode(clean);
const MAX = 60;
@@ -116,13 +116,14 @@ function labelHeaderPairs(label: ClassificationLabel, extraHeader: string): Arra
export function labelHeaderProperties(label: ClassificationLabel, extraHeader: string): Record<string, string> {
const out: Record<string, string> = {};
for (const [name, value, form] of labelHeaderPairs(label, extraHeader)) {
out[form === 'raw' ? `header:${name}:asRaw` : `header:${name}:asText`] = value;
// The server writes "Name: " itself; a raw value keeps only its own folds.
out[form === 'raw' ? `header:${name}:asRaw` : `header:${name}:asText`] = form === 'raw' ? value.trimStart() : value;
}
return out;
}
function encodedWord(value: string): string {
// eslint-disable-next-line no-control-regex
if (/^[\x20-\x7e]*$/.test(value)) return value;
let binary = '';
for (const byte of new TextEncoder().encode(value)) binary += String.fromCharCode(byte);