Merge branch 'ThePorgs:dev' into dev

.github/workflows/entrypoint_nightly.yml

@@ -163,7 +163,7 @@ jobs:
         image: [ "${{ needs.init.outputs.IMAGE_TAG }}" ]
     steps:
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_ad.yml

@@ -123,7 +123,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_base.yml

@@ -131,7 +131,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_full.yml

@@ -123,7 +123,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_light.yml

@@ -123,7 +123,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_osint.yml

@@ -123,7 +123,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/entrypoint_preprod_web.yml

@@ -123,7 +123,7 @@ jobs:
     steps:
       - name: Login to Dockerhub
         if: success()
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/sub_build_belt.yml

@@ -142,7 +142,7 @@ jobs:
     timeout-minutes: 360
     steps:
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/sub_release_manifest.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

sources/assets/apt/preferences.d/default-stable

@@ -0,0 +1,19 @@
+Package: *
+Pin: release a=stable-security
+Pin-Priority: 700
+
+Package: *
+Pin: release a=stable-updates
+Pin-Priority: 700
+
+Package: *
+Pin: release a=stable
+Pin-Priority: 700
+
+Package: *
+Pin: release a=testing
+Pin-Priority: 650
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 200

sources/assets/apt/sources.list.d/sid-debian.sources

@@ -0,0 +1,5 @@
+Types: deb
+URIs: http://deb.debian.org/debian
+Suites: sid
+Components: main non-free non-free-firmware contrib
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

sources/assets/desktop/bin/desktop-start

