wifi-probes fix, dbus-find-session.sh no longer needed

This commit is contained in:
Ruzicka Pavel 2016-09-16 22:45:52 +02:00
parent 0ed5e6011c
commit c2ef76e7d6
4 changed files with 47 additions and 46 deletions

View file

@ -1,22 +1,34 @@
#!/bin/bash
#!/bin/bash -x
PIDFILE="/run/wifi-probe-scanner.pid"
WIFI_INTERFACE="wlxra"
UPLINK_WLAN=""
#WIFI_INTERFACE="wlanRabbit"
NOW="$(date +%Y-%m-%d--%H:%M:%S)"
#HOOVER_OPTS="--verbose"
HOOVER_OPTS="--verbose"
MY_PID="$$"
DISPLAY=:0
export DISPLAY
HOME=/home/ruza/
# this is your first wifi device used to connect to Internet. We are detecting your location based on SSID you are connected to on yout first wifi device.
UPLINK_WLAN="${UPLINK_WLAN:-wlp3s0}"
WLAN0_SSID="$(iw dev ${UPLINK_WLAN} info | awk -F' ' '/ssid/ {print $2 }')"
DUMPFILE="/home/LEAKS/wifi/probes/dump-${NOW}-${WLAN0_SSID}.txt"
DUMPFILE_LAST="/home/LEAKS/wifi/probes/dump-last.log"
. /usr/local/bin/dbus-find-session.sh
ln -sf ${DUMPFILE} ${DUMPFILE_LAST}
function find_dbus_session {
dbus_session_file=/home/ruza/.dbus/session-bus/$(cat /var/lib/dbus/machine-id)-0
. "$dbus_session_file"
export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
#echo "DBUS-FCE: D-Bus session is: $DBUS_SESSION_BUS_ADDRESS" >> /tmp/wifi-probes.debug
}
function airmon_stop {
MON_IFACES="$(ifconfig -a|grep $(ifconfig -a|grep ${WIFI_INTERFACE}|awk '{print $5}'|sed 's/:/-/g'|tr a-z A-Z)|awk '{print $1}')"
MON_IFACES="$(ifconfig -a|grep $(ifconfig -a|grep ${WIFI_INTERFACE}|awk '{print $5}'|sed -n 's/:/-/g;1p'|tr a-z A-Z)|awk '{print $1}')"
for mon in ${MON_IFACES};do
echo "## Shutting down $mon"
sudo airmon-ng stop ${mon} && echo "** Monitoring device ${mon} destroyed"
@ -31,28 +43,23 @@ function ctrl_c() {
}
function main_start {
echo "${MY_PID}" > ${PIDFILE}
find_dbus_session
echo "${MY_PID}" > ${PIDFILE}
sudo ifconfig ${WIFI_INTERFACE} up
sudo airmon-ng start ${WIFI_INTERFACE} && echo "** Monitoring device for ${WIFI_INTERFACE} started"
touch ${DUMPFILE} && echo "** dumpfile is ${DUMPFILE}"
sudo /usr/local/bin/hoover.pl --interface mon0 --dumpfile ${DUMPFILE} ${HOOVER_OPTS} | while read LINE
do
# echo $LINE
while read -r LINE; do
if [[ $LINE == *probe* ]] ; then
# notify-send "$(echo \"${LINE}\"|sed 's/.*++//')"
#MSG="$(echo \"${LINE}\"|sed 's/.*++//')"
# /usr/local/bin/notify-send-as-root-MSG.sh "" "${TITLE}" "${MSG}"
#export DISPLAY=:0
#sudo -s /bin/bash su -c /usr/local/bin/notify-send-as-root-MSG.sh "-u low" "WiFi probe" "${MSG}"
# notify-send "${MSG}"
#DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION /usr/bin/notify-send "Wifi Probe" "$(echo \"${LINE}\"|sed 's/.*++//')"
DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION /usr/bin/notify-send -u low "$(echo \"${LINE}\"|sed 's/.*++//')"
fi
done
find_dbus_session
#echo "$(echo \"${LINE}\"|sed 's/.*++//')" >> /tmp/wifi-probes.debug
su ruza -c "notify-send \"$LINE\""
#/usr/bin/notify-send -u low "${LINE}"
#DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS}" DISPLAY=:0 /usr/bin/notify-send -u low "${LINE}"
fi
done < <(sudo /usr/local/bin/hoover.pl --interface mon0 --dumpfile ${DUMPFILE} ${HOOVER_OPTS})
}
function main_stop {
@ -63,6 +70,7 @@ function main_stop {
case "$1" in
start)
find_dbus_session
#main_stop
main_start
;;