Merge branch 'main' into codex/rename-variable-chector-to-checktor

Author: vizzdoom

README.md

@@ -3,4 +3,4 @@
 ## Project website: https://vizzdoom.github.io/sqlmap-command-builder/
 
 Interactive command line generator for conducting advanced SQLMap pentests.
-This project works locally with pure HTML/JS/CSS (no data exchanged to any server).
+This project works locally with pure HTML/JS/CSS (no data exchanged to any server).

app.js

@@ -291,12 +291,12 @@ class SQLMapGenerator {
         if (tor) config['--tor'] = tor;        
 
         const checkTor = document.getElementById('checkTor').checked;
-        if (checkTor) config['--check-tor'] = checkTor;  
+        if (checkTor) config['--check-tor'] = checkTor;
 
         const torPort = document.getElementById('torPort').value.trim();
         if (torPort) config['--tor-port'] = torPort;        
 
-        const torType = document.getElementById('torType').value.trim();;
+        const torType = document.getElementById('torType').value.trim();
         if (torType && torType !== "SOCKS5") config['--tor-type'] = torType;        
 
         // Request options
@@ -574,12 +574,12 @@ class SQLMapGenerator {
         const copyBtn = document.getElementById('copyBtn');
         const copyText = document.getElementById('copyText');
         const txt_command_copy_clipboard = 'COPY COMMAND TO CLIPBOARD';
-        const txt_command_copy_coppied = 'COMMAND COPIED!';
+        const txt_command_copy_copied = 'COMMAND COPIED!';
 
         try {
             await navigator.clipboard.writeText(command);
             copyBtn.classList.add('copying');
-            copyText.textContent = txt_command_copy_coppied;
+            copyText.textContent = txt_command_copy_copied;
 
             setTimeout(() => {
                 copyBtn.classList.remove('copying');
@@ -594,7 +594,7 @@ class SQLMapGenerator {
             document.execCommand('copy');
             document.body.removeChild(textArea);
 
-            copyText.textContent = txt_command_copy_coppied;
+            copyText.textContent = txt_command_copy_copied;
             setTimeout(() => {
                 copyText.textContent = txt_command_copy_clipboard;
             }, 3000);
@@ -607,12 +607,12 @@ class SQLMapGenerator {
         const copyUrlBtn = document.getElementById('copyUrlBtn');
         const copyUrlText = document.getElementById('copyUrlText');
         const txt_command_url_clipboard = 'COPY CONFIG URL';
-        const txt_command_url_coppied = 'URL COPIED!';
+        const txt_command_url_copied = 'URL COPIED!';
 
         try {
             await navigator.clipboard.writeText(command);
             copyUrlBtn.classList.add('copying');
-            copyUrlText.textContent = txt_command_url_coppied;
+            copyUrlText.textContent = txt_command_url_copied;
 
             setTimeout(() => {
                 copyUrlBtn.classList.remove('copying');
@@ -629,7 +629,7 @@ class SQLMapGenerator {
             document.execCommand('copy');
             document.body.removeChild(textArea);
 
-            copyUrlText.textContent = txt_command_url_coppied;
+            copyUrlText.textContent = txt_command_url_copied;
             setTimeout(() => {
                 copyUrlText.textContent = txt_command_url_clipboard;
             }, 3000);
@@ -653,11 +653,10 @@ class SQLMapGenerator {
                 'url': 'url',
                 'data': 'data',
                 'requestFile': 'requestFile',
-                'requestFileScope': 'requestFileScope',
                 'burpFile': 'burpFile',
                 'level': 'level',
                 'risk': 'risk',
-                'randomAgent': 'randomAgent',
+                'randomAgent': 'userAgent',
                 'batch': 'batch',
                 'dbs': 'dbs'
             };
@@ -767,7 +766,7 @@ class SQLMapGenerator {
                 '--host': 'host',
                 '-A': 'userAgent',
                 '--mobile': 'mobileUserAgent',
-                '--random-agent': 'randomAgent',
+                '--random-agent': 'userAgent',
                 '--referer': 'referer',
                 '-H': 'headers',
                 '--cookie': 'cookie',

build.py

@@ -1,22 +1,19 @@
-# build.py
-html = open('index.html').read()
-css = open('style.css').read()
-js = open('app.js').read()
+def read_text(path):
+    with open(path) as file:
+        return file.read()
 
-# Zakładam, że index.html ma <head>...</head> i </body>
-# Dodaj CSS do <head>
-html = html.replace('<link rel="stylesheet" href="style.css">', '');
 
-html = html.replace(
-    '</head>',
-    f'<style>\n{css}\n</style>\n</head>'
-)
-# Dodaj JS na końcu przed </body>
-html = html.replace('<script src="app.js"></script>','');
-html = html.replace(
-    '</body>',
-    f'<script>\n{js}\n</script>\n</body>'
-)
+def inline_assets(html, css, js):
+    page = html.replace('<link rel="stylesheet" href="style.css">', '')
+    page = page.replace('</head>', f'<style>\n{css}\n</style>\n</head>')
+    page = page.replace('<script src="app.js"></script>', '')
+    return page.replace('</body>', f'<script>\n{js}\n</script>\n</body>')
 
-with open('index.html', 'w') as f:
-    f.write(html)
+
+if __name__ == "__main__":
+    html = read_text('index.html')
+    css = read_text('style.css')
+    js = read_text('app.js')
+
+    with open('index.html', 'w') as output:
+        output.write(inline_assets(html, css, js))

index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="pl">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -183,7 +183,7 @@ <h3>Proxy Options</h3>
                             </div>
                             <!-- --proxy-cred -->
                             <div class="form-group" title="Use a proxy to connect to the target URL">
-                                <label class="form-label" for="proxyCred">HTTP(S) PROXY CREDENTIALS<br/><span>--proxy-creed</span></label>
+                                <label class="form-label" for="proxyCred">HTTP(S) PROXY CREDENTIALS<br/><span>--proxy-cred</span></label>
                                 <input type="text" id="proxyCred" class="form-control" placeholder="username:password">
                             </div>
                             <!-- --proxy-file -->