Merge remote-tracking branch 'origin/master' into merge

Author: Esonhugh

.gitignore

@@ -4,7 +4,8 @@ hosts/
 users/
 services/
 index.md
-Makefile
 .DS_Store
 .vscode/.command_history
-zsh_history
+zsh_history
+weapon_test
+test*

Makefile

@@ -0,0 +1,18 @@
+build:
+	@echo "Building the project..."
+	uv run ./craft.py
+	uv run ./completion_creator.py
+	@echo "Build complete."
+
+install: build
+	@echo "Preparing the environment..."
+	WEAPON_LOCATION=$(shell pwd)/weapon_test ./installer.sh
+	@echo "Installation complete."
+
+install-trace: build
+	@echo "Preparing the environment with trace..."
+	WEAPON_LOCATION=$(shell pwd)/weapon_test ./installer.sh --trace-mode
+	@echo "Installation with trace complete."
+
+clean:
+	rm -rf ./hosts ./users ./weapon_test ./createhackenv.sh ./zsh_history

completion_indexer/impacket

@@ -68,6 +68,7 @@ dcomexec.py -hashes :"$NT_HASH" "$DOMAIN"/"$USER"@"$TARGET"
 atexec.py -hashes :"$NT_HASH" "$DOMAIN"/"$USER"@"$TARGET"
 changepasswd.py -newpass '123Pentest!!!' "$DOMAIN"/"$USER":"$PASS"@"$DC_HOST"
 changepasswd.py -newpass '123Pentest!!!' -hashes :"$NT_HASH" "$DOMAIN"/"$USER"@"$TARGET"
+owneredit.py -action write -new-owner "$USER" -target "$TARGET_OBJECT" "$DOMAIN"/"$USER":"$PASS"
 owneredit.py -action write -new-owner "$NEW_OWNER" -target "$TARGET_OBJECT" "$DOMAIN"/"$USER":"$PASS"
 mssqlclient.py "$DOMAIN"/"$USER":"$PASS"@"$TARGET"
 describeTicket.py "$KRB5CCNAME"

installer.sh

