V1.2.0 (#3)

* 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

* Add ssh key generation options

* Add terminator

* Fix apt install

* Simplify if statement

* Add pwncat alias

* Add openvpn alias

* Add Bitwarden

* Add go/pip install if missing

* Update README

* Update version

* Fix alias name

* Fix+Update SSH generation

* Add bash_alais in .zshrc (for kali)

---------

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

README.md

@@ -1,15 +1,13 @@
 # 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.
+To run the script use the following command:
-
 ```Bash
-curl -L https://github.com/d3vyce/pentools/releases/latest/download/pentools.sh | sh
+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 +16,20 @@ 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
-- Chrome (+Extension: Dark Reader, FoxyProxy, WappAnalyser, Hack-Tools)
+- Obsidian
+- Chrome (+Extension: Dark Reader, FoxyProxy, WappAnalyser, Hack-Tools, Bitwarden)
+- Terminator
 - FFUF
 - PWNcat
+- Chisel
+- Nuclei
+- sshuttle
 
 ## Tools
 - linPeas
@@ -36,5 +42,13 @@ I'm working on a compatibility with CentOS and other distribution.
 - nmap
 
 ## Alias
-- Python server file
+- Python server file in pentools folder (command: `filesrv`)
-- Sublime-Text
+- Open Sublime-Text (command: `sublime`) -> To open Sublime-Text in current folder : `sublime .`
+- OpenVPN (command: `vpn [file.ovpn]`)
+- Pwncat (command: `pwncat [port]`)
+
+## Automation
+- SSH keygen
+
+# 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
+     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
+     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,56 @@ software() {
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
 
-     if ! command -v go &> /dev/null
+     printf ${GREEN}"[+] Chrome Extension: Bitwarden\n"
-     then
+     sudo touch /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
-          printf ${RED}"[x] Missing Go, skiping install of Fuff...\n"
+     sudo chmod 646 /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
-     else
+     sudo echo '{
-          printf ${GREEN}"[+] ffuf\n"
+  "external_update_url": "https://clients2.google.com/service/update2/crx"
-          go install github.com/ffuf/ffuf@latest  
+}' > /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
+
+     printf ${GREEN}"[+] terminator\n"
+     sudo apt install terminator -y >/dev/null 2>&1
+
+     printf ${GREEN}"[+] sshuttle\n"
+     sudo apt install sshuttle -y >/dev/null 2>&1
+     
+     printf ${GREEN}"[+] nuclei\n"
+     sudo apt install nuclei -y >/dev/null 2>&1
+
+     if ! command -v go &> /dev/null; then
+          printf ${GREEN}"[+] go\n"
+          wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz >/dev/null 2>&1
+          sudo tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz >/dev/null 2>&1
+          rm go1.20.1.linux-amd64.tar.gz
+          echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.profile
+          source ~/.profile 
      fi
 
-     if ! command -v pip &> /dev/null
+     if ! command -v ffuf &> /dev/null; then
-     then
+          printf ${GREEN}"[+] ffuf\n"
-          printf ${RED}"[x] Missing Pip, skiping install of PwnCat...\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
+
+     if ! command -v pip &> /dev/null; then
+          printf ${GREEN}"[+] pip\n"
+          sudo apt install python-pip -y
+     fi
+
+     if ! command -v pwncat-cs &> /dev/null; then
           printf ${GREEN}"[+] pwncat-cs\n"
-          pip install pwncat-cs
+          sudo pip install pwncat-cs >/dev/null 2>&1
+     else
+          printf ${ITALIC_LIGHT_CYAN}"[~] pwncat-cs is already installed, skipping...\n"
      fi
 }
 
@@ -116,18 +167,35 @@ binary() {
 aliascmd() {
      printf "\n${YELLOW}[*]${BLUE} Alias ------------------------------------\n"
 
-     sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bashrc
+     FILE=~/.bash_aliases
+     if [ -f "$FILE" ]; then
+          sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bash_aliases
+     fi
+
+     if ! grep -q ".bash_aliases" ~/.zshrc >/dev/null 2>&1; then
+          echo '{
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi}' >> ~/.zshrc
+     fi
 
      echo "
-# Alias created by 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='/opt/sublime_text/sublime_text'" >> ~/.bashrc
+     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
 
-     echo "# https://github.com/d3vyce/pentools" >> ~/.bashrc
+     printf ${GREEN}"[+] pwncat [port]\n"
+     echo "alias pwncat='sudo pwncat-cs --listen --port '" >> ~/.bash_aliases
+
+     printf ${GREEN}"[+] openvpn [file.ovpn]\n"
+     echo "alias vpn='sudo openvpn '" >> ~/.bash_aliases
+
+     echo "# https://github.com/d3vyce/pentools" >> ~/.bash_aliases
+     source ~/.bash_aliases 
 }
 
 printf "${YELLOW}
@@ -139,7 +207,7 @@ printf "${YELLOW}
   /_/    \___/_/ /_/_/  \____/\____/_/____/  
                                             
  ---------------------------------------------
- v1.0 - ${ITALIC}https://github.com/d3vyce/pentools \n
+ v1.2 - ${ITALIC}https://github.com/d3vyce/pentools \n
 "
 
 printf ${YELLOW}"[*]${BLUE} What do you want to install?\n"
@@ -157,6 +225,9 @@ PWD=$(pwd)
 read -p "${BLUE}Target [${YELLOW}$PWD${BLUE}]: ${YELLOW}" TARGET
 TARGET=${TARGET:-$PWD}
 
+read -p "${BLUE}Do you want to generate SSH key? (y/n) [${YELLOW}y${BLUE}]: ${YELLOW}" SSH_GEN
+SSH_GEN=${SSH_GEN:-y}
+
 case $CHOICE in
      1)
           wordlist
@@ -184,3 +255,19 @@ case $CHOICE in
           printf "${RED}[x] Select an option between 1 and 6"
           ;;
 esac
+
+if [ $SSH_GEN == 'y' ]; then
+     FILE=~/.ssh/id_rsa
+     if [ -f "$FILE" ]; then
+          read -p "${BLUE}SSH keys are already present, do you want to saved them up before generating new ones? (y/n) [${YELLOW}y${BLUE}]: ${YELLOW}" SSH_SAVE
+          SSH_SAVE=${SSH_SAVE:-y}
+          if [ $SSH_SAVE == 'y' ]; then
+               mv ~/.ssh/id_rsa ~/.ssh/id_rsa.save
+               mv ~/.ssh/id_rsa.pub ~/.ssh/id_rsa.pub.save
+          fi
+     fi
+     printf ${GREEN}"[+] Creation of your ssh key pair...\n"
+     ssh-keygen -q -t rsa -N '' -f ~/.ssh/id_rsa >/dev/null 2>&1
+     printf "${ITALIC_LIGHT_CYAN}"
+     cat ~/.ssh/id_rsa.pub
+fi