meyerast/DECSEraser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redid Linux infogathering, changed exit behavior

Browse Source
This commit is contained in:
meyerast
2026-04-13 11:37:28 -04:00
parent dc69953226
commit a890de17a7
2 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erase_drive.sh
+15 -20
View File
@@ -57,15 +57,12 @@ confirm_message () {
catch_sigint () { catch_sigint () {
logwarn "Signal Interrupt initiated. Stopping script." logwarn "Signal Interrupt initiated. Stopping script."
cleanup cleanup
trap - INT
kill -INT "$$" kill -INT "$$"
} }
# shellcheck disable=SC2329 # shellcheck disable=SC2329
catch_exit () { catch_exit () {
cleanup cleanup
trap - EXIT
trap - INT
kill -INT "$$" kill -INT "$$"
} }
@@ -85,6 +82,8 @@ cleanup () {
umount /mnt/"$ticket_number" umount /mnt/"$ticket_number"
else else
umount "/mnt/UNKNWN" umount "/mnt/UNKNWN"
trap - EXIT
trap - INT
fi fi
} }
@@ -149,6 +148,10 @@ mount_remote () {
mkdir -p /mnt/decs mkdir -p /mnt/decs
if mount -t cifs -o user="$netid",sec=krb5i "//decs/decs/support/dban_logs" /mnt/decs if mount -t cifs -o user="$netid",sec=krb5i "//decs/decs/support/dban_logs" /mnt/decs
then then
if [ ! -w "//decs/decs/support/dban_logs" ]; then
logerror "Insufficient permissions to write in //decs/decs/support/dban_logs"
exit
fi
if [[ ! $ticket_number =~ ^\s*$ ]]; if [[ ! $ticket_number =~ ^\s*$ ]];
then then
mkdir -p /mnt/decs/UNKNWN-"$start_time" mkdir -p /mnt/decs/UNKNWN-"$start_time"
@@ -345,22 +348,16 @@ make_infolog () {
{ {
echo "LINUX DETAILS" echo "LINUX DETAILS"
cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/os-release")" cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/os-release")"
echo "" echo "Hostname: $(cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/hostname")")"
echo "HOSTNAME" cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/passwd")" | grep -E '.+:x:[0-9]{4,}:[0-9]{4,}:.+,,,.*' | sed -E 's/.+:x:[0-9]{4,}:[0-9]{4,}:(.+),,,.*/User: \1/'
cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/hostname")"
echo ""
echo "LOGON DETAILS"
w
echo ""
cat "$(find /mnt/"$ticket_number" -maxdepth 3 -ipath "*/etc/passwd")"
echo "" echo ""
tree -a -L 1 -D "$(find /mnt/"$ticket_number" -maxdepth 3 -type d -ipath "*/home")" tree -a -L 1 -D "$(find /mnt/"$ticket_number" -maxdepth 3 -type d -ipath "*/home")"
echo "" echo ""
} >> "$infolog" } >> "$infolog"
else else
echo "Non Linux OS device detected on $device$i." >> "$infolog" echo "Non Linux Unix partition detected on $device$i." >> "$infolog"
loginfo "Non Linux OS device detected on $device$i." loginfo "Non Linux Unix partition detected on $device$i."
tree -a -L 3 -D /mnt/"$ticket_number" >> "$infolog" tree -a -L 2 -D /mnt/"$ticket_number" >> "$infolog"
fi fi
umount /mnt/"$ticket_number" umount /mnt/"$ticket_number"
else else
@@ -412,9 +409,9 @@ make_infolog () {
echo "" echo ""
} >> "$infolog" } >> "$infolog"
else else
loginfo "Non Windows NTFS device detected on $device$i." loginfo "Non Windows NTFS partition detected on $device$i."
echo "Non Windows NTFS device detected on $device$i." >> "$infolog" echo "Non Windows NTFS partition detected on $device$i." >> "$infolog"
tree -a -L 3 -D /mnt/"$ticket_number" >> "$infolog" tree -a -L 2 -D /mnt/"$ticket_number" >> "$infolog"
fi fi
umount /mnt/"$ticket_number" umount /mnt/"$ticket_number"
else else
@@ -717,11 +714,9 @@ main (){
;; ;;
esac esac
sleep 3
loginfo "Finished erasing $devicetype : $device with erase level $eraselevel." loginfo "Finished erasing $devicetype : $device with erase level $eraselevel."
exit cleanup
} }
main main
log_drive_info.sh
+11 -20
View File
@@ -45,15 +45,12 @@ logerror() {
catch_sigint () { catch_sigint () {
logwarn "Signal Interrupt initiated. Stopping script." logwarn "Signal Interrupt initiated. Stopping script."
cleanup cleanup
trap - INT
kill -INT "$$" kill -INT "$$"
} }
# shellcheck disable=SC2329 # shellcheck disable=SC2329
catch_exit () { catch_exit () {
cleanup cleanup
trap - EXIT
trap - INT
kill -INT "$$" kill -INT "$$"
} }
@@ -68,6 +65,8 @@ cleanup () {
umount "/mnt/decs" umount "/mnt/decs"
fi fi
umount "/mnt/UNKNWN" umount "/mnt/UNKNWN"
trap - EXIT
trap - INT
} }
trap catch_sigint SIGINT trap catch_sigint SIGINT
@@ -267,22 +266,16 @@ make_infolog () {
{ {
echo "LINUX DETAILS" echo "LINUX DETAILS"
cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/os-release")" cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/os-release")"
echo "" echo "Hostname: $(cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/hostname")")"
echo "HOSTNAME" cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/passwd")" | grep -E '.+:x:[0-9]{4,}:[0-9]{4,}:.+,,,.*' | sed -E 's/.+:x:[0-9]{4,}:[0-9]{4,}:(.+),,,.*/User: \1/'
cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/hostname")"
echo ""
echo "LOGON DETAILS"
w
echo ""
cat "$(find /mnt/UNKNWN -maxdepth 3 -ipath "*/etc/passwd")"
echo "" echo ""
tree -a -L 1 -D "$(find /mnt/UNKNWN -maxdepth 3 -type d -ipath "*/home")" tree -a -L 1 -D "$(find /mnt/UNKNWN -maxdepth 3 -type d -ipath "*/home")"
echo "" echo ""
} >> "$infolog" } >> "$infolog"
else else
echo "Non Linux OS device detected on $device$i." >> "$infolog" echo "Non Linux Unix partition detected on $device$i." >> "$infolog"
loginfo "Non Linux OS device detected on $device$i." loginfo "Non Linux Unix partition detected on $device$i."
tree -a -L 3 -D /mnt/UNKNWN/ >> "$infolog" tree -a -L 2 -D /mnt/UNKNWN/ >> "$infolog"
fi fi
umount /mnt/UNKNWN umount /mnt/UNKNWN
else else
@@ -334,9 +327,9 @@ make_infolog () {
echo "" echo ""
} >> "$infolog" } >> "$infolog"
else else
loginfo "Non Windows NTFS device detected on $device$i." loginfo "Non Windows NTFS partition detected on $device$i."
echo "Non Windows NTFS device detected on $device$i." >> "$infolog" echo "Non Windows NTFS partition detected on $device$i." >> "$infolog"
tree -a -L 3 -D /mnt/UNKNWN/ >> "$infolog" tree -a -L 2 -D /mnt/UNKNWN/ >> "$infolog"
fi fi
umount /mnt/UNKNWN umount /mnt/UNKNWN
else else
@@ -419,11 +412,9 @@ main (){
make_infolog #Logs a bunch of details to a info log file from the system. make_infolog #Logs a bunch of details to a info log file from the system.
sleep 3
loginfo "Finished gathering logs of $devicetype : $device." loginfo "Finished gathering logs of $devicetype : $device."
exit cleanup
} }
main main