@@ -12,6 +12,8 @@ function check_command() {
 function check_requirements() {
     check_command "awk" "awk is required for parsing the output of commands, please install it." || return 2
     check_command "sed" "sed is required for parsing the output of commands, please install it." || return 2
+    check_command "grep" "grep is required for parsing the output of commands, please install it." || return 2
+    check_command "tr" "tr is required for parsing the output of commands, please install it." || return 2
     check_command "zsh" "zsh is core to WeaponizedVSCode integrated shell." || return 2
     check_command "vim" "vim is required for task edit /etc/hosts, please install it or change it." || return 2
     check_command "nc" "nc is core for netcat shell session handling or u can't use it, please install it." || return 2
@@ -27,44 +29,92 @@ function check_requirements() {
     check_command "uv" "uv is optional but recommended for better performance, install it with 'pip install uv'. Their script is useful"
 }
 
+export INSTALL_IDENTIFIER="WeaponizedVSCode installation script. The following commands are generated by WeaponizedVSCode installer."
+
+function args() {
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            (--trace-mode)
+                export WEAPON_TRACE_MODE=true
+                shift
+                ;;
+            (--force-install)
+                export WEAPON_FORCE_INSTALL=true
+                shift
+                ;;
+            *)
+                echo "Unknown option: $1"
+                exit 1
+                ;;
+        esac
+    done
+}
+
 function main() {
     check_requirements
     if [[ $? -ne 0 && "$FORCE_INSTALL" != "true" ]]; then
         echo "Please install the required commands to continue."
         echo "If you want to force install without checking requirements, run the script with FORCE_INSTALL=true ./installer.sh"
         exit 1
     fi
-
-    if [[ -z "$WEAPON_LOCATON" ]]; then
+    
+    if [[ -z "$WEAPON_LOCATION" ]]; then
         echo "WEAPON_LOCATION is not set. set to default ~/.local/weapon"
         export WEAPON_LOCATION=~/.local/weapon
         echo "You can set it by exporting WEAPON_LOCATION=your_desired_path before running this script."
     fi
 
     if [[ -d "$WEAPON_LOCATION" ]]; then
         echo "Weapon already installed."
+        if [[ "$WEAPON_FORCE_INSTALL" == "true" ]]; then
+            echo "Force install mode enabled, removing existing Weapon directory at $WEAPON_LOCATION."
+            rm -rf "$WEAPON_LOCATION"
+        else
+            echo "If you want to reinstall Weapon, please remove the existing directory at $WEAPON_LOCATION or use --force-install option."
+            exit 0
+        fi
         exit 0
     fi
+
     export LOCATION="$WEAPON_LOCATION"
     echo "Weapon will be installed to $LOCATION, Press Enter key to continue or Ctrl+C to cancel..."
     read
     echo "Installing Weapon..."
     mkdir -p $LOCATION && echo "Weapon directory created at $LOCATION."
-    cp -f ./createhackenv.sh $LOCATION && echo "createhackenv.sh copied to $LOCATION."
-    echo "" >>$LOCATION/createhackenv.sh
-    echo "export WEAPON_LOCATION=$LOCATION" >>$LOCATION/createhackenv.sh # overwrite if exists
+    cat ./createhackenv.sh |sed -e "s#__REPLACE__#$LOCATION#g" > $LOCATION/createhackenv.sh && echo "createhackenv.sh copied to $LOCATION."
     cp -f ./zsh_history $LOCATION && echo "zsh_history copied to $LOCATION."
 
-    grep -zq "source $LOCATION/createhackenv.sh" ~/.zshrc
+    if [[ "$WEAPON_TRACE_MODE" == "true" ]];then
+        cp -f ./zsh_preformance_tracer.sh $LOCATION && echo "zsh_performance_tracer is copied to $LOCATION."
+    fi
+
+    grep -zq "${INSTALL_IDENTIFIER}" ~/.zshrc
     if [[ $? -eq 0 ]]; then
         echo "createhackenv.sh already sourced in ~/.zshrc. sktpping..."
     else
         echo "Sourcing createhackenv.sh in ~/.zshrc..."
-        echo "source $LOCATION/createhackenv.sh" >>~/.zshrc
+        cp ~/.zshrc ~/.zshrc.pre-weaponized-vscode && echo "Backup ~/.zshrc to ~/.zshrc.pre-weaponized-vscode"
+
+        if [[ "$WEAPON_TRACE_MODE" == "true" ]]; then
+cat<<EOF >> ~/.zshrc
+
+# ${INSTALL_IDENTIFIER}
+[[ -f $LOCATION/zsh_preformance_tracer.sh ]] && source $LOCATION/zsh_preformance_tracer.sh && zsh_trace_start
+[[ -f $LOCATION/createhackenv.sh ]] && source $LOCATION/createhackenv.sh
+[[ -f $LOCATION/zsh_preformance_tracer.sh ]] && zsh_trace_end
+EOF
+        else
+cat<<EOF >> ~/.zshrc
+
+# ${INSTALL_IDENTIFIER}
+[[ -f $LOCATION/createhackenv.sh ]] && source $LOCATION/createhackenv.sh
+EOF
+        fi
+
     fi
 
     echo "Weaponized VSCode installation completed."
-
 }
 
-main "$@"
+args "$@"
+main 

launch_helper.zsh

@@ -1,6 +1,8 @@
+export WEAPON_LOCATION=__REPLACE__
+
 weapon_vscode_launch_helper () {
-    if [ -f ~/.local/weapon/zsh_history ]; then
-        export HIST_COMMAND_INDEXER=~/.local/weapon/zsh_history
+    if [ -f ${WEAPON_LOCATION}/zsh_history ]; then
+        export HIST_COMMAND_INDEXER=${WEAPON_LOCATION}/zsh_history
     fi
     if [ -n "$PROJECT_FOLDER" ]; then
         if [ -f "$PROJECT_FOLDER/.vscode/.zshrc" ]; then

zsh_preformance_tracer.sh

@@ -1,3 +1,5 @@
+export WEAPON_TRACE_LOG=/tmp/weapon_trace_log.$$
+
 zsh_trace_start() {
     echo "starting zsh tracing"
     # set the trace prompt to include seconds, nanoseconds, script name and line number
@@ -11,7 +13,7 @@ zsh_trace_start() {
     fi
     # save file stderr to file descriptor 3 and redirect stderr (including trace 
     # output) to a file with the script's PID as an extension
-    exec 3>&2 2>/tmp/startlog.$$
+    exec 3>&2 2>$WEAPON_TRACE_LOG
     # set options to turn on tracing and expansion of commands contained in the prompt
     setopt xtrace prompt_subst
     trap 'setopt xtrace' EXIT
@@ -22,7 +24,7 @@ zsh_trace_end() {
     unsetopt xtrace
     # restore stderr to the value saved in FD 3
     exec 2>&3 3>&-
-    echo "zsh tracing done. See /tmp/startlog.$$"
+    echo "zsh tracing done. See $WEAPON_TRACE_LOG for details."
     trap 'unsetopt xtrace' EXIT
 }