Fixed pkg-manager bug, and other minor issues.

Fixed a bug caused by not resetting the package manager after finishing. The bug occured only when the installer was interrupted. Removed obsolete code from fluxion's exit procedure. Added better message feedback to the apt manager. Updated languages' dialog for new package manager reset notice.
2017-12-20 18:30:09 -06:00 · 2017-12-20 18:30:09 -06:00 · 3df7ec512d
parent bfcb897f23
commit 3df7ec512d
16 changed files with 29 additions and 10 deletions
--- a/fluxion.sh
+++ b/fluxion.sh
@ -92,12 +92,14 @@ function fluxion_exitmode() {

 	echo -e "$CWht[$CRed-$CWht]$CRed $FLUXIONCleanupAndClosingNotice$CClr"

+    # List currently running processes which we might have to kill before exiting.
 	local processes
 	readarray processes < <(ps -A)

-	# Currently, fluxion is only responsible for killing airodump-ng,
-	# since it uses it to scan for candidate target access points.
-	# Everything else should be taken care of by the custom attack abort handler.
+	# Currently, fluxion is only responsible for killing airodump-ng, because
+	# fluxion explicitly it uses it to scan for candidate target access points.
+	# NOTICE: Processes started by subscripts, such as an attack script,
+	# MUST BE TERMINATED BY THAT SAME SCRIPT in the subscript's abort handler.
 	local targets=("airodump-ng")

 	local targetID # Program identifier/title
@ -109,10 +111,13 @@ function fluxion_exitmode() {
 		killall $targetPID &> $FLUXIONOutputDevice
 	done

-	if [ "$WIAccessPoint" ]; then
-		echo -e "$CWht[$CRed-$CWht] $FLUXIONDisablingExtraInterfacesNotice$CGrn $WIAccessPoint$CClr"
-		iw dev $WIAccessPoint del &> $FLUXIONOutputDevice
-	fi
+
+	# If the installer activated the package manager, make sure to undo any changes.
+    if [ "$PackageManagerCLT" ]; then
+        echo -e "$CWht[$CRed-$CWht] "$(io_dynamic_output "$FLUXIONRestoringPackageManagerNotice")"$CClr"
+        unprep_package_manager
+    fi
+

 	if [ "$WIMonitor" ]; then
 		echo -e "$CWht[$CRed-$CWht] $FLUXIONDisablingMonitorNotice$CGrn $WIMonitor$CClr"
--- a/language/cs.sh
+++ b/language/cs.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Čištění a zavírání"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Vypínání monitorovacího rozhraní"
 FLUXIONDisablingExtraInterfacesNotice="Vypínání rozhraní"
 FLUXIONDisablingPacketForwardingNotice="Vypínání ${CGry}směrování packetů"
--- a/language/de.sh
+++ b/language/de.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Xterm Terminal konnte nicht gestartet we
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Aufräumen und schließen"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Deaktivierung der Netzwerkkarte"
 FLUXIONDisablingExtraInterfacesNotice="Deaktivierung der Netzwerkkarte"
 FLUXIONDisablingPacketForwardingNotice="Deaktivierung ${CGry}von der Weiterleitung von Paketen"
--- a/language/el.sh
+++ b/language/el.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Καθαρισμός και τερματισμός"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Απενεργοποίση εποπτείας περιβάλλοντος"
 FLUXIONDisablingExtraInterfacesNotice="Απενεργοποίηση περιβάλλοντος"
 FLUXIONDisablingPacketForwardingNotice="Απενεργοποίηση ${CGry}προώθησης των πακέτων"
--- a/language/en.sh
+++ b/language/en.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Cleaning and closing"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Disabling monitoring interface"
 FLUXIONDisablingExtraInterfacesNotice="Disabling extra interfaces"
 FLUXIONDisablingPacketForwardingNotice="Disabling ${CGry}forwarding of packets"
--- a/language/es.sh
+++ b/language/es.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Limpiando y cerrando"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Deshabilitando interfaz de monitoreo"
 FLUXIONDisablingExtraInterfacesNotice="Deshabilitando interfaz"
 FLUXIONDisablingPacketForwardingNotice="Deshabilitando ${CGry}reenvio de paquetes"
--- a/language/fr.sh
+++ b/language/fr.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed} Echec au lancement de la session xterm
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Nettoyage et fermeture"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Désactivation de l'interface de monitoring"
 FLUXIONDisablingExtraInterfacesNotice="Désactivation de l'interface"
 FLUXIONDisablingPacketForwardingNotice="Désactivation de ${CGry}transmission de paquets"
--- a/language/it.sh
+++ b/language/it.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Errore nell'avvio della sessione XTerm (
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Pulizia e chiusura"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Disabilito l'Interfaccia Monitor"
 FLUXIONDisablingExtraInterfacesNotice="Disabilito l'Interfaccia"
 FLUXIONDisablingPacketForwardingNotice="Disabilito ${CGry}l'invio dei pacchetti"
--- a/language/pl.sh
+++ b/language/pl.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed} Start xterm niemożliwy (źle skonfigur
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Sprzątanie i zamykanie"
 FLUXIONKillingProcessNotice="Zabijanie procesu ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Wyłączanie karty monitorującej"
 FLUXIONDisablingExtraInterfacesNotice="Disabling extra interfaces"
 FLUXIONDisablingPacketForwardingNotice="Disabling ${CGry}forwarding of packets"
--- a/language/pt-br.sh
+++ b/language/pt-br.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Falha ao iniciar a sessão xterm (possiv
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Limpando e saindo"
 FLUXIONKillingProcessNotice="Matando ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Desabilitando interface do modo monitor"
 FLUXIONDisablingExtraInterfacesNotice="Desabilitando interfaces extras"
 FLUXIONDisablingPacketForwardingNotice="Desabilitando ${CGry}encaminhador de pacotes"
--- a/language/ro.sh
+++ b/language/ro.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Curatire si inchidere"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Dezacticati interfata monitorizata"
 FLUXIONDisablingExtraInterfacesNotice="Dezactivati interfata"
 FLUXIONDisablingPacketForwardingNotice="Dezactivati ${CGry}forwarding of packets"
--- a/language/sk.sh
+++ b/language/sk.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Nepodarilo sa spustiť 'xterm session' (
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Čistím a zatváram"
 FLUXIONKillingProcessNotice="Ukončujem ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Vypínam monitorovací adaptér"
 FLUXIONDisablingExtraInterfacesNotice="Vypínam extra adaptéry"
 FLUXIONDisablingPacketForwardingNotice="Vypínam ${CGry}smerovanie packet-ov"
--- a/language/sl.sh
+++ b/language/sl.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Čiščenje in zapiranje"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Onemogočanje nadzornega načina"
 FLUXIONDisablingExtraInterfacesNotice="Onemogočanje vmesnika"
 FLUXIONDisablingPacketForwardingNotice="Onemogočanje ${CGry}posredovanja paketov"
--- a/language/tk.sh
+++ b/language/tk.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="Temizleniyor ve Kapatiliyor"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="Monitor modu kapatiliyor"
 FLUXIONDisablingExtraInterfacesNotice="Ag Arayuzu kapatiliyor"
 FLUXIONDisablingPacketForwardingNotice="Kapatiliyor ${CGry}forwarding of packets"
--- a/language/zh.sh
+++ b/language/zh.sh
@ -66,6 +66,7 @@ FLUXIONGeneralXTermFailureError="${CRed}Failed to start xterm session (possible
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 FLUXIONCleanupAndClosingNotice="清理进程并退出"
 FLUXIONKillingProcessNotice="Killing ${CGry}\$targetID$CClr"
+FLUXIONRestoringPackageManagerNotice="Restoring ${CCyn}\$PackageManagerCLT$CClr"
 FLUXIONDisablingMonitorNotice="关闭监听模式界面"
 FLUXIONDisablingExtraInterfacesNotice="关闭USB外部网卡接口"
 FLUXIONDisablingPacketForwardingNotice="关闭 ${CGry}转发数据包"
--- a/lib/installer/InstallerUtils.sh
+++ b/lib/installer/InstallerUtils.sh
@ -14,7 +14,7 @@ PackageManagerLog="$InstallerUtilsWorkspacePath/package_manager.log"
 function installer_utils_run_spinner() {
 	local pid=$1
 	local delay=0.15
-	local spinstr='|/-\'
+	local spinstr="|/-\\"

 	tput civis
 	while [ "`ps a | awk '{print $1}' | grep $pid`" ]; do