clean code

.gitea/workflows/shellcheck.yml

@@ -1,14 +0,0 @@
-name: Shellcheck
-on: [push]
-jobs:
-  shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out repository code
-      uses: actions/checkout@v3
-    - name: Set up shellcheck
-      run: |
-        apt update
-        apt install -y shellcheck                        
-    - name: Analysing the code with shellcheck
-      run: find . -type f -name "*.sh" | xargs shellcheck -S warning

README.md

@@ -1,13 +1,15 @@
 # PenTools
 
-![terminal](images/terminal.png)
+Presentation of the tools...
 
 # Quick Start
 
-To run the script use the following command:
+Before running the script make sure you have `go` and `pip` installed.
+
 ```Bash
-bash <(curl -L https://github.com/d3vyce/PenTools/releases/latest/download/pentools.sh)
+curl -L https://github.com/d3vyce/pentools/releases/latest/download/pentools.sh | 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.
 
@@ -16,20 +18,12 @@ 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, Bitwarden)
-- Terminator
+- Chrome (+Extension: Dark Reader, FoxyProxy, WappAnalyser, Hack-Tools)
 - FFUF
 - PWNcat
-- Chisel
-- Nuclei
-- sshuttle
 
 ## Tools
 - linPeas
@@ -42,13 +36,5 @@ I'm working on a compatibility with CentOS and other distribution.
 - nmap
 
 ## Alias
-- Python server file in pentools folder (command: `filesrv`)
-- 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.
+- Python server file
+- Sublime-Text

pentools.sh

@@ -13,22 +13,13 @@ wordlist() {
      mkdir $TARGET/wordlist >/dev/null 2>&1
 
      printf ${GREEN}"[+] rockyou.txt\n"
-     wget -q -O - https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt > $TARGET/wordlist/rockyou.txt 2>&1
+     curl https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt > $TARGET/wordlist/rockyou.txt 2>&1
 
      printf ${GREEN}"[+] common.txt\n"
      curl http://ffuf.me/wordlist/common.txt > $TARGET/wordlist/common.txt 2>&1
 
      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() {
@@ -37,98 +28,56 @@ 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 >/dev/null 2>&1
-     sudo apt -y install ./google-chrome-stable_current_amd64.deb >/dev/null 2>&1
+     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+     sudo apt -y install ./google-chrome-stable_current_amd64.deb
      rm google-chrome-stable_current_amd64.deb
 
      sudo mkdir /opt/google/chrome/extensions >/dev/null 2>&1
      printf ${GREEN}"[+] Chrome Extension: FoxyProxy\n"
      sudo touch /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
      sudo chmod 646 /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
 
      printf ${GREEN}"[+] Chrome Extension: Dark Reader\n"
      sudo touch /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
      sudo chmod 646 /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
 
      printf ${GREEN}"[+] Chrome Extension: WappAnalyser\n"
      sudo touch /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
      sudo chmod 646 /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
 
      printf ${GREEN}"[+] Chrome Extension: Hack-Tools\n"
      sudo touch /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
      sudo chmod 646 /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
 
-     printf ${GREEN}"[+] Chrome Extension: Bitwarden\n"
-     sudo touch /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
-     sudo chmod 646 /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
-     echo '{
-  "external_update_url": "https://clients2.google.com/service/update2/crx"
-}' > /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 $HOME/.profile 
-     fi
-
-     if ! command -v ffuf &> /dev/null; then
+     if ! command -v go &> /dev/null
+     then
+          printf ${RED}"[x] Missing Go, skiping install of Fuff...\n"
+     else
           printf ${GREEN}"[+] ffuf\n"
-          go install github.com/ffuf/ffuf@latest >/dev/null 2>&1
+          go install github.com/ffuf/ffuf@latest  
+     fi
+
+     if ! command -v pip &> /dev/null
+     then
+          printf ${RED}"[x] Missing Pip, skiping install of PwnCat...\n"
      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"
-          sudo pip install pwncat-cs >/dev/null 2>&1
-     else
-          printf ${ITALIC_LIGHT_CYAN}"[~] pwncat-cs is already installed, skipping...\n"
+          pip install pwncat-cs
      fi
 }
 
@@ -153,12 +102,6 @@ tools() {
 
      printf ${GREEN}"[+] mimikatz.exe\n"
      wget -q -O - https://github.com/ParrotSec/mimikatz/blob/master/Win32/mimikatz.exe > $TARGET/tools/mimikatz.exe 2>&1
-
-     printf ${GREEN}"[+] Sherlock.ps1\n"
-     curl https://raw.githubusercontent.com/rasta-mouse/Sherlock/master/Sherlock.ps1 > $TARGET/tools/Sherlock.ps1 2>&1
-
-     printf ${GREEN}"[+] laps.py\n"
-     curl https://raw.githubusercontent.com/n00py/LAPSDumper/main/laps.py > $TARGET/tools/laps.py 2>&1
 }
 
 binary() {
@@ -168,44 +111,23 @@ binary() {
      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
-
-     printf ${GREEN}"[+] pspy64\n"
-     wget -q -O - https://github.com/DominicBreuker/pspy/releases/download/v1.2.1/pspy64 > $TARGET/binary/pspy64
-     chmod +x $TARGET/binary/pspy64
 }
 
 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
-
-     if ! grep -q ".bash_aliases" ~/.zshrc >/dev/null 2>&1; then
-          echo '{
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi}' >> ~/.zshrc
-     fi
+     sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bashrc
 
      echo "
-# Alias created by PenTools" >> ~/.bash_aliases
+# Alias created by PenTools" >> ~/.bashrc
 
      printf ${GREEN}"[+] sudo filesrv\n"
-     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bash_aliases
+     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bashrc
 
      printf ${GREEN}"[+] sublime\n"
-     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
+     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.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 $HOME/.zshrc
+     echo "# https://github.com/d3vyce/pentools" >> ~/.bashrc
 }
 
 printf "${YELLOW}
@@ -217,7 +139,7 @@ printf "${YELLOW}
   /_/    \___/_/ /_/_/  \____/\____/_/____/  
                                             
  ---------------------------------------------
- v1.3 - ${ITALIC}https://github.com/d3vyce/pentools \n
+ v1.0 - ${ITALIC}https://github.com/d3vyce/pentools \n
 "
 
 printf ${YELLOW}"[*]${BLUE} What do you want to install?\n"
@@ -235,9 +157,6 @@ 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
@@ -264,20 +183,4 @@ 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
+esac