🛡️ Sentinel: [CRITICAL] Fix Path Traversal in TypeScript Extractor

.jules/sentinel.md

@@ -0,0 +1,4 @@
+## 2025-03-09 - Insecure Path Normalization Logic
+**Vulnerability:** `Component::ParentDir` incorrectly handled root/prefix directories and ignored relative traversals when the component list was empty or trailing `..`, enabling path traversal and incorrect relative path preservation.
+**Learning:** Manually normalizing paths by just popping components on `..` fails to account for empty queues, existing `..` elements, and non-removable path prefixes/roots.
+**Prevention:** Explicitly block `Component::ParentDir` from popping `Component::RootDir` or `Component::Prefix` and push `Component::ParentDir` when the list is empty or the last element is already `Component::ParentDir`.

crates/ast-engine/src/tree_sitter/mod.rs

@@ -553,9 +553,8 @@ impl ContentExt for String {
         let mut bytes = std::mem::take(self).into_bytes();
         let original_len = bytes.len();
         bytes.splice(safe_start..safe_end, full_inserted);
-        *self = Self::from_utf8(bytes).unwrap_or_else(|e| {
-            Self::from_utf8_lossy(&e.into_bytes()).into_owned()
-        });
+        *self = Self::from_utf8(bytes)
+            .unwrap_or_else(|e| Self::from_utf8_lossy(&e.into_bytes()).into_owned());
 
         // We calculate new_end_byte using the difference in the new overall string length
         // to correctly align the end offset, taking any potential replacement bytes from
@@ -791,7 +790,10 @@ mod test {
 
         let tree2 = parse_lang(|p| p.parse(&src, Some(&tree)), &Tsx.get_ts_language())?;
         let fresh_tree = parse(&src)?;
-        assert_eq!(tree2.root_node().to_sexp(), fresh_tree.root_node().to_sexp());
+        assert_eq!(
+            tree2.root_node().to_sexp(),
+            fresh_tree.root_node().to_sexp()
+        );
         Ok(())
     }
 }

crates/flow/src/incremental/extractors/typescript.rs

@@ -808,7 +808,25 @@ impl TypeScriptDependencyExtractor {
                 for component in resolved.components() {
                     match component {
                         std::path::Component::ParentDir => {
-                            components.pop();
+                            // Security enhancement: Prevent popping root/prefix and correctly handle ../../
+                            if let Some(last) = components.last() {
+                                match last {
+                                    std::path::Component::RootDir
+                                    | std::path::Component::Prefix(_) => {
+                                        // Do not pop RootDir or Prefix
+                                    }
+                                    std::path::Component::ParentDir => {
+                                        // Push another ParentDir to handle ../../ correctly
+                                        components.push(component);
+                                    }
+                                    _ => {
+                                        components.pop();
+                                    }
+                                }
+                            } else {
+                                // Push ParentDir if empty
+                                components.push(component);
+                            }
                         }
                         std::path::Component::CurDir => {}
                         _ => components.push(component),

crates/rule-engine/src/rule/mod.rs

@@ -246,7 +246,11 @@ impl Rule {
 
     pub fn defined_vars(&self) -> RapidSet<String> {
         match self {
-            Rule::Pattern(p) => p.defined_vars().into_iter().map(|s| s.to_string()).collect(),
+            Rule::Pattern(p) => p
+                .defined_vars()
+                .into_iter()
+                .map(|s| s.to_string())
+                .collect(),
             Rule::Kind(_) => RapidSet::default(),
             Rule::Regex(_) => RapidSet::default(),
             Rule::NthChild(n) => n.defined_vars(),

crates/rule-engine/src/rule/referent_rule.rs

@@ -27,10 +27,7 @@ impl<R> Clone for Registration<R> {
 
 impl<R> Registration<R> {
     fn read(&self) -> Arc<RapidMap<String, R>> {
-        self.0
-            .read()
-            .unwrap_or_else(|e| e.into_inner())
-            .clone()
+        self.0.read().unwrap_or_else(|e| e.into_inner()).clone()
     }
     pub(crate) fn contains_key(&self, key: &str) -> bool {
         self.read().contains_key(key)