cfsolve 0.1.2 → 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.
Files changed (368) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/THIRD_PARTY_LICENSES/README.md +71 -254
  4. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  5. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  6. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  7. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  8. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  9. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  11. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  12. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  13. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  14. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  15. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  16. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  17. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  18. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  19. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  21. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  22. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  24. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  30. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  32. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  34. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  36. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  38. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  40. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  42. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  43. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  45. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  47. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  49. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  51. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  53. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  55. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  56. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  57. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  58. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  59. data/UPSTREAM.md +7 -5
  60. data/ext/cfsolve/Cargo.lock +534 -1727
  61. data/ext/cfsolve/Cargo.toml +4 -0
  62. data/ext/cfsolve/src/main.rs +1 -1
  63. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  64. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  65. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  66. data/lib/cfsolve/version.rb +2 -2
  67. data/vendor/cfsolve/Cargo.lock +561 -1729
  68. data/vendor/cfsolve/Cargo.toml +26 -8
  69. data/vendor/cfsolve/README.md +4 -0
  70. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  71. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  72. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  73. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  74. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  75. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  76. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  77. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  78. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  79. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  80. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  81. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  82. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  83. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  84. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  85. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  86. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  87. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  88. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  89. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  90. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  91. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  92. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  93. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  94. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  95. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  96. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  97. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  98. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  99. data/vendor/cfsolve/src/challenge.rs +1 -0
  100. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  101. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  102. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  103. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  104. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  105. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  106. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  107. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  108. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  109. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  110. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  111. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  112. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  113. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  114. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  115. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  116. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  117. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  118. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  119. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  120. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  121. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  122. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  123. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  124. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  125. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  126. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  127. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  128. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  129. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  130. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  131. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  132. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  133. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  134. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  135. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  136. data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -18
  137. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  138. data/vendor/cfsolve/src/error.rs +40 -5
  139. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  140. data/vendor/cfsolve/src/http/client.rs +7 -10
  141. data/vendor/cfsolve/src/http/requests.rs +2 -2
  142. data/vendor/cfsolve/src/js/ast.rs +479 -263
  143. data/vendor/cfsolve/src/lib.rs +1 -0
  144. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  145. data/vendor/cfsolve/src/listing/query.rs +1 -47
  146. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  147. data/vendor/cfsolve/src/profiling.rs +49 -0
  148. data/vendor/cfsolve/src/script.rs +35 -24
  149. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  150. data/vendor/cfsolve/src/session/channel.rs +2 -2
  151. data/vendor/cfsolve/src/session/initial.rs +5 -5
  152. data/vendor/cfsolve/src/session/sink.rs +26 -1
  153. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  154. data/vendor/cfsolve/src/session.rs +1 -1
  155. data/vendor/cfsolve/src/solver.rs +3 -1
  156. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  157. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  158. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  159. data/vendor/cfsolve/src/stage2/benchmark.rs +62 -31
  160. data/vendor/cfsolve/src/stage2/call_stack.rs +1415 -1025
  161. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  162. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  163. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  164. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  165. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  166. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  167. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  168. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  169. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  170. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  171. data/vendor/cfsolve/src/stage2/vocabulary.rs +1 -11
  172. data/vendor/cfsolve/src/stage2.rs +2 -0
  173. data/vendor/cfsolve/src/vm/disassemble.rs +7 -3
  174. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  175. data/vendor/cfsolve/src/vm/extract.rs +347 -250
  176. data/vendor/cfsolve/src/vm/interpret/access.rs +63 -48
  177. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  178. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  179. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  180. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  181. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  182. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  183. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  184. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  185. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  186. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +123 -59
  187. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  188. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  189. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
  190. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  191. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
  192. data/vendor/cfsolve/src/vm/interpret/run.rs +116 -45
  193. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  194. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  195. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  196. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  197. data/vendor/cfsolve/src/vm/machine.rs +56 -49
  198. data/vendor/cfsolve/src/vm/output.rs +13 -5
  199. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  200. data/vendor/cfsolve/src/vm/session.rs +185 -120
  201. data/vendor/cfsolve/src/vm/value.rs +22 -19
  202. data/vendor/cfsolve/src/vm.rs +2 -1
  203. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  204. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  205. metadata +94 -178
  206. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  207. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  208. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  209. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  210. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  211. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  212. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  213. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  214. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  215. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  216. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  217. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  218. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  219. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  220. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  221. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  222. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  223. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  224. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  225. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  226. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  227. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  228. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  229. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  230. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  231. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  232. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  233. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  234. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  235. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  237. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  238. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  239. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  240. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  241. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  242. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  243. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  244. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  245. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  246. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  247. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  248. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  249. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  250. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  251. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  252. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  253. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  255. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  256. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  257. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  258. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  259. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  260. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  261. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  262. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  263. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  264. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  265. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  266. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  268. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  269. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  270. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  271. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  272. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  273. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  274. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  277. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  278. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  279. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  280. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  281. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  282. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  283. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  284. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  286. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  288. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  289. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  290. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  291. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  292. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  293. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  294. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  295. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  296. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  297. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  298. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  299. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  300. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  301. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  302. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  303. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  305. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  329. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  330. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  331. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  332. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  333. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  334. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  335. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  336. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  337. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  338. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  339. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  340. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  341. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  342. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  343. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  344. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  345. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  346. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  347. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  348. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  349. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  350. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  351. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  352. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  353. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  354. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  355. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  356. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  357. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  358. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  359. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  360. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  361. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  362. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  363. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  364. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  365. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  366. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  367. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  368. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -9,45 +9,64 @@
