cfsolve 0.1.4 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +25 -0
- data/README.md +26 -6
- data/UPSTREAM.md +23 -8
- data/lib/cfsolve/profiles/safari-26-ios/answers.json +805 -797
- data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +909 -899
- data/lib/cfsolve/version.rb +2 -2
- data/lib/cfsolve.rb +22 -11
- data/vendor/cfsolve/README.md +5 -53
- data/vendor/cfsolve/examples/listing_dump.rs +24 -0
- data/vendor/cfsolve/examples/probe_similarity.rs +37 -0
- data/vendor/cfsolve/examples/rebase_reference.rs +96 -0
- data/vendor/cfsolve/examples/reread_capture.rs +31 -0
- data/vendor/cfsolve/examples/turnstile_smoke.rs +24 -3
- data/vendor/cfsolve/profiles/safari-26-ios/answers.json +805 -797
- data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +909 -899
- data/vendor/cfsolve/src/capture/sessions.rs +88 -4
- data/vendor/cfsolve/src/capture.rs +1 -0
- data/vendor/cfsolve/src/deobfuscate/ast.rs +16 -0
- data/vendor/cfsolve/src/deobfuscate/control_flow.rs +1 -1
- data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +33 -0
- data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +24 -4
- data/vendor/cfsolve/src/embedding_page/extra_params.rs +10 -113
- data/vendor/cfsolve/src/embedding_page/page.rs +70 -99
- data/vendor/cfsolve/src/session/initial.rs +6 -7
- data/vendor/cfsolve/src/session/probes.rs +0 -1
- data/vendor/cfsolve/src/stage2/analysis/analyze.rs +4 -33
- data/vendor/cfsolve/src/stage2/analysis/discovery.rs +9 -17
- data/vendor/cfsolve/src/stage2/benchmark.rs +42 -62
- data/vendor/cfsolve/src/stage2/call_stack.rs +133 -227
- data/vendor/cfsolve/src/stage2/challenge_page.rs +10 -3
- data/vendor/cfsolve/src/stage2/probes/dates.rs +0 -44
- data/vendor/cfsolve/src/stage2/probes/parent_info.rs +345 -61
- data/vendor/cfsolve/src/stage2/probes/performance.rs +42 -5
- data/vendor/cfsolve/src/stage2/probes/stack.rs +45 -117
- data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +7 -76
- data/vendor/cfsolve/src/stage2/probes.rs +0 -1
- data/vendor/cfsolve/src/stage2/reference.json +1 -1
- data/vendor/cfsolve/src/stage2/reference.rs +70 -115
- data/vendor/cfsolve/src/stage2/registry.rs +6 -11
- data/vendor/cfsolve/src/stage2/replay.rs +3 -34
- data/vendor/cfsolve/src/stage2/stylesheets.rs +0 -35
- data/vendor/cfsolve/src/stage2/trace.rs +1 -1
- data/vendor/cfsolve/src/stage2/vocabulary.rs +6 -111
- data/vendor/cfsolve/src/stage2.rs +0 -1
- data/vendor/cfsolve/src/vm/dataflow.rs +15 -6
- data/vendor/cfsolve/src/vm/disassemble.rs +5 -68
- data/vendor/cfsolve/src/vm/encoded_strings.rs +1553 -0
- data/vendor/cfsolve/src/vm/extract.rs +193 -343
- data/vendor/cfsolve/src/vm/interpret/access.rs +2 -10
- data/vendor/cfsolve/src/vm/interpret/builtin.rs +0 -13
- data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +28 -43
- data/vendor/cfsolve/src/vm/interpret/mix32.rs +216 -86
- data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +42 -21
- data/vendor/cfsolve/src/vm/interpret/pattern.rs +272 -100
- data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +259 -36
- data/vendor/cfsolve/src/vm/interpret/run.rs +0 -4
- data/vendor/cfsolve/src/vm/machine.rs +14 -70
- data/vendor/cfsolve/src/vm/output.rs +3 -5
- data/vendor/cfsolve/src/vm/registers.rs +26 -46
- data/vendor/cfsolve/src/vm/session.rs +11 -9
- data/vendor/cfsolve/src/vm.rs +1 -1
- metadata +6 -12
- data/lib/cfsolve/profiles/chrome-157-macos/answers.json +0 -4777
- data/lib/cfsolve/profiles/chrome-157-macos.json +0 -613
- data/vendor/cfsolve/profiles/chrome-157-macos/answers.json +0 -4777
- data/vendor/cfsolve/profiles/chrome-157-macos.json +0 -613
- data/vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js +0 -1
- data/vendor/cfsolve/src/stage2/probes/parent_info_array.rs +0 -326
- data/vendor/cfsolve/src/stage2/value_labels.rs +0 -185
- data/vendor/cfsolve/src/vm/encoded_names.rs +0 -635
- data/vendor/cfsolve/src/vm/fixtures/free_functions/README.md +0 -9
- data/vendor/cfsolve/src/vm/fixtures/free_functions/machine.js +0 -7438
- data/vendor/cfsolve/src/vm/fixtures/free_functions/program.base64 +0 -1
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
use std::collections::btree_map::Entry;
|
|
5
5
|
use std::collections::{BTreeMap, VecDeque};
|
|
6
|
+
use std::iter;
|
|
6
7
|
use std::ops::ControlFlow;
|
|
7
8
|
|
|
8
9
|
use super::{Listing, Path};
|
|
@@ -22,16 +23,24 @@ impl<K: Ord + Clone, V: PartialEq + Clone> Facts for BTreeMap<K, V> {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
/// Sets `key` to `value`, or forgets it when `value` is unknown.
|
|
27
|
+
pub(crate) fn assign<K: Ord, V>(facts: &mut BTreeMap<K, V>, key: K, value: Option<V>) {
|
|
28
|
+
match value {
|
|
29
|
+
Some(value) => facts.insert(key, value),
|
|
30
|
+
None => facts.remove(&key),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
|
|
25
34
|
/// Computes entry facts for instructions reachable from `entries`. `transfer` updates a copy of
|
|
26
35
|
/// facts for one instruction path and reports whether it can run, or stops the analysis. Facts
|
|
27
36
|
/// propagate through the exit only if the path can run.
|
|
28
37
|
///
|
|
29
38
|
/// Only recorded exits propagate facts, so function entries and hidden branch targets need
|
|
30
39
|
/// explicit entries. Reaching a position without an instruction ends that path.
|
|
31
|
-
pub(crate) fn forward<F: Facts, B>(
|
|
32
|
-
listing: &Listing,
|
|
40
|
+
pub(crate) fn forward<'listing, F: Facts, B>(
|
|
41
|
+
listing: &'listing Listing,
|
|
33
42
|
entries: impl IntoIterator<Item = (u32, F)>,
|
|
34
|
-
mut transfer: impl FnMut(u32, &Path, &mut F) -> ControlFlow<B, bool>,
|
|
43
|
+
mut transfer: impl FnMut(u32, &'listing Path, &mut F) -> ControlFlow<B, bool>,
|
|
35
44
|
) -> ControlFlow<B, BTreeMap<u32, F>> {
|
|
36
45
|
let mut incoming = BTreeMap::new();
|
|
37
46
|
let mut pending = VecDeque::new();
|
|
@@ -42,9 +51,9 @@ pub(crate) fn forward<F: Facts, B>(
|
|
|
42
51
|
let Some(instruction) = listing.instructions.get(&pc) else {
|
|
43
52
|
continue;
|
|
44
53
|
};
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
54
|
+
// The last path takes the entry facts rather than a copy.
|
|
55
|
+
let entries = iter::repeat_n(incoming[&pc].clone(), instruction.paths.len());
|
|
56
|
+
for (path, mut facts) in iter::zip(&instruction.paths, entries) {
|
|
48
57
|
match transfer(pc, path, &mut facts) {
|
|
49
58
|
ControlFlow::Break(stop) => return ControlFlow::Break(stop),
|
|
50
59
|
ControlFlow::Continue(false) => continue,
|
|
@@ -21,7 +21,7 @@ use super::interpret::Way;
|
|
|
21
21
|
use super::machine::{Loaded, Machine};
|
|
22
22
|
use super::output::{Constant, Effect, Exit, Hidden, Instruction, Listing, Path, Position, Term};
|
|
23
23
|
use super::value::Value;
|
|
24
|
-
use super::{HashMap, convert, dataflow,
|
|
24
|
+
use super::{HashMap, convert, dataflow, encoded_strings, packed_names};
|
|
25
25
|
use crate::{candidates, profiling};
|
|
26
26
|
|
|
27
27
|
impl Machine<'_> {
|
|
@@ -70,10 +70,7 @@ impl Machine<'_> {
|
|
|
70
70
|
listing.failures.sort_unstable_by_key(|failure| failure.pc);
|
|
71
71
|
fuse_method_calls(&mut listing);
|
|
72
72
|
packed_names::fold(&mut listing);
|
|
73
|
-
|
|
74
|
-
// Decoding captured keys makes method loads stable even after their key register is
|
|
75
|
-
// reused before the call.
|
|
76
|
-
fuse_method_calls(&mut listing);
|
|
73
|
+
encoded_strings::fold(&mut listing);
|
|
77
74
|
profiling::report("VM");
|
|
78
75
|
Ok(listing)
|
|
79
76
|
}
|
|
@@ -457,7 +454,7 @@ fn incoming_loads(
|
|
|
457
454
|
/// Tracks registers holding `object[key]` while the object and key registers remain unchanged.
|
|
458
455
|
/// Saves facts at each instruction's entry. Uses a vector because these sets are small.
|
|
459
456
|
#[derive(Clone, Default)]
|
|
460
|
-
struct Loads(Vec<(u8, Load)
|
|
457
|
+
struct Loads(Vec<(u8, Load)>);
|
|
461
458
|
|
|
462
459
|
impl Loads {
|
|
463
460
|
fn get(&self, register: u8) -> Option<&Load> {
|
|
@@ -470,12 +467,9 @@ impl Loads {
|
|
|
470
467
|
impl dataflow::Facts for Loads {
|
|
471
468
|
fn meet(&mut self, other: &Self) -> bool {
|
|
472
469
|
let before = self.0.len();
|
|
473
|
-
let constants = self.1.len();
|
|
474
470
|
self.0
|
|
475
471
|
.retain(|(register, load)| other.get(*register) == Some(load));
|
|
476
|
-
self.
|
|
477
|
-
.retain(|register, value| other.1.get(register) == Some(value));
|
|
478
|
-
self.0.len() < before || self.1.len() < constants
|
|
472
|
+
self.0.len() < before
|
|
479
473
|
}
|
|
480
474
|
}
|
|
481
475
|
|
|
@@ -490,11 +484,6 @@ fn update_loads(loads: &mut Loads, effect: &Effect) {
|
|
|
490
484
|
let Effect::Set(register, value) = effect else {
|
|
491
485
|
return;
|
|
492
486
|
};
|
|
493
|
-
let constant = match value {
|
|
494
|
-
Term::Const(Constant::String(text)) if text.len() <= 128 => Some(value.clone()),
|
|
495
|
-
Term::Reg(source) => loads.1.get(source).cloned(),
|
|
496
|
-
_ => None,
|
|
497
|
-
};
|
|
498
487
|
loads.0.retain(|(loaded, load)| {
|
|
499
488
|
loaded != register && load.object != *register && load.key != Term::Reg(*register)
|
|
500
489
|
});
|
|
@@ -507,22 +496,9 @@ fn update_loads(loads: &mut Loads, effect: &Effect) {
|
|
|
507
496
|
_ => false,
|
|
508
497
|
}
|
|
509
498
|
{
|
|
510
|
-
let key =
|
|
511
|
-
loads
|
|
512
|
-
.1
|
|
513
|
-
.get(®ister)
|
|
514
|
-
.cloned()
|
|
515
|
-
.unwrap_or_else(|| (**key).clone())
|
|
516
|
-
} else {
|
|
517
|
-
(**key).clone()
|
|
518
|
-
};
|
|
499
|
+
let key = (**key).clone();
|
|
519
500
|
loads.0.push((*register, Load { object, key }));
|
|
520
501
|
}
|
|
521
|
-
if let Some(value) = constant {
|
|
522
|
-
loads.1.insert(*register, value);
|
|
523
|
-
} else {
|
|
524
|
-
loads.1.remove(register);
|
|
525
|
-
}
|
|
526
502
|
}
|
|
527
503
|
|
|
528
504
|
/// Rewrites a call of a register still holding `object[key]` with `object` as receiver. Calls
|
|
@@ -540,42 +516,3 @@ fn fuse_call(term: &mut Term, loads: &Loads) {
|
|
|
540
516
|
*this = None;
|
|
541
517
|
}
|
|
542
518
|
}
|
|
543
|
-
|
|
544
|
-
#[cfg(test)]
|
|
545
|
-
mod tests {
|
|
546
|
-
use super::*;
|
|
547
|
-
|
|
548
|
-
#[test]
|
|
549
|
-
fn method_keys_survive_register_reuse_but_receivers_do_not() {
|
|
550
|
-
let mut loads = Loads::default();
|
|
551
|
-
let key = Term::Const(Constant::String("mark".into()));
|
|
552
|
-
update_loads(&mut loads, &Effect::Set(1, key.clone()));
|
|
553
|
-
update_loads(
|
|
554
|
-
&mut loads,
|
|
555
|
-
&Effect::Set(2, Term::Get(Box::new(Term::Reg(3)), Box::new(Term::Reg(1)))),
|
|
556
|
-
);
|
|
557
|
-
update_loads(
|
|
558
|
-
&mut loads,
|
|
559
|
-
&Effect::Set(1, Term::Const(Constant::String("prefix".into()))),
|
|
560
|
-
);
|
|
561
|
-
let call = Term::Call {
|
|
562
|
-
callee: Box::new(Term::Reg(2)),
|
|
563
|
-
this: Some(Box::new(Term::Reg(3))),
|
|
564
|
-
arguments: vec![],
|
|
565
|
-
};
|
|
566
|
-
let mut fused = call.clone();
|
|
567
|
-
fuse_call(&mut fused, &loads);
|
|
568
|
-
assert_eq!(
|
|
569
|
-
fused,
|
|
570
|
-
Term::Call {
|
|
571
|
-
callee: Box::new(Term::Get(Box::new(Term::Reg(3)), Box::new(key))),
|
|
572
|
-
this: None,
|
|
573
|
-
arguments: vec![]
|
|
574
|
-
}
|
|
575
|
-
);
|
|
576
|
-
update_loads(&mut loads, &Effect::Set(3, Term::Const(Constant::Null)));
|
|
577
|
-
let mut after_replacement = call.clone();
|
|
578
|
-
fuse_call(&mut after_replacement, &loads);
|
|
579
|
-
assert_eq!(after_replacement, call);
|
|
580
|
-
}
|
|
581
|
-
}
|