cfsolve 0.1.2 → 0.1.4

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.
Files changed (395) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +22 -0
  3. data/README.md +8 -3
  4. data/THIRD_PARTY_LICENSES/README.md +71 -254
  5. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  6. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  7. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  8. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  9. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  11. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  12. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  13. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  14. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  15. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  16. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  17. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  18. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  19. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  21. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  22. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  24. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  30. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  32. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  34. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  36. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  38. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  40. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  42. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  43. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  45. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  47. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  49. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  51. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  53. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  55. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  56. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  57. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  58. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  59. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  60. data/UPSTREAM.md +14 -6
  61. data/ext/cfsolve/Cargo.lock +534 -1727
  62. data/ext/cfsolve/Cargo.toml +4 -0
  63. data/ext/cfsolve/src/main.rs +1 -1
  64. data/lib/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  65. data/lib/cfsolve/profiles/chrome-157-macos.json +613 -0
  66. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  67. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  68. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  69. data/lib/cfsolve/version.rb +2 -2
  70. data/lib/cfsolve.rb +1 -1
  71. data/vendor/cfsolve/Cargo.lock +561 -1729
  72. data/vendor/cfsolve/Cargo.toml +26 -8
  73. data/vendor/cfsolve/README.md +57 -5
  74. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  75. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  76. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  77. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  78. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  79. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  80. data/vendor/cfsolve/examples/turnstile_smoke.rs +58 -0
  81. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  82. data/vendor/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  83. data/vendor/cfsolve/profiles/chrome-157-macos.json +613 -0
  84. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  85. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  86. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  87. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  88. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  89. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  90. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  91. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  92. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  93. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  94. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  95. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  96. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  97. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  98. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  99. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  100. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  101. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  102. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  103. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  104. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  105. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  106. data/vendor/cfsolve/src/challenge.rs +1 -0
  107. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  108. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  109. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  110. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  111. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  112. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  113. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  114. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  115. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  116. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  117. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  118. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  119. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  120. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  121. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  122. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  123. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  124. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  125. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  126. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  127. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  128. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  129. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  130. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  131. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  132. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  133. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  134. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  135. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  136. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  137. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  138. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  139. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  140. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  141. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  142. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  143. data/vendor/cfsolve/src/embedding_page/extra_params.rs +132 -24
  144. data/vendor/cfsolve/src/embedding_page/page.rs +41 -1
  145. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  146. data/vendor/cfsolve/src/error.rs +40 -5
  147. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  148. data/vendor/cfsolve/src/http/client.rs +7 -10
  149. data/vendor/cfsolve/src/http/requests.rs +2 -2
  150. data/vendor/cfsolve/src/js/ast.rs +479 -263
  151. data/vendor/cfsolve/src/lib.rs +1 -0
  152. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  153. data/vendor/cfsolve/src/listing/query.rs +1 -47
  154. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  155. data/vendor/cfsolve/src/profiling.rs +49 -0
  156. data/vendor/cfsolve/src/script.rs +35 -24
  157. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  158. data/vendor/cfsolve/src/session/channel.rs +2 -2
  159. data/vendor/cfsolve/src/session/initial.rs +12 -11
  160. data/vendor/cfsolve/src/session/probes.rs +1 -0
  161. data/vendor/cfsolve/src/session/sink.rs +26 -1
  162. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  163. data/vendor/cfsolve/src/session.rs +1 -1
  164. data/vendor/cfsolve/src/solver.rs +3 -1
  165. data/vendor/cfsolve/src/stage2/analysis/analyze.rs +33 -4
  166. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  167. data/vendor/cfsolve/src/stage2/analysis/discovery.rs +13 -2
  168. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  169. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  170. data/vendor/cfsolve/src/stage2/benchmark.rs +113 -41
  171. data/vendor/cfsolve/src/stage2/call_stack.rs +1564 -1041
  172. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  173. data/vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js +1 -0
  174. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  175. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  176. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  177. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  178. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  179. data/vendor/cfsolve/src/stage2/probes/dates.rs +44 -0
  180. data/vendor/cfsolve/src/stage2/probes/parent_info_array.rs +326 -0
  181. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  182. data/vendor/cfsolve/src/stage2/probes/stack.rs +117 -4
  183. data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +80 -2
  184. data/vendor/cfsolve/src/stage2/probes.rs +1 -0
  185. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  186. data/vendor/cfsolve/src/stage2/reference.rs +5 -0
  187. data/vendor/cfsolve/src/stage2/registry.rs +8 -2
  188. data/vendor/cfsolve/src/stage2/replay.rs +34 -3
  189. data/vendor/cfsolve/src/stage2/stylesheets.rs +35 -0
  190. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  191. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  192. data/vendor/cfsolve/src/stage2/value_labels.rs +185 -0
  193. data/vendor/cfsolve/src/stage2/vocabulary.rs +112 -17
  194. data/vendor/cfsolve/src/stage2.rs +3 -0
  195. data/vendor/cfsolve/src/vm/disassemble.rs +75 -7
  196. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  197. data/vendor/cfsolve/src/vm/encoded_names.rs +635 -0
  198. data/vendor/cfsolve/src/vm/extract.rs +550 -250
  199. data/vendor/cfsolve/src/vm/fixtures/free_functions/README.md +9 -0
  200. data/vendor/cfsolve/src/vm/fixtures/free_functions/machine.js +7438 -0
  201. data/vendor/cfsolve/src/vm/fixtures/free_functions/program.base64 +1 -0
  202. data/vendor/cfsolve/src/vm/interpret/access.rs +71 -50
  203. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  204. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  205. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  206. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  207. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  208. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  209. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  210. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  211. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  212. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +160 -58
  213. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  214. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  215. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1765 -0
  216. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  217. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +392 -0
  218. data/vendor/cfsolve/src/vm/interpret/run.rs +120 -45
  219. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  220. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  221. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  222. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  223. data/vendor/cfsolve/src/vm/machine.rs +116 -51
  224. data/vendor/cfsolve/src/vm/output.rs +19 -6
  225. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  226. data/vendor/cfsolve/src/vm/registers.rs +35 -21
  227. data/vendor/cfsolve/src/vm/session.rs +189 -121
  228. data/vendor/cfsolve/src/vm/value.rs +22 -19
  229. data/vendor/cfsolve/src/vm.rs +3 -1
  230. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  231. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  232. metadata +106 -178
  233. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  234. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  235. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  237. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  238. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  239. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  240. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  241. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  242. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  243. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  244. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  245. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  246. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  247. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  248. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  249. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  250. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  251. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  252. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  253. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  255. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  256. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  257. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  258. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  259. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  260. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  261. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  262. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  263. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  264. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  265. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  266. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  268. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  269. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  270. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  271. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  272. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  273. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  274. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  277. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  278. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  279. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  280. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  281. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  282. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  283. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  284. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  286. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  288. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  289. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  290. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  291. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  292. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  293. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  294. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  295. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  296. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  297. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  298. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  299. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  300. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  301. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  302. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  303. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  305. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  329. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  330. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  331. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  332. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  333. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  334. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  335. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  336. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  337. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  338. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  339. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  340. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  341. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  342. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  343. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  344. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  345. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  346. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  347. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  348. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  349. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  350. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  351. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  352. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  353. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  354. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  355. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  356. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  357. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  358. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  359. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  360. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  361. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  362. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  363. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  364. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  365. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  366. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  367. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  368. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  369. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  370. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  371. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  372. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  373. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  374. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  375. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  376. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  377. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  378. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  379. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  380. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  381. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  382. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  383. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  384. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  385. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  386. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  387. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  388. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  389. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  390. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  391. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  392. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  393. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  394. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  395. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -2,30 +2,35 @@
