-EA or --enhanced-auth to insert SN and DevID1 in GET request + store…

… it if valid.

More to come with DevID2 and random seed. #16

bin/mcbash

@@ -24,7 +24,7 @@ check_dependencies() {
 			exit 1
 		fi
 	done
-	opt_dep=("md5sum" "sha256sum") # optional dependencies
+	opt_dep=("md5sum" "sha256sum" "od") # optional dependencies
 	for o in ${opt_dep[@]}; do
 		if ! [[ $(which $o 2>/dev/null) ]]; then
 			echo -e "${_YELLOW}${_BOLD}WARNING: mcbash could need optional dependency ${_RED}${o}${_YELLOW}. \nConsider installing it on your machine.${_RESET}"
@@ -434,9 +434,9 @@ generate_mac() {
 
 valid_mac_found() {
 	if [[ $valid_macs_number == 0 ]]; then
-		echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+		write_date_before_mac
 	fi
-	echo "$mac [$expiration_date]" >> $destination/valid_macs_$name
+	write_valid_mac
 	if [[ -n ${only_outputs_mac} ]]; then
 		echo $mac
 	else
@@ -445,6 +445,26 @@ valid_mac_found() {
 	valid_macs_number=$(( $valid_macs_number + 1 ))
 }
 
+write_date_before_mac() {
+	echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+}
+
+write_valid_mac() {
+	echo "$mac [$expiration_date]" >> $destination/valid_macs_$name
+	if [[ -n "${enhanced_auth}" ]]; then
+		echo -e "\t-> SN: ${sn}" >> $destination/valid_macs_$name
+		echo -e "\t-> Device_ID1: ${device_id}" >> $destination/valid_macs_$name
+	fi
+}
+
+write_expired_mac() {
+	echo "$mac [expired]" >> $destination/valid_macs_$name
+	if [[ -n "${enhanced_auth}" ]]; then
+		echo -e "\t-> SN: ${sn}" >> $destination/valid_macs_$name
+		echo -e "\t-> DevID1: ${device_id}" >> $destination/valid_macs_$name
+	fi
+}
+
 check_parameters() {
 	if [ "$avoid_parameters" = true ]; then
 		populate_necessary_values
@@ -920,9 +940,9 @@ get_exp_date() {
 			echo -ne "\r${_YELLOW}[$item]${_RESET} ${_BOLD}${_RED}$mac [expired] ${_RESET}\n"
 		fi
 		if [[ $valid_macs_number == 0 ]]; then
-			echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+			write_date_before_mac
 		fi
-		echo "$mac [expired]" >> $destination/valid_macs_$name
+		write_expired_mac
 		return 1
 	fi
 }
@@ -989,6 +1009,7 @@ done
 # - echo : core/utils
 # - md5sum : core/utils
 # - sha256sum : core/utils
+# - od : core/utils
 
 
 # 

func/08_mac

@@ -110,13 +110,33 @@ generate_mac() {
 
 valid_mac_found() {
 	if [[ $valid_macs_number == 0 ]]; then
-		echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+		write_date_before_mac
 	fi
-	echo "$mac [$expiration_date]" >> $destination/valid_macs_$name
+	write_valid_mac
 	if [[ -n ${only_outputs_mac} ]]; then
 		echo $mac
 	else
 		echo -ne "\r${_BOLD}${_GREEN}[$item] $mac ${_RESET}${_RED}[$expiration_date] ${_RESET}\n"
 	fi
 	valid_macs_number=$(( $valid_macs_number + 1 ))
 }
+
+write_date_before_mac() {
+	echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+}
+
+write_valid_mac() {
+	echo "$mac [$expiration_date]" >> $destination/valid_macs_$name
+	if [[ -n "${enhanced_auth}" ]]; then
+		echo -e "\t-> SN: ${sn}" >> $destination/valid_macs_$name
+		echo -e "\t-> Device_ID1: ${device_id}" >> $destination/valid_macs_$name
+	fi
+}
+
+write_expired_mac() {
+	echo "$mac [expired]" >> $destination/valid_macs_$name
+	if [[ -n "${enhanced_auth}" ]]; then
+		echo -e "\t-> SN: ${sn}" >> $destination/valid_macs_$name
+		echo -e "\t-> DevID1: ${device_id}" >> $destination/valid_macs_$name
+	fi
+}

func/11_scan

@@ -220,9 +220,9 @@ get_exp_date() {
 			echo -ne "\r${_YELLOW}[$item]${_RESET} ${_BOLD}${_RED}$mac [expired] ${_RESET}\n"
 		fi
 		if [[ $valid_macs_number == 0 ]]; then
-			echo -e "\n$dns ($(date))\n" >> $destination/valid_macs_$name
+			write_date_before_mac
 		fi
-		echo "$mac [expired]" >> $destination/valid_macs_$name
+		write_expired_mac
 		return 1
 	fi
 }