new: logfmt: changed allowed formatting

* disallowed all text except key=value pairs * relaxed allowed characters restrictions in key
pamburus · Mar 9, 2024 · bbfc736 · bbfc736
1 parent b244180
commit bbfc736
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ categories = ["command-line-utilities"]
 description = "Utility for viewing json-formatted log files."
 keywords = ["cli", "human", "log"]
 name = "hl"
-version = "0.27.0-beta.1.2"
+version = "0.27.0-beta.1.3"
 edition = "2021"
 build = "build.rs"
 

diff --git a/src/logfmt/de.rs b/src/logfmt/de.rs
@@ -497,18 +497,15 @@ impl<'de> Parser<'de> {
 
         while self.index < self.input.len() {
             let c = self.input[self.index];
-            match c {
-                b'=' => {
-                    break;
-                }
-                b'\x00'..=b' ' => {
+            match KEY[c as usize] {
+                KeyCh::EQ_SIGN => {
                     break;
                 }
-                b'\x80'..=b'\xFF' => {
+                KeyCh::UNICODE => {
                     unicode = true;
                     self.index += 1;
                 }
-                b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'_' | b'-' | b'.' => {
+                KeyCh::ALLOWED => {
                     self.index += 1;
                 }
                 _ => {
@@ -935,6 +932,41 @@ static HEX: [u8; 256] = {
     ]
 };
 
+struct KeyCh;
+
+impl KeyCh {
+    const NOT_ALLOWED: u8 = 255;
+    const ALLOWED: u8 = 0;
+    const EQ_SIGN: u8 = 1;
+    const UNICODE: u8 = 2;
+}
+
+static KEY: [u8; 256] = {
+    const NA: u8 = KeyCh::NOT_ALLOWED;
+    const __: u8 = KeyCh::ALLOWED;
+    const EQ: u8 = KeyCh::EQ_SIGN;
+    const UC: u8 = KeyCh::UNICODE;
+    [
+        //   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+        NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 0
+        NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 1
+        NA, __, NA, __, __, __, __, NA, NA, NA, __, __, NA, __, __, __, // 2
+        __, __, __, __, __, __, __, __, __, __, __, NA, NA, EQ, NA, __, // 3
+        __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 4
+        __, __, __, __, __, __, __, __, __, __, __, NA, NA, NA, NA, __, // 5
+        NA, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, // 6
+        __, __, __, __, __, __, __, __, __, __, __, NA, NA, NA, __, NA, // 7
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // 8
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // 9
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // A
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // B
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // C
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // D
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // E
+        UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, UC, // F
+    ]
+};
+
 // ---
 
 #[test]