@reclaimprotocol/attestor-core 5.1.1 → 5.1.3

package/lib/external-rpc/index.js

@@ -8807,13 +8807,14 @@ function parseHttpResponse(buff) {
 var RE2;
 import("re2").then((m) => {
   RE2 = m.default;
-}).catch(() => {
+}).catch((err) => {
+  logger.warn({ err }, "Failed to load RE2; falling back to native RegExp");
 });
 function makeRegex(str) {
   if (RE2) {
     return RE2(str, "sgiu");
   }
-  return new RegExp(str, "sgiu");
+  return new RegExp(str, "sgi");
 }
 var TEMPLATE_START_CHARCODE = "{".charCodeAt(0);
 var TEMPLATE_END_CHARCODE = "}".charCodeAt(0);
@@ -9038,6 +9039,9 @@ var HTTP_PROVIDER = {
     if (res.headerIndices["date"]) {
       reveals.push(res.headerIndices["date"]);
     }
+    if (res.headerIndices["content-type"]) {
+      reveals.push(res.headerIndices["content-type"]);
+    }
     if (revealFraming && res.headerIndices["transfer-encoding"]) {
       reveals.push(res.headerIndices["transfer-encoding"]);
     }
@@ -9129,36 +9133,53 @@ var HTTP_PROVIDER = {
     const firstRealIdx = allServerBlocks.findIndex((b) => !b.every((x) => x === REDACTION_CHAR_CODE2));
     const serverBlocks = firstRealIdx === -1 ? [] : allServerBlocks.slice(firstRealIdx);
     const response = concatArrays(...serverBlocks);
-    let res;
-    res = uint8ArrayToStr(response);
+    let bodyStart;
+    if (shouldRevealCrlf(ctx)) {
+      const responseAfterStatus = response.slice(OK_HTTP_HEADER.length);
+      const separatorIdx = findIndexInUint8Array(
+        responseAfterStatus,
+        strToUint8Array("\r\n\r\n")
+      );
+      if (separatorIdx === -1) {
+        throw new Error("Response body start not found");
+      }
+      bodyStart = OK_HTTP_HEADER.length + separatorIdx + 4;
+    } else {
+      bodyStart = OK_HTTP_HEADER.length;
+    }
+    const headersText = uint8ArrayToStr(response.slice(0, bodyStart));
     const okRegex = makeRegex("^HTTP\\/1.1 2\\d{2}");
-    const matchRes = okRegex.exec(res);
+    const matchRes = okRegex.exec(headersText);
     if (!matchRes) {
       const statusRegex = makeRegex("^HTTP\\/1.1 (\\d{3})");
-      const matchRes2 = statusRegex.exec(res);
+      const matchRes2 = statusRegex.exec(headersText);
       if (matchRes2 && matchRes2.length > 1) {
         throw new Error(`Provider returned error ${matchRes2[1]}`);
       }
-      let lineEnd = res.indexOf("*");
+      let lineEnd = headersText.indexOf("*");
       if (lineEnd === -1) {
-        lineEnd = res.indexOf("\n");
+        lineEnd = headersText.indexOf("\n");
       }
       if (lineEnd === -1) {
         lineEnd = OK_HTTP_HEADER.length;
       }
       throw new Error(
-        `Response did not start with "HTTP/1.1 2XX" got "${res.slice(0, lineEnd)}"`
+        `Response did not start with "HTTP/1.1 2XX" got "${headersText.slice(0, lineEnd)}"`
       );
     }
-    let bodyStart;
-    if (shouldRevealCrlf(ctx)) {
-      bodyStart = res.indexOf("\r\n\r\n", OK_HTTP_HEADER.length) + 4;
-      if (bodyStart < 4) {
-        throw new Error("Response body start not found");
+    const paramBody = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
+    if (paramBody.length > 0 && !matchRedactedStrings(paramBody, req.body)) {
+      throw new Error("request body mismatch");
+    }
+    let body = response.slice(bodyStart);
+    if (shouldRevealChunkFraming(clientVersion)) {
+      if (/transfer-encoding:\s*chunked/i.test(headersText)) {
+        body = dechunkResponseBody(body);
       }
-    } else {
-      bodyStart = OK_HTTP_HEADER.length;
     }
+    const charset = shouldRevealCrlf(ctx) ? getResponseBodyCharset(headersText) : void 0;
+    const bodyText = decodeResponseBody(body, charset);
+    let res = headersText + bodyText;
     const dateHeader = makeRegex(dateHeaderRegex).exec(res);
     if (dateHeader && dateHeader.length > 1) {
       const serverDate = new Date(dateHeader[1]);
@@ -9166,14 +9187,7 @@ var HTTP_PROVIDER = {
         logger2.info({ dateHeader: dateHeader[0], current: Date.now() }, "date header is off");
       }
     }
-    const paramBody = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
-    if (paramBody.length > 0 && !matchRedactedStrings(paramBody, req.body)) {
-      throw new Error("request body mismatch");
-    }
-    if (shouldRevealChunkFraming(clientVersion)) {
-      const headersStr = res.slice(0, bodyStart);
-      res = /transfer-encoding:\s*chunked/i.test(headersStr) ? headersStr + dechunkResponseBody(res.slice(bodyStart)) : res;
-    } else if (!secretParams) {
+    if (!shouldRevealChunkFraming(clientVersion) && !secretParams) {
       res = res.slice(bodyStart).replace(/\*{3,}/g, "");
     }
     for (const { type, value, invert } of params.responseMatches || []) {
@@ -9264,12 +9278,35 @@ function shouldRevealCrlf({ version }) {
 function shouldRevealChunkFraming(version) {
   return version >= AttestorVersion.ATTESTOR_VERSION_3_2_0;
 }
+function getResponseBodyCharset(headers) {
+  const contentType = /(?:^|[\r\n*])content-type\s*:\s*([^*\r\n]*)/i.exec(headers)?.[1];
+  if (typeof contentType === "undefined") {
+    return void 0;
+  }
+  const charsetMatch = /(?:^|;)\s*charset\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^;\s]*))/i.exec(contentType);
+  if (!charsetMatch) {
+    return void 0;
+  }
+  const charset = charsetMatch[1]?.replace(/\\(.)/g, "$1") ?? charsetMatch[2];
+  return charset.trim() || void 0;
+}
+function decodeResponseBody(body, charset) {
+  try {
+    return new TextDecoder(charset ?? "utf-8").decode(body);
+  } catch (error) {
+    if (charset) {
+      throw new Error(`Unsupported response charset "${charset}"`, { cause: error });
+    }
+    throw error;
+  }
+}
 function dechunkResponseBody(body) {
   const parser = makeHttpResponseParser();
-  parser.onChunk(
-    strToUint8Array("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n" + body)
-  );
-  return uint8ArrayToStr(parser.res.body ?? new Uint8Array());
+  parser.onChunk(concatenateUint8Arrays7([
+    strToUint8Array("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n"),
+    body
+  ]));
+  return parser.res.body ?? new Uint8Array();
 }
 function getHostPort(params, secretParams) {
   const { host } = new URL(getURL(params, secretParams));
@@ -9955,6 +9992,7 @@ async function _createClaimOnAttestor({
           block,
           redactedPlaintext,
           overshotToprfFromPrevBlock,
+          overshotOprfRawFromPrevBlock,
           toprfs,
           oprfRawMarkers
         } = reveal;
@@ -9963,7 +10001,8 @@ async function _createClaimOnAttestor({
           redactedPlaintext,
           toprfs,
           oprfRawMarkers,
-          overshotToprfFromPrevBlock
+          overshotToprfFromPrevBlock,
+          overshotOprfRawFromPrevBlock
         });
         revealedPackets.push(
           { sender: "server", message: redactedPlaintext }

package/lib/index.js

@@ -7124,13 +7124,14 @@ function parseHttpResponse(buff) {
 var RE2;
 import("re2").then((m) => {
   RE2 = m.default;
-}).catch(() => {
+}).catch((err) => {
+  logger.warn({ err }, "Failed to load RE2; falling back to native RegExp");
 });
 function makeRegex(str) {
   if (RE2) {
     return RE2(str, "sgiu");
   }
-  return new RegExp(str, "sgiu");
+  return new RegExp(str, "sgi");
 }
 var TEMPLATE_START_CHARCODE = "{".charCodeAt(0);
 var TEMPLATE_END_CHARCODE = "}".charCodeAt(0);
@@ -7336,6 +7337,9 @@ var HTTP_PROVIDER = {
     if (res.headerIndices["date"]) {
       reveals.push(res.headerIndices["date"]);
     }
+    if (res.headerIndices["content-type"]) {
+      reveals.push(res.headerIndices["content-type"]);
+    }
     if (revealFraming && res.headerIndices["transfer-encoding"]) {
       reveals.push(res.headerIndices["transfer-encoding"]);
     }
@@ -7427,36 +7431,53 @@ var HTTP_PROVIDER = {
     const firstRealIdx = allServerBlocks.findIndex((b) => !b.every((x) => x === REDACTION_CHAR_CODE2));
     const serverBlocks = firstRealIdx === -1 ? [] : allServerBlocks.slice(firstRealIdx);
     const response = concatArrays(...serverBlocks);
-    let res;
-    res = uint8ArrayToStr(response);
+    let bodyStart;
+    if (shouldRevealCrlf(ctx)) {
+      const responseAfterStatus = response.slice(OK_HTTP_HEADER.length);
+      const separatorIdx = findIndexInUint8Array(
+        responseAfterStatus,
+        strToUint8Array("\r\n\r\n")
+      );
+      if (separatorIdx === -1) {
+        throw new Error("Response body start not found");
+      }
+      bodyStart = OK_HTTP_HEADER.length + separatorIdx + 4;
+    } else {
+      bodyStart = OK_HTTP_HEADER.length;
+    }
+    const headersText = uint8ArrayToStr(response.slice(0, bodyStart));
     const okRegex = makeRegex("^HTTP\\/1.1 2\\d{2}");
-    const matchRes = okRegex.exec(res);
+    const matchRes = okRegex.exec(headersText);
     if (!matchRes) {
       const statusRegex = makeRegex("^HTTP\\/1.1 (\\d{3})");
-      const matchRes2 = statusRegex.exec(res);
+      const matchRes2 = statusRegex.exec(headersText);
       if (matchRes2 && matchRes2.length > 1) {
         throw new Error(`Provider returned error ${matchRes2[1]}`);
       }
-      let lineEnd = res.indexOf("*");
+      let lineEnd = headersText.indexOf("*");
       if (lineEnd === -1) {
-        lineEnd = res.indexOf("\n");
+        lineEnd = headersText.indexOf("\n");
       }
       if (lineEnd === -1) {
         lineEnd = OK_HTTP_HEADER.length;
       }
       throw new Error(
-        `Response did not start with "HTTP/1.1 2XX" got "${res.slice(0, lineEnd)}"`
+        `Response did not start with "HTTP/1.1 2XX" got "${headersText.slice(0, lineEnd)}"`
       );
     }
-    let bodyStart;
-    if (shouldRevealCrlf(ctx)) {
-      bodyStart = res.indexOf("\r\n\r\n", OK_HTTP_HEADER.length) + 4;
-      if (bodyStart < 4) {
-        throw new Error("Response body start not found");
+    const paramBody = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
+    if (paramBody.length > 0 && !matchRedactedStrings(paramBody, req.body)) {
+      throw new Error("request body mismatch");
+    }
+    let body = response.slice(bodyStart);
+    if (shouldRevealChunkFraming(clientVersion)) {
+      if (/transfer-encoding:\s*chunked/i.test(headersText)) {
+        body = dechunkResponseBody(body);
       }
-    } else {
-      bodyStart = OK_HTTP_HEADER.length;
     }
+    const charset = shouldRevealCrlf(ctx) ? getResponseBodyCharset(headersText) : void 0;
+    const bodyText = decodeResponseBody(body, charset);
+    let res = headersText + bodyText;
     const dateHeader = makeRegex(dateHeaderRegex).exec(res);
     if (dateHeader && dateHeader.length > 1) {
       const serverDate = new Date(dateHeader[1]);
@@ -7464,14 +7485,7 @@ var HTTP_PROVIDER = {
         logger2.info({ dateHeader: dateHeader[0], current: Date.now() }, "date header is off");
       }
     }
-    const paramBody = params.body instanceof Uint8Array ? params.body : strToUint8Array(params.body || "");
-    if (paramBody.length > 0 && !matchRedactedStrings(paramBody, req.body)) {
-      throw new Error("request body mismatch");
-    }
-    if (shouldRevealChunkFraming(clientVersion)) {
-      const headersStr = res.slice(0, bodyStart);
-      res = /transfer-encoding:\s*chunked/i.test(headersStr) ? headersStr + dechunkResponseBody(res.slice(bodyStart)) : res;
-    } else if (!secretParams) {
+    if (!shouldRevealChunkFraming(clientVersion) && !secretParams) {
       res = res.slice(bodyStart).replace(/\*{3,}/g, "");
     }
     for (const { type, value, invert } of params.responseMatches || []) {
@@ -7562,12 +7576,35 @@ function shouldRevealCrlf({ version }) {
 function shouldRevealChunkFraming(version) {
   return version >= AttestorVersion.ATTESTOR_VERSION_3_2_0;
 }
+function getResponseBodyCharset(headers) {
+  const contentType = /(?:^|[\r\n*])content-type\s*:\s*([^*\r\n]*)/i.exec(headers)?.[1];
+  if (typeof contentType === "undefined") {
+    return void 0;
+  }
+  const charsetMatch = /(?:^|;)\s*charset\s*=\s*(?:"((?:[^"\\]|\\.)*)"|([^;\s]*))/i.exec(contentType);
+  if (!charsetMatch) {
+    return void 0;
+  }
+  const charset = charsetMatch[1]?.replace(/\\(.)/g, "$1") ?? charsetMatch[2];
+  return charset.trim() || void 0;
+}
+function decodeResponseBody(body, charset) {
+  try {
+    return new TextDecoder(charset ?? "utf-8").decode(body);
+  } catch (error) {
+    if (charset) {
+      throw new Error(`Unsupported response charset "${charset}"`, { cause: error });
+    }
+    throw error;
+  }
+}
 function dechunkResponseBody(body) {
   const parser = makeHttpResponseParser();
-  parser.onChunk(
-    strToUint8Array("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n" + body)
-  );
-  return uint8ArrayToStr(parser.res.body ?? new Uint8Array());
+  parser.onChunk(concatenateUint8Arrays6([
+    strToUint8Array("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n"),
+    body
+  ]));
+  return parser.res.body ?? new Uint8Array();
 }
 function getHostPort(params, secretParams) {
   const { host } = new URL(getURL(params, secretParams));
@@ -8454,6 +8491,7 @@ async function _createClaimOnAttestor({
           block,
           redactedPlaintext,
           overshotToprfFromPrevBlock,
+          overshotOprfRawFromPrevBlock,
           toprfs,
           oprfRawMarkers
         } = reveal;
@@ -8462,7 +8500,8 @@ async function _createClaimOnAttestor({
           redactedPlaintext,
           toprfs,
           oprfRawMarkers,
-          overshotToprfFromPrevBlock
+          overshotToprfFromPrevBlock,
+          overshotOprfRawFromPrevBlock
         });
         revealedPackets.push(
           { sender: "server", message: redactedPlaintext }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reclaimprotocol/attestor-core",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "",
   "type": "module",
   "imports": {