Merge branch 'dev' into feat/ws-relay

spansy/src/http/types.rs

@@ -1,4 +1,4 @@
-use utils::range::{RangeDifference, RangeSet, ToRangeSet};
+use utils::range::{Difference, RangeSet, ToRangeSet};
 
 use crate::{json::JsonValue, Span, Spanned};
 

spansy/src/json/types.rs

@@ -1,6 +1,6 @@
 use std::ops::{Index, Range};
 
-use utils::range::{RangeDifference, RangeSet, ToRangeSet};
+use utils::range::{Difference, RangeSet, ToRangeSet};
 
 use crate::{Span, Spanned};
 

utils/fuzz/Cargo.toml

@@ -40,6 +40,18 @@ path = "fuzz_targets/range_diff_set.rs"
 test = false
 doc = false
 
+[[bin]]
+name = "range_intersection_set"
+path = "fuzz_targets/range_intersection_set.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "range_subset_set"
+path = "fuzz_targets/range_subset_set.rs"
+test = false
+doc = false
+
 [[bin]]
 name = "set_union_range"
 path = "fuzz_targets/set_union_range.rs"
@@ -58,6 +70,18 @@ path = "fuzz_targets/set_diff_set.rs"
 test = false
 doc = false
 
+[[bin]]
+name = "set_intersection_set"
+path = "fuzz_targets/set_intersection_set.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "set_subset_set"
+path = "fuzz_targets/set_subset_set.rs"
+test = false
+doc = false
+
 [[bin]]
 name = "set_diff_range"
 path = "fuzz_targets/set_diff_range.rs"

utils/fuzz/fuzz_targets/range_intersection_set.rs

@@ -0,0 +1,25 @@
+#![no_main]
+
+use std::collections::HashSet;
+use std::ops::Range;
+
+use libfuzzer_sys::fuzz_target;
+
+use tlsn_utils_fuzz::{assert_invariants, SmallSet};
+
+use utils::range::*;
+
+fuzz_target!(|r: (Range<u8>, SmallSet)| {
+    let s1 = r.0;
+    let s2: RangeSet<u8> = r.1.into();
+
+    let h1: HashSet<u8> = HashSet::from_iter(s1.clone());
+    let h2: HashSet<u8> = HashSet::from_iter(s2.iter());
+
+    let intersection = s1.intersection(&s2);
+    let h3: HashSet<u8> = HashSet::from_iter(intersection.iter());
+
+    assert_eq!(h3, h1.intersection(&h2).copied().collect::<HashSet<_>>());
+
+    assert_invariants(intersection);
+});

utils/fuzz/fuzz_targets/range_subset_set.rs

@@ -0,0 +1,20 @@
+#![no_main]
+
+use std::collections::HashSet;
+use std::ops::Range;
+
+use libfuzzer_sys::fuzz_target;
+
+use tlsn_utils_fuzz::SmallSet;
+
+use utils::range::*;
+
+fuzz_target!(|r: (Range<u8>, SmallSet)| {
+    let s1 = r.0;
+    let s2: RangeSet<u8> = r.1.into();
+
+    let h1: HashSet<u8> = HashSet::from_iter(s1.clone());
+    let h2: HashSet<u8> = HashSet::from_iter(s2.iter());
+
+    assert_eq!(s1.is_subset(&s2), h1.is_subset(&h2));
+});

utils/fuzz/fuzz_targets/set_intersection_set.rs

@@ -0,0 +1,24 @@
+#![no_main]
+
+use std::collections::HashSet;
+
+use libfuzzer_sys::fuzz_target;
+
+use tlsn_utils_fuzz::{assert_invariants, SmallSet};
+
+use utils::range::*;
+
+fuzz_target!(|r: (SmallSet, SmallSet)| {
+    let s1: RangeSet<u8> = r.0.into();
+    let s2: RangeSet<u8> = r.1.into();
+
+    let h1: HashSet<u8> = HashSet::from_iter(s1.iter());
+    let h2: HashSet<u8> = HashSet::from_iter(s2.iter());
+
+    let intersection = s1.intersection(&s2);
+    let h3: HashSet<u8> = HashSet::from_iter(intersection.iter());
+
+    assert_eq!(h3, h1.intersection(&h2).copied().collect::<HashSet<_>>());
+
+    assert_invariants(intersection);
+});

utils/fuzz/fuzz_targets/set_subset_set.rs

@@ -0,0 +1,19 @@
+#![no_main]
+
+use std::collections::HashSet;
+
+use libfuzzer_sys::fuzz_target;
+
+use tlsn_utils_fuzz::SmallSet;
+
+use utils::range::*;
+
+fuzz_target!(|r: (SmallSet, SmallSet)| {
+    let s1: RangeSet<u8> = r.0.into();
+    let s2: RangeSet<u8> = r.1.into();
+
+    let h1: HashSet<u8> = HashSet::from_iter(s1.iter());
+    let h2: HashSet<u8> = HashSet::from_iter(s2.iter());
+
+    assert_eq!(s1.is_subset(&s2), h1.is_subset(&h2));
+});