From 38d8fe264738757e6dbff5ec46a35aff4216b6cd Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 14 Dec 2022 20:18:13 +0200 Subject: [PATCH] Revert "try to serve turnstile script" This reverts commit fc18ce9c8ea13ff98f6ec84e9e9ae00070d6ecb5. --- files/assets/js/vendor/turnstile.js | 1 - files/templates/login/sign_up.html | 2 +- nginx-headers.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 files/assets/js/vendor/turnstile.js diff --git a/files/assets/js/vendor/turnstile.js b/files/assets/js/vendor/turnstile.js deleted file mode 100644 index a2b473b21..000000000 --- a/files/assets/js/vendor/turnstile.js +++ /dev/null @@ -1 +0,0 @@ -(()=>{function I(e,l){return e.indexOf(l)!==-1}function M(e){return I(["auto","dark","light"],e)}function S(e){return I(["auto","never"],e)}function N(e){return e>0&&e<9e5}var te=/^[0-9A-Za-z_-]{3,100}$/;function Y(e){return te.test(e)}var re=/^[a-z0-9_-]{0,32}$/i;function X(e){return re.test(e)}var ne=/^[a-z0-9_-]{0,255}$/i;function J(e){return ne.test(e)}function P(e){return I(["normal","compact","invisible"],e)}function O(e){return I(["auto","manual","never"],e)}var ie=".cf-turnstile",ae=".cf-challenge",oe=".g-recaptcha",se="cf_challenge_response",le="cf-turnstile-response",de="g-recaptcha-response",ce=8e3,_=!1;function d(e){console.error(`[Cloudflare Turnstile] ${e}.`)}function g(e){console.warn(`[Cloudflare Turnstile] ${e}.`)}function ue(e){d(`Failed with code: ${e}`)}function W(e){Z(e,"")}function D(){let e=[ie,ae];_&&e.push(oe);let l=document.querySelectorAll(e.join(", "));for(let a=0;a 0 and < 900000"`);return}let y=(B=t["refresh-expired"])!=null?B:"auto";if(O(y))t["refresh-expired"]=y;else{d(`Invalid type for parameter "refressh-expired", expected never|manual|auto, got "${y}" ${typeof y}`);return}let F=o.getElementsByTagName("iframe")[0];F&&F.id.startsWith(x)&&E(o);let h=document.createElement("iframe");if(n!==void 0&&typeof n!="string"){d(`Invalid type for parameter "action", expected "string", got "${typeof n}"`);return}if(n=n===void 0?null:n,!X(n)){d(`Invalid input for parameter "action", got "${n}"`);return}if(c!==void 0&&typeof c!="string"){d(`Invalid type for parameter "cData", expected "string", got "${typeof c}"`);return}if(!J(c)){d(`Invalid input for parameter "cData", got "${c}"`);return}c=c===void 0?null:c;let Q="https://challenges.cloudflare.com",L=a(),w=C(L);e.set(L,{action:n,cData:c,cbSuccess:v,cbError:R,cbExpired:b,cbTimeout:k,params:t,isResetting:!1}),h.style.display="none",h.style.border="none",h.style.overflow="hidden";let ee="h/b/";if(h.setAttribute("src",`${Q}/cdn-cgi/challenge-platform/${ee}turnstile/if/ov2/av0/${L}/${f}/${t.theme}/${t.size}`),h.id=w,h.tabIndex=(G=t.tabindex)!=null?G:0,h.title="Widget containing a Cloudflare security challenge",o.appendChild(h),(q=t["response-field"])!=null?q:!0){let m=document.createElement("input");if(m.type="hidden",m.name=(j=t["response-field-name"])!=null?j:le,m.id=`${w}_response`,o.appendChild(m),typeof t["response-field-name"]!="string"&&fe(f)){let $=document.createElement("input");$.type="hidden",$.name=se,$.id=`${w}_legacy_response`,o.appendChild($)}}if(_){let m=document.createElement("input");m.type="hidden",m.name=de,m.id=`${w}_g_response`,o.appendChild(m)}return w},reset:p,remove:E,getResponse(i){let r=u(i);if(!r){d(`Could not find widget for getResponse(${i})`);return}return e.get(r).response}}}();function me(e){var y;let a={sitekey:e.getAttribute("data-sitekey")},u=e.getAttribute("data-tabindex");u&&(a.tabindex=parseInt(u,10));let p=e.getAttribute("data-theme");p&&(M(p)?a.theme=p:g(`Unknown data-theme value: "${p}"`));let E=e.getAttribute("data-size");E&&(P(E)?a.size=E:g(`Unknown data-size value: "${E}"`));let i=e.getAttribute("data-base-url");typeof i=="string"&&(a["base-url"]=i);let r=e.getAttribute("data-action");typeof r=="string"&&(a.action=r);let o=e.getAttribute("data-cdata");typeof o=="string"&&(a.cData=o);let s=e.getAttribute("data-retry");s&&(S(s)?a.retry=s:g(`Unknown data-retry value: "${s}"`));let t=+e.getAttribute("data-retry-interval");t&&(N(t)?a["retry-interval"]=t:g(`Invalid data-retry-interval value: "${t}, expected an integer value > 0 and < 900000"`));let n=e.getAttribute("data-refresh-expired");n&&(O(n)?a["refresh-expired"]=n:g(`Unknown data-refresh-expired value: "${n}, expected either: never, auto or manual.`));let c=e.getAttribute("data-error-callback");c&&window[c]&&(a["error-callback"]=window[c]);let f=e.getAttribute("data-callback");f&&window[f]&&(a.callback=window[f]);let v=e.getAttribute("data-expired-callback");v&&window[v]&&(a["expired-callback"]=window[v]);let b=e.getAttribute("data-timeout-callback");b&&window[b]&&(a["timeout-callback"]=window[b]);let k=(y=e.getAttribute("data-response-field"))!=null?y:"true";a["response-field"]=k==="true";let R=e.getAttribute("data-response-field-name");return R&&(a["response-field-name"]=R),a}function he(){let e=/\/turnstile\/v0(\/.*)?\/api\.js/,l=document.currentScript;if(e.test(l.src))return l;let a=document.getElementsByTagName("script");for(let u=0;u1?new URLSearchParams(a[1]):new URLSearchParams}var A=Ee();if(A){let e=A.get("compat");(e==null?void 0:e.toLowerCase())==="recaptcha"?window.grecaptcha?g("grecaptcha is already defined. The compatibility layer will not be enabled"):(g("Compatibility layer enabled"),_=!0,window.grecaptcha=T):e!==null&&g(`Unknown value for api.js?compat: "${e}", ignoring`),A.forEach(function(a,u){I(["onload","compat","render"],u)||g(`Unknown parameter passed to api.js: "?${u}=...", ignoring`)});let l=A.get("onload");l&&setTimeout(function(){typeof window[l]=="function"&&window[l]()},0)}var ye="turnstile"in window;ye?g("Turnstile already has been loaded. Is Turnstile imported multiple times?"):("Proxy"in window?window.cfChallengeAPI=new Proxy(T,{get(e,l){return g("window.cfChallengeAPI is deprecated, please move to window.turnstile"),e[l]}}):window.cfChallengeAPI=T,window.turnstile=T,A.get("render")!=="explicit"&&(document.readyState==="complete"||document.readyState==="interactive"?setTimeout(D,0):window.addEventListener("DOMContentLoaded",D)));})(); diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html index 40b39b690..6de6df162 100644 --- a/files/templates/login/sign_up.html +++ b/files/templates/login/sign_up.html @@ -118,6 +118,6 @@ {% block scripts %} {% if turnstile != DEFAULT_CONFIG_VALUE %} - + {% endif %} {% endblock %} diff --git a/nginx-headers.conf b/nginx-headers.conf index b62068212..d69a5f5ce 100644 --- a/nginx-headers.conf +++ b/nginx-headers.conf @@ -2,4 +2,4 @@ add_header Referrer-Policy "same-origin"; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"; add_header X-Frame-Options "deny"; add_header X-Content-Type-Options "nosniff"; -add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' rdrama.net; connect-src 'self' tls-use1.fpapi.io api.fpjs.io; object-src 'none';"; +add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' challenges.cloudflare.com rdrama.net; connect-src 'self' tls-use1.fpapi.io api.fpjs.io; object-src 'none';";