fix: 🥚 merge conflicts

README.md

@@ -128,23 +128,25 @@ const attackHandlers = {
 
 ### FAQs ❓
 
-> 1. What operating system does MMB support?
+**1. What operating system does MMB support?**
 
-**Re:** **Windows**, **Linux**, **Mac** and **Android (untested)**
+> **Windows**, **Linux**, **Mac** and **Android (untested)**
 
-> 2. It crashes on startup, giving a "concurrently" error.
+**2. It crashes on startup, giving a "concurrently" error**
 
-**Re:** Try running two terminals instead of one, in the first one use "npm run dev:client", and in the other one "npm run dev:server". (This happened to several people with Windows 11)
+> Try running two terminals instead of one, in the first one use "npm run dev:client", and in the other one "npm run dev:server". (This happened to several people with Windows 11)
 
-> 3. I go to "http://localhost:3000" and nothing appears.
+**3. I go to "http://localhost:3000" and nothing appears.**
 
-**Re:** Port `3000` is the server port, to see the UI you must use port `5173` (http://localhost:5173)
+> Port `3000` is the server port, to see the UI you must use port `5173` (http://localhost:5173)
 
-> 4. Requests fail to be sent to the target server (Read timeout and variations)
+**4. Requests fail to be sent to the target server (Read timeout and variations)**
-**Re:** You must put the corresponding proxies in the file `data/proxies.txt`. On each line, put a different proxy that will be used to perform the attack. The format must be the following:
+
-- `protocol://host:port`
+> You must put the corresponding proxies in the file `data/proxies.txt`. On each line, put a different proxy that will be used to perform the attack. The format must be the following:
-- `host:port` (Uses http as default protocol)
+> - `protocol://user:password@host:port` (Proxy with authentication)
-- `host` (Uses 8080 as default port)
+> - `protocol://host:port`
+> - `host:port` (Uses http as default protocol)
+> - `host` (Uses 8080 as default port)
 
 ---
 

server/fileLoader.ts

@@ -28,9 +28,23 @@ export function loadUserAgents() {
 
 export function loadProxies(): Proxy[] {
   const lines = loadFileLines(join(currentPath(), "data/proxies.txt"));
+
+  //RegEx for proxies with authentication (protocol://user:pass@host:port)
+  const authProxiesRegEx = new RegExp(/^(http|https|socks4|socks5|):\/\/(\S+:\S+)@((\w+|\d+\.\d+\.\d+\.\d+):\d+)$/, 'g');
+
   return lines.map((line) => {
-    const [protocol, addr] = line.split("://");
+    const [protocol, loginInfo] = line.split("://");
-    const [host, port] = addr.split(":");
+
-    return { protocol, host, port: parseInt(port) };
+    if (authProxiesRegEx.test(line)) {
+      const [auth, addr] = loginInfo.split("@");
+      const [user, pass] = auth.split(":");
+      const [host, port] = addr.split(":");
+
+      return { protocol, host, port: parseInt(port), username: user, password: pass };
+    } else {
+      const [host, port] = loginInfo.split(":");
+
+      return { protocol, host, port: parseInt(port) };
+    }
   });
 }

server/lib.ts

@@ -1,6 +1,8 @@
 export type ProxyProtocol = "http" | "https" | "socks4" | "socks5" | string;
 
 export interface Proxy {
+  username?: string;
+  password?: string;
   protocol: ProxyProtocol;
   host: string;
   port: number;

server/utils/mcUtils.js

@@ -87,10 +87,10 @@ class MinecraftBufferReader {
 
 export function pingMinecraftServer(host, port, proxy) {
   return new Promise((resolve, reject) => {
-    const { protocol, host: proxyHost, port: proxyPort } = proxy;
+    const { protocol, host: proxyHost, port: proxyPort, username: proxyUsername, password: proxyPassword } = proxy;
 
     const agent = new SocksProxyAgent(
-      `${protocol}://${proxyHost}:${proxyPort}`
+      `${protocol}://${proxyUsername && proxyPassword ? `${proxyUsername}:${proxyPassword}@` : ""}${proxyHost}:${proxyPort}`
     );
 
     const socket = net.createConnection({

server/workers/httpFloodAttack.js

@@ -27,9 +27,16 @@ const startAttack = () => {
           host: proxy.host,
           port: proxy.port,
         };
+
+        if (proxy.username && proxy.password) {
+          config.proxy.auth = {
+            username: proxy.username,
+            password: proxy.password,
+          }
+        }
       } else if (proxy.protocol === "socks4" || proxy.protocol === "socks5") {
-        config.httpAgent = new SocksProxyAgent(
+        config.httpAgent, config.httpsAgent = new SocksProxyAgent(
-          `${proxy.protocol}://${proxy.host}:${proxy.port}`
+          `${proxy.protocol}://${proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : ""}${proxy.host}:${proxy.port}`
         );
       }
 

server/workers/httpSlowlorisAttack.js

@@ -31,7 +31,7 @@ const startAttack = () => {
         Host: targetHost,
       },
       agent: new SocksProxyAgent(
-        `${proxy.protocol}://${proxy.host}:${proxy.port}`
+        `${proxy.protocol}://${proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : ""}${proxy.host}:${proxy.port}`
       ),
     };
 

server/workers/tcpFloodAttack.js

@@ -20,7 +20,7 @@ const startAttack = () => {
     socket.setTimeout(2000);
 
     const proxyAgent = new SocksProxyAgent(
-      `${proxy.protocol}://${proxy.host}:${proxy.port}`
+      `${proxy.protocol}://${proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : ""}${proxy.host}:${proxy.port}`
     );
 
     setInterval(() => {

src/App.tsx

@@ -69,7 +69,7 @@ function ConfigureProxiesAndAgentsView() {
             onChange={(e) =>
               setConfiguration([e.target.value, configuration[1]])
             }
-            placeholder="socks5://0.0.0.0"
+            placeholder="socks5://0.0.0.0
socks4://user:pass@0.0.0.0:12345"
           ></textarea>
           <p className="pl-1 mt-2 mb-1 italic">uas.txt</p>
           <textarea

src/index.css

@@ -156,7 +156,7 @@ input[type=range].volume_bar:focus::-ms-fill-upper {
   background: linear-gradient(to bottom right, rgba(236, 72, 153, 1), rgba(59, 130, 246, 1));
 }
 /*TODO: Use one of the selectors from https://stackoverflow.com/a/20541859/7077589 and figure out
-how to remove the virtical space around the range input in IE*/
+how to remove the vertical space around the range input in IE*/
 @supports (-ms-ime-align:auto) {
   /* Pre-Chromium Edge only styles, selector taken from hhttps://stackoverflow.com/a/32202953/7077589 */
   input[type=range].volume_bar {

vite.config.ts

@@ -11,4 +11,7 @@ export default defineConfig({
   build: {
     outDir: path.resolve(__dirname, "dist/public"),
   },
+  server: {
+    strictPort: true,
+  },
 });