@@ -10,7 +10,7 @@ find_available_display() {
     readarray -t x11_sockets < <(ss -x | grep X11| cut -d 'X' -f3 | cut -d ' ' -f 1 | sort -u)
   fi
 
-  local max_num=0
+  local max_num=1
 
   # Find the maximum number
   for num in "${x11_sockets[@]}"; do
@@ -19,8 +19,8 @@ find_available_display() {
     fi
   done
 
-  # Search number from 1 to max_num+1 to find the first available DISPLAY id
-  for (( i = 1; i <= max_num + 1; i++ )); do
+  # Search number from 2 to max_num+1 to find the first available DISPLAY id (DISPLAY :1 cannot be used in some setup, starting from 2)
+  for (( i = 2; i <= max_num + 1; i++ )); do
     found=0
     for num in "${x11_sockets[@]}"; do
       if (( num == i )); then
@@ -42,6 +42,12 @@ host=${EXEGOL_DESKTOP_HOST:-"$HOSTNAME"}
 port=${EXEGOL_DESKTOP_PORT:-"6336"}
 username=${EXEGOL_USERNAME:-"root"}
 
+# Clear X11 env from host sharing (if any)
+unset XDG_RUNTIME_DIR
+unset XDG_SESSION_TYPE
+unset DISPLAY
+unset WAYLAND_DISPLAY
+
 echo "Starting Exegol desktop with $mode"
 
 display_id=$(find_available_display)
@@ -67,7 +73,7 @@ case "$mode" in
   http)
     random_port=$(python3 -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()')
     vncserver -localhost "yes" -rfbport "$random_port" -geometry "1920x1080" -SecurityTypes "Plain" -PAMService "tigervnc" -PlainUsers "$username" ":$display_id" && \
-      websockify -D --web /usr/share/novnc/ "$host:$port" "localhost:$random_port"
+      websockify -D --web /usr/share/novnc/ "$host:$port" "127.0.0.1:$random_port"
     ;;
 esac
 

sources/assets/exegol/load_supported_setups.sh

@@ -275,6 +275,14 @@ function _trust_ca_cert_in_firefox() {
   certutil -A -n "$2" -t "TC" -i "$1" -d ~/.mozilla/firefox/*.Exegol
 }
 
+function deploy_arsenal_cheatsheet () {
+# Function to add custom cheatsheets into arsenal
+  colorecho "Deploying custom arsenal cheatsheet"
+  if [[ ! -d "$MY_SETUP_PATH/arsenal-cheats" ]]; then
+      mkdir -p "$MY_SETUP_PATH/arsenal-cheats"
+  fi
+}
+
 # Starting
 # This procedure is supposed to be executed only once at the first startup, using a lockfile check
 
@@ -292,6 +300,7 @@ deploy_python3
 deploy_firefox_addons
 deploy_bloodhound
 trust_ca_certs_in_firefox
+deploy_arsenal_cheatsheet
 
 run_user_setup
 

sources/assets/grc/grc.conf

@@ -1,7 +1,3 @@
-# cme
-(^|[/\w\.]+/)g?crackmapexec\s?
-conf.cme
-
 # rbcd
 (^|[/\w\.]+/)g?rbcd.py\s?
 conf.rbcd

sources/assets/shells/aliases.d/adminer

@@ -0,0 +1 @@
+alias adminer=AD-miner

sources/assets/shells/aliases.d/metasploit

@@ -1,10 +1,10 @@
-alias msfconsole='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfconsole'
-alias msfd='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfd'
+alias msfconsole='BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfconsole'
+alias msfd='BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfd'
+alias msfrpc='BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfrpc'
+alias msfrpcd='BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfrpcd'
+alias msfupdate='cd /opt/tools/metasploit-framework && /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfupdate; cd -'
+alias msfvenom='BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfvenom'
 msfdb_func() {
-    sudo -u postgres sh -c "cd /opt/tools/metasploit-framework && /usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/bundle exec /opt/tools/metasploit-framework/msfdb $@"
+    sudo -u postgres sh -c "BUNDLE_GEMFILE=/opt/tools/metasploit-framework/Gemfile /usr/local/rvm/gems/ruby-3.1.5@metasploit-framework/wrappers/bundle exec /opt/tools/metasploit-framework/msfdb $@"
 }
-alias msfdb='msfdb_func'
-alias msfrpc='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfrpc'
-alias msfrpcd='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfrpcd'
-alias msfupdate='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfupdate'
-alias msfvenom='/usr/local/rvm/gems/ruby-3.2.2@metasploit/wrappers/ruby /opt/tools/metasploit-framework/msfvenom'
+alias msfdb='msfdb_func'

sources/assets/shells/aliases.d/netexec

@@ -1,2 +1,4 @@
 alias netexec-neo4j-enable='sed -i "s/bh_enabled = False/bh_enabled = True/" ~/.nxc/nxc.conf'
-alias netexec-neo4j-disable='sed -i "s/bh_enabled = True/bh_enabled = False/" ~/.nxc/nxc.conf'
+alias netexec-neo4j-disable='sed -i "s/bh_enabled = True/bh_enabled = False/" ~/.nxc/nxc.conf'
+alias crackmapexec='echo "crackmapexec has been replaced with netexec"'
+alias cme=crackmapexec

sources/assets/shells/aliases.d/responder

@@ -1,8 +1,8 @@
 function MultiRelay.py { (cd /opt/tools/Responder/tools/ && /opt/tools/Responder/venv/bin/python3 /opt/tools/Responder/tools/MultiRelay.py "$@") }
 alias RunFinger.py='/opt/tools/Responder/venv/bin/python3 /opt/tools/Responder/tools/RunFinger.py'
 alias Responder.py='/opt/tools/Responder/venv/bin/python3 /opt/tools/Responder/Responder.py'
-alias responder-http-on="sed -i 's/HTTP = Off/HTTP = On/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'HTTP ='"
-alias responder-http-off="sed -i 's/HTTP = On/HTTP = Off/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'HTTP ='"
-alias responder-smb-on="sed -i 's/SMB = Off/SMB = On/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'SMB ='"
-alias responder-smb-off="sed -i 's/SMB = On/SMB = Off/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'SMB ='"
+alias responder-http-on="sed -i -E 's/^HTTP( +)= Off/HTTP = On/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'HTTP ='"
+alias responder-http-off="sed -i -E 's/^HTTP( +)= On/HTTP = Off/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'HTTP ='"
+alias responder-smb-on="sed -i -E 's/^SMB( +)= Off/SMB = On/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'SMB ='"
+alias responder-smb-off="sed -i -E 's/^SMB( +)= On/SMB = Off/g' /opt/tools/Responder/Responder.conf && cat /opt/tools/Responder/Responder.conf | grep --color=never 'SMB ='"
 alias responder="Responder.py"

sources/assets/shells/aliases.d/volatility3

@@ -1,2 +1,3 @@
+alias vol='/opt/tools/volatility3/venv/bin/python3 /opt/tools/volatility3/venv/bin/vol'
 alias volatility3='vol'
 alias vol3='volatility3'

sources/assets/shells/history.d/adminer

@@ -0,0 +1,2 @@
+AD-miner -c -cf My_Report u $USERNAME -p $PASSWORD
+adminer -c -cf My_Report -u $USERNAME -p $PASSWORD

sources/assets/shells/history.d/gobuster

@@ -1,2 +1,4 @@
 gobuster dir -w `fzf-wordlists` -t 20 -x php,txt,pl,sh,asp,aspx,html,json,py,cfm,rb,cgi,bak,tar.gz,tgz,zip -u "http://$TARGET/"
 gobuster dir -w `fzf-wordlists` -u http://192.168.56.0:8000/
+gobuster dns -d "$TARGET" -w `fzf-wordlists`
+gobuster vhost -u "$TARGET" -w `fzf-wordlists` --append-domain