isomorphic-git 1.37.3 → 1.37.5

package/index.cjs

@@ -8,6 +8,7 @@ var AsyncLock = _interopDefault(require('async-lock'));
 var Hash = _interopDefault(require('sha.js/sha1.js'));
 var crc32 = _interopDefault(require('crc-32'));
 var pako = _interopDefault(require('pako'));
+var crypto$1 = require('crypto');
 var pify = _interopDefault(require('pify'));
 var ignore = _interopDefault(require('ignore'));
 var cleanGitRef = _interopDefault(require('clean-git-ref'));
@@ -3273,12 +3274,13 @@ class GitPackIndex {
       0b1100000: 'ofs_delta',
       0b1110000: 'ref_delta',
     };
-    if (!this.pack) {
+    const pack = await this.pack;
+    if (!pack) {
       throw new InternalError(
-        'Tried to read from a GitPackIndex with no packfile loaded into memory'
+        'Could not read packfile data. The packfile may be missing, corrupted, or too large to read into memory.'
       )
     }
-    const raw = (await this.pack).slice(start);
+    const raw = pack.slice(start);
     const reader = new BufferCursor(raw);
     const byte = reader.readUInt8();
     // Object type is encoded in bits 654
@@ -3367,6 +3369,19 @@ function readPackIndex({
   return p
 }
 
+const SHA1_CHUNK_SIZE = 8 * 1024 * 1024;
+
+async function shasumRange(
+  buffer,
+  { start = 0, end = buffer.length } = {}
+) {
+  const hash = crypto$1.createHash('sha1');
+  for (let i = start; i < end; i += SHA1_CHUNK_SIZE) {
+    hash.update(buffer.subarray(i, Math.min(i + SHA1_CHUNK_SIZE, end)));
+  }
+  return hash.digest('hex')
+}
+
 async function readObjectPacked({
   fs,
   cache,
@@ -3390,12 +3405,18 @@ async function readObjectPacked({
     if (p.error) throw new InternalError(p.error)
     // If the packfile DOES have the oid we're looking for...
     if (p.offsets.has(oid)) {
-      // Get the resolved git object from the packfile
+      // Derive the .pack path from the .idx path
+      const packFile = indexFile.replace(/idx$/, 'pack');
       if (!p.pack) {
-        const packFile = indexFile.replace(/idx$/, 'pack');
         p.pack = fs.read(packFile);
       }
       const pack = await p.pack;
+      if (!pack) {
+        p.pack = null;
+        throw new InternalError(
+          `Could not read packfile at ${packFile}. The file may be missing, corrupted, or too large to read into memory.`
+        )
+      }
 
       // === Packfile Integrity Verification ===
       // Performance optimization: use _checksumVerified flag to verify only once per packfile
@@ -3414,11 +3435,12 @@ async function readObjectPacked({
           )
         }
 
-        // 2. Deep Integrity Check: Calculate actual SHA-1 of packfile payload
-        // This ensures true data integrity by verifying the entire packfile content
-        // Use subarray for zero-copy reading of large files
-        const payload = pack.subarray(0, -20);
-        const actualPayloadSha = await shasum(payload);
+        // 2. Deep Integrity Check: Calculate actual SHA-1 of packfile payload.
+        // The Node package build swaps in a chunked implementation for large packs.
+        const actualPayloadSha = await shasumRange(pack, {
+          start: 0,
+          end: pack.length - 20,
+        });
         if (actualPayloadSha !== expectedShaFromIndex) {
           throw new InternalError(
             `Packfile payload corrupted: calculated ${actualPayloadSha} but expected ${expectedShaFromIndex}. The packfile may have been tampered with.`
@@ -9304,8 +9326,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.37.3',
-  agent: 'git/isomorphic-git@1.37.3',
+  version: '1.37.5',
+  agent: 'git/isomorphic-git@1.37.5',
 };
 
 class FIFO {

package/index.js

@@ -3267,12 +3267,13 @@ class GitPackIndex {
       0b1100000: 'ofs_delta',
       0b1110000: 'ref_delta',
     };
-    if (!this.pack) {
+    const pack = await this.pack;
+    if (!pack) {
       throw new InternalError(
-        'Tried to read from a GitPackIndex with no packfile loaded into memory'
+        'Could not read packfile data. The packfile may be missing, corrupted, or too large to read into memory.'
       )
     }
-    const raw = (await this.pack).slice(start);
+    const raw = pack.slice(start);
     const reader = new BufferCursor(raw);
     const byte = reader.readUInt8();
     // Object type is encoded in bits 654
@@ -3361,6 +3362,13 @@ function readPackIndex({
   return p
 }
 
+async function shasumRange(
+  buffer,
+  { start = 0, end = buffer.length } = {}
+) {
+  return shasum(buffer.subarray(start, end))
+}
+
 async function readObjectPacked({
   fs,
   cache,
@@ -3384,12 +3392,18 @@ async function readObjectPacked({
     if (p.error) throw new InternalError(p.error)
     // If the packfile DOES have the oid we're looking for...
     if (p.offsets.has(oid)) {
-      // Get the resolved git object from the packfile
+      // Derive the .pack path from the .idx path
+      const packFile = indexFile.replace(/idx$/, 'pack');
       if (!p.pack) {
-        const packFile = indexFile.replace(/idx$/, 'pack');
         p.pack = fs.read(packFile);
       }
       const pack = await p.pack;
+      if (!pack) {
+        p.pack = null;
+        throw new InternalError(
+          `Could not read packfile at ${packFile}. The file may be missing, corrupted, or too large to read into memory.`
+        )
+      }
 
       // === Packfile Integrity Verification ===
       // Performance optimization: use _checksumVerified flag to verify only once per packfile
@@ -3408,11 +3422,12 @@ async function readObjectPacked({
           )
         }
 
-        // 2. Deep Integrity Check: Calculate actual SHA-1 of packfile payload
-        // This ensures true data integrity by verifying the entire packfile content
-        // Use subarray for zero-copy reading of large files
-        const payload = pack.subarray(0, -20);
-        const actualPayloadSha = await shasum(payload);
+        // 2. Deep Integrity Check: Calculate actual SHA-1 of packfile payload.
+        // The Node package build swaps in a chunked implementation for large packs.
+        const actualPayloadSha = await shasumRange(pack, {
+          start: 0,
+          end: pack.length - 20,
+        });
         if (actualPayloadSha !== expectedShaFromIndex) {
           throw new InternalError(
             `Packfile payload corrupted: calculated ${actualPayloadSha} but expected ${expectedShaFromIndex}. The packfile may have been tampered with.`
@@ -9298,8 +9313,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.37.3',
-  agent: 'git/isomorphic-git@1.37.3',
+  version: '1.37.5',
+  agent: 'git/isomorphic-git@1.37.5',
 };
 
 class FIFO {