V1.1.0 (#2)

* Add wordlist

* Add obsidian

* Add new go software

* Update printf

* Add sshuttle

* Add rush install

* Fix bug & add bash_aliases file check

* update Readme

* Update content lsit

* Update version

* Update nuclei install

---------

Co-authored-by: d3vyce <contact@d3vyce.fr>

README.md

@@ -1,15 +1,19 @@
 # PenTools
 
-Presentation of the tools...
+![terminal](https://github.com/d3vyce/PenTools/blob/main/images/terminal.png)
 
 # Quick Start
 
-Before running the script make sure you have `go` and `pip` installed.
-
-```Bash
-curl -L https://github.com/d3vyce/pentools/releases/latest/download/pentools.sh | sh
+Before running the script make sure you have `go`, `pip` and `rust` installed.
+```bash
+# https://phoenixnap.com/kb/debian-install-go
+sudo apt install python-pip # pip
+curl https://sh.rustup.rs -sSf | sh # rust
+```
+To run the script use the following command:
+```Bash
+bash <(curl -L https://github.com/d3vyce/PenTools/releases/latest/download/pentools.sh)
 ```
-
 This script has been tested on debian distribution, but it should also work with Ubuntu.
 I'm working on a compatibility with CentOS and other distribution.
 
@@ -18,12 +22,19 @@ I'm working on a compatibility with CentOS and other distribution.
 - rockyou.txt
 - common.txt
 - subdomains.txt
+- directory-list-2.3-medium.txt
+- password.lst
+- nmap.lst
 
 ## Software
 - Sublime Text
+- Obsidian
 - Chrome (+Extension: Dark Reader, FoxyProxy, WappAnalyser, Hack-Tools)
 - FFUF
 - PWNcat
+- Chisel
+- Nuclei
+- sshuttle
 
 ## Tools
 - linPeas
@@ -36,5 +47,8 @@ I'm working on a compatibility with CentOS and other distribution.
 - nmap
 
 ## Alias
-- Python server file
-- Sublime-Text
+- Python server file in pentools folder (command: `filesrv`)
+- Open Sublime-Text (command : `sublime`) -> To open Sublime-Text in current folder : `sublime .`
+
+# Contribute to the project
+To participate in the project, you can propose new implementations of tools/binary/software/... via issues or merge request.

pentools.sh

@@ -20,6 +20,15 @@ wordlist() {
 
      printf ${GREEN}"[+] subdomains.txt\n"
      curl http://ffuf.me/wordlist/subdomains.txt > $TARGET/wordlist/subdomains.txt 2>&1
+
+     printf ${GREEN}"[+] directory-list-2.3-medium.txt\n"
+     curl https://raw.githubusercontent.com/daviddias/node-dirbuster/master/lists/directory-list-2.3-medium.txt > $TARGET/wordlist/directory-list-2.3-medium.txt 2>&1
+
+     printf ${GREEN}"[+] password.lst\n"
+     curl https://raw.githubusercontent.com/piyushcse29/john-the-ripper/master/run/password.lst > $TARGET/wordlist/password.lst 2>&1
+
+     printf ${GREEN}"[+] nmap.lst\n"
+     curl https://raw.githubusercontent.com/drtychai/wordlists/master/nmap.lst > $TARGET/wordlist/nmap.lst 2>&1
 }
 
 software() {
@@ -28,11 +37,17 @@ software() {
      printf ${GREEN}"[+] Sublime-text\n"
      wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - >/dev/null 2>&1
      echo "deb https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sources.list.d/sublime-text.list >/dev/null 2>&1
+     sudo apt update >/dev/null 2>&1
      sudo apt -y install sublime-text >/dev/null 2>&1
 
+     printf ${GREEN}"[+] Obsidian\n"
+     wget https://github.com/obsidianmd/obsidian-releases/releases/download/v1.1.9/obsidian_1.1.9_amd64.deb >/dev/null 2>&1
+     sudo apt install ./obsidian_1.1.9_amd64.deb >/dev/null 2>&1
+     rm obsidian_1.1.9_amd64.deb
+
      printf ${GREEN}"[+] Chrome\n"
-     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-     sudo apt -y install ./google-chrome-stable_current_amd64.deb
+     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >/dev/null 2>&1
+     sudo apt -y install ./google-chrome-stable_current_amd64.deb >/dev/null 2>&1
      rm google-chrome-stable_current_amd64.deb
 
      sudo mkdir /opt/google/chrome/extensions >/dev/null 2>&1
@@ -64,20 +79,44 @@ software() {
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
 
+     printf ${GREEN}"[+] sshuttle\n"
+     sudo apt install sshuttle >/dev/null 2>&1
+     
+     printf ${GREEN}"[+] nuclei\n"
+     sudo apt install nuclei >/dev/null 2>&1
+
      if ! command -v go &> /dev/null
      then
-          printf ${RED}"[x] Missing Go, skiping install of Fuff...\n"
+          printf ${RED}"[x] Missing Go, skipping install of Fuff, Chisel and Nuclei...\n"
      else
-          printf ${GREEN}"[+] ffuf\n"
-          go install github.com/ffuf/ffuf@latest  
+          if ! command -v ffuf &> /dev/null
+          then
+               printf ${GREEN}"[+] ffuf\n"
+               go install github.com/ffuf/ffuf@latest >/dev/null 2>&1
+          else
+               printf ${ITALIC_LIGHT_CYAN}"[~] ffuf is already installed, skipping...\n"
+          fi
+
+          if ! command -v chisel &> /dev/null
+          then
+               printf ${GREEN}"[+] chisel\n"
+               go install github.com/jpillora/chisel@latest >/dev/null 2>&1
+          else
+               printf ${ITALIC_LIGHT_CYAN}"[~] chisel is already installed, skipping...\n"
+          fi
      fi
 
      if ! command -v pip &> /dev/null
      then
-          printf ${RED}"[x] Missing Pip, skiping install of PwnCat...\n"
+          printf ${RED}"[x] Missing Pip, skipping install of PwnCat...\n"
      else
-          printf ${GREEN}"[+] pwncat-cs\n"
-          pip install pwncat-cs
+          if ! command -v pwncat-cs &> /dev/null
+          then
+               printf ${GREEN}"[+] pwncat-cs\n"
+               sudo pip install pwncat-cs >/dev/null 2>&1
+          else
+               printf ${ITALIC_LIGHT_CYAN}"[~] pwncat-cs is already installed, skipping...\n"
+          fi
      fi
 }
 
@@ -107,9 +146,7 @@ tools() {
 binary() {
      printf "\n${YELLOW}[*]${BLUE} Binary -----------------------------------\n"
      mkdir binary >/dev/null 2>&1
-{
-  "external_update_url": "https://clients2.google.com/service/update2/crx"
-}
+
      printf ${GREEN}"[+] nmap\n"
      wget -q -O - https://github.com/andrew-d/static-binaries/raw/master/binaries/linux/x86_64/nmap > $TARGET/binary/nmap
      chmod +x $TARGET/binary/nmap
@@ -118,16 +155,22 @@ binary() {
 aliascmd() {
      printf "\n${YELLOW}[*]${BLUE} Alias ------------------------------------\n"
 
+     FILE=~/.bash_aliases
+     if [ -f "$FILE" ]; then
+          sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bash_aliases
+     fi
+
      echo "
-# Alias created by PenTools
-# https://github.com/d3vyce/pentools" >> ~/.bashrc
-     
+# Alias created by PenTools" >> ~/.bash_aliases
+
      printf ${GREEN}"[+] sudo filesrv\n"
-     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bashrc
+     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bash_aliases
 
      printf ${GREEN}"[+] sublime\n"
-     echo "alias sublime='sublime .'" >> ~/.bashrc
+     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
 
+     echo "# https://github.com/d3vyce/pentools" >> ~/.bash_aliases
+     source ~/.bash_aliases 
 }
 
 printf "${YELLOW}
@@ -139,7 +182,7 @@ printf "${YELLOW}
   /_/    \___/_/ /_/_/  \____/\____/_/____/  
                                             
  ---------------------------------------------
- v1.0 - ${ITALIC}https://github.com/d3vyce/pentools \n
+ v1.1 - ${ITALIC}https://github.com/d3vyce/pentools \n
 "
 
 printf ${YELLOW}"[*]${BLUE} What do you want to install?\n"
@@ -183,4 +226,4 @@ case $CHOICE in
      *)
           printf "${RED}[x] Select an option between 1 and 6"
           ;;
-esac
+esac