Commit 31742f2

Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening: - A local file header that disagrees with the central directory on compression method, sizes, CRC, or the encryption flag lets another ZIP reader extract a different member from the same archive; such an archive must be rejected (fixed in a follow-up commit). - zipFiles() must reject a FIFO/special source rather than block forever on open() (fixed in a follow-up commit). - Streaming (contentIterator) is hard-bounded by the header's declared uncompressed size and rejects a member that inflates past it, so entry.size is a ceiling a consumer can trust up front; lock that in. Signed-off-by: Philipp Dunkel <pip@pipobscure.com> PR-URL: #65016 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2

1 file changed

Lines changed: 120 additions & 0 deletions

File tree

‎test/parallel/test-zlib-zip-security-hardening.js‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 31742f2
Browse files
pipobscureaduh95
pipobscure
authored and
aduh95
committed
test: cover ZIP header-confusion and DoS guards
Add regression tests for node:zlib ZIP hardening:
- A local file header that disagrees with the central directory on
compression method, sizes, CRC, or the encryption flag lets another
ZIP reader extract a different member from the same archive; such an
archive must be rejected (fixed in a follow-up commit).
- zipFiles() must reject a FIFO/special source rather than block forever
on open() (fixed in a follow-up commit).
- Streaming (contentIterator) is hard-bounded by the header's declared
uncompressed size and rejects a member that inflates past it, so
entry.size is a ceiling a consumer can trust up front; lock that in.
Signed-off-by: Philipp Dunkel <pip@pipobscure.com>
PR-URL: #65016
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 9b4f349 commit 31742f2
1 file changed
Lines changed: 120 additions & 0 deletions
File tree
‎test/parallel/test-zlib-zip-security-hardening.js‎
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
'use strict';
2+
3+
// Security-hardening regression tests for node:zlib ZIP support. Each test
4+
// describes a distinct issue found by audit and asserts the *secure* behavior,
5+
// so every test fails on the pre-fix code and passes once its fix lands.
6+
//
7+
// 1. Local-vs-central header confusion (parser-confusion / inspect-then-consume
8+
// divergence): the central directory is authoritative in this reader, but a
9+
// local file header that disagrees on method, sizes, CRC, or the encryption
10+
// flag lets another ZIP tool (which extracts from the local header) read a
11+
// different member from the same archive. Such an archive must be rejected.
12+
// 2. The archiver (zipFiles) must not block forever on a FIFO/special source.
13+
// 3. The streaming read path (contentIterator) is hard-bounded by the header's
14+
// declared uncompressed size: a member that inflates past it is rejected
15+
// mid-stream, so entry.size is a ceiling a consumer can trust up front.
16+
17+
require('../common');
18+
constassert=require('assert');
19+
const{ test }=require('node:test');
20+
constzlib=require('zlib');
21+
constpath=require('path');
22+
const{ spawnSync }=require('child_process');
23+
consttmpdir=require('../common/tmpdir');
24+
25+
constSIG_LOCAL=0x04034b50;
26+
constSIG_CENTRAL=0x02014b50;
27+
28+
// A minimal single-member archive; caller patches its headers.
29+
functionbuildStored(name,content,method='store'){
30+
constentry=zlib.ZipEntry.createSync(name,Buffer.from(content),{ method });
31+
constchunks=[];
32+
for(constchunkofzlib.createZipArchiveSync([entry]))chunks.push(chunk);
33+
returnBuffer.concat(chunks);
34+
}
35+
36+
functioncentralOffset(buf){
37+
for(leti=buf.length-22;i>=0;i--){
38+
if(buf.readUInt32LE(i)===SIG_CENTRAL)returni;
39+
}
40+
thrownewError('no central directory header found');
41+
}
42+
43+
// A ZipBuffer parses the central directory; reading a member resolves and
44+
// checks its local header. Do both so the assertion holds whether the check
45+
// is eager (parse time) or lazy (read time).
46+
functionreadsThrow(buf,name){
47+
assert.throws(()=>{
48+
constzb=newzlib.ZipBuffer(buf);
49+
zb.get(name).contentSync();
50+
},{code: 'ERR_ZIP_INVALID_ARCHIVE'});
51+
}
52+
53+
// 1a. Local vs central compressed/uncompressed size disagreement.
54+
test('a local/central size disagreement is rejected',()=>{
55+
constbuf=buildStored('a.txt','hello');
56+
assert.strictEqual(buf.readUInt32LE(0),SIG_LOCAL);
57+
buf.writeUInt32LE(999,18);// Local compressed size
58+
buf.writeUInt32LE(999,22);// Local uncompressed size
59+
readsThrow(buf,'a.txt');
60+
});
61+
62+
// 1b. Local vs central compression-method disagreement.
63+
test('a local/central method disagreement is rejected',()=>{
64+
constbuf=buildStored('a.txt','hello');
65+
buf.writeUInt16LE(8,8);// Local method deflate; central stays store(0)
66+
readsThrow(buf,'a.txt');
67+
});
68+
69+
// 1c. Central marks the member encrypted while the local header does not:
70+
// a central-directory reader (e.g. python) treats it as opaque/encrypted, so
71+
// Node must not silently decode it either.
72+
test('a local/central encryption-flag disagreement is rejected',()=>{
73+
constbuf=buildStored('a.txt','hello');
74+
constc=centralOffset(buf);
75+
buf.writeUInt16LE(buf.readUInt16LE(c+8)|0x0001,c+8);// Central encrypted bit
76+
readsThrow(buf,'a.txt');
77+
});
78+
79+
// 2. zipFiles must reject a FIFO source rather than block on open() forever.
80+
test('zipFiles rejects a FIFO source instead of hanging',()=>{
81+
if(process.platform==='win32')return;// no mkfifo
82+
tmpdir.refresh();
83+
constfifo=path.join(tmpdir.path,'evil.fifo');
84+
if(spawnSync('mkfifo',[fifo]).status!==0)return;// mkfifo unavailable
85+
constscript=
86+
'const zlib = require("zlib");'+
87+
'(async () => {'+
88+
' try {'+
89+
` for await (const _ of zlib.zipFiles([[${JSON.stringify(fifo)}, "x"]], `+
90+
' { followSymlinks: false })) {}'+
91+
' console.log("COMPLETED");'+
92+
' } catch (e) { console.log("REJECTED:" + e.code); }'+
93+
'})();';
94+
constres=spawnSync(process.execPath,['--no-warnings','-e',script],
95+
{timeout: 5000,encoding: 'utf8'});
96+
assert.ok(res.signal===null,
97+
'zipFiles hung on a FIFO source (killed by timeout)');
98+
assert.match(res.stdout,/REJECTED:ERR_ZIP_UNSUPPORTED_FEATURE/);
99+
});
100+
101+
// 3. Streaming is hard-bounded by the declared uncompressed size: a member
102+
// whose data inflates past it is rejected mid-stream, so a consumer can trust
103+
// entry.size as the ceiling before choosing to buffer.
104+
test('contentIterator rejects a member that inflates past its declared size',async()=>{
105+
constbig=zlib.ZipEntry.createSync(
106+
'big',Buffer.alloc(64*1024),{method: 'deflate'});
107+
constchunks=[];
108+
for(constchunkofzlib.createZipArchiveSync([big]))chunks.push(chunk);
109+
constbuf=Buffer.concat(chunks);
110+
// Shrink the declared uncompressed size in both headers (kept consistent so
111+
// the header cross-check passes) below what the data actually inflates to.
112+
constc=centralOffset(buf);
113+
buf.writeUInt32LE(100,22);// Local uncompressed size
114+
buf.writeUInt32LE(100,c+24);// Central uncompressed size
115+
constentry=newzlib.ZipBuffer(buf).get('big');
116+
awaitassert.rejects(async()=>{
117+
// eslint-disable-next-line no-unused-vars
118+
forawait(const_ofentry.contentIterator()){/* drain */}
119+
},{code: 'ERR_ZIP_ENTRY_CORRUPT',message: /inflatesbeyonditsdeclaredsize/});
120+
});
0 commit comments
Comments
 (0)