From 0301cc566f87ce1132364cf59e8fb65715431edc Mon Sep 17 00:00:00 2001
From: khawarahemad <ahemadkhawar123@gmail.com>
Date: Wed, 26 Aug 2026 00:11:01 +0530
Subject: [PATCH] fix(security): replace global TLS bypass with scoped
 certificate-error handler

---
 src/AppCore/index.ts | 28 +++++++++++++++++++++++++---
 src/overrides.d.ts   | 15 ++++++---------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/AppCore/index.ts b/src/AppCore/index.ts
index 3e3678a..6934615 100644
--- a/src/AppCore/index.ts
+++ b/src/AppCore/index.ts
@@ -21,6 +21,7 @@ import contextMenu from "electron-context-menu";
 import { scope } from "electron-log";
 import { autoUpdater } from "electron-updater";
 import EventEmitter from "events";
+import fs from "fs";
 import path from "path";
 
 import server from "./APIServer";
@@ -169,7 +170,6 @@ export class DiscordBotClient extends EventEmitter {
         const disabledFeatures = new Set(app.commandLine.getSwitchValue("disable-features").split(","));
         // Allow Localhost SSL
         app.commandLine.appendSwitch("allow-insecure-localhost", "true");
-        app.commandLine.appendSwitch("ignore-certificate-errors");
         app.commandLine.appendSwitch("host-rules", `MAP ${Constants.CustomDiscordDomain} 127.0.0.1:${this.port}`);
         // Vesktop
         // Disable renderer backgrounding to prevent the app from unloading when in the background
@@ -242,6 +242,20 @@ export class DiscordBotClient extends EventEmitter {
             ]);
             app.whenReady().then(async () => {
                 this.logger.info("Creating session...");
+                app.on("certificate-error", (event, webContents, url, error, certificate, callback) => {
+                    try {
+                        const { hostname } = new URL(url);
+                        if (
+                            hostname === Constants.CustomDiscordDomain ||
+                            hostname === "localhost" ||
+                            hostname === "127.0.0.1"
+                        ) {
+                            event.preventDefault();
+                            return callback(true);
+                        }
+                    } catch {}
+                    callback(false);
+                });
                 this.customSession = session.fromPartition("persist:elysia_dbc");
                 // Enable DoH (Cloudflare)
                 app.configureHostResolver({
@@ -333,8 +347,16 @@ export class DiscordBotClient extends EventEmitter {
             },
         );
         // Load Vencord-Web Extension
-        const extension = await this.session.extensions.loadExtension(Constants.VencordExtensionPath);
-        this.logger.info(`Loaded Vencord Extension v${extension.version} from ${Constants.VencordExtensionPath}`);
+        if (fs.existsSync(Constants.VencordExtensionPath)) {
+            try {
+                const extension = await this.session.extensions.loadExtension(Constants.VencordExtensionPath);
+                this.logger.info(`Loaded Vencord Extension v${extension.version} from ${Constants.VencordExtensionPath}`);
+            } catch (err) {
+                this.logger.error("Failed to load Vencord extension:", err);
+            }
+        } else {
+            this.logger.warn(`Vencord extension not found at ${Constants.VencordExtensionPath}, running without extension.`);
+        }
     }
     async createWindow () {
         this.setupTray();
diff --git a/src/overrides.d.ts b/src/overrides.d.ts
index 8dd4d5a..ac5ee83 100644
--- a/src/overrides.d.ts
+++ b/src/overrides.d.ts
@@ -1,19 +1,16 @@
-/* Copyright Elysia © 2025. All rights reserved */
-
 import "express";
 
 import type { IncomingHttpHeaders } from "http";
 
 import type { DiscordBotClient } from "./AppCore";
 
-declare module "express-serve-static-core" {
-    interface Request {
-        originalHeaders: IncomingHttpHeaders;
-        rawBody?: string;
-    }
-}
-
 declare global {
+    namespace Express {
+        interface Request {
+            originalHeaders: IncomingHttpHeaders;
+            rawBody?: string;
+        }
+    }
     interface BigInt {
         toJSON(): string;
     }