port: Disable Javascript Whitelist on captcha iframe. ccd0#3292

from 2a8bf2a
TuxedoTako · Mar 5, 2023 · 60127be · 60127be
1 parent 9a1bc45
commit 60127be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ The 4chan XT project is a migration of 4chan X from coffeescript to TypeScript/J
   - [x] 86071184aa39b3585f06c1a4e2921c411ad8cf10 archived.moe adds /pw/ search, tokyochronos has hosting issues
   - [x] 8a6392b1cf721ddfae6d8f4e3ec2566f15755370 add Eientei
   - [x] 451a06f54b878ce433b0775858affefc71927fc7 alice.al domain change
-- [ ] 2a8bf2adb0737ce7bb1e21f6b959e4c6e1de1bc7 Disable Javascript Whitelist on captcha iframe. #3292
+- [x] 2a8bf2adb0737ce7bb1e21f6b959e4c6e1de1bc7 Disable Javascript Whitelist on captcha iframe. #3292
 - [ ] e9c1529da7844a42a1b40458c2c77b77e23ca537 Make QR post more like original form post. #3330
 - [ ] d16062a8fac5c092c34310c7704ac3980494b6ef Merge remote-tracking branch '4chenz/master'
   - [ ] 8795b1c56dbdfb52a32ddb3ea80b549f0048dc7b Add Google Lens image search url

diff --git a/src/main/Main.js b/src/main/Main.js
@@ -207,6 +207,7 @@ const Main = {
     if (
       /\.4chan(?:nel)?\.org$/.test(location.hostname) &&
       !SW.yotsuba.regexp.pass.test(location.href) &&
+      !SW.yotsuba.regexp.captcha.test(location.href) &&
       !$$('script:not([src])').filter(s => /this\[/.test(s.textContent)).length
     ) {
       ($.getSync || $.get)({ 'jsWhitelist': Conf['jsWhitelist'] }, ({ jsWhitelist }) => $.addCSP(`script-src ${jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim()}`));

diff --git a/src/site/SW.yotsuba.tsx b/src/site/SW.yotsuba.tsx
@@ -139,7 +139,9 @@ $\
     quotelinkHTML:
       /<a [^>]*\bhref="(?:(?:\/\/boards\.4chan(?:nel)?\.org)?\/([^\/]+)\/thread\/)?(\d+)?(?:#p(\d+))?"/g,
     pass:
-      /^https?:\/\/www\.4chan(?:nel)?\.org\/+pass(?:$|[?#])/
+      /^https?:\/\/www\.4chan(?:nel)?\.org\/+pass(?:$|[?#])/,
+    captcha:
+      /^https?:\/\/sys\.4chan(?:nel)?\.org\/+captcha(?:$|[?#])/,
   },
 
   bgColoredEl() {