@c4a/extract-proto 0.7.5 → 0.7.9

package/index.js

@@ -11444,15 +11444,21 @@ function replaceWithCount(value, pattern, replacement, count) {
     return replacement(...args.slice(0, -2));
   });
 }
+var SECRET_TEXT_KEY = "(?:[A-Za-z0-9_.-]*(?:password|passwd|pwd|secret|token|credential|cookie)[A-Za-z0-9_.-]*|api[-_]?key|access[-_]?(?:key|token)|private[-_]?key|client[-_]?secret|authorization)";
+var SECRET_TEXT_ASSIGNMENT = `(?:=\\s*|:\\s+(?=\\S)|:\\s*(?=["']))`;
+var AUTHORIZATION_TEXT_PATTERN = new RegExp(`(\\bauthorization\\s*:\\s*(?:bearer|basic)\\s+)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^\\s,;]+`, "giu");
+var QUERY_SECRET_TEXT_PATTERN = new RegExp(`([?&](?:access_token|refresh_token|api_key|password|secret)=)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^&#\\s]+`, "giu");
+var ASSIGNMENT_SECRET_TEXT_PATTERN = new RegExp(`((?:["']?${SECRET_TEXT_KEY}["']?)\\s*${SECRET_TEXT_ASSIGNMENT})` + `(?!["']?${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})` + `(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu");
 function redactKnownText(value, count) {
+  if (!value.includes(":") && !value.includes("=") && !value.includes("-----BEGIN ")) {
+    return value;
+  }
   let output = value;
   output = replaceWithCount(output, /-----BEGIN (?:RSA |EC |OPENSSH )?PRIVATE KEY-----[\s\S]*?-----END (?:RSA |EC |OPENSSH )?PRIVATE KEY-----/gu, INDEXER_OUTPUT_REDACTION_MARKER, count);
-  output = replaceWithCount(output, new RegExp(`(\\bauthorization\\s*:\\s*(?:bearer|basic)\\s+)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^\\s,;]+`, "giu"), (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
+  output = replaceWithCount(output, AUTHORIZATION_TEXT_PATTERN, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
   output = replaceWithCount(output, /([a-z][a-z0-9+.-]*:\/\/)[^\s/@:]+:[^\s/@]+@/giu, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}@`, count);
-  output = replaceWithCount(output, new RegExp(`([?&](?:access_token|refresh_token|api_key|password|secret)=)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^&#\\s]+`, "giu"), (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
-  const key = "(?:[A-Za-z0-9_.-]*(?:password|passwd|pwd|secret|token|credential|cookie)[A-Za-z0-9_.-]*|api[-_]?key|access[-_]?(?:key|token)|private[-_]?key|client[-_]?secret|authorization)";
-  const assignment = `(?:=\\s*|:\\s+(?=\\S)|:\\s*(?=["']))`;
-  output = replaceWithCount(output, new RegExp(`((?:["']?${key}["']?)\\s*${assignment})` + `(?!["']?${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})` + `(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu"), (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
+  output = replaceWithCount(output, QUERY_SECRET_TEXT_PATTERN, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
+  output = replaceWithCount(output, ASSIGNMENT_SECRET_TEXT_PATTERN, (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
   return output;
 }
 function redactBlockedText(value, blocked, count) {
@@ -12018,6 +12024,55 @@ var INDEXABLE_EXTENSIONS = new Set([
 var UPLOAD_ALLOWED_EXTENSIONS = collectExtensions(() => true);
 var TEXT_EXTENSIONS = collectExtensions((definition) => definition.cas.encoding === "utf8");
 var UPLOAD_MAX_FILE_SIZE = 5 * 1024 * 1024;
+// src/protoFields.ts
+function protoFields(tokens, kind, oneof) {
+  const fields = [];
+  let start = 0;
+  for (let index = 0;index < tokens.length; index++) {
+    if (tokens[index].value === "{") {
+      let end = index + 1;
+      let depth = 1;
+      for (;end < tokens.length && depth > 0; end++) {
+        if (tokens[end].value === "{")
+          depth++;
+        if (tokens[end].value === "}")
+          depth--;
+      }
+      if (tokens[start]?.value === "oneof")
+        fields.push(...protoFields(tokens.slice(index + 1, end - 1), "message", tokens[start + 1]?.value));
+      index = end - 1;
+      start = end;
+      continue;
+    }
+    if (tokens[index].value !== ";")
+      continue;
+    const statement = tokens.slice(start, index);
+    start = index + 1;
+    if (["option", "reserved", "extensions"].includes(statement[0]?.value ?? ""))
+      continue;
+    const equals = statement.findIndex((token) => token.value === "=");
+    const name = statement[equals - 1];
+    const number = statement[equals + 1];
+    if (name?.kind !== "identifier" || number === undefined)
+      continue;
+    const label = statement[0]?.value;
+    const offset = ["optional", "required", "repeated"].includes(label ?? "") ? 1 : 0;
+    const defaultIndex = statement.findIndex((token, at) => token.value === "default" && statement[at + 1]?.value === "=");
+    const defaultToken = statement[defaultIndex + 2];
+    fields.push({
+      name: name.value,
+      number: number.value,
+      type: kind === "enum" ? "enum value" : statement.slice(offset, equals - 1).map((token) => token.value).join(""),
+      ...label === "optional" ? { optional: true } : label === "required" ? { optional: false } : {},
+      repeated: label === "repeated",
+      ...oneof === undefined ? {} : { oneof },
+      ...defaultIndex < 0 || defaultToken === undefined ? {} : { defaultValue: defaultToken.kind === "string" ? JSON.stringify(defaultToken.value) : defaultToken.value },
+      location: { line: name.line, column: name.column }
+    });
+  }
+  return fields;
+}
+
 // src/protoParser.ts
 import { posix } from "node:path";
 
@@ -12276,8 +12331,10 @@ class ProtoDocumentParser {
     const kind = this.take().value;
     const name = this.identifier(`${kind} name`);
     const qualifiedName = prefix ? `${prefix}.${name.value}` : name.value;
-    this.document.types.push({ kind, name: name.value, qualified_name: qualifiedName, locator: { path: this.path, line: name.line, column: name.column } });
+    const declaration = { kind, name: name.value, qualified_name: qualifiedName, locator: { path: this.path, line: name.line, column: name.column } };
+    this.document.types.push(declaration);
     this.take("{");
+    const fieldStart = this.index;
     while (this.token() && this.token().value !== "}") {
       if (this.token().value === ";") {
         this.index += 1;
@@ -12293,6 +12350,7 @@ class ProtoDocumentParser {
       }
       this.skipDeclaration();
     }
+    declaration.fields = protoFields(this.tokens.slice(fieldStart, this.index), kind);
     this.take("}");
   }
   parseService() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/extract-proto",
-  "version": "0.7.5",
+  "version": "0.7.9",
   "type": "module",
   "description": "Protocol Buffers IDL catalog parser for Context",
   "license": "MIT",