9
9
  //! identifier. Both forms access the same property. A computed `__proto__` key stays computed: it
10
10
  //! defines a property, while a named key sets the prototype.
11
11
 
12
- use swc_core::ecma::ast::{IdentName, MemberExpr, MemberProp, Program, Prop, PropName};
13
- use swc_core::ecma::visit::{VisitMut, VisitMutWith};
12
+ use oxc::allocator::TakeIn;
13
+ use oxc::ast::ast::{IdentifierName, MemberExpression, ObjectProperty, Program, PropertyKey};
14
+ use oxc::ast_visit::{VisitMut, walk_mut};
15
+ use oxc::span::GetSpan;
16
+ use oxc::str::Ident;
17
+ use oxc::syntax::identifier::is_identifier_name;
14
18
 
15
19
  use super::analysis::Analysis;
16
- use crate::js::ast;
20
+ use super::ast;
17
21
 
18
- pub(super) fn run(program: &mut Program, _: &mut Analysis) -> bool {
19
- let mut members = NameStaticMembers { changed: false };
20
- program.visit_mut_with(&mut members);
22
+ pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
23
+ let mut members = StaticMembers {
24
+ analysis,
25
+ changed: false,
26
+ };
27
+ members.visit_program(program);
21
28
  members.changed
22
29
  }
23
30
 
