hbsig 0.2.1 → 0.2.2

package/cjs/httpsig.js

@@ -414,14 +414,12 @@ function parseMultipart(contentType, body) {
           var name = line.substring(0, colonIndex).toLowerCase();
           var value = line.substring(colonIndex + 2);
 
-          // Special handling for known binary fields or detected binary data
-          if (name === "owner" || name === "signature") {
-            // These fields contain binary data that may have embedded newlines
-            // We need to read until we find the next header or end of headers
+          // Check if this might be binary data by looking at the first part
+          var valueBuf = Buffer.from(value, "binary");
+          var mightBeBinary = isBinaryData(valueBuf);
+          if (mightBeBinary) {
+            // Binary data may contain embedded newlines, so read until next header
             var valueStart = currentPos + colonIndex + 2;
-
-            // Look ahead to find where this field really ends
-            // The next header will start with a valid header name followed by ": "
             var searchPos = valueStart;
             var valueEnd = headerBlock.length;
 
@@ -429,40 +427,24 @@ function parseMultipart(contentType, body) {
             while (searchPos < headerBlock.length) {
               var nextNewline = headerBlock.indexOf("\n", searchPos);
               if (nextNewline === -1) break;
-
-              // Check if what follows looks like a header
               var nextLineStart = nextNewline + 1;
               var nextColon = headerBlock.indexOf(":", nextLineStart);
-
-              // Valid header should have colon relatively close to line start
               if (nextColon > nextLineStart && nextColon < nextLineStart + 50) {
-                // Check if the text before colon looks like a header name (ASCII text)
                 var possibleHeaderName = headerBlock.substring(nextLineStart, nextColon);
                 var looksLikeHeader = /^[a-zA-Z0-9-]+$/.test(possibleHeaderName);
                 if (looksLikeHeader) {
-                  // Found the next header, value ends at the newline before it
                   valueEnd = nextNewline;
                   break;
                 }
               }
               searchPos = nextNewline + 1;
             }
-
-            // Extract the full value as binary string
             value = headerBlock.substring(valueStart, valueEnd);
-
-            // Remove trailing CR if present (since we found the LF)
             if (value.endsWith("\r")) {
               value = value.substring(0, value.length - 1);
             }
-
-            // Convert to Buffer to preserve binary
             headers[name] = Buffer.from(value, "binary");
             currentPos = valueEnd + 1;
-          } else if (isBinaryData(Buffer.from(value, "binary"))) {
-            // Regular field but contains binary data
-            headers[name] = Buffer.from(value, "binary");
-            currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1);
           } else {
             // Regular text field
             headers[name] = value;

package/esm/httpsig.js

@@ -360,14 +360,13 @@ function parseMultipart(contentType, body) {
         const name = line.substring(0, colonIndex).toLowerCase()
         let value = line.substring(colonIndex + 2)
 
-        // Special handling for known binary fields or detected binary data
-        if (name === "owner" || name === "signature") {
-          // These fields contain binary data that may have embedded newlines
-          // We need to read until we find the next header or end of headers
-          let valueStart = currentPos + colonIndex + 2
+        // Check if this might be binary data by looking at the first part
+        const valueBuf = Buffer.from(value, "binary")
+        const mightBeBinary = isBinaryData(valueBuf)
 
-          // Look ahead to find where this field really ends
-          // The next header will start with a valid header name followed by ": "
+        if (mightBeBinary) {
+          // Binary data may contain embedded newlines, so read until next header
+          let valueStart = currentPos + colonIndex + 2
           let searchPos = valueStart
           let valueEnd = headerBlock.length
 
@@ -376,13 +375,10 @@ function parseMultipart(contentType, body) {
             let nextNewline = headerBlock.indexOf("\n", searchPos)
             if (nextNewline === -1) break
 
-            // Check if what follows looks like a header
             let nextLineStart = nextNewline + 1
             let nextColon = headerBlock.indexOf(":", nextLineStart)
 
-            // Valid header should have colon relatively close to line start
             if (nextColon > nextLineStart && nextColon < nextLineStart + 50) {
-              // Check if the text before colon looks like a header name (ASCII text)
               let possibleHeaderName = headerBlock.substring(
                 nextLineStart,
                 nextColon
@@ -390,7 +386,6 @@ function parseMultipart(contentType, body) {
               let looksLikeHeader = /^[a-zA-Z0-9-]+$/.test(possibleHeaderName)
 
               if (looksLikeHeader) {
-                // Found the next header, value ends at the newline before it
                 valueEnd = nextNewline
                 break
               }
@@ -398,21 +393,13 @@ function parseMultipart(contentType, body) {
             searchPos = nextNewline + 1
           }
 
-          // Extract the full value as binary string
           value = headerBlock.substring(valueStart, valueEnd)
-
-          // Remove trailing CR if present (since we found the LF)
           if (value.endsWith("\r")) {
             value = value.substring(0, value.length - 1)
           }
 
-          // Convert to Buffer to preserve binary
           headers[name] = Buffer.from(value, "binary")
           currentPos = valueEnd + 1
-        } else if (isBinaryData(Buffer.from(value, "binary"))) {
-          // Regular field but contains binary data
-          headers[name] = Buffer.from(value, "binary")
-          currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1)
         } else {
           // Regular text field
           headers[name] = value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hbsig",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "cjs/index.js",
   "license": "MIT",
   "devDependencies": {