feat(pii): Adopt new selectors

relay-general/src/pii/attachments.rs

@@ -369,7 +369,7 @@ impl<'a> PiiAttachmentsProcessor<'a> {
     ) -> ProcessingState<'s> {
         self.root_state.enter_borrowed(
             filename,
-            Some(Cow::Owned(FieldAttrs::new().pii(Pii::Maybe))),
+            Some(Cow::Owned(FieldAttrs::new().pii(Pii::True))),
             Some(value_type),
         )
     }
@@ -383,9 +383,18 @@ impl<'a> PiiAttachmentsProcessor<'a> {
         state: &ProcessingState<'_>,
         encodings: ScrubEncodings,
     ) -> bool {
+        let pii = state.attrs().pii;
+        if pii == Pii::False {
+            return false;
+        }
+
         let mut changed = false;
 
         for (selector, rules) in &self.compiled_config.applications {
+            if pii == Pii::Maybe && !selector.is_specific() {
+                continue;
+            }
+
             if state.path().matches_selector(&selector) {
                 for rule in rules {
                     // Note:

relay-general/src/pii/minidumps.rs

@@ -256,39 +256,61 @@ impl PiiAttachmentsProcessor<'_> {
         let mut changed = false;
 
         for item in items {
-            // IMPORTANT: Minidump sections are always classified as Pii:Maybe. This avoids to
-            // accidentally scrub stack memory with highly generic selectors. TODO: Update the PII
-            // system with a better approach.
-            let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
-
             match item {
                 MinidumpItem::StackMemory(range) => {
+                    // IMPORTANT: The stack is PII::Maybe to avoid accidentally scrubbing it
+                    // with highly generic selectors.
                     let slice = data
                         .get_mut(range)
                         .ok_or(ScrubMinidumpError::InvalidAddress)?;
+
+                    // Backwards-compatible visit
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
                     let state =
                         file_state.enter_static("", Some(attrs), Some(ValueType::StackMemory));
                     changed |= self.scrub_bytes(slice, &state, ScrubEncodings::All);
+
+                    // Documented visit
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
+                    let state = file_state.enter_static(
+                        "stack_memory",
+                        Some(attrs),
+                        Some(ValueType::Binary),
+                    );
+                    changed |= self.scrub_bytes(slice, &state, ScrubEncodings::All);
                 }
                 MinidumpItem::NonStackMemory(range) => {
+                    // Backwards-compatible visit.
                     let slice = data
                         .get_mut(range)
                         .ok_or(ScrubMinidumpError::InvalidAddress)?;
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
                     let state =
                         file_state.enter_static("", Some(attrs), Some(ValueType::HeapMemory));
                     changed |= self.scrub_bytes(slice, &state, ScrubEncodings::All);
+
+                    // Documented visit.
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
+                    let state = file_state.enter_static(
+                        "heap_memory",
+                        Some(attrs),
+                        Some(ValueType::Binary),
+                    );
+                    changed |= self.scrub_bytes(slice, &state, ScrubEncodings::All);
                 }
                 MinidumpItem::LinuxEnviron(range) | MinidumpItem::LinuxCmdLine(range) => {
                     let slice = data
                         .get_mut(range)
                         .ok_or(ScrubMinidumpError::InvalidAddress)?;
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
                     let state = file_state.enter_static("", Some(attrs), Some(ValueType::Binary));
                     changed |= self.scrub_bytes(slice, &state, ScrubEncodings::All);
                 }
                 MinidumpItem::CodeModuleName(range) => {
                     let slice = data
                         .get_mut(range)
                         .ok_or(ScrubMinidumpError::InvalidAddress)?;
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
                     // Mirrors decisions made on NativeImagePath type
                     let state =
                         file_state.enter_static("code_file", Some(attrs), Some(ValueType::String));
@@ -299,6 +321,7 @@ impl PiiAttachmentsProcessor<'_> {
                     let slice = data
                         .get_mut(range)
                         .ok_or(ScrubMinidumpError::InvalidAddress)?;
+                    let attrs = Cow::Owned(FieldAttrs::new().pii(Pii::Maybe));
                     // Mirrors decisions made on NativeImagePath type
                     let state =
                         file_state.enter_static("debug_file", Some(attrs), Some(ValueType::String));
@@ -377,6 +400,33 @@ mod tests {
             iter.next(); // remove main module
             iter.cloned().collect()
         }
+
+        /// Returns the raw stack memory regions.
+        fn stacks<'slf>(&'slf self, which: Which) -> Vec<&'slf [u8]> {
+            let dump: &'slf Minidump<&'static [u8]> = match which {
+                Which::Original => &self.orig_dump,
+                Which::Scrubbed => &self.scrubbed_dump,
+            };
+
+            let thread_list: MinidumpThreadList = dump.get_stream().unwrap();
+            let stack_rvas: Vec<RVA> = thread_list
+                .threads
+                .iter()
+                .map(|t| t.raw.stack.memory.rva)
+                .collect();
+
+            // These bytes are kept alive by our struct itself, so returning them with the
+            // lifetime of our struct is fine.  The lifetimes on the Minidump::MemoryRegions
+            // iterator are currenty wrong and assumes we keep a reference to the
+            // MinidumpMemoryList, hence we need to transmute this.  See
+            // https://github.com/luser/rust-minidump/pull/111
+            let mem_list: MinidumpMemoryList<'slf> = dump.get_stream().unwrap();
+            mem_list
+                .iter()
+                .filter(|mem| stack_rvas.contains(&mem.desc.memory.rva))
+                .map(|mem| unsafe { std::mem::transmute(mem.bytes) })
+                .collect()
+        }
     }
 
     #[test]
@@ -542,4 +592,149 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn test_stack_scrubbing_backwards_compatible_selector() {
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$minidump.$stack_memory": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for stack in scrubber.stacks(Which::Scrubbed) {
+            assert!(stack.iter().all(|b| *b == b'*'));
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_path_item_selector() {
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$minidump.stack_memory": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for stack in scrubber.stacks(Which::Scrubbed) {
+            assert!(stack.iter().all(|b| *b == b'*'));
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_valuetype_selector() {
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$minidump.$binary": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for stack in scrubber.stacks(Which::Scrubbed) {
+            assert!(stack.iter().all(|b| *b == b'*'));
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_valuetype_not_fully_qualified() {
+        // Not fully qualified valuetype should not touch the stack
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$binary": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for (scrubbed_stack, original_stack) in scrubber
+            .stacks(Which::Scrubbed)
+            .iter()
+            .zip(scrubber.stacks(Which::Original).iter())
+        {
+            assert_eq!(scrubbed_stack, original_stack);
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_wildcard() {
+        // Wildcard should not touch the stack
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$minidump.*": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for (scrubbed_stack, original_stack) in scrubber
+            .stacks(Which::Scrubbed)
+            .iter()
+            .zip(scrubber.stacks(Which::Original).iter())
+        {
+            assert_eq!(scrubbed_stack, original_stack);
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_deep_wildcard() {
+        // Wildcard should not touch the stack
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$attachments.**": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for (scrubbed_stack, original_stack) in scrubber
+            .stacks(Which::Scrubbed)
+            .iter()
+            .zip(scrubber.stacks(Which::Original).iter())
+        {
+            assert_eq!(scrubbed_stack, original_stack);
+        }
+    }
+
+    #[test]
+    fn test_stack_scrubbing_binary_not_stack() {
+        let scrubber = TestScrubber::new(
+            "linux.dmp",
+            include_bytes!("../../../tests/fixtures/linux.dmp"),
+            serde_json::json!(
+                {
+                    "applications": {
+                        "$binary && !stack_memory": ["@anything:mask"],
+                    }
+                }
+            ),
+        );
+        for (scrubbed_stack, original_stack) in scrubber
+            .stacks(Which::Scrubbed)
+            .iter()
+            .zip(scrubber.stacks(Which::Original).iter())
+        {
+            assert_eq!(scrubbed_stack, original_stack);
+        }
+    }
 }