24
- struct NameStaticMembers {
31
+ struct StaticMembers<'b, 'a> {
32
+ analysis: &'b Analysis<'a>,
25
33
  changed: bool,
26
34
  }
27
35
 
28
- impl VisitMut for NameStaticMembers {
29
- fn visit_mut_member_expr(&mut self, member: &mut MemberExpr) {
30
- member.visit_mut_children_with(self);
31
-
32
- if let MemberProp::Computed(property) = &member.prop
33
- && let Some(property_name) = ast::static_str(&property.expr)
34
- && swc_ecma_utils::is_valid_ident(property_name)
36
+ impl<'a> VisitMut<'a> for StaticMembers<'_, 'a> {
37
+ fn visit_member_expression(&mut self, member: &mut MemberExpression<'a>) {
38
+ walk_mut::walk_member_expression(self, member);
39
+ if let MemberExpression::ComputedMemberExpression(computed) = member
40
+ && let Some(name) = ast::static_str(&computed.expression)
41
+ && is_identifier_name(name)
35
42
  {
36
- member.prop = MemberProp::Ident(IdentName::new(property_name.into(), property.span));
43
+ let builder = &self.analysis.ast;
44
+ let name = Ident::from_str_in(name, builder);
45
+ let property = IdentifierName::new(computed.expression.span(), name, builder);
46
+ let object = computed.object.take_in(builder);
47
+ *member = MemberExpression::new_static_member_expression(
48
+ computed.span,
49
+ object,
50
+ property,
51
+ computed.optional,
52
+ builder,
53
+ );
37
54
  self.changed = true;
38
55
  }
39
56
  }
40
57
 
41
- fn visit_mut_prop(&mut self, property: &mut Prop) {
42
- property.visit_mut_children_with(self);
43
-
44
- if let Prop::KeyValue(property) = property
45
- && let PropName::Computed(key) = &property.key
46
- && let Some(name) = ast::static_str(&key.expr)
47
- && swc_ecma_utils::is_valid_ident(name)
48
- && name != "__proto__"
58
+ fn visit_object_property(&mut self, property: &mut ObjectProperty<'a>) {
59
+ walk_mut::walk_object_property(self, property);
60
+ if let Some(name) = ast::key(&property.key, property.computed)
61
+ && is_identifier_name(name)
62
+ && !matches!(property.key, PropertyKey::StaticIdentifier(_))
63
+ && !(name == "__proto__" && property.computed)
49
64
  {
50
- property.key = PropName::Ident(IdentName::new(name.into(), key.span));
65
+ let builder = &self.analysis.ast;
66
+ let name = Ident::from_str_in(name, builder);
67
+ let key = IdentifierName::boxed(property.key.span(), name, builder);
68
+ property.key = PropertyKey::StaticIdentifier(key);
69
+ property.computed = false;
51
70
  self.changed = true;
52
71
  }
53
72
  }
@@ -60,14 +79,10 @@ mod tests {
60
79
  #[test]
61
80
  fn uses_cooked_static_template_properties() {
62
81
  let output =
63
- testing::transform(r#"obj[`lo\u0067`](); obj?.[`name`]; obj[`a-b`]; obj[`${key}`];"#);
82
+ testing::transform(r#"obj[`log`](); obj?.[`name`]; obj[`a-b`]; obj[`${key}`];"#);
64
83
  let expected = ["obj.log()", "obj?.name", "obj[`a-b`]", "obj[`${key}`]"];
65
- testing::assert_contains(&output, &expected, &[]);
84
+ testing::assert_contains(&output, &expected);
66
85
  let output = testing::transform(r#"f({ ["add"]: 1, [`a-b`]: 2, ["__proto__"]: 3 });"#);
67
- testing::assert_contains(
68
- &output,
69
- &[],
70
- &["add: 1", "[`a-b`]: 2", r#"["__proto__"]: 3"#],
71
- );
86
+ testing::assert_contains(&output, &["add: 1", "[`a-b`]: 2", r#"["__proto__"]: 3"#]);
72
87
  }
73
88
  }
@@ -1,78 +1,68 @@
1
1
  //! Helpers for testing deobfuscation passes on source text.
2
2
 
3
- use swc_core::ecma::ast::{Id, Ident, Pass, Program, fn_pass};
4
- use swc_core::ecma::visit::{Visit, VisitWith};
5
- use swc_ecma_transforms::fixer;
3
+ use oxc::allocator::{Allocator, CloneIn};
4
+ use oxc::ast::ast::Program;
5
+ use oxc::span::ContentEq;
6
6
 
7
- use super::analysis::Analysis;
7
+ use super::analysis::{Analysis, Id};
8
+ use super::pipeline::{self, Rewrite};
8
9
 
9
- /// The whole deobfuscation pass, as the library applies it.
10
- pub(crate) fn transform(source: &str) -> String {
10
+ pub(super) fn transform(source: &str) -> String {
11
11
  super::deobfuscate(source.to_owned())
12
12
  .expect("test deobfuscation should succeed")
13
13
  .text
14
14
  }
15
15
 
16
- /// Checks that `output` contains each `expected` string verbatim and each `code` string
17
- /// ignoring whitespace, so printer layout does not affect the check.
18
- pub(crate) fn assert_contains(output: &str, expected: &[&str], code: &[&str]) {
16
+ /// Runs one rewrite and checks that it reports truthfully whether it changed the program.
17
+ pub(super) fn rewrite(source: &str, rewrite: Rewrite) -> String {
18
+ let allocator = Allocator::default();
19
+ let (mut program, mut analysis) =
20
+ pipeline::parse(&allocator, source).expect("test script should parse");
21
+ let before = program.clone_in_with_semantic_ids(&allocator);
22
+ let changed = rewrite(&mut program, &mut analysis);
23
+ assert_eq!(
24
+ changed,
25
+ !program.content_eq(&before),
26
+ "rewrite misreported whether it changed the program"
27
+ );
28
+ pipeline::print(&program)
29
+ }
30
+
31
+ /// Checks that `output` contains each expected snippet, ignoring whitespace and quote style.
32
+ pub(super) fn assert_contains(output: &str, expected: &[&str]) {
33
+ let compact = |text: &str| {
34
+ text.split_whitespace()
35
+ .collect::<String>()
36
+ .replace('\'', "\"")
37
+ };
19
38
  for expected in expected {
20
- assert!(output.contains(expected), "{expected}: {output}");
21
- }
22
- let strip = |text: &str| -> String { text.split_whitespace().collect() };
23
- for code in code {
24
- assert!(strip(output).contains(&strip(code)), "{code}: {output}");
39
+ assert!(
40
+ compact(output).contains(&compact(expected)),
41
+ "{expected}: {output}"
42
+ );
25
43
  }
26
44
  }
27
45
 
28
- pub(crate) fn assert_lacks(output: &str, absent: &[&str]) {
46
+ pub(super) fn assert_lacks(output: &str, absent: &[&str]) {
29
47
  for absent in absent {
30
- assert!(!output.contains(absent), "{absent}: {output}");
48
+ assert!(!output.contains(absent), "{absent}: {output}")
31
49
  }
32
50
  }
33
51
 
34
- /// One rewrite in isolation, followed by the fixer when `fix` is set.
35
- pub(super) fn rewrite(
52
+ /// Parses `source` and runs `check` with a lookup of local bindings by name.
53
+ pub(super) fn check(
36
54
  source: &str,
37
- rewrite: fn(&mut Program, &mut Analysis) -> bool,
38
- fix: bool,
39
- ) -> String {
40
- super::pipeline::transform(source.to_owned(), |_, unresolved_mark| {
41
- fn_pass(move |program: &mut Program| {
42
- rewrite(program, &mut Analysis::new(unresolved_mark));
43
- if fix {
44
- fixer::fixer(None).process(program);
45
- }
46
- })
47
- })
48
- .expect("test transformation should succeed")
49
- }
50
-
51
- /// Every identifier of a program, in visiting order.
52
- struct Names(Vec<Id>);
53
-
54
- impl Visit for Names {
55
- fn visit_ident(&mut self, identifier: &Ident) {
56
- self.0.push(identifier.to_id());
57
- }
58
- }
59
-
60
- /// Resolves names in `source` and runs `check` with a lookup from each spelling to the binding
61
- /// of its first identifier.
62
- pub(crate) fn check(source: &str, mut check: impl FnMut(&Program, &dyn Fn(&str) -> Id)) {
63
- let checked = super::pipeline::transform(source.to_owned(), |_, _| {
64
- fn_pass(|program: &mut Program| {
65
- let mut names = Names(vec![]);
66
- program.visit_with(&mut names);
67
- check(program, &|name: &str| {
68
- names
69
- .0
70
- .iter()
71
- .find(|(spelling, _)| *spelling == name)
72
- .unwrap_or_else(|| panic!("{name} not found"))
73
- .clone()
74
- });
75
- })
76
- });
77
- checked.expect("test transformation should succeed");
55
+ check: impl FnOnce(&Program<'_>, &Analysis<'_>, &dyn Fn(&str) -> Id),
56
+ ) {
57
+ let allocator = Allocator::default();
58
+ let (program, analysis) =
59
+ pipeline::parse(&allocator, source).expect("test script should parse");
60
+ let id = |name: &str| {
61
+ let mut symbols = analysis.scoping.symbol_ids();
62
+ let symbol = symbols
63
+ .find(|&symbol| analysis.scoping.symbol_name(symbol) == name)
64
+ .unwrap_or_else(|| panic!("{name} not found"));
65
+ Id::Local(symbol)
66
+ };
67
+ check(&program, &analysis, &id);
78
68
  }
@@ -12,138 +12,128 @@
12
12
  //! Leaves globals, whose writes other scripts can observe, and parameters of functions using
13
13
  //! `arguments`, whose writes `arguments` reflects.
14
14
 
15
- use swc_core::common::util::take::Take;
16
- use swc_core::ecma::ast::{Decl, Expr, Id, Lit, Program, SeqExpr, Stmt, VarDeclarator};
17
- use swc_core::ecma::visit::{VisitMut, VisitMutWith};
15
+ use oxc::allocator::{CloneIn, GetAllocator, Vec};
16
+ use oxc::ast::ast::{Expression, Program, SequenceExpression, Statement, VariableDeclarator};
17
+ use oxc::ast_visit::{VisitMut, walk_mut};
18
+ use oxc_ecmascript::side_effects::MayHaveSideEffects;
18
19
 
19
- use super::analysis::{Analysis, Bindings, Globals};
20
- use super::{HashMap, removal};
21
- use crate::js::ast;
20
+ use super::analysis::{Analysis, Id};
21
+ use super::{HashMap, ast};
22
22
 
23
- pub(super) fn run(program: &mut Program, analysis: &mut Analysis) -> bool {
24
- let globals = analysis.globals;
25
- let mut remove = RemoveUnused {
26
- bindings: analysis.bindings(program),
27
- globals,
23
+ pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
24
+ let mut remove = Remove {
25
+ analysis,
28
26
  removed: HashMap::default(),
29
27
  changed: false,
30
28
  };
31
- program.visit_mut_with(&mut remove);
29
+ remove.visit_program(program);
32
30
  remove.changed
33
31
  }
34
32
 
35
- struct RemoveUnused<'bindings> {
36
- bindings: &'bindings Bindings,
37
- globals: Globals,
38
- /// How many writes of each binding this pass has removed. Statement lists are visited
39
- /// after the lists they contain, so a declaration sees the definitions removed below it.
33
+ struct Remove<'b, 'a> {
34
+ analysis: &'b Analysis<'a>,
40
35
  removed: HashMap<Id, usize>,
41
36
  changed: bool,
42
37
  }
43
38
 
44
- impl RemoveUnused<'_> {
45
- fn is_unused(&self, id: &Id) -> bool {
46
- id.1 != self.globals.unresolved
47
- && self.bindings.references(id) == 0
48
- && !self.bindings.is_mapped_parameter(id)
39
+ impl<'a> Remove<'_, 'a> {
40
+ fn is_unused(&self, id: Id) -> bool {
41
+ !id.is_global()
42
+ && self.analysis.bindings.references(&id) == 0
43
+ && !self.analysis.bindings.is_mapped_parameter(&id)
49
44
  }
50
45
 
51
- /// Recognizes an assignment of an effect-free value to an unused binding. Records the
52
- /// removed write.
53
- fn remove_definition(&mut self, expression: &Expr) -> bool {
54
- match ast::assignment(expression) {
55
- Some((id, value)) if self.is_unused(&id) && self.is_pure(value) => {
56
- *self.removed.entry(id).or_default() += 1;
57
- true
58
- }
59
- _ => false,
60
- }
46
+ fn is_pure(&self, expression: &Expression<'a>) -> bool {
47
+ !matches!(expression, Expression::ObjectExpression(_))
48
+ && !expression.may_have_side_effects(self.analysis)
61
49
  }
62
50
 
63
- /// Whether evaluating `value` has no effects and cannot throw. Reading a global can throw
64
- /// or run a getter; reading a local cannot.
65
- fn is_pure(&self, value: &Expr) -> bool {
66
- match value {
67
- Expr::Fn(_) | Expr::Arrow(_) | Expr::Lit(_) => true,
68
- Expr::Ident(identifier) => identifier.ctxt != self.globals.unresolved,
69
- Expr::Tpl(template) => template.exprs.is_empty(),
70
- Expr::Paren(paren) => self.is_pure(&paren.expr),
71
- Expr::Array(array) => array
72
- .elems
73
- .iter()
74
- .flatten()
75
- .all(|element| element.spread.is_none() && self.is_pure(&element.expr)),
76
- _ => false,
51
+ /// Checks for a removable definition of an unused binding, and counts it as removed.
52
+ fn remove_definition(&mut self, expression: &Expression<'a>) -> bool {
53
+ let Some((id, value)) = self.analysis.assignment(expression) else {
54
+ return false;
55
+ };
56
+ let removable = self.is_unused(id) && self.is_pure(value);
57
+ if removable {
58
+ *self.removed.entry(id).or_default() += 1;
77
59
  }
60
+ removable
78
61
  }
79
62
 
80
- /// Matches an unused binding declaration, with or without an initializer, only when no
81
- /// remaining write needs the binding. Initializers must have no effects. Removing a
82
- /// declaration while keeping a write could turn that write into a global assignment.
83
- fn is_declaration(&self, declarator: &VarDeclarator) -> bool {
84
- let Some(name) = declarator.name.as_ident() else {
63
+ fn is_dead_statement(&mut self, statement: &Statement<'a>) -> bool {
64
+ let Statement::ExpressionStatement(statement) = statement else {
65
+ return false;
66
+ };
67
+ let expression = &statement.expression;
68
+ self.remove_definition(expression)
69
+ || (!matches!(expression, Expression::StringLiteral(_)) && self.is_pure(expression))
70
+ }
71
+
72
+ /// Checks that every write to an unused declared binding has been removed except its
73
+ /// initializer, which must be pure.
74
+ fn is_dead_declarator(&self, declarator: &VariableDeclarator<'a>) -> bool {
75
+ let Some(id) = ast::pattern_id(&declarator.id) else {
85
76
  return false;
86
77
  };
87
- let id = name.to_id();
88
78
  let removed = self.removed.get(&id).copied().unwrap_or(0);
89
- self.is_unused(&id)
90
- && self.bindings.write_count(&id) - removed == usize::from(declarator.init.is_some())
91
- && declarator
92
- .init
93
- .as_deref()
94
- .is_none_or(|value| self.is_pure(value))
79
+ let writes = self
80
+ .analysis
81
+ .bindings
82
+ .write_count(&id)
83
+ .saturating_sub(removed);
84
+ let init = declarator.init.as_ref();
85
+ self.is_unused(id)
86
+ && writes == usize::from(init.is_some())
87
+ && init.is_none_or(|value| self.is_pure(value))
95
88
  }
96
89
  }
97
90
 
98
- impl VisitMut for RemoveUnused<'_> {
99
- fn visit_mut_seq_expr(&mut self, sequence: &mut SeqExpr) {
100
- sequence.visit_mut_children_with(self);
101
- // The last operand supplies the sequence's value.
102
- if let Some(last) = sequence.exprs.pop() {
103
- self.changed |= removal::retain(&mut sequence.exprs, |operand| {
104
- !self.remove_definition(operand)
105
- });
106
- sequence.exprs.push(last);
91
+ impl<'a> VisitMut<'a> for Remove<'_, 'a> {
92
+ fn visit_sequence_expression(&mut self, sequence: &mut SequenceExpression<'a>) {
93
+ walk_mut::walk_sequence_expression(self, sequence);
94
+ if let Some(last) = sequence.expressions.pop() {
95
+ let before = sequence.expressions.len();
96
+ sequence
97
+ .expressions
98
+ .retain(|expression| !self.remove_definition(expression));
99
+ self.changed |= sequence.expressions.len() != before;
100
+ sequence.expressions.push(last)
107
101
  }
108
102
  }
109
103
 
110
- fn visit_mut_expr(&mut self, expression: &mut Expr) {
111
- expression.visit_mut_children_with(self);
112
- if let Expr::Seq(sequence) = expression
113
- && sequence.exprs.len() == 1
114
- {
115
- *expression = *sequence.exprs.remove(0);
116
- }
117
- // Dropping `unused` preserves the value of `other = value`.
118
- if let Some((id, value)) = ast::assignment(expression)
119
- && value.is_assign()
120
- && self.is_unused(&id)
104
+ fn visit_expression(&mut self, expression: &mut Expression<'a>) {
105
+ walk_mut::walk_expression(self, expression);
106
+ let allocator = self.analysis.allocator();
107
+ if let Some((id, value)) = self.analysis.assignment(expression)
108
+ && matches!(value, Expression::AssignmentExpression(_))
109
+ && self.is_unused(id)
121
110
  {
122
111
  *self.removed.entry(id).or_default() += 1;
123
- *expression = *expression.take().expect_assign().right;
112
+ *expression = value.clone_in_with_semantic_ids(allocator);
113
+ self.changed = true
114
+ } else if let Expression::SequenceExpression(sequence) = expression
115
+ && let [only] = sequence.expressions.as_slice()
116
+ {
117
+ *expression = only.clone_in_with_semantic_ids(allocator);
124
118
  self.changed = true;
125
119
  }
126
120
  }
127
121
 
128
- fn visit_mut_stmts(&mut self, statements: &mut Vec<Stmt>) {
129
- statements.visit_mut_children_with(self);
130
- // Remove unused definitions and statements with no side effects, including decoy arrays of
131
- // helpers. Keep strings that may be directives.
132
- self.changed |= removal::remove_expr_stmts(statements, |expression| {
133
- self.remove_definition(expression)
134
- || (!matches!(expression, Expr::Lit(Lit::Str(_))) && self.is_pure(expression))
135
- });
136
- for statement in statements.iter_mut() {
137
- if let Stmt::Decl(Decl::Var(declaration)) = statement {
138
- self.changed |= removal::retain(&mut declaration.decls, |declarator| {
139
- !self.is_declaration(declarator)
140
- });
141
- }
142
- }
143
- removal::retain(statements, |statement| match statement {
144
- Stmt::Decl(Decl::Var(declaration)) => !declaration.decls.is_empty(),
145
- _ => true,
122
+ fn visit_statements(&mut self, statements: &mut Vec<'a, Statement<'a>>) {
123
+ walk_mut::walk_statements(self, statements);
124
+ let before = statements.len();
125
+ statements.retain(|statement| !self.is_dead_statement(statement));
126
+ statements.retain_mut(|statement| {
127
+ let Statement::VariableDeclaration(declaration) = statement else {
128
+ return true;
129
+ };
130
+ let declarations = &mut declaration.declarations;
131
+ let count = declarations.len();
132
+ declarations.retain(|declarator| !self.is_dead_declarator(declarator));
133
+ self.changed |= declarations.len() != count;
134
+ !declarations.is_empty()
146
135
  });
136
+ self.changed |= statements.len() != before;
147
137
  }
148
138
  }
149
139
 
@@ -153,23 +143,23 @@ mod tests {
153
143
 
154
144
  #[test]
155
145
  fn removes_unread_locals_but_keeps_globals_effects_and_mapped_parameters() {
156
- let transform = |source: &str| testing::rewrite(source, super::run, /* fix= */ true);
146
+ let transform = |source: &str| testing::rewrite(source, super::run);
157
147
  // Removing `all` leaves `add` unread, for the pipeline's next round.
158
148
  let output = transform(&transform(
159
149
  "function f(a, b) { var unused, add, all, kept = g(); \
160
150
  add = function(x) { var scratch; return x; }; all = [add, a]; return a + b; }",
161
151
  ));
162
152
  let expected = "function f(a, b) { var kept = g(); return a + b; }";
163
- testing::assert_contains(&output, &[], &[expected]);
153
+ testing::assert_contains(&output, &[expected]);
164
154
  let output = transform(
165
155
  "global = function() {}; function f(a) { var v, w; v = g(); w = [missing]; \
166
156
  return arguments; } function h(p) { p = 1; return arguments; }",
167
157
  );
168
158
  let kept = ["global = function", "var v", "v = g()", "w = [", "p = 1"];
169
- testing::assert_contains(&output, &kept, &[]);
159
+ testing::assert_contains(&output, &kept);
170
160
  let output = transform("function f(a) { 'use strict'; [a, function() {}]; a; g(a); }");
171
- testing::assert_contains(&output, &["'use strict';"], &["{ 'use strict'; g(a); }"]);
161
+ testing::assert_contains(&output, &["'use strict';", "{ 'use strict'; g(a); }"]);
172
162
  let output = transform("function f() { var c, o; c = o = g(); h(c = o = 1); return o; }");
173
- testing::assert_contains(&output, &["var o;", "o = g();", "h(o = 1);"], &[]);
163
+ testing::assert_contains(&output, &["var o;", "o = g();", "h(o = 1);"]);
174
164
  }
175
165
  }
@@ -1,18 +1,16 @@
1
- //! Deobfuscates Cloudflare challenge scripts in repeated rewrite rounds.
1
+ //! Deobfuscates challenge scripts in repeated rewrite rounds using Oxc.
2
2
  //!
3
- //! Rewrites make further rewrites possible: decoding names allows helper inlining, which
4
- //! reveals control flow and more calls. Each round runs the [`pipeline`] steps in order. A step
5
- //! is skipped if it already left the current program unchanged. Rounds stop when all steps have
6
- //! processed the current program or a whole round makes no net change. The final hygiene pass
7
- //! resolves naming conflicts. Each rewrite module describes its transformation.
8
-
9
- /// Fast hashing for the rewrites' identifier and node maps; no rewrite depends on their order.
10
- type HashMap<K, V> = rustc_hash::FxHashMap<K, V>;
11
- type HashSet<T> = rustc_hash::FxHashSet<T>;
3
+ //! Rewrites make further rewrites possible: decoding names allows helper inlining, which reveals
4
+ //! control flow and more calls. Each round runs the [`pipeline`] steps in order, skipping a step
5
+ //! that already left the current program unchanged. Rounds stop when the passes settle, a whole
6
+ //! round makes no net change, or the round limit is reached. Final hygiene resolves naming
7
+ //! conflicts introduced by moving references. Each rewrite module describes its transformation,
8
+ //! the patterns it accepts, and the conditions that keep it safe.
12
9
 
13
10
  mod analysis;
14
11
  mod argument_arrays;
15
12
  mod arrow_blocks;
13
+ mod ast;
16
14
  mod bitwise;
17
15
  mod blocks;
18
16
  mod call_helpers;
@@ -24,6 +22,7 @@ mod dispatch;
24
22
  mod encoded_strings;
25
23
  mod function_lengths;
26
24
  mod helper_objects;
25
+ mod hygiene;
27
26
  mod int32_helpers;
28
27
  mod literals;
29
28
  mod loops;
@@ -32,6 +31,7 @@ mod merged_functions;
32
31
  mod pipeline;
33
32
  mod register_arrays;
34
33
  mod removal;
34
+ mod simplify;
35
35
  mod state_machines;
36
36
  mod statements;
37
37
  mod static_members;
@@ -41,4 +41,8 @@ mod unused_bindings;
41
41
 
42
42
  pub(crate) use encoded_strings::{Encoded, encode as encode_string, inline_strings};
43
43
  pub use pipeline::{Deobfuscated, Unconverged, deobfuscate};
44
- pub(crate) use pipeline::{deobfuscate_with, read_decoded};
44
+ pub(crate) use pipeline::{decode, deobfuscate_capturing};
45
+
46
+ /// Fast hashing for identifier and node maps; no rewrite depends on their iteration order.
47
+ type HashMap<K, V> = rustc_hash::FxHashMap<K, V>;
48
+ type HashSet<T> = rustc_hash::FxHashSet<T>;
@@ -2,16 +2,17 @@
2
2
  //! configuration, elapsed times, loader resource timing, and the page summary.
3
3
 
4
4
  use anyhow::{Context, Result};
5
+ use oxc::ast::ast::{CallExpression, Expression, ObjectPropertyKind};
6
+ use oxc::ast_visit::{Visit, walk};
5
7
  use serde::{Deserialize, Serialize};
6
- use swc_core::ecma::ast::{CallExpr, Expr, KeyValueProp};
7
- use swc_core::ecma::visit::{Visit, VisitWith};
8
8
  use url::Url;
9
9
 
10
10
  use crate::challenge::reduced_timing::{Entry, ResourceTiming};
11
11
  use crate::embedding_page::page::{Layout, PageSignals, RenderedPage};
12
12
  use crate::embedding_page::render_sample::RenderSample;
13
13
  use crate::engine::Engine;
14
- use crate::js::{JsValue, ast, json};
14
+ use crate::js::ast::{self, ParsedScript};
15
+ use crate::js::{JsValue, json};
15
16
  use crate::resource_timing::{NEXT_HOP_PROTOCOL, Phases, ResourceMeasurement};
16
17
  use crate::{candidates, random_id};
17
18
 
@@ -95,16 +96,17 @@ impl ApiScript {
95
96
  timeline: &Timeline,
96
97
  engine: Engine,
97
98
  ) -> Result<Self> {
98
- let parsed = ast::parse_javascript("the Turnstile loader", source)?;
99
+ let parsed = ParsedScript::parse("the Turnstile loader", source)?;
100
+ let script = parsed.script();
99
101
  let mut literals = Literals::default();
100
- parsed.script.visit_with(&mut literals);
102
+ literals.visit_program(script.program);
101
103
  let build = candidates::at_most_one_distinct(literals.builds, "build hash")?
102
104
  .context("loader script has no api.js build hash; is this really api.js?")?;
103
105
  let variant =
104
106
  candidates::at_most_one_distinct(literals.routes, "challenge-platform route")?
105
107
  .context("loader script names no challenge-platform route")?;
106
108
  let render_sample =
107
- RenderSample::from_parsed(&parsed, stack_url(&url, &response, engine), engine)?;
109
+ RenderSample::from_script(script, stack_url(&url, &response, engine), engine)?;
108
110
  Ok(Self {
109
111
  url,
110
112
  build,
@@ -214,11 +216,12 @@ struct Literals {
214
216
  routes: Vec<String>,
215
217
  }
216
218
 
217
- impl Visit for Literals {
219
+ impl<'a> Visit<'a> for Literals {
218
220
  /// `ch: "e694063b5082"`: the twelve-digit hexadecimal build hash, which the iframe compares
219
221
  /// with its compiled-in build.
220
- fn visit_key_value_prop(&mut self, property: &KeyValueProp) {
221
- if ast::key_str(&property.key) == Some("ch")
222
+ fn visit_object_property_kind(&mut self, property: &ObjectPropertyKind<'a>) {
223
+ if let Some(property) = ast::key_value(property)
224
+ && ast::key_str(&property.key, property.computed) == Some("ch")
222
225
  && let Some(value) = ast::static_str(&property.value)
223
226
  && value.len() == 12
224
227
  && value
@@ -227,23 +230,25 @@ impl Visit for Literals {
227
230
  {
228
231
  self.builds.push(value.to_owned());
229
232
  }
230
- property.visit_children_with(self);
233
+ walk::walk_object_property_kind(self, property);
231
234
  }
232
235
 
233
236
  /// `f(..., "b", Reason.New, ...)`: the one-letter route beside the render reason when the
234
237
  /// loader builds a widget's first iframe URL.
235
- fn visit_call_expr(&mut self, call: &CallExpr) {
236
- for pair in call.args.windows(2) {
237
- if let Expr::Member(reason) = &*pair[1].expr
238
- && ast::member_str(&reason.prop) == Some("New")
239
- && let Some(route) = ast::static_str(&pair[0].expr)
238
+ fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
239
+ for pair in call.arguments.windows(2) {
240
+ if let Some(reason) = pair[1]
241
+ .as_expression()
242
+ .and_then(Expression::as_member_expression)
243
+ && ast::member_str(reason) == Some("New")
244
+ && let Some(route) = pair[0].as_expression().and_then(ast::static_str)
240
245
  && route.len() == 1
241
246
  && route.bytes().all(|byte| byte.is_ascii_lowercase())
242
247
  {
243
248
  self.routes.push(route.to_owned());
244
249
  }
245
250
  }
246
- call.visit_children_with(self);
251
+ walk::walk_call_expression(self, call);
247
252
  }
248
253
  }
249
254
 
@@ -439,8 +444,8 @@ mod tests {
439
444
  fn finds_build_hashes_and_routes_only_where_the_loader_keeps_them() {
440
445
  let literals = |source: &str| {
441
446
  let mut literals = Literals::default();
442
- let parsed = ast::parse_javascript("t", source).unwrap();
443
- parsed.script.visit_with(&mut literals);
447
+ let parsed = ParsedScript::parse("t", source).unwrap();
448
+ literals.visit_program(parsed.script().program);
444
449
  literals
445
450
  };
446
451
  let hash = "e694063b5082";