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
|
@@ -17,11 +17,11 @@ use oxc::ast::ast::{
|
|
|
17
17
|
use oxc::semantic::SymbolId;
|
|
18
18
|
use oxc::syntax::operator::BinaryOperator;
|
|
19
19
|
|
|
20
|
-
use super::extract::{self,
|
|
20
|
+
use super::extract::{self, Accessors, RunFunction};
|
|
21
21
|
use super::interpret::{self, Branching, Frozen, Intrinsics, Plans, Run, Spare, StringDecoder};
|
|
22
22
|
use super::machine::Definition;
|
|
23
23
|
use super::output::{Constant, Position, Term};
|
|
24
|
-
use super::registers::
|
|
24
|
+
use super::registers::Member;
|
|
25
25
|
use super::value::Value;
|
|
26
26
|
use super::{HashMap, convert};
|
|
27
27
|
use crate::js::ast::{self, Binding, Script};
|
|
@@ -46,13 +46,14 @@ pub(crate) struct Session<'ast> {
|
|
|
46
46
|
/// stops interpretation.
|
|
47
47
|
pub unavailable: HashMap<Binding<'ast>, String>,
|
|
48
48
|
pub layout: Layout,
|
|
49
|
-
pub register_access: Access<'ast>,
|
|
50
49
|
/// Handler state: registers, register mask, and state-register indices.
|
|
51
50
|
pub state: HashMap<String, Value<'ast>>,
|
|
52
51
|
/// Initial register stacks created by the constructor for handler execution.
|
|
53
52
|
pub initial: Vec<(u8, Value<'ast>)>,
|
|
54
53
|
/// Function used to decrypt string records stored in registers.
|
|
55
54
|
pub record_decoder: Option<&'ast Function<'ast>>,
|
|
55
|
+
/// The register file's reader and writer, which the run function calls.
|
|
56
|
+
pub accessors: Option<Accessors<'ast>>,
|
|
56
57
|
/// Script functions run natively.
|
|
57
58
|
pub intrinsics: Intrinsics,
|
|
58
59
|
/// The record decoder, run natively, if it has the recognized shape.
|
|
@@ -91,18 +92,19 @@ impl<'ast> Session<'ast> {
|
|
|
91
92
|
ref prelude,
|
|
92
93
|
ref functions,
|
|
93
94
|
ref run,
|
|
95
|
+
entry,
|
|
94
96
|
..
|
|
95
97
|
} = definition;
|
|
96
98
|
let constructor = extract::constructor(class)?;
|
|
97
99
|
let handlers = extract::handlers(script, functions, &run.dispatch)?;
|
|
98
|
-
let record_decoder = extract::record_decoder(script,
|
|
100
|
+
let record_decoder = extract::record_decoder(script, run.accessors.read)
|
|
99
101
|
.and_then(|symbol| functions.get(&symbol).copied());
|
|
100
102
|
let mut session = Self {
|
|
101
103
|
functions: functions.clone(),
|
|
102
104
|
handlers,
|
|
103
|
-
entry
|
|
105
|
+
entry,
|
|
104
106
|
record_decoder,
|
|
105
|
-
|
|
107
|
+
accessors: Some(run.accessors),
|
|
106
108
|
..Self::unevaluated(script, constructor)
|
|
107
109
|
};
|
|
108
110
|
(session.bindings, session.unavailable) =
|
|
@@ -134,12 +136,12 @@ impl<'ast> Session<'ast> {
|
|
|
134
136
|
bindings: HashMap::default(),
|
|
135
137
|
unavailable: HashMap::default(),
|
|
136
138
|
layout: Layout::default(),
|
|
137
|
-
register_access: Access::default(),
|
|
138
139
|
state: HashMap::default(),
|
|
139
140
|
program_key: None,
|
|
140
141
|
symbol_fields: Vec::new(),
|
|
141
142
|
initial: Vec::new(),
|
|
142
143
|
record_decoder: None,
|
|
144
|
+
accessors: None,
|
|
143
145
|
intrinsics: Intrinsics::default(),
|
|
144
146
|
string_decoder: None,
|
|
145
147
|
fields: HashMap::default(),
|
|
@@ -392,7 +394,7 @@ fn construct_assignment<'a>(
|
|
|
392
394
|
// `registers.<index> = <copy of a field>`.
|
|
393
395
|
_ => {
|
|
394
396
|
let field = copied_field(script, &assign.right, copies);
|
|
395
|
-
match ast::member_str(target).and_then(
|
|
397
|
+
match ast::member_str(target).and_then(Member::of) {
|
|
396
398
|
Some(Member::PcIndex) => constructed.pc = field,
|
|
397
399
|
Some(Member::KeyIndex) => constructed.key = field,
|
|
398
400
|
_ => {}
|
|
@@ -437,7 +439,7 @@ fn concrete<'a>(mut fields: HashMap<String, Value<'a>>) -> HashMap<String, Value
|
|
|
437
439
|
/// zero for the mask during analysis.
|
|
438
440
|
fn recover_state<'a>(
|
|
439
441
|
session: &mut Session<'a>,
|
|
440
|
-
names: &
|
|
442
|
+
names: &RunFunction<'_>,
|
|
441
443
|
constructed: &Constructed<'a>,
|
|
442
444
|
) -> Result<()> {
|
|
443
445
|
let fields = &constructed.fields;
|
data/vendor/cfsolve/src/vm.rs
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cfsolve
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Oliver Morgan
|
|
@@ -578,8 +578,6 @@ files:
|
|
|
578
578
|
- ext/cfsolve/extconf.rb
|
|
579
579
|
- ext/cfsolve/src/main.rs
|
|
580
580
|
- lib/cfsolve.rb
|
|
581
|
-
- lib/cfsolve/profiles/chrome-157-macos.json
|
|
582
|
-
- lib/cfsolve/profiles/chrome-157-macos/answers.json
|
|
583
581
|
- lib/cfsolve/profiles/safari-26-ios.json
|
|
584
582
|
- lib/cfsolve/profiles/safari-26-ios/answers.json
|
|
585
583
|
- lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json
|
|
@@ -595,7 +593,11 @@ files:
|
|
|
595
593
|
- vendor/cfsolve/examples/compare_session.rs
|
|
596
594
|
- vendor/cfsolve/examples/disassemble.rs
|
|
597
595
|
- vendor/cfsolve/examples/fill_profile.rs
|
|
596
|
+
- vendor/cfsolve/examples/listing_dump.rs
|
|
598
597
|
- vendor/cfsolve/examples/probe_plan.rs
|
|
598
|
+
- vendor/cfsolve/examples/probe_similarity.rs
|
|
599
|
+
- vendor/cfsolve/examples/rebase_reference.rs
|
|
600
|
+
- vendor/cfsolve/examples/reread_capture.rs
|
|
599
601
|
- vendor/cfsolve/examples/solver_profile.rs
|
|
600
602
|
- vendor/cfsolve/examples/solver_smoke.rs
|
|
601
603
|
- vendor/cfsolve/examples/stage2_snapshot.rs
|
|
@@ -604,8 +606,6 @@ files:
|
|
|
604
606
|
- vendor/cfsolve/examples/vm_snapshot.rs
|
|
605
607
|
- vendor/cfsolve/examples/vocabulary.rs
|
|
606
608
|
- vendor/cfsolve/examples/write_order_check.rs
|
|
607
|
-
- vendor/cfsolve/profiles/chrome-157-macos.json
|
|
608
|
-
- vendor/cfsolve/profiles/chrome-157-macos/answers.json
|
|
609
609
|
- vendor/cfsolve/profiles/safari-26-ios.json
|
|
610
610
|
- vendor/cfsolve/profiles/safari-26-ios/answers.json
|
|
611
611
|
- vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json
|
|
@@ -739,7 +739,6 @@ files:
|
|
|
739
739
|
- vendor/cfsolve/src/stage2/benchmark.rs
|
|
740
740
|
- vendor/cfsolve/src/stage2/call_stack.rs
|
|
741
741
|
- vendor/cfsolve/src/stage2/challenge_page.rs
|
|
742
|
-
- vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js
|
|
743
742
|
- vendor/cfsolve/src/stage2/interaction.rs
|
|
744
743
|
- vendor/cfsolve/src/stage2/interaction/checkbox.rs
|
|
745
744
|
- vendor/cfsolve/src/stage2/interaction/click.rs
|
|
@@ -765,7 +764,6 @@ files:
|
|
|
765
764
|
- vendor/cfsolve/src/stage2/probes/media.rs
|
|
766
765
|
- vendor/cfsolve/src/stage2/probes/network_information.rs
|
|
767
766
|
- vendor/cfsolve/src/stage2/probes/parent_info.rs
|
|
768
|
-
- vendor/cfsolve/src/stage2/probes/parent_info_array.rs
|
|
769
767
|
- vendor/cfsolve/src/stage2/probes/performance.rs
|
|
770
768
|
- vendor/cfsolve/src/stage2/probes/platform.rs
|
|
771
769
|
- vendor/cfsolve/src/stage2/probes/private_token.rs
|
|
@@ -784,7 +782,6 @@ files:
|
|
|
784
782
|
- vendor/cfsolve/src/stage2/stylesheets.rs
|
|
785
783
|
- vendor/cfsolve/src/stage2/syntax.rs
|
|
786
784
|
- vendor/cfsolve/src/stage2/trace.rs
|
|
787
|
-
- vendor/cfsolve/src/stage2/value_labels.rs
|
|
788
785
|
- vendor/cfsolve/src/stage2/vocabulary.rs
|
|
789
786
|
- vendor/cfsolve/src/stage2/worker_timing.rs
|
|
790
787
|
- vendor/cfsolve/src/vm.rs
|
|
@@ -792,11 +789,8 @@ files:
|
|
|
792
789
|
- vendor/cfsolve/src/vm/dataflow.rs
|
|
793
790
|
- vendor/cfsolve/src/vm/disassemble.rs
|
|
794
791
|
- vendor/cfsolve/src/vm/dispatch.rs
|
|
795
|
-
- vendor/cfsolve/src/vm/
|
|
792
|
+
- vendor/cfsolve/src/vm/encoded_strings.rs
|
|
796
793
|
- vendor/cfsolve/src/vm/extract.rs
|
|
797
|
-
- vendor/cfsolve/src/vm/fixtures/free_functions/README.md
|
|
798
|
-
- vendor/cfsolve/src/vm/fixtures/free_functions/machine.js
|
|
799
|
-
- vendor/cfsolve/src/vm/fixtures/free_functions/program.base64
|
|
800
794
|
- vendor/cfsolve/src/vm/interpret.rs
|
|
801
795
|
- vendor/cfsolve/src/vm/interpret/access.rs
|
|
802
796
|
- vendor/cfsolve/src/vm/interpret/builtin.rs
|