cfsolve 0.1.1 → 0.1.3
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 +18 -0
- data/README.md +10 -9
- data/THIRD_PARTY_LICENSES/README.md +71 -254
- data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
- data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
- data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
- data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
- data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
- data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
- data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
- data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
- data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
- data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
- data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
- data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
- data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
- data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
- data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
- data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
- data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
- data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
- data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
- data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
- data/UPSTREAM.md +10 -8
- data/ext/cfsolve/Cargo.lock +534 -1727
- data/ext/cfsolve/Cargo.toml +4 -0
- data/ext/cfsolve/src/main.rs +1 -1
- data/lib/cfsolve/profiles/safari-26-ios/answers.json +2570 -1894
- data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +1867 -1192
- data/lib/cfsolve/profiles/safari-26-ios.json +102 -156
- data/lib/cfsolve/version.rb +2 -2
- data/vendor/cfsolve/Cargo.lock +561 -1729
- data/vendor/cfsolve/Cargo.toml +26 -8
- data/vendor/cfsolve/README.md +4 -35
- data/vendor/cfsolve/examples/build_profile.rs +17 -15
- data/vendor/cfsolve/examples/capture_session.rs +37 -0
- data/vendor/cfsolve/examples/check_answers.rs +66 -0
- data/vendor/cfsolve/examples/compare_session.rs +189 -0
- data/vendor/cfsolve/examples/solver_profile.rs +84 -0
- data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
- data/vendor/cfsolve/examples/stage2_snapshot.rs +6 -3
- data/vendor/cfsolve/examples/tls_echo.rs +3 -3
- data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
- data/vendor/cfsolve/profiles/safari-26-ios/answers.json +2570 -1894
- data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +1867 -1192
- data/vendor/cfsolve/profiles/safari-26-ios.json +102 -156
- data/vendor/cfsolve/scripts/capture_cssom.mjs +42 -0
- data/vendor/cfsolve/scripts/serve_cssom.py +111 -0
- data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
- data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
- data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
- data/vendor/cfsolve/src/capture/profile.rs +7 -18
- data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
- data/vendor/cfsolve/src/capture/proxy.rs +44 -13
- data/vendor/cfsolve/src/capture/recorded.rs +42 -7
- data/vendor/cfsolve/src/capture/sessions.rs +4 -3
- data/vendor/cfsolve/src/capture/upstream.rs +1 -1
- data/vendor/cfsolve/src/challenge/codec.rs +4 -2
- data/vendor/cfsolve/src/challenge/expression.rs +161 -117
- data/vendor/cfsolve/src/challenge/installed/audit.rs +132 -0
- data/vendor/cfsolve/src/challenge/installed.rs +127 -269
- data/vendor/cfsolve/src/challenge/merge.rs +120 -80
- data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
- data/vendor/cfsolve/src/challenge/payload.rs +175 -35
- data/vendor/cfsolve/src/challenge/program.rs +197 -178
- data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
- data/vendor/cfsolve/src/challenge/source.rs +151 -96
- data/vendor/cfsolve/src/challenge/state.rs +236 -122
- data/vendor/cfsolve/src/challenge/tally.rs +64 -50
- data/vendor/cfsolve/src/challenge.rs +1 -0
- data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
- data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
- data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
- data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
- data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
- data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
- data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
- data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
- data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
- data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
- data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
- data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
- data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
- data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
- data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
- data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
- data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
- data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +201 -205
- data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
- data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +346 -536
- data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
- data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
- data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
- data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
- data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
- data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
- data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
- data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +361 -322
- data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
- data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
- data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
- data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
- data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
- data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
- data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
- data/vendor/cfsolve/src/deobfuscate.rs +15 -11
- data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -32
- data/vendor/cfsolve/src/embedding_page/page.rs +28 -2
- data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
- data/vendor/cfsolve/src/error.rs +40 -5
- data/vendor/cfsolve/src/fingerprint.rs +8 -2
- data/vendor/cfsolve/src/http/client.rs +9 -1
- data/vendor/cfsolve/src/http/requests.rs +2 -2
- data/vendor/cfsolve/src/js/ast.rs +479 -254
- data/vendor/cfsolve/src/js/objects.rs +9 -2
- data/vendor/cfsolve/src/lib.rs +1 -0
- data/vendor/cfsolve/src/listing/fold.rs +19 -92
- data/vendor/cfsolve/src/listing/query.rs +26 -291
- data/vendor/cfsolve/src/listing.rs +0 -1
- data/vendor/cfsolve/src/performance_clock.rs +20 -1
- data/vendor/cfsolve/src/profiling.rs +49 -0
- data/vendor/cfsolve/src/script.rs +35 -24
- data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
- data/vendor/cfsolve/src/session/channel.rs +2 -2
- data/vendor/cfsolve/src/session/initial.rs +19 -10
- data/vendor/cfsolve/src/session/probes.rs +160 -125
- data/vendor/cfsolve/src/session/sink.rs +26 -1
- data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
- data/vendor/cfsolve/src/session/timing.rs +58 -53
- data/vendor/cfsolve/src/session/widget.rs +5 -6
- data/vendor/cfsolve/src/session.rs +1 -1
- data/vendor/cfsolve/src/solver.rs +3 -1
- data/vendor/cfsolve/src/stage2/analysis/analyze.rs +50 -33
- data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
- data/vendor/cfsolve/src/stage2/analysis/discovery.rs +61 -66
- data/vendor/cfsolve/src/stage2/analysis/envelope.rs +33 -22
- data/vendor/cfsolve/src/stage2/analysis/recognize.rs +3 -5
- data/vendor/cfsolve/src/stage2/analysis.rs +0 -1
- data/vendor/cfsolve/src/stage2/audit_globals.rs +378 -0
- data/vendor/cfsolve/src/stage2/benchmark.rs +66 -38
- data/vendor/cfsolve/src/stage2/call_stack.rs +1463 -1017
- data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
- data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
- data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
- data/vendor/cfsolve/src/stage2/interaction/native.rs +2 -1
- data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -7
- data/vendor/cfsolve/src/stage2/payload/recover.rs +56 -25
- data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
- data/vendor/cfsolve/src/stage2/probes/ice.rs +11 -10
- data/vendor/cfsolve/src/stage2/probes/media.rs +47 -33
- data/vendor/cfsolve/src/stage2/probes/performance.rs +13 -8
- data/vendor/cfsolve/src/stage2/probes/rects.rs +12 -17
- data/vendor/cfsolve/src/stage2/probes/stack.rs +50 -103
- data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +17 -86
- data/vendor/cfsolve/src/stage2/probes.rs +0 -1
- data/vendor/cfsolve/src/stage2/queries.rs +50 -0
- data/vendor/cfsolve/src/stage2/records.rs +4 -13
- data/vendor/cfsolve/src/stage2/reference.json +1 -1
- data/vendor/cfsolve/src/stage2/reference.rs +98 -100
- data/vendor/cfsolve/src/stage2/registry.rs +41 -34
- data/vendor/cfsolve/src/stage2/replay.rs +182 -254
- data/vendor/cfsolve/src/stage2/stylesheets.rs +176 -0
- data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
- data/vendor/cfsolve/src/stage2/trace.rs +152 -108
- data/vendor/cfsolve/src/stage2/vocabulary.rs +103 -403
- data/vendor/cfsolve/src/stage2.rs +4 -1
- data/vendor/cfsolve/src/vm/disassemble.rs +46 -13
- data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
- data/vendor/cfsolve/src/vm/extract.rs +347 -250
- data/vendor/cfsolve/src/vm/interpret/access.rs +67 -68
- data/vendor/cfsolve/src/vm/interpret/builtin.rs +16 -63
- data/vendor/cfsolve/src/vm/interpret/call.rs +192 -51
- data/vendor/cfsolve/src/vm/interpret/compile.rs +643 -0
- data/vendor/cfsolve/src/vm/interpret/copies.rs +232 -120
- data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +149 -40
- data/vendor/cfsolve/src/vm/interpret/evaluate.rs +189 -572
- data/vendor/cfsolve/src/vm/interpret/explore.rs +159 -46
- data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
- data/vendor/cfsolve/src/vm/interpret/frozen.rs +169 -0
- data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +414 -0
- data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
- data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
- data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
- data/vendor/cfsolve/src/vm/interpret/plan.rs +605 -330
- data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
- data/vendor/cfsolve/src/vm/interpret/run.rs +314 -54
- data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
- data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
- data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
- data/vendor/cfsolve/src/vm/interpret.rs +16 -3
- data/vendor/cfsolve/src/vm/machine.rs +58 -47
- data/vendor/cfsolve/src/vm/output.rs +13 -5
- data/vendor/cfsolve/src/vm/packed_names.rs +311 -0
- data/vendor/cfsolve/src/vm/session.rs +197 -110
- data/vendor/cfsolve/src/vm/value.rs +35 -19
- data/vendor/cfsolve/src/vm.rs +3 -1
- data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
- data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
- data/vendor/cfsolve/vendor/btls-sys/src/lib.rs +3 -0
- metadata +106 -183
- data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
- data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
- data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
- data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
- data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
- data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
- data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
- data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
- data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
- data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
- data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
- data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
- data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
- data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
- data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
- data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
- data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
- data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
- data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
- data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
- data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
- data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
- data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
- data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
- data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
- data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
- data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
- data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
- data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
- data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
- data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
- data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
- data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
- data/vendor/cfsolve/src/listing/normalize.rs +0 -264
- data/vendor/cfsolve/src/stage2/analysis/outputs.rs +0 -327
- data/vendor/cfsolve/src/stage2/probes/stylesheets.rs +0 -249
- data/vendor/cfsolve/src/stage2/reference-expanded.json +0 -42
- data/vendor/cfsolve/src/stage2/session_names.rs +0 -470
- /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
- /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
- /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
- /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
- /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
- /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
//! Browser-measured CSSOM spelling, reused only when the source differs by session names.
|
|
2
|
+
//!
|
|
3
|
+
//! A whole-sheet comparison guards against reusing a serialization after its CSS changes.
|
|
4
|
+
|
|
5
|
+
use std::collections::BTreeMap;
|
|
6
|
+
use std::sync::LazyLock;
|
|
7
|
+
|
|
8
|
+
use anyhow::{Context, Result, ensure};
|
|
9
|
+
use regex::{Captures, Regex};
|
|
10
|
+
use scraper::{Html, Selector};
|
|
11
|
+
use serde::{Deserialize, Serialize};
|
|
12
|
+
use sha2::{Digest, Sha256};
|
|
13
|
+
|
|
14
|
+
use super::records::Probe;
|
|
15
|
+
use super::reference::{STYLESHEETS_HASH, STYLESHEETS_TEXT};
|
|
16
|
+
use super::registry::Kind;
|
|
17
|
+
use super::vocabulary;
|
|
18
|
+
use crate::js::{JsObject, json};
|
|
19
|
+
|
|
20
|
+
static NAME: LazyLock<Regex> =
|
|
21
|
+
LazyLock::new(|| Regex::new(r"_[0-9a-f]{24}").expect("the session name pattern is valid"));
|
|
22
|
+
|
|
23
|
+
/// Source CSS and the browser's serialization of each of its rules.
|
|
24
|
+
#[derive(Debug, Deserialize, Serialize)]
|
|
25
|
+
pub struct Stylesheet {
|
|
26
|
+
pub source: String,
|
|
27
|
+
pub rules: Vec<String>,
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/// Numbers session names by first appearance; returns the text and the names in order.
|
|
31
|
+
fn normalized(source: &str) -> (String, Vec<String>) {
|
|
32
|
+
let mut names = Vec::new();
|
|
33
|
+
let text = NAME.replace_all(source, |found: &Captures<'_>| {
|
|
34
|
+
let name = &found[0];
|
|
35
|
+
let index = names.iter().position(|old| old == name).unwrap_or_else(|| {
|
|
36
|
+
names.push(name.to_owned());
|
|
37
|
+
names.len() - 1
|
|
38
|
+
});
|
|
39
|
+
format!("__name_{index}__")
|
|
40
|
+
});
|
|
41
|
+
(text.into_owned(), names)
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
impl Stylesheet {
|
|
45
|
+
/// The rules under `current`'s session names, if `current` is this sheet's CSS.
|
|
46
|
+
fn translate(&self, current: &str) -> Option<Vec<String>> {
|
|
47
|
+
let (old, recorded_names) = normalized(&self.source);
|
|
48
|
+
let (new, current_names) = normalized(current);
|
|
49
|
+
if old != new {
|
|
50
|
+
return None;
|
|
51
|
+
}
|
|
52
|
+
let mapping: BTreeMap<String, String> =
|
|
53
|
+
recorded_names.into_iter().zip(current_names).collect();
|
|
54
|
+
self.rules
|
|
55
|
+
.iter()
|
|
56
|
+
.map(|rule| {
|
|
57
|
+
let known = NAME
|
|
58
|
+
.find_iter(rule)
|
|
59
|
+
.all(|found| mapping.contains_key(found.as_str()));
|
|
60
|
+
known.then(|| {
|
|
61
|
+
NAME.replace_all(rule, |found: &Captures<'_>| mapping[&found[0]].clone())
|
|
62
|
+
.into_owned()
|
|
63
|
+
})
|
|
64
|
+
})
|
|
65
|
+
.collect()
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/// The hex-named class selector the stylesheet probe excludes from its hash, or `None` if
|
|
70
|
+
/// `probe` is not the stylesheet probe.
|
|
71
|
+
pub(crate) fn excluded_selector(probe: &Probe) -> Option<Result<&str>> {
|
|
72
|
+
let operation = probe.operation.as_ref()?;
|
|
73
|
+
(operation.family() == Kind::Stylesheets).then(|| {
|
|
74
|
+
probe
|
|
75
|
+
.features
|
|
76
|
+
.iter()
|
|
77
|
+
.find(|text| text.strip_prefix('.').is_some_and(vocabulary::is_hex_name))
|
|
78
|
+
.map(String::as_str)
|
|
79
|
+
.context("the stylesheet probe has no excluded selector")
|
|
80
|
+
})
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/// Recomputes the CSS text and its digest from this iframe's styles, rejecting unknown CSS.
|
|
84
|
+
pub(crate) fn patch(
|
|
85
|
+
html: &str,
|
|
86
|
+
templates: &[Stylesheet],
|
|
87
|
+
excluded: &str,
|
|
88
|
+
fields: &mut JsObject,
|
|
89
|
+
) -> Result<()> {
|
|
90
|
+
let document = Html::parse_document(html);
|
|
91
|
+
let selector = Selector::parse("style").expect("`style` is a valid selector");
|
|
92
|
+
let mut included = Vec::new();
|
|
93
|
+
let mut matched = None;
|
|
94
|
+
for (index, style) in document.select(&selector).enumerate() {
|
|
95
|
+
let source = style.inner_html();
|
|
96
|
+
let rules = templates
|
|
97
|
+
.iter()
|
|
98
|
+
.find_map(|template| template.translate(&source))
|
|
99
|
+
.with_context(|| format!("no CSSOM measurement matches iframe stylesheet {index}"))?;
|
|
100
|
+
let text = format!("{}{index}", rules.join("|"));
|
|
101
|
+
if text.contains(excluded) {
|
|
102
|
+
matched = Some(text);
|
|
103
|
+
} else {
|
|
104
|
+
included.push(text);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
ensure!(
|
|
108
|
+
!included.is_empty(),
|
|
109
|
+
"the stylesheet hash has no input sheets"
|
|
110
|
+
);
|
|
111
|
+
let text = matched.context("the stylesheet probe's excluded selector is absent")?;
|
|
112
|
+
let hash = format!("{:x}", Sha256::digest(included.join("|").as_bytes()));
|
|
113
|
+
fields.insert(STYLESHEETS_TEXT.into(), json!(text));
|
|
114
|
+
fields.insert(STYLESHEETS_HASH.into(), json!(&hash[..32]));
|
|
115
|
+
Ok(())
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
#[cfg(test)]
|
|
119
|
+
mod tests {
|
|
120
|
+
use super::*;
|
|
121
|
+
|
|
122
|
+
#[test]
|
|
123
|
+
fn hashes_current_names_and_excludes_the_reported_sheet() {
|
|
124
|
+
let templates = vec![
|
|
125
|
+
Stylesheet {
|
|
126
|
+
source: "._111111111111111111111111{color:red}".into(),
|
|
127
|
+
rules: vec!["._111111111111111111111111 { color: red; }".into()],
|
|
128
|
+
},
|
|
129
|
+
Stylesheet {
|
|
130
|
+
source: "._222222222222222222222222{width:0}".into(),
|
|
131
|
+
rules: vec!["._222222222222222222222222 { width: 0px; }".into()],
|
|
132
|
+
},
|
|
133
|
+
];
|
|
134
|
+
let html = "<style>._aaaaaaaaaaaaaaaaaaaaaaaa{color:red}</style><style>._bbbbbbbbbbbbbbbbbbbbbbbb{width:0}</style>";
|
|
135
|
+
let mut fields = JsObject::new();
|
|
136
|
+
patch(html, &templates, "._bbbbbbbbbbbbbbbbbbbbbbbb", &mut fields).unwrap();
|
|
137
|
+
assert_eq!(
|
|
138
|
+
fields[STYLESHEETS_HASH],
|
|
139
|
+
json!("c04d76a7e9af7f370a08eb5d1776c682")
|
|
140
|
+
);
|
|
141
|
+
assert_eq!(
|
|
142
|
+
fields[STYLESHEETS_TEXT],
|
|
143
|
+
json!("._bbbbbbbbbbbbbbbbbbbbbbbb { width: 0px; }1")
|
|
144
|
+
);
|
|
145
|
+
assert!(
|
|
146
|
+
patch(
|
|
147
|
+
&html.replace("color:red", "color:blue"),
|
|
148
|
+
&templates,
|
|
149
|
+
"._bbbbbbbbbbbbbbbbbbbbbbbb",
|
|
150
|
+
&mut fields
|
|
151
|
+
)
|
|
152
|
+
.is_err()
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
#[test]
|
|
157
|
+
fn translation_requires_identical_css_and_consistent_names() {
|
|
158
|
+
let measured = Stylesheet {
|
|
159
|
+
source: "._111111111111111111111111{color:red}".into(),
|
|
160
|
+
rules: vec!["._111111111111111111111111 { color: red; }".into()],
|
|
161
|
+
};
|
|
162
|
+
assert_eq!(
|
|
163
|
+
measured.translate("._aaaaaaaaaaaaaaaaaaaaaaaa{color:red}"),
|
|
164
|
+
Some(vec!["._aaaaaaaaaaaaaaaaaaaaaaaa { color: red; }".into()])
|
|
165
|
+
);
|
|
166
|
+
assert!(
|
|
167
|
+
measured
|
|
168
|
+
.translate("._aaaaaaaaaaaaaaaaaaaaaaaa{color:blue}")
|
|
169
|
+
.is_none()
|
|
170
|
+
);
|
|
171
|
+
assert_ne!(
|
|
172
|
+
normalized("_111111111111111111111111 _111111111111111111111111").0,
|
|
173
|
+
normalized("_aaaaaaaaaaaaaaaaaaaaaaaa _bbbbbbbbbbbbbbbbbbbbbbbb").0
|
|
174
|
+
);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
//! Syntax matchers and walkers shared by stage-two extractors.
|
|
2
|
+
//!
|
|
3
|
+
//! Extractors draw these distinctions, which Oxc's tree does not:
|
|
4
|
+
//! - A call after `?.` in an optional chain, such as `a?.b()`, is not matched as a call.
|
|
5
|
+
//! - `super.x` is not matched as a member expression.
|
|
6
|
+
//! - The bodies of object getters and setters and of class constructors belong to the enclosing
|
|
7
|
+
//! code rather than to nested functions.
|
|
8
|
+
|
|
9
|
+
use oxc::ast::ast::{
|
|
10
|
+
AssignmentTarget, BindingPattern, CallExpression, Expression, FormalParameter,
|
|
11
|
+
MemberExpression, MethodDefinition, MethodDefinitionKind, ObjectProperty, PropertyKind,
|
|
12
|
+
};
|
|
13
|
+
use oxc::ast_visit::{Visit, walk};
|
|
14
|
+
use oxc::semantic::SymbolId;
|
|
15
|
+
use oxc::syntax::scope::ScopeFlags;
|
|
16
|
+
|
|
17
|
+
/// Whether `call` follows a `?.` in an optional chain. Call matchers skip such calls.
|
|
18
|
+
pub(super) fn is_optional_call(call: &CallExpression<'_>) -> bool {
|
|
19
|
+
fn optional(expression: &Expression<'_>) -> bool {
|
|
20
|
+
match expression {
|
|
21
|
+
Expression::CallExpression(call) => call.optional || optional(&call.callee),
|
|
22
|
+
_ => expression
|
|
23
|
+
.as_member_expression()
|
|
24
|
+
.is_some_and(|member| member.optional() || optional(member.object())),
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
call.optional || optional(&call.callee)
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/// Matches a member expression whose object is not `super`.
|
|
31
|
+
pub(super) fn member<'b, 'a>(expression: &'b Expression<'a>) -> Option<&'b MemberExpression<'a>> {
|
|
32
|
+
expression
|
|
33
|
+
.as_member_expression()
|
|
34
|
+
.filter(|member| !is_super(member))
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/// Matches assignment to a member whose object is not `super`.
|
|
38
|
+
pub(super) fn assigned_member<'b, 'a>(
|
|
39
|
+
target: &'b AssignmentTarget<'a>,
|
|
40
|
+
) -> Option<&'b MemberExpression<'a>> {
|
|
41
|
+
target
|
|
42
|
+
.as_member_expression()
|
|
43
|
+
.filter(|member| !is_super(member))
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/// The binding of a parameter without a pattern or default value.
|
|
47
|
+
pub(super) fn plain_parameter(parameter: &FormalParameter<'_>) -> Option<SymbolId> {
|
|
48
|
+
match ¶meter.pattern {
|
|
49
|
+
BindingPattern::BindingIdentifier(name) if parameter.initializer.is_none() => {
|
|
50
|
+
Some(name.symbol_id())
|
|
51
|
+
}
|
|
52
|
+
_ => None,
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
fn is_super(member: &MemberExpression<'_>) -> bool {
|
|
57
|
+
matches!(member.object(), Expression::Super(_))
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/// Walks `property`, visiting an accessor's body in place instead of as a nested function.
|
|
61
|
+
/// Visitors that skip or scope nested functions call this from `visit_object_property`.
|
|
62
|
+
pub(super) fn walk_property<'a>(visitor: &mut impl Visit<'a>, property: &ObjectProperty<'a>) {
|
|
63
|
+
match &property.value {
|
|
64
|
+
Expression::FunctionExpression(function)
|
|
65
|
+
if matches!(property.kind, PropertyKind::Get | PropertyKind::Set) =>
|
|
66
|
+
{
|
|
67
|
+
visitor.visit_property_key(&property.key);
|
|
68
|
+
walk::walk_function(visitor, function, ScopeFlags::Function);
|
|
69
|
+
}
|
|
70
|
+
_ => walk::walk_object_property(visitor, property),
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/// Walks `method`, visiting a constructor's body in place instead of as a nested function.
|
|
75
|
+
/// Visitors that skip or scope nested functions but enter classes call this from
|
|
76
|
+
/// `visit_method_definition`.
|
|
77
|
+
pub(super) fn walk_method<'a>(visitor: &mut impl Visit<'a>, method: &MethodDefinition<'a>) {
|
|
78
|
+
if method.kind == MethodDefinitionKind::Constructor {
|
|
79
|
+
visitor.visit_property_key(&method.key);
|
|
80
|
+
walk::walk_function(
|
|
81
|
+
visitor,
|
|
82
|
+
&method.value,
|
|
83
|
+
ScopeFlags::Function | ScopeFlags::Constructor,
|
|
84
|
+
);
|
|
85
|
+
} else {
|
|
86
|
+
walk::walk_method_definition(visitor, method);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
@@ -6,13 +6,19 @@
|
|
|
6
6
|
|
|
7
7
|
use std::collections::BTreeSet;
|
|
8
8
|
|
|
9
|
-
use
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
use anyhow::{Context, Result};
|
|
10
|
+
use oxc::ast::AstKind;
|
|
11
|
+
use oxc::ast::ast::{
|
|
12
|
+
AssignmentExpression, AssignmentTarget, CallExpression, Expression, Function, MethodDefinition,
|
|
13
|
+
ObjectProperty, Statement,
|
|
12
14
|
};
|
|
13
|
-
use
|
|
15
|
+
use oxc::ast_visit::{Visit, walk};
|
|
16
|
+
use oxc::syntax::operator::BinaryOperator;
|
|
17
|
+
use oxc::syntax::scope::ScopeFlags;
|
|
14
18
|
|
|
15
|
-
use
|
|
19
|
+
use super::syntax::{assigned_member, is_optional_call, member, walk_method, walk_property};
|
|
20
|
+
use super::vocabulary;
|
|
21
|
+
use crate::js::ast::{self, Binding, Script};
|
|
16
22
|
use crate::script::Source;
|
|
17
23
|
use crate::{candidates, vm};
|
|
18
24
|
|
|
@@ -31,26 +37,55 @@ pub struct Trace {
|
|
|
31
37
|
}
|
|
32
38
|
|
|
33
39
|
impl Trace {
|
|
40
|
+
/// The frames the environment audit reports, including a worker continuation when present.
|
|
41
|
+
pub fn audit_key(&self, features: &[String], controller: Option<&str>) -> Result<String> {
|
|
42
|
+
let entered = features
|
|
43
|
+
.windows(2)
|
|
44
|
+
.find_map(|pair| match pair {
|
|
45
|
+
[name, next] if *next == self.replace && !vocabulary::is_hex_name(name) => {
|
|
46
|
+
Some(name)
|
|
47
|
+
}
|
|
48
|
+
[previous, name] if *previous == self.replace && name.contains('$') => Some(name),
|
|
49
|
+
_ => None,
|
|
50
|
+
})
|
|
51
|
+
.context("environment audit has no session trace entry")?;
|
|
52
|
+
let second = controller.unwrap_or(&self.returned_root);
|
|
53
|
+
Ok(format!("{},{second},{entered}", self.initial_root))
|
|
54
|
+
}
|
|
55
|
+
|
|
34
56
|
/// Recovers the iframe's trace if its helpers and entry sites are present and unambiguous.
|
|
35
57
|
#[must_use]
|
|
36
58
|
pub fn recover(source: &Source) -> Option<Self> {
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
fn from_parsed(parsed: &ParsedScript) -> Option<Self> {
|
|
59
|
+
let script = source.script();
|
|
41
60
|
let mut structure = Structure {
|
|
42
|
-
|
|
43
|
-
|
|
61
|
+
script,
|
|
62
|
+
runner: vm::runner_name(script)?,
|
|
63
|
+
replacements: BTreeSet::new(),
|
|
64
|
+
pushes: BTreeSet::new(),
|
|
65
|
+
initializers: BTreeSet::new(),
|
|
66
|
+
returned: BTreeSet::new(),
|
|
67
|
+
roots: Vec::new(),
|
|
44
68
|
};
|
|
45
|
-
|
|
69
|
+
for node in script.nodes.iter() {
|
|
70
|
+
match node.kind() {
|
|
71
|
+
AstKind::Function(function) if function.is_declaration() => {
|
|
72
|
+
structure.declaration(function);
|
|
73
|
+
}
|
|
74
|
+
AstKind::AssignmentExpression(assignment) => structure.assignment(assignment),
|
|
75
|
+
AstKind::BlockStatement(block) => structure.block(&block.body),
|
|
76
|
+
AstKind::FunctionBody(body) => structure.block(&body.statements),
|
|
77
|
+
AstKind::StaticBlock(block) => structure.block(&block.body),
|
|
78
|
+
_ => {}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
46
81
|
let replacement =
|
|
47
82
|
candidates::exactly_one(&structure.replacements, "trace replace helper").ok()?;
|
|
48
|
-
let root = |entries: &BTreeSet<
|
|
83
|
+
let root = |entries: &BTreeSet<Binding>, what: &str| {
|
|
49
84
|
let frames: BTreeSet<&str> = structure
|
|
50
85
|
.roots
|
|
51
86
|
.iter()
|
|
52
87
|
.filter(|root| root.helper == replacement.helper && entries.contains(&root.entry))
|
|
53
|
-
.map(|root| root.frame
|
|
88
|
+
.map(|root| root.frame)
|
|
54
89
|
.collect();
|
|
55
90
|
candidates::exactly_one(frames, what)
|
|
56
91
|
.ok()
|
|
@@ -63,11 +98,11 @@ impl Trace {
|
|
|
63
98
|
.iter()
|
|
64
99
|
.filter(|push| push.array == replacement.array);
|
|
65
100
|
Some(Self {
|
|
66
|
-
global: replacement.array.
|
|
67
|
-
replace: replacement.helper.
|
|
101
|
+
global: replacement.array.to_owned(),
|
|
102
|
+
replace: replacement.helper.to_owned(),
|
|
68
103
|
push: candidates::exactly_one(pushes, "trace push helper")
|
|
69
104
|
.ok()
|
|
70
|
-
.map(|push| push.helper.
|
|
105
|
+
.map(|push| push.helper.to_owned()),
|
|
71
106
|
initial_root: root(&structure.initializers, "initial root frame")?,
|
|
72
107
|
returned_root: root(&structure.returned, "returned root frame")?,
|
|
73
108
|
})
|
|
@@ -76,24 +111,27 @@ impl Trace {
|
|
|
76
111
|
|
|
77
112
|
/// Reads a literal string through surrounding parentheses. Rejects lone surrogates because
|
|
78
113
|
/// lossy conversion would produce a frame name the program never uses.
|
|
79
|
-
fn string(expression: &
|
|
80
|
-
ast::static_str(expression.
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
fn call(statement: &Stmt) -> Option<&CallExpr> {
|
|
84
|
-
statement.as_expr()?.expr.unwrap_parens().as_call()
|
|
114
|
+
fn string<'a>(expression: &Expression<'a>) -> Option<&'a str> {
|
|
115
|
+
ast::static_str(expression.without_parentheses())
|
|
85
116
|
}
|
|
86
117
|
|
|
87
|
-
|
|
88
|
-
|
|
118
|
+
/// The call an expression statement makes, through parentheses.
|
|
119
|
+
fn call<'b, 'a>(statement: &'b Statement<'a>) -> Option<&'b CallExpression<'a>> {
|
|
120
|
+
let Statement::ExpressionStatement(statement) = statement else {
|
|
121
|
+
return None;
|
|
122
|
+
};
|
|
123
|
+
match statement.expression.without_parentheses() {
|
|
124
|
+
Expression::CallExpression(call) => Some(call),
|
|
125
|
+
_ => None,
|
|
126
|
+
}
|
|
89
127
|
}
|
|
90
128
|
|
|
91
129
|
/// Returns the program passed to a call of the program runner `runner`.
|
|
92
|
-
fn run_program<'
|
|
130
|
+
fn run_program<'b, 'a>(call: &'b CallExpression<'a>, runner: &str) -> Option<&'b Expression<'a>> {
|
|
93
131
|
if !vm::calls_runner(call, runner) {
|
|
94
132
|
return None;
|
|
95
133
|
}
|
|
96
|
-
Some(
|
|
134
|
+
Some(ast::argument_expression(call.arguments.first()?))
|
|
97
135
|
}
|
|
98
136
|
|
|
99
137
|
/// Checks for calls running a literal program in this function's own body, as used by the
|
|
@@ -103,141 +141,148 @@ struct Calls<'runner> {
|
|
|
103
141
|
literal_program: bool,
|
|
104
142
|
}
|
|
105
143
|
|
|
106
|
-
impl Visit for Calls<'_> {
|
|
107
|
-
fn visit_function(&mut self, _: &Function) {}
|
|
144
|
+
impl<'a> Visit<'a> for Calls<'_> {
|
|
145
|
+
fn visit_function(&mut self, _: &Function<'a>, _: ScopeFlags) {}
|
|
108
146
|
|
|
109
|
-
fn
|
|
110
|
-
self
|
|
111
|
-
|
|
112
|
-
|
|
147
|
+
fn visit_object_property(&mut self, property: &ObjectProperty<'a>) {
|
|
148
|
+
walk_property(self, property);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
fn visit_method_definition(&mut self, method: &MethodDefinition<'a>) {
|
|
152
|
+
walk_method(self, method);
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
|
|
156
|
+
if !is_optional_call(call) {
|
|
157
|
+
self.literal_program |=
|
|
158
|
+
run_program(call, self.runner).is_some_and(|program| string(program).is_some());
|
|
159
|
+
}
|
|
160
|
+
walk::walk_call_expression(self, call);
|
|
113
161
|
}
|
|
114
162
|
}
|
|
115
163
|
|
|
116
164
|
/// Finds array properties modified by a helper: last-element replacement through
|
|
117
165
|
/// `o.array[o.array.length - 1] = value` and append through `o.array.push(value)`.
|
|
118
166
|
#[derive(Default)]
|
|
119
|
-
struct Helpers {
|
|
120
|
-
replace: Option
|
|
121
|
-
push: Option
|
|
167
|
+
struct Helpers<'a> {
|
|
168
|
+
replace: Option<&'a str>,
|
|
169
|
+
push: Option<&'a str>,
|
|
122
170
|
}
|
|
123
171
|
|
|
124
|
-
impl Visit for Helpers {
|
|
125
|
-
fn
|
|
126
|
-
if let
|
|
127
|
-
&& let
|
|
128
|
-
&&
|
|
129
|
-
&& index.op == BinaryOp::Sub
|
|
172
|
+
impl<'a> Visit<'a> for Helpers<'a> {
|
|
173
|
+
fn visit_assignment_expression(&mut self, assignment: &AssignmentExpression<'a>) {
|
|
174
|
+
if let AssignmentTarget::ComputedMemberExpression(member) = &assignment.left
|
|
175
|
+
&& let Expression::BinaryExpression(index) = member.expression.without_parentheses()
|
|
176
|
+
&& index.operator == BinaryOperator::Subtraction
|
|
130
177
|
&& matches!(
|
|
131
|
-
index.right.
|
|
132
|
-
|
|
178
|
+
index.right.without_parentheses(),
|
|
179
|
+
Expression::NumericLiteral(number) if number.value == 1.0
|
|
133
180
|
)
|
|
134
|
-
&& let
|
|
135
|
-
&& ast::member_str(
|
|
136
|
-
&& let
|
|
181
|
+
&& let Some(length) = self::member(index.left.without_parentheses())
|
|
182
|
+
&& ast::member_str(length) == Some("length")
|
|
183
|
+
&& let Some(array) = self::member(member.object.without_parentheses())
|
|
137
184
|
{
|
|
138
|
-
self.replace = ast::member_str(
|
|
185
|
+
self.replace = ast::member_str(array);
|
|
139
186
|
}
|
|
140
|
-
|
|
187
|
+
walk::walk_assignment_expression(self, assignment);
|
|
141
188
|
}
|
|
142
189
|
|
|
143
|
-
fn
|
|
144
|
-
if
|
|
145
|
-
&&
|
|
146
|
-
&&
|
|
190
|
+
fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
|
|
191
|
+
if !is_optional_call(call)
|
|
192
|
+
&& let Some(member) = self::member(call.callee.without_parentheses())
|
|
193
|
+
&& ast::member_str(member) == Some("push")
|
|
194
|
+
&& let Some(array) = self::member(member.object().without_parentheses())
|
|
147
195
|
{
|
|
148
|
-
self.push = ast::member_str(
|
|
196
|
+
self.push = ast::member_str(array);
|
|
149
197
|
}
|
|
150
|
-
|
|
198
|
+
walk::walk_call_expression(self, call);
|
|
151
199
|
}
|
|
152
200
|
}
|
|
153
201
|
|
|
154
202
|
/// A helper `o.<helper> = function ...` that edits the array `o.<array>`.
|
|
155
203
|
#[derive(PartialEq, Eq, PartialOrd, Ord)]
|
|
156
|
-
struct ArrayHelper {
|
|
157
|
-
helper:
|
|
158
|
-
array:
|
|
204
|
+
struct ArrayHelper<'a> {
|
|
205
|
+
helper: &'a str,
|
|
206
|
+
array: &'a str,
|
|
159
207
|
}
|
|
160
208
|
|
|
161
209
|
/// A call `o.<helper>("<frame>")` immediately followed by a call of `<entry>`, which names a
|
|
162
210
|
/// root frame when `helper` is the replace helper.
|
|
163
|
-
struct RootSite {
|
|
164
|
-
helper:
|
|
165
|
-
frame:
|
|
166
|
-
entry:
|
|
211
|
+
struct RootSite<'a> {
|
|
212
|
+
helper: &'a str,
|
|
213
|
+
frame: &'a str,
|
|
214
|
+
entry: Binding<'a>,
|
|
167
215
|
}
|
|
168
216
|
|
|
169
217
|
/// Script components used to recover the trace.
|
|
170
|
-
|
|
171
|
-
|
|
218
|
+
struct Structure<'a> {
|
|
219
|
+
script: Script<'a>,
|
|
172
220
|
/// The name the program runner is installed under.
|
|
173
221
|
runner: String,
|
|
174
|
-
replacements: BTreeSet<ArrayHelper
|
|
175
|
-
pushes: BTreeSet<ArrayHelper
|
|
222
|
+
replacements: BTreeSet<ArrayHelper<'a>>,
|
|
223
|
+
pushes: BTreeSet<ArrayHelper<'a>>,
|
|
176
224
|
/// Functions that run a literal program (see [`Calls`]).
|
|
177
|
-
initializers: BTreeSet<
|
|
225
|
+
initializers: BTreeSet<Binding<'a>>,
|
|
178
226
|
/// Bindings holding callbacks returned by programs run from nonliteral inputs.
|
|
179
|
-
returned: BTreeSet<
|
|
180
|
-
roots: Vec<RootSite
|
|
227
|
+
returned: BTreeSet<Binding<'a>>,
|
|
228
|
+
roots: Vec<RootSite<'a>>,
|
|
181
229
|
}
|
|
182
230
|
|
|
183
|
-
impl
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
231
|
+
impl<'a> Structure<'a> {
|
|
232
|
+
/// Records a function declaration that runs a literal program.
|
|
233
|
+
fn declaration(&mut self, function: &'a Function<'a>) {
|
|
234
|
+
let (Some(name), Some(body)) = (&function.id, &function.body) else {
|
|
235
|
+
return;
|
|
236
|
+
};
|
|
237
|
+
let mut calls = Calls {
|
|
238
|
+
runner: &self.runner,
|
|
239
|
+
literal_program: false,
|
|
240
|
+
};
|
|
241
|
+
calls.visit_function_body(body);
|
|
242
|
+
if calls.literal_program {
|
|
243
|
+
self.initializers.insert(Binding::Symbol(name.symbol_id()));
|
|
194
244
|
}
|
|
195
|
-
function.visit_children_with(self);
|
|
196
245
|
}
|
|
197
246
|
|
|
198
|
-
fn
|
|
199
|
-
if let
|
|
200
|
-
&& let Some(helper) = ast::member_str(
|
|
201
|
-
&& let
|
|
202
|
-
&& let Some(body) = &function.
|
|
247
|
+
fn assignment(&mut self, assignment: &'a AssignmentExpression<'a>) {
|
|
248
|
+
if let Some(member) = assigned_member(&assignment.left)
|
|
249
|
+
&& let Some(helper) = ast::member_str(member)
|
|
250
|
+
&& let Expression::FunctionExpression(function) = assignment.right.without_parentheses()
|
|
251
|
+
&& let Some(body) = &function.body
|
|
203
252
|
{
|
|
204
253
|
let mut helpers = Helpers::default();
|
|
205
|
-
|
|
206
|
-
let edits = |array| ArrayHelper {
|
|
207
|
-
helper: helper.to_owned(),
|
|
208
|
-
array,
|
|
209
|
-
};
|
|
254
|
+
helpers.visit_function_body(body);
|
|
255
|
+
let edits = |array| ArrayHelper { helper, array };
|
|
210
256
|
self.replacements.extend(helpers.replace.map(edits));
|
|
211
257
|
self.pushes.extend(helpers.push.map(edits));
|
|
212
258
|
}
|
|
213
|
-
if let
|
|
214
|
-
&& let
|
|
259
|
+
if let AssignmentTarget::AssignmentTargetIdentifier(name) = &assignment.left
|
|
260
|
+
&& let Expression::CallExpression(call) = assignment.right.without_parentheses()
|
|
215
261
|
&& run_program(call, &self.runner).is_some_and(|program| string(program).is_none())
|
|
216
262
|
{
|
|
217
|
-
self.returned.insert(
|
|
263
|
+
self.returned.insert(self.script.binding(name));
|
|
218
264
|
}
|
|
219
|
-
assignment.visit_children_with(self);
|
|
220
265
|
}
|
|
221
266
|
|
|
222
|
-
|
|
223
|
-
|
|
267
|
+
/// Records root sites among a block's consecutive statements.
|
|
268
|
+
fn block(&mut self, statements: &'a [Statement<'a>]) {
|
|
269
|
+
for statements in statements.windows(2) {
|
|
224
270
|
if let [trace_statement, entry_statement] = statements
|
|
225
271
|
&& let Some(trace_call) = call(trace_statement)
|
|
226
|
-
&& let Some(
|
|
227
|
-
&& let Some(helper) = ast::member_str(
|
|
228
|
-
&& let Some(argument) = trace_call.
|
|
229
|
-
&& let Some(frame) = string(
|
|
272
|
+
&& let Some(member) = member(trace_call.callee.without_parentheses())
|
|
273
|
+
&& let Some(helper) = ast::member_str(member)
|
|
274
|
+
&& let Some(argument) = trace_call.arguments.first()
|
|
275
|
+
&& let Some(frame) = string(ast::argument_expression(argument))
|
|
230
276
|
&& let Some(entry_call) = call(entry_statement)
|
|
231
|
-
&& let
|
|
277
|
+
&& let Expression::Identifier(entry) = entry_call.callee.without_parentheses()
|
|
232
278
|
{
|
|
233
279
|
self.roots.push(RootSite {
|
|
234
|
-
helper
|
|
235
|
-
frame
|
|
236
|
-
entry:
|
|
280
|
+
helper,
|
|
281
|
+
frame,
|
|
282
|
+
entry: self.script.binding(entry),
|
|
237
283
|
});
|
|
238
284
|
}
|
|
239
285
|
}
|
|
240
|
-
block.visit_children_with(self);
|
|
241
286
|
}
|
|
242
287
|
}
|
|
243
288
|
|
|
@@ -268,8 +313,7 @@ mod tests {
|
|
|
268
313
|
|
|
269
314
|
/// The trace of a script defining `helpers` and [`ENTRIES`].
|
|
270
315
|
fn recover(helpers: &str) -> Trace {
|
|
271
|
-
|
|
272
|
-
Trace::from_parsed(&parsed).unwrap()
|
|
316
|
+
Trace::recover(&Source::try_new(&format!("{helpers}{ENTRIES}")).unwrap()).unwrap()
|
|
273
317
|
}
|
|
274
318
|
|
|
275
319
|
#[test]
|