@socprime/logtotal-sanitizer 0.2.0-beta.0 → 0.2.0-beta.1

package/cli.js

@@ -1571,13 +1571,15 @@ var hostnamesRule = {
     "host",
     "fqdn",
     "domain",
+    "computer",
     "computerName",
     "serverName",
     "nodeName",
     "dnsName",
     "machineName",
     "targetHost"
-  ]
+  ],
+  jsonKeyContains: ["computer", "domainname"]
 };
 
 // src/rules/definitions/ipAddresses.ts
@@ -2366,7 +2368,8 @@ var usersRule = {
     "surname",
     "userId",
     "uid"
-  ]
+  ],
+  jsonKeyContains: ["owner", "username"]
 };
 
 // src/rules/registry.ts
@@ -2862,27 +2865,44 @@ function looksLikeJson(line) {
 function normalizeKey2(key) {
   return key.toLowerCase().replace(/[-_]/g, "");
 }
-function buildJsonKeyIndex(rules) {
-  const index = /* @__PURE__ */ new Map();
+function buildJsonKeyMatcher(rules) {
+  const exact = /* @__PURE__ */ new Map();
+  const contains = [];
   for (const rule of rules) {
     for (const key of rule.jsonKeys ?? []) {
       const normalized = normalizeKey2(key);
-      if (!index.has(normalized)) {
-        index.set(normalized, rule);
+      if (!exact.has(normalized)) {
+        exact.set(normalized, rule);
       }
     }
+    for (const fragment of rule.jsonKeyContains ?? []) {
+      contains.push({ fragment: normalizeKey2(fragment), rule });
+    }
+  }
+  return { exact, contains };
+}
+function resolveJsonKeyRule(matcher, key) {
+  const normalized = normalizeKey2(key);
+  const exact = matcher.exact.get(normalized);
+  if (exact) {
+    return exact;
+  }
+  for (const entry of matcher.contains) {
+    if (normalized.includes(entry.fragment)) {
+      return entry.rule;
+    }
   }
-  return index;
+  return void 0;
 }
-var jsonKeyIndexCache = /* @__PURE__ */ new WeakMap();
-function jsonKeyIndex(rules) {
-  const cached = jsonKeyIndexCache.get(rules);
+var jsonKeyMatcherCache = /* @__PURE__ */ new WeakMap();
+function jsonKeyMatcher(rules) {
+  const cached = jsonKeyMatcherCache.get(rules);
   if (cached) {
     return cached;
   }
-  const index = buildJsonKeyIndex(rules);
-  jsonKeyIndexCache.set(rules, index);
-  return index;
+  const matcher = buildJsonKeyMatcher(rules);
+  jsonKeyMatcherCache.set(rules, matcher);
+  return matcher;
 }
 function mergeCounts(target, source) {
   for (const [id, count] of Object.entries(source)) {
@@ -2972,7 +2992,7 @@ function redactJsonLine(line, ctx, options = {}) {
   const withSegments = options.withSegments ?? false;
   const withMatches = options.withMatches ?? false;
   const collectOriginals = withMatches || withSegments;
-  const keyIndex = jsonKeyIndex(ctx.rules);
+  const keyMatcher = jsonKeyMatcher(ctx.rules);
   const counts = {};
   const matches = [];
   const originals = [];
@@ -2995,7 +3015,7 @@ function redactJsonLine(line, ctx, options = {}) {
   };
   const redactValue = (value, key) => {
     if (typeof value === "string") {
-      const fieldRule = key === void 0 ? void 0 : keyIndex.get(normalizeKey2(key));
+      const fieldRule = key === void 0 ? void 0 : resolveJsonKeyRule(keyMatcher, key);
       if (fieldRule) {
         if (isAllowed(ctx.allow, fieldRule.id, value)) {
           return value;
@@ -3220,6 +3240,14 @@ function validateRule(rule) {
       requireText(key, id, `jsonKeys[${index}]`);
     }
   }
+  if (rule.jsonKeyContains !== void 0) {
+    if (!Array.isArray(rule.jsonKeyContains)) {
+      throw new InvalidRuleError(`Rule "${id}": \`jsonKeyContains\` must be an array of strings.`);
+    }
+    for (const [index, fragment] of rule.jsonKeyContains.entries()) {
+      requireText(fragment, id, `jsonKeyContains[${index}]`);
+    }
+  }
   if (rule.validate !== void 0 && typeof rule.validate !== "function") {
     throw new InvalidRuleError(`Rule "${id}": \`validate\` must be a function.`);
   }