2
2
  //! hashes, objects built in a block, and expressions used to construct options and payloads.
3
3
 
4
4
  use anyhow::{Context, Result, bail, ensure};
5
- use swc_core::ecma::ast::{
6
- AssignExpr, AssignTarget, BinExpr, BinaryOp, BlockStmt, Expr, Lit, SimpleAssignTarget, Stmt,
7
- UnaryOp,
5
+ use oxc::ast::ast::{
6
+ ArrayExpressionElement, AssignmentExpression, AssignmentTarget, BinaryExpression, Expression,
7
+ FunctionBody, MemberExpression, Statement,
8
8
  };
9
+ use oxc::syntax::operator::{BinaryOperator, LogicalOperator, UnaryOperator};
9
10
 
10
- use crate::js::{self, JsValue, Options, Window, ast};
11
+ use crate::js::ast::{self, Binding, Script};
12
+ use crate::js::{self, JsValue, Options, Window};
11
13
 
12
14
  /// Reads the build hash from `"0…0" + <number>.toString(16)`. The zero literal sets the
13
15
  /// hexadecimal width. Requires an integer literal that fits without truncation; accepts any
14
16
  /// numeric base and ignores surrounding parentheses.
15
17
  #[must_use]
16
- pub(crate) fn padded_build(sum: &BinExpr) -> Option<String> {
18
+ pub(crate) fn padded_build(sum: &BinaryExpression<'_>) -> Option<String> {
17
19
  let zeros = ast::static_str(&sum.left)?;
18
- let call = sum.right.unwrap_parens().as_call()?;
19
- let member = call.callee.as_expr()?.unwrap_parens().as_member()?;
20
- let (Expr::Lit(Lit::Num(number)), [radix]) = (member.obj.unwrap_parens(), &call.args[..])
20
+ let Expression::CallExpression(call) = sum.right.without_parentheses() else {
21
+ return None;
22
+ };
23
+ let member = call.callee.without_parentheses().as_member_expression()?;
24
+ let (Expression::NumericLiteral(number), [radix]) =
25
+ (member.object().without_parentheses(), &call.arguments[..])
21
26
  else {
22
27
  return None;
23
28
  };
24
- let padded =
25
- sum.op == BinaryOp::Add && !zeros.is_empty() && zeros.bytes().all(|byte| byte == b'0');
26
- let hexadecimal = ast::member_str(&member.prop) == Some("toString")
27
- && radix.spread.is_none()
28
- && ast::index_literal(&radix.expr) == Some(16);
29
+ let padded = sum.operator == BinaryOperator::Addition
30
+ && !zeros.is_empty()
31
+ && zeros.bytes().all(|byte| byte == b'0');
32
+ let hexadecimal = ast::member_str(member) == Some("toString")
33
+ && radix.as_expression().and_then(ast::index_literal) == Some(16);
29
34
  let (number, width) = (number.value, zeros.len());
30
35
  // For padding wider than sixteen hex digits, the `u64` range limits the value.
31
36
  let limit = 16f64.powi(i32::try_from(width).ok()?).min(2f64.powi(64));
@@ -33,153 +38,187 @@ pub(crate) fn padded_build(sum: &BinExpr) -> Option<String> {
33
38
  .then(|| format!("{:0width$x}", number as u64))
34
39
  }
35
40
 
36
- /// Resolves a static expression using known options (see [`evaluate`]). Unknown options have no
37
- /// static value.
41
+ /// Resolves a static expression in `script` using known options (see [`evaluate`]). Unknown
42
+ /// options have no static value.
38
43
  #[must_use]
39
- pub(crate) fn static_value(expression: &Expr, options: &Options) -> Option<JsValue> {
40
- evaluate(expression, options, &Window::new()).ok()?
44
+ pub(crate) fn static_value(
45
+ script: Script<'_>,
46
+ expression: &Expression<'_>,
47
+ options: &Options,
48
+ ) -> Option<JsValue> {
49
+ evaluate(script, expression, options, &Window::new()).ok()?
41
50
  }
42
51
 
43
52
  /// The `_cf_chl_opt` property read by `<global>._cf_chl_opt.<name>`.
44
53
  #[must_use]
45
- pub(crate) fn option_key(expression: &Expr) -> Option<&str> {
46
- let member = expression.as_member()?;
47
- ast::member_str(&member.prop).filter(|_| is_options(&member.obj))
54
+ pub(crate) fn option_key<'a>(expression: &Expression<'a>) -> Option<&'a str> {
55
+ options_member(expression.as_member_expression()?)
48
56
  }
49
57
 
50
58
  /// The option assigned by `_cf_chl_opt.<name> = ...`.
51
59
  #[must_use]
52
- pub(crate) fn option_assignment(target: &AssignTarget) -> Option<&str> {
53
- let member = target.as_simple()?.as_member()?;
54
- ast::member_str(&member.prop).filter(|_| is_options(&member.obj))
60
+ pub(crate) fn option_assignment<'a>(target: &AssignmentTarget<'a>) -> Option<&'a str> {
61
+ options_member(target.as_member_expression()?)
62
+ }
63
+
64
+ /// The option `member` names, if it is a property of `_cf_chl_opt`.
65
+ fn options_member<'a>(member: &MemberExpression<'a>) -> Option<&'a str> {
66
+ ast::member_str(member).filter(|_| is_options(member.object()))
55
67
  }
56
68
 
57
69
  /// Returns the assignment contained in an expression statement.
58
- pub(crate) fn assignment(statement: &Stmt) -> Option<&AssignExpr> {
59
- statement.as_expr()?.expr.as_assign()
70
+ pub(crate) fn assignment<'b, 'a>(
71
+ statement: &'b Statement<'a>,
72
+ ) -> Option<&'b AssignmentExpression<'a>> {
73
+ match statement {
74
+ Statement::ExpressionStatement(statement) => match &statement.expression {
75
+ Expression::AssignmentExpression(assignment) => Some(assignment),
76
+ _ => None,
77
+ },
78
+ _ => None,
79
+ }
60
80
  }
61
81
 
62
82
  /// Finds standalone assignment statements in `body`.
63
- pub(crate) fn assignments(body: &BlockStmt) -> impl Iterator<Item = &AssignExpr> {
64
- body.stmts.iter().filter_map(assignment)
83
+ pub(crate) fn assignments<'b, 'a>(
84
+ body: &'b FunctionBody<'a>,
85
+ ) -> impl Iterator<Item = &'b AssignmentExpression<'a>> {
86
+ body.statements.iter().filter_map(assignment)
65
87
  }
66
88
 
67
89
  /// An object held by a local variable in a block.
68
- pub(crate) struct BuiltObject<'body> {
69
- pub local: &'body str,
70
- pub fields: Vec<ObjectField<'body>>,
90
+ pub(crate) struct BuiltObject<'b, 'a> {
91
+ pub local: Binding<'a>,
92
+ pub fields: Vec<ObjectField<'b, 'a>>,
71
93
  }
72
94
 
73
95
  /// One field of an object, as `key: value` or `<local>.<key> = <value>`.
74
- pub(crate) struct ObjectField<'body> {
75
- pub key: &'body str,
76
- pub value: &'body Expr,
96
+ pub(crate) struct ObjectField<'b, 'a> {
97
+ pub key: &'a str,
98
+ pub value: &'b Expression<'a>,
77
99
  }
78
100
 
79
101
  /// Records an object assigned to a local, or a property write to one, in `built`. Returns
80
102
  /// whether it matched. The deobfuscator may emit a literal, or an empty object followed by
81
103
  /// property writes.
82
- pub(crate) fn track<'body>(
83
- built: &mut Vec<BuiltObject<'body>>,
84
- assignment: &'body AssignExpr,
104
+ pub(crate) fn track<'b, 'a>(
105
+ script: Script<'a>,
106
+ built: &mut Vec<BuiltObject<'b, 'a>>,
107
+ assignment: &'b AssignmentExpression<'a>,
85
108
  ) -> bool {
86
- let value = &*assignment.right;
87
- match assignment.left.as_simple() {
88
- Some(SimpleAssignTarget::Ident(local)) => {
89
- let Some(fields) = object_fields(value) else {
90
- return false;
91
- };
92
- built.push(BuiltObject {
93
- local: &local.id.sym,
94
- fields,
95
- });
96
- }
97
- Some(SimpleAssignTarget::Member(member)) => {
98
- let Expr::Ident(object) = &*member.obj else {
99
- return false;
100
- };
101
- let target = built
102
- .iter_mut()
103
- .rfind(|target| target.local == &*object.sym);
104
- let (Some(key), Some(target)) = (ast::member_str(&member.prop), target) else {
105
- return false;
106
- };
107
- match target.fields.iter_mut().find(|field| field.key == key) {
108
- Some(field) => field.value = value,
109
- None => target.fields.push(ObjectField { key, value }),
110
- }
111
- }
112
- _ => return false,
109
+ let value = &assignment.right;
110
+ if let AssignmentTarget::AssignmentTargetIdentifier(local) = &assignment.left {
111
+ let Some(fields) = object_fields(value) else {
112
+ return false;
113
+ };
114
+ built.push(BuiltObject {
115
+ local: script.binding(local),
116
+ fields,
117
+ });
118
+ return true;
119
+ }
120
+ let Some(member) = assignment.left.as_member_expression() else {
121
+ return false;
122
+ };
123
+ let Expression::Identifier(object) = member.object() else {
124
+ return false;
125
+ };
126
+ let object = script.binding(object);
127
+ let target = built.iter_mut().rfind(|target| target.local == object);
128
+ let (Some(key), Some(target)) = (ast::member_str(member), target) else {
129
+ return false;
130
+ };
131
+ match target.fields.iter_mut().find(|field| field.key == key) {
132
+ Some(field) => field.value = value,
133
+ None => target.fields.push(ObjectField { key, value }),
113
134
  }
114
135
  true
115
136
  }
116
137
 
117
138
  /// The fields of an object literal whose keys are all names.
118
- pub(crate) fn object_fields(expression: &Expr) -> Option<Vec<ObjectField<'_>>> {
119
- let fields = expression.as_object()?.props.iter().map(|property| {
139
+ pub(crate) fn object_fields<'b, 'a>(
140
+ expression: &'b Expression<'a>,
141
+ ) -> Option<Vec<ObjectField<'b, 'a>>> {
142
+ let Expression::ObjectExpression(object) = expression else {
143
+ return None;
144
+ };
145
+ let fields = object.properties.iter().map(|property| {
120
146
  let property = ast::key_value(property)?;
121
147
  Some(ObjectField {
122
- key: ast::key_str(&property.key)?,
148
+ key: ast::key_str(&property.key, property.computed)?,
123
149
  value: &property.value,
124
150
  })
125
151
  });
126
152
  fields.collect()
127
153
  }
128
154
 
129
- /// Evaluates expressions used to build options and payloads. Supports literals, `undefined`,
130
- /// arrays, objects, `!`, `||`, `+`, `-`, `===`, `!==`, and `JSON.stringify`. Reads options from
131
- /// `<global>._cf_chl_opt.<key>` and globals from `<global>.<key>`, including getters called
132
- /// without arguments.
155
+ /// Evaluates expressions in `script` used to build options and payloads. Supports literals,
156
+ /// `undefined`, arrays, objects, `!`, `||`, `+`, `-`, `===`, `!==`, and `JSON.stringify`. Reads
157
+ /// options from `<global>._cf_chl_opt.<key>` and globals from `<global>.<key>`, including getters
158
+ /// called without arguments.
133
159
  ///
134
160
  /// Objects keep static properties and omit callbacks, matching `JSON.stringify`. `None`
135
161
  /// represents `undefined`. Unsupported expressions return errors.
136
162
  pub(crate) fn evaluate(
137
- expression: &Expr,
163
+ script: Script<'_>,
164
+ expression: &Expression<'_>,
138
165
  options: &Options,
139
166
  globals: &Window,
140
167
  ) -> Result<Option<JsValue>> {
141
- let evaluate = |expression: &Expr| evaluate(expression, options, globals);
168
+ let evaluate = |expression: &Expression<'_>| evaluate(script, expression, options, globals);
142
169
  Ok(match expression {
143
- Expr::Paren(paren) => evaluate(&paren.expr)?,
144
- Expr::Lit(Lit::Str(_)) | Expr::Tpl(_) => Some(JsValue::from(
170
+ Expression::ParenthesizedExpression(paren) => evaluate(&paren.expression)?,
171
+ Expression::StringLiteral(_) | Expression::TemplateLiteral(_) => Some(JsValue::from(
145
172
  ast::static_str(expression).context("unsupported template or string literal")?,
146
173
  )),
147
- Expr::Lit(Lit::Num(number)) => Some(JsValue::Number(number.value)),
148
- Expr::Lit(Lit::Bool(value)) => Some(JsValue::Bool(value.value)),
149
- Expr::Lit(Lit::Null(_)) => Some(JsValue::Null),
150
- Expr::Ident(ident) if ident.sym == "undefined" => None,
174
+ Expression::NumericLiteral(number) => Some(JsValue::Number(number.value)),
175
+ Expression::BooleanLiteral(value) => Some(JsValue::Bool(value.value)),
176
+ Expression::NullLiteral(_) => Some(JsValue::Null),
177
+ Expression::Identifier(_) if script.is_global(expression, "undefined") => None,
151
178
  // `JSON.stringify` writes an undefined element as `null`.
152
- Expr::Array(array) => {
153
- let mut elements = Vec::with_capacity(array.elems.len());
154
- for element in &array.elems {
155
- let element = element.as_ref().context("unsupported array hole")?;
156
- ensure!(element.spread.is_none(), "unsupported spread element");
157
- elements.push(evaluate(&element.expr)?.unwrap_or(JsValue::Null));
179
+ Expression::ArrayExpression(array) => {
180
+ let mut elements = Vec::with_capacity(array.elements.len());
181
+ for element in &array.elements {
182
+ let element = match element {
183
+ ArrayExpressionElement::Elision(_) => bail!("unsupported array hole"),
184
+ ArrayExpressionElement::SpreadElement(_) => bail!("unsupported spread element"),
185
+ element => element.to_expression(),
186
+ };
187
+ elements.push(evaluate(element)?.unwrap_or(JsValue::Null));
158
188
  }
159
189
  Some(JsValue::Array(elements))
160
190
  }
161
- Expr::Object(object) => Some(JsValue::Object(
191
+ Expression::ObjectExpression(object) => Some(JsValue::Object(
162
192
  ast::key_values(object)
163
193
  .filter_map(|property| {
164
194
  let value = evaluate(&property.value).ok()??;
165
- Some((ast::key_str(&property.key)?.to_owned(), value))
195
+ Some((
196
+ ast::key_str(&property.key, property.computed)?.to_owned(),
197
+ value,
198
+ ))
166
199
  })
167
200
  .collect(),
168
201
  )),
169
202
  // `!x` is always a boolean; an unset option is `undefined`, so falsy.
170
- Expr::Unary(unary) if unary.op == UnaryOp::Bang => Some(JsValue::Bool(
171
- !evaluate(&unary.arg)?.as_ref().is_some_and(js::truthy),
172
- )),
173
- Expr::Bin(binary) => {
174
- let left = evaluate(&binary.left)?;
175
- match binary.op {
203
+ Expression::UnaryExpression(unary) if unary.operator == UnaryOperator::LogicalNot => Some(
204
+ JsValue::Bool(!evaluate(&unary.argument)?.as_ref().is_some_and(js::truthy)),
205
+ ),
206
+ Expression::LogicalExpression(logical) => {
207
+ let left = evaluate(&logical.left)?;
208
+ match logical.operator {
176
209
  // The right-hand side runs only when the left is falsy.
177
- BinaryOp::LogicalOr if left.as_ref().is_some_and(js::truthy) => left,
178
- BinaryOp::LogicalOr => evaluate(&binary.right)?,
179
- BinaryOp::Sub => Some(JsValue::Number(
210
+ LogicalOperator::Or if left.as_ref().is_some_and(js::truthy) => left,
211
+ LogicalOperator::Or => evaluate(&logical.right)?,
212
+ operator => bail!("unsupported operator {}", operator.as_str()),
213
+ }
214
+ }
215
+ Expression::BinaryExpression(binary) => {
216
+ let left = evaluate(&binary.left)?;
217
+ match binary.operator {
218
+ BinaryOperator::Subtraction => Some(JsValue::Number(
180
219
  js::number(left.as_ref()) - js::number(evaluate(&binary.right)?.as_ref()),
181
220
  )),
182
- BinaryOp::Add => {
221
+ BinaryOperator::Addition => {
183
222
  let right = evaluate(&binary.right)?;
184
223
  // Strings, arrays, and objects trigger string concatenation; other values
185
224
  // use numeric addition.
@@ -196,7 +235,7 @@ pub(crate) fn evaluate(
196
235
  JsValue::Number(js::number(left) + js::number(right))
197
236
  })
198
237
  }
199
- BinaryOp::EqEqEq | BinaryOp::NotEqEq => {
238
+ BinaryOperator::StrictEquality | BinaryOperator::StrictInequality => {
200
239
  let [left, right] = [left, evaluate(&binary.right)?]
201
240
  .map(|value| value.unwrap_or(JsValue::Undefined));
202
241
  // `JsValue` equality implements `===` for primitive values. Copies of
@@ -208,17 +247,20 @@ pub(crate) fn evaluate(
208
247
  "unsupported identity comparison of an object"
209
248
  );
210
249
  Some(JsValue::Bool(
211
- (left == right) == (binary.op == BinaryOp::EqEqEq),
250
+ (left == right) == (binary.operator == BinaryOperator::StrictEquality),
212
251
  ))
213
252
  }
214
- operator => bail!("unsupported operator {operator}"),
253
+ operator => bail!("unsupported operator {}", operator.as_str()),
215
254
  }
216
255
  }
217
- Expr::Member(member) => {
218
- let key = ast::member_str(&member.prop).context("unsupported computed property")?;
219
- match &*member.obj {
256
+ Expression::StaticMemberExpression(_)
257
+ | Expression::ComputedMemberExpression(_)
258
+ | Expression::PrivateFieldExpression(_) => {
259
+ let member = expression.to_member_expression();
260
+ let key = ast::member_str(member).context("unsupported computed property")?;
261
+ match member.object() {
220
262
  object if is_options(object) => options.get(key).cloned(),
221
- Expr::Ident(_) => globals.get(key).cloned(),
263
+ Expression::Identifier(_) => globals.get(key).cloned(),
222
264
  object => match evaluate(object)? {
223
265
  Some(JsValue::Object(object)) => object.get(key).cloned(),
224
266
  None | Some(JsValue::Undefined) => bail!("reads {key} of undefined"),
@@ -226,25 +268,28 @@ pub(crate) fn evaluate(
226
268
  },
227
269
  }
228
270
  }
229
- Expr::Call(call) => {
271
+ Expression::CallExpression(call) => {
230
272
  let member = call
231
273
  .callee
232
- .as_expr()
233
- .and_then(|callee| callee.as_member())
274
+ .as_member_expression()
234
275
  .context("unsupported call")?;
235
- if ast::is_method_of(member, "JSON", "stringify") {
236
- let [argument] = &call.args[..] else {
276
+ if script.is_method_of(member, "JSON", "stringify") {
277
+ let [argument] = &call.arguments[..] else {
237
278
  bail!("unsupported JSON.stringify arguments");
238
279
  };
239
- ensure!(argument.spread.is_none(), "unsupported spread argument");
280
+ let argument = argument
281
+ .as_expression()
282
+ .context("unsupported spread argument")?;
240
283
  // `JSON.stringify(undefined)` is itself `undefined`.
241
- evaluate(&argument.expr)?
284
+ evaluate(argument)?
242
285
  .and_then(|value| value.stringify())
243
286
  .map(JsValue::String)
244
- } else if matches!(&*member.obj, Expr::Ident(_)) && call.args.is_empty() {
287
+ } else if matches!(member.object(), Expression::Identifier(_))
288
+ && call.arguments.is_empty()
289
+ {
245
290
  // Use the getter's collected value instead of running the call.
246
291
  globals
247
- .get(ast::member_str(&member.prop).context("unsupported computed getter")?)
292
+ .get(ast::member_str(member).context("unsupported computed getter")?)
248
293
  .cloned()
249
294
  } else {
250
295
  bail!("unsupported call")
@@ -256,9 +301,8 @@ pub(crate) fn evaluate(
256
301
 
257
302
  /// Whether an expression is the `_cf_chl_opt` object itself, rather than one of its properties.
258
303
  #[must_use]
259
- pub(crate) fn is_options(expression: &Expr) -> bool {
260
- matches!(
261
- expression,
262
- Expr::Member(member) if ast::member_str(&member.prop) == Some("_cf_chl_opt")
263
- )
304
+ pub(crate) fn is_options(expression: &Expression<'_>) -> bool {
305
+ expression
306
+ .as_member_expression()
307
+ .is_some_and(|member| ast::member_str(member) == Some("_cf_chl_opt"))
264
308
  }
@@ -3,12 +3,12 @@
3
3
 
4
4
  use std::rc::Rc;
5
5
 
6
- use swc_core::ecma::ast::BinaryOp;
6
+ use oxc::syntax::operator::BinaryOperator;
7
7
 
8
8
  use super::{Held, Installed};
9
+ use crate::challenge;
9
10
  use crate::js::{JsValue, json};
10
11
  use crate::listing::fold::{Frame, Known};
11
- use crate::stage2::vocabulary;
12
12
  use crate::vm::{Effect, Listing, Term};
13
13
 
14
14
  pub(super) fn read(listing: &Listing, installed: &mut Installed) {
@@ -24,7 +24,7 @@ pub(super) fn read(listing: &Listing, installed: &mut Installed) {
24
24
  && let Some(text) = known.text()
25
25
  && let Some(function) = text.strip_prefix("function ")
26
26
  && let Some((name, _)) = function.split_once('(')
27
- && vocabulary::is_hex_name(name)
27
+ && challenge::is_hex_name(name)
28
28
  {
29
29
  installed.audit.insert(name.into(), "N".into());
30
30
  installed
@@ -44,17 +44,18 @@ pub(super) fn read(listing: &Listing, installed: &mut Installed) {
44
44
  && *index >= 0.0
45
45
  && index.fract() == 0.0
46
46
  {
47
- let native = if let Some(Known::Ext(Held::NativeFunction(name))) = &value {
48
- Some(format!("function {name}() {{ [native code] }}"))
49
- } else {
50
- None
47
+ let native = match &value {
48
+ Some(Known::Ext(Held::NativeFunction(name))) => {
49
+ Some(format!("function {name}() {{ [native code] }}"))
50
+ }
51
+ _ => None,
51
52
  };
52
53
  array.borrow_mut().insert(*index as usize, native);
53
54
  }
54
55
  if !matches!(object, Known::Ext(Held::Window)) {
55
56
  return;
56
57
  }
57
- let Some(name) = key.text().filter(|name| vocabulary::is_hex_name(name)) else {
58
+ let Some(name) = key.text().filter(|name| challenge::is_hex_name(name)) else {
58
59
  return;
59
60
  };
60
61
  let (role, audit) = match value {
@@ -115,12 +116,12 @@ fn evaluate(frame: &Frame<Held>, value: &Term) -> Option<Known<Held>> {
115
116
  return Some(Known::Literal(json!(text)));
116
117
  }
117
118
  }
118
- Term::Binary(BinaryOp::Sub, _, right)
119
+ Term::Binary(BinaryOperator::Subtraction, _, right)
119
120
  if matches!(frame.resolve(right), Some(Known::Ext(Held::Clock))) =>
120
121
  {
121
122
  return Some(Known::Ext(Held::ClockDelta));
122
123
  }
123
- Term::Binary(BinaryOp::Add, left, right) => {
124
+ Term::Binary(BinaryOperator::Addition, left, right) => {
124
125
  if let (Some(left), Some(right)) = (string(left), string(right)) {
125
126
  return Some(Known::Literal(json!(format!("{left}{right}"))));
126
127
  }
@@ -10,7 +10,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
10
10
  use std::rc::Rc;
11
11
 
12
12
  use anyhow::Result;
13
- use swc_core::ecma::ast::BinaryOp;
13
+ use oxc::syntax::operator::BinaryOperator;
14
14
 
15
15
  use crate::js::{JsObject, JsValue, Options, Window, json};
16
16
  use crate::listing::fold::{Frame, Known};
@@ -147,10 +147,10 @@ fn evaluate(frame: &Frame<Held>, value: &Term) -> Option<Known<Held>> {
147
147
  };
148
148
  Known::Ext(Held::Built(frame.resolve(argument)?.text()?.to_owned()))
149
149
  }
150
- Term::Binary(BinaryOp::Add, left, right) => {
150
+ Term::Binary(BinaryOperator::Addition, left, right) => {
151
151
  Known::Literal(json!(number(frame, left)? + number(frame, right)?))
152
152
  }
153
- Term::Binary(BinaryOp::Mul, left, right) => {
153
+ Term::Binary(BinaryOperator::Multiplication, left, right) => {
154
154
  Known::Literal(json!(number(frame, left)? * number(frame, right)?))
155
155
  }
156
156
  value => frame.resolve(value)?,
@@ -289,12 +289,19 @@ mod tests {
289
289
  set(3, method("charCodeAt", vec![number(1.0)]));
290
290
  set(
291
291
  4,
292
- Term::Binary(BinaryOp::Mul, Box::new(number(256.0)), register(2)),
292
+ Term::Binary(
293
+ BinaryOperator::Multiplication,
294
+ Box::new(number(256.0)),
295
+ register(2),
296
+ ),
293
297
  );
294
- set(4, Term::Binary(BinaryOp::Add, register(4), register(3)));
295
298
  set(
296
299
  4,
297
- Term::Binary(BinaryOp::Add, register(4), Box::new(number(2.0))),
300
+ Term::Binary(BinaryOperator::Addition, register(4), register(3)),
301
+ );
302
+ set(
303
+ 4,
304
+ Term::Binary(BinaryOperator::Addition, register(4), Box::new(number(2.0))),
298
305
  );
299
306
  set(5, method("slice", vec![number(2.0), Term::Reg(4)]));
300
307
  assert_eq!(frame.register(5).and_then(Known::text), Some("abc"));