mirror of
https://github.com/smartfrigde/armcord.git
synced 2024-08-14 23:56:58 +00:00
Fix csp (Vencord QuickCss & dynamic imports) (#260)
This commit is contained in:
parent
bea251634c
commit
c5ce910940
1 changed files with 14 additions and 37 deletions
|
@ -1,52 +1,29 @@
|
|||
//https://github.com/GooseMod/GooseMod/wiki/Stuck-Updater-or-Blank-Window-Fix
|
||||
/*
|
||||
Copyright 2022 GooseMod
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
import electron from "electron";
|
||||
import {getConfig} from "../utils";
|
||||
const otherMods = {
|
||||
generic: {
|
||||
electronProxy: require("util").types.isProxy(electron) // Many modern mods overwrite electron with a proxy with a custom BrowserWindow (copied from PowerCord)
|
||||
}
|
||||
};
|
||||
|
||||
const unstrictCSP = () => {
|
||||
const unstrictCSP = async () => {
|
||||
console.log("Setting up CSP unstricter...");
|
||||
|
||||
const cspAllowAll = ["connect-src", "style-src", "img-src", "font-src"];
|
||||
const cspAllowAll = ["style-src", "connect-src", "img-src", "font-src", "media-src"];
|
||||
|
||||
const corsAllowUrls = [
|
||||
"https://raw.githubusercontent.com/Cordwood/builds/master/index.js",
|
||||
"https://github.com/Vendicated/Vencord/releases/download/devbuild/browser.js",
|
||||
"https://cors.armcord.xyz/raw.githubusercontent.com/uwu/shelter-builds/main/shelter.js"
|
||||
];
|
||||
|
||||
electron.session.defaultSession.webRequest.onHeadersReceived(({responseHeaders, url}, done) => {
|
||||
const isVencord = await getConfig("mods").then((s) => s.includes("vencord"));
|
||||
electron.session.defaultSession.webRequest.onHeadersReceived(({responseHeaders}, done) => {
|
||||
let csp = responseHeaders!["content-security-policy"];
|
||||
|
||||
if (otherMods.generic.electronProxy) {
|
||||
// Since patch v16, override other mod's onHeadersRecieved (Electron only allows 1 listener); because they rely on 0 CSP at all (GM just unrestricts some areas), remove it fully if we detect other mods
|
||||
delete responseHeaders!["content-security-policy"];
|
||||
csp = [];
|
||||
}
|
||||
|
||||
if (csp) {
|
||||
for (let p of cspAllowAll) {
|
||||
csp[0] = csp[0].replace(`${p}`, `${p} * blob: data:`); // * does not include data: URIs
|
||||
for (const directive of cspAllowAll) {
|
||||
csp[0] = csp[0].replace(new RegExp(`${directive}.+?;`), `${directive} * blob: data: 'unsafe-inline';`);
|
||||
}
|
||||
|
||||
if (isVencord) {
|
||||
// unpkg and cdnjs are used for QuickCss and some plugins' dependencies (e.g. GifEncoder & APNG for FakeNitro)
|
||||
csp[0] = csp[0].replace(
|
||||
/script-src.+?(?=;)/,
|
||||
"$& 'unsafe-eval' https://unpkg.com https://cdnjs.cloudflare.com"
|
||||
);
|
||||
}
|
||||
// Fix Discord's broken CSP which disallows unsafe-inline due to having a nonce (which they don't even use?)
|
||||
csp[0] = csp[0].replace(/'nonce-.*?' /, "");
|
||||
}
|
||||
|
||||
if (corsAllowUrls.some((x) => url.startsWith(x))) {
|
||||
responseHeaders!["access-control-allow-origin"] = ["*"];
|
||||
csp[0] = csp[0].replace(/'nonce-.+?' /, "");
|
||||
}
|
||||
|
||||
done({responseHeaders});
|
||||
|
|
Loading…
Reference in a new issue