updated mytools webpage

alecmaly · Sep 5, 2021 · 1a35f8b · 1a35f8b
1 parent 014180d
commit 1a35f8b
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 #### Clone buffer overflow to current directory
 ```
-git clone https://[email protected]/alecjmaly/hacking-myTools.git && mv hacking-myTools/buffer_overflow/* . && rm -rf hacking-myTools
+git clone https://[email protected]/alecjmaly/hacking-myTools.git && mv hacking-myTools/exploit_development/buffer_overflow/* . && rm -rf hacking-myTools
 ```
 
 #### Install depedency packages

diff --git a/buffer_overflow/1_fuzzer.py → ...t_development/buffer_overflow/1_fuzzer.py b/buffer_overflow/1_fuzzer.py → ...t_development/buffer_overflow/1_fuzzer.py
diff --git a/buffer_overflow/2_pattern.py → ..._development/buffer_overflow/2_pattern.py b/buffer_overflow/2_pattern.py → ..._development/buffer_overflow/2_pattern.py
diff --git a/buffer_overflow/3_badchars.py → ...development/buffer_overflow/3_badchars.py b/buffer_overflow/3_badchars.py → ...development/buffer_overflow/3_badchars.py
diff --git a/buffer_overflow/4_exploit.py → ..._development/buffer_overflow/4_exploit.py b/buffer_overflow/4_exploit.py → ..._development/buffer_overflow/4_exploit.py
diff --git a/buffer_overflow/README.md → ...oit_development/buffer_overflow/README.md b/buffer_overflow/README.md → ...oit_development/buffer_overflow/README.md
diff --git a/buffer_overflow/boo.py → exploit_development/buffer_overflow/boo.py b/buffer_overflow/boo.py → exploit_development/buffer_overflow/boo.py
diff --git a/buffer_overflow/constants.py → ..._development/buffer_overflow/constants.py b/buffer_overflow/constants.py → ..._development/buffer_overflow/constants.py
diff --git a/exploit_development/python3_offline-install_windows.ps1 b/exploit_development/python3_offline-install_windows.ps1
@@ -0,0 +1,30 @@
+# WINDOWS
+
+# [online] create
+## virtual environment 
+python -m venv ./venv
+.\venv\Scripts\activate.bat
+
+# install from requirements (pip install -r requirements.txt)
+pip install pyperclip pykd pwntools keystone-engine
+#### INSTALL NEW DEPENDENCIES
+
+### pip freeze and download
+pip freeze > requirements.txt
+powershell remove-item packages -recurse
+pip3 download -r requirements.txt -d packages
+
+## download + zip packages
+copy requirements.txt packages
+powershell Compress-Archive .\packages\*.* packages.zip -force
+
+
+
+
+
+
+
+# [offline] install
+powershell Expand-Archive packages.zip -force
+cd packages
+pip install --no-index --find-links . -r requirements.txt
diff --git a/tools/http/mywebtools.html b/tools/http/mywebtools.html
@@ -32,8 +32,9 @@
     </style>
 
     <body>
-        <p id='output_length'>(\n) Length: 0  |  Hex: 0<br>(\r\n) Length: 0  |  Hex: 0</p>
+        <p id='output_length' style='white-space: pre'>(\n) Length: 0  |  Hex: 0<br>(\r\n) Length: 0  |  Hex: 0</p>
 
+
         <textarea 
             id='text'
             placeholder='Enter text here to calculate length. Newlines \n are converted to \r\n' 
@@ -96,7 +97,7 @@ <h2>Tools</h2>
             // main function
             function update() {
                 let text = document.querySelector('#text').value
-                updateLength(text)
+                updateLength()
 
                 // update encode hrml
                 try {
@@ -176,11 +177,23 @@ <h2>Tools</h2>
 
 
             // subroutines
-            function updateLength(text) {
-                let new_length = text.replaceAll('\n', '\r\n').length;
+            function updateLength() {
+                let text = document.querySelector('#text').value
+                let length_with_return = text.replaceAll('\n', '\r\n').length || 0;
+
+                let selected_text = getSelectionText()
+                let selected_length_with_return = selected_text.replaceAll('\n', '\r\n').length || 0;
+
+
                 document.querySelector('#output_length').innerText = 
-                '(\\n) Length: ' + text.length + '  |  Hex: ' + text.length.toString(16) + '\n' +
-                '(\\r\\n)\t Length: ' + new_length + '  |  Hex: ' + new_length.toString(16) 
+                `(\\n)\t Length: ${text.length}  |  Hex: ${text.length.toString(16)}` + 
+                `\t\t [SELECTED] Length: ${selected_text.length}  |  Hex: ${selected_text.length.toString(16)}` + 
+                `\t\t [UNSELECTED] Length: ${text.length - selected_text.length}  |  Hex: ${(text.length - selected_text.length).toString(16)}` + 
+
+                '\n' +
+                `(\\r\\n) Length: ${length_with_return}  |  Hex: ${length_with_return.toString(16)}` +
+                `\t\t [SELECTED] Length: ${selected_length_with_return}  |  Hex: ${selected_length_with_return.toString(16)}` + 
+                `\t\t [UNSELECTED] Length: ${length_with_return - selected_length_with_return}  |  Hex: ${(length_with_return - selected_length_with_return).toString(16)}`
             }
 
             function updateDecodeHtml(html) {
@@ -272,6 +285,25 @@ <h2>Tools</h2>
             this.style.height = "auto";
             this.style.height = (this.scrollHeight) + "px";
         }
+
+        function getSelectionText() {
+            var text = "";
+            var activeEl = document.activeElement;
+            var activeElTagName = activeEl ? activeEl.tagName.toLowerCase() : null;
+            if (
+                (activeElTagName == "textarea") || (activeElTagName == "input" &&
+                /^(?:text|search|password|tel|url)$/i.test(activeEl.type)) &&
+                (typeof activeEl.selectionStart == "number")
+            ) {
+                text = activeEl.value.slice(activeEl.selectionStart, activeEl.selectionEnd);
+            } else if (window.getSelection) {
+                text = window.getSelection().toString();
+            }
+
+            return text;
+        }
+
+        document.onmouseup = document.onkeyup = document.onselectionchange = updateLength
         </script>
     </body>
 

diff --git a/tools/http/xss.py b/tools/http/xss.py
@@ -34,7 +34,7 @@
 
 delimiter = '-'
 orig_string = r'''sdfsdf-'-&#x27;-"-&quot;-`-<-&lt;->-&gt;-&-&amp;-(-)-\-+-*-{-}-;-$-${1+1}-{{1+1}}-<><sCrIPt>-&lt;&gt;&lt;sCrIPt&gt;-sdfsdf'''
-end_string = r'''sdfsdf-'-'-"-"-`-&lt;-&lt;-&gt;-&gt;-&amp;-&amp;-(-)-\-+-*-{-}-;-$-${1+1}-{{1+1}}-&lt;&gt;<script>-&lt;&gt;&lt;sCrIPt&gt;-sdfsdf'''
+end_string = r'''sdfsdf-'-&#x27;-"-&quot;-\`-<-&lt;->-&gt;-&-&amp;-(-)-\\-+-*-{-}-;-$-${1+1}-{{1+1}}-<%= 1+1 %>-&lt;%= 1+1 %&gt;-${1+1}-%{1+1}-@(1+1)-<><sCrIPt>-&lt;&gt;&lt;sCrIPt&gt;-sdfsdf'''
 
 
 print(f'old payload: {orig_string}')