Do not apply linkpath,global from global pax header

isaacs · Apr 14, 2024 · af04392 · af04392
1 parent b0fbdea
commit af04392
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/header.ts b/src/header.ts
@@ -96,8 +96,9 @@ export class Header implements HeaderData {
 
     // if we have extended or global extended headers, apply them now
     // See https://github.com/npm/node-tar/pull/187
-    if (ex) this.#slurp(ex)
+    // Apply global before local, so it overrides
     if (gex) this.#slurp(gex, true)
+    if (ex) this.#slurp(ex)
 
     // old tar versions marked dirs as a file with a trailing /
     const t = decString(buf, off + 156, 1)
@@ -168,7 +169,9 @@ export class Header implements HeaderData {
           return !(
             v === null ||
             v === undefined ||
-            (k === 'path' && gex)
+            (k === 'path' && gex) ||
+            (k === 'linkpath' && gex) ||
+            (k === 'global')
           )
         }),
       ),

diff --git a/test/header.js b/test/header.js
@@ -614,6 +614,8 @@ t.test('null block, global extended header', t => {
     {
       path: '/global.path',
       foo: 'global foo',
+      global: true,
+      linkpath: 'asdf'
     },
   )
   t.match(h, {