From 9bac19b21a15de022c3db4670390c61aa2e671e9 Mon Sep 17 00:00:00 2001 From: Dallas Winger Date: Thu, 23 Jul 2020 14:23:42 -0400 Subject: [PATCH] update broken status functions --- modules/autossh | 2 +- modules/openvpn | 2 +- modules/ptunnel | 103 ---------------------------------------- modules/sshfs | 3 +- modules/urlsnarf | 120 ----------------------------------------------- 5 files changed, 3 insertions(+), 227 deletions(-) delete mode 100755 modules/ptunnel delete mode 100755 modules/urlsnarf diff --git a/modules/autossh b/modules/autossh index 6041fcf..8fae0df 100755 --- a/modules/autossh +++ b/modules/autossh @@ -26,7 +26,7 @@ function stop { } function status { - if pgrep autossh > /dev/null; then echo "1"; else echo "0"; fi + if pgrep /usr/sbin/autossh > /dev/null; then echo "1"; else echo "0"; fi } function configure { diff --git a/modules/openvpn b/modules/openvpn index b330ae9..ad2266b 100755 --- a/modules/openvpn +++ b/modules/openvpn @@ -26,7 +26,7 @@ function stop { } function status { - if pgrep openvpn > /dev/null; then echo "1"; else echo "0"; fi + if pgrep /usr/sbin/openvpn > /dev/null; then echo "1"; else echo "0"; fi } function configure { diff --git a/modules/ptunnel b/modules/ptunnel deleted file mode 100755 index da22c61..0000000 --- a/modules/ptunnel +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash /usr/lib/turtle/turtle_module -VERSION="1.0" -DESCRIPTION="Proxies TCP over Ping (ICMP) traffic" -CONF=/tmp/ptunnel.form - -: ${DIALOG_OK=0} -: ${DIALOG_CANCEL=1} -: ${DIALOG_HELP=2} -: ${DIALOG_EXTRA=3} -: ${DIALOG_ITEM_HELP=4} -: ${DIALOG_ESC=255} - -function start { - if [ -s /etc/config/ptunnel ] - then - ptunnel_host=$(uci get ptunnel.host) - ptunnel_local_port=$(uci get ptunnel.lport) - ptunnel_dst_host=$(uci get ptunnel.rhost) - ptunnel_dst_port=$(uci get ptunnel.rport) - echo ptunnel -p "$ptunnel_host" -lp "$ptunnel_local_port" -da "$ptunnel_dst_host" -dp "$ptunnel_dst_port" > /dev/null & - ptunnel -p "$ptunnel_host" -lp "$ptunnel_local_port" -da "$ptunnel_dst_host" -dp "$ptunnel_dst_port" > /dev/null & - echo -n "ptunnel started with pid: "; pidof ptunnel - else - touch /etc/config/ptunnel - echo "ptunnel not configured" - fi -} - -function stop { - killall ptunnel -} - -function status { - if pgrep ptunnel > /dev/null; then echo "1"; else echo "0"; fi -} - -function configure { - - if [ -s /etc/config/ptunnel ] - then - ptunnel_host=$(uci get ptunnel.host) - ptunnel_local_port=$(uci get ptunnel.lport) - ptunnel_dst_host=$(uci get ptunnel.rhost) - ptunnel_dst_port=$(uci get ptunnel.rport) - else - touch /etc/config/ptunnel - fi - - dialog --ok-label "Submit" \ - --help-button \ - --title "PTunnel Configuration" \ - --form "\nPTunnel Server: Address of the server running the ptunnel proxy.\n\ -Local Port: Port on localhost from which traffic will be tunneled.\n\ -Dst Server: Destination host to which traffic will be proxied.\n\ -Dst Port: Destination port to which traffic will be proxied.\n\n" 16 75 4\ - "PTunnel Host:" 1 1 "$ptunnel_host" 1 15 40 0 \ - "Local Port:" 2 1 "$ptunnel_local_port" 2 15 40 0 \ - "Dst. Host:" 3 1 "$ptunnel_dst_host" 3 15 40 0 \ - "Dst. Port:" 4 1 "$ptunnel_dst_port" 4 15 40 0 \ - 2>$CONF - - return=$? - - case $return in - $DIALOG_OK) - cat $CONF | { - read -r ptunnel_host - read -r ptunnel_local_port - read -r ptunnel_dst_host - read -r ptunnel_dst_port - touch /etc/config/ptunnel - uci set ptunnel.host="$ptunnel_host" - uci set ptunnel.lport="$ptunnel_local_port" - uci set ptunnel.rhost="$ptunnel_dst_host" - uci set ptunnel.rport="$ptunnel_dst_port" - uci commit ptunnel - rm $CONF - clear - };; - $DIALOG_CANCEL) - rm $CONF - clear - exit;; - $DIALOG_HELP) - dialog --title "Help" \ - --msgbox "Ping Tunnel, or ptunnel, is an application that allows you to reliably tunnel TCP connections to a remote host using ICMP echo request and reply packets, commonly known as ping requests and replies.\ -A common use case is to provide a secure covert reverse shell via SSH.\n\n\ -Ping Tunnel configuration accepts the following:\n\n\ -* Ptunnel Host: Address of the server running the ptunnel proxy - often a VPS or other such machine online with a static IP or domain.\n\ -* Local Port: TCP listening port on localhost through which traffic will be proxied to the ptunnel host.\n\ -* Dst Server: Destination host of the remote proxy to which traffic will be forwarded.\n\ -* Dst Port: Destination port to remote proxy to which traffic will be forwarded.\n\n\ -Example: example.com, 8000, example.com, 22\n\n\ -This would configure ptunnel to connect to the ptunnel server running on domain.com and forward all traffic going to port 8000 on localhost to port 22 on example.com.\n\n\ -With this an autoSSH session to the SSH server running on example.com port 22 may be established through the Ping Tunnel via localhost port 8000.\ -" 20 60 - configure - ;; - $DIALOG_ESC) - clear;; - esac -} - diff --git a/modules/sshfs b/modules/sshfs index 0468bab..707219f 100755 --- a/modules/sshfs +++ b/modules/sshfs @@ -32,8 +32,7 @@ function stop { } function status { - pidof sshfs > /dev/null - if [ $? -eq 0 ]; then echo "1"; else echo "0"; fi + if pgrep /usr/bin/sshfs > /dev/null; then echo "1"; else echo "0"; fi } function configure { diff --git a/modules/urlsnarf b/modules/urlsnarf deleted file mode 100755 index d0f1892..0000000 --- a/modules/urlsnarf +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash /usr/lib/turtle/turtle_module -VERSION="1.1" -DESCRIPTION="URL Snarf sniffs HTTP traffic" -CONF=/tmp/urlsnarf.form - -: ${DIALOG_OK=0} -: ${DIALOG_CANCEL=1} -: ${DIALOG_HELP=2} -: ${DIALOG_EXTRA=3} -: ${DIALOG_ITEM_HELP=4} -: ${DIALOG_ESC=255} - -function start { - DATE=$(date +"%Y-%m-%d_%H-%M") - if [ -s /etc/config/urlsnarf ] - then - urlsnarf_log=$(uci get urlsnarf.log) - case $urlsnarf_log in - sshfs) - if pgrep sshfs > /dev/null; then - echo "SSHFS Running" - echo "urlsnarf -n -i br-lan >> /sshfs/urlsnarf_$DATE.log" | at now - echo urlsnarf started with pid $(pidof urlsnarf) - else - echo "SSHFS not running" - fi - ;; - tmp) - echo "urlsnarf -n -i br-lan > /tmp/urlsnarf_$DATE.log" | at now - echo urlsnarf started with pid $(pidof urlsnarf) - ;; - none) - echo "urlsnarf -n -i br-lan" | at now - echo urlsnarf started with pid $(pidof urlsnarf) - ;; - esac - else - echo "URLSnarf not configured." - fi -} - -function stop { - echo "Killing URLSnarf at PID:" - pidof urlsnarf - kill $(pidof urlsnarf) -} - -function status { - if pgrep urlsnarf > /dev/null; then echo "1"; else echo "0"; fi -} - -function configure { - if [ -s /etc/config/urlsnarf ]; - then - urlsnarf_log=$(uci get urlsnarf.log) - else - touch /etc/config/urlsnarf - fi - - dialog --ok-label "Submit" \ - --extra-button \ - --extra-label "Test" \ - --help-button \ - --title "URLSnarf Configuration" \ - --radiolist "\n\ -urlsnarf outputs all requested URLs sniffed from HTTP traffic in CLF (Common Log Format, used by most web servers), suitable for offline post-processing with web log analysis tool (analog, wwwstat, etc.)...\n\nUse [Space] to select choice.\n" 16 60 3\ - 1 "Save log to SSHFS if available." off\ - 2 "Save log to /tmp/" off\ - 3 "Do not save log file." on\ - 2>$CONF - - return=$? - - case $return in - $DIALOG_OK) - LOG=$(cat $CONF) - case $LOG in - 1) - uci set urlsnarf.log="sshfs" - uci commit urlsnarf - ;; - 2) - uci set urlsnarf.log="tmp" - uci commit urlsnarf - ;; - 3) - uci set urlsnarf.log="none" - uci commit urlsnarf - ;; - esac - ;; - $DIALOG_CANCEL) - rm $CONF - clear - exit;; - $DIALOG_HELP) - dialog --title "Help" \ - --msgbox "\ -Using URLSnarf, one may monitor the HTTP (web) activity on passing through the LAN Turtle.\n\n\ -The default configuration monitors TCP ports 80, 8080 and 3128 (Squid) with IP hostname resolution disabled.\n\n\ -Activity may be logged either locally in /tmp/ (which is memory limited), or to a remote file system using the SSHFS module.\n\n\ -Logs will be saved in the CLF (Common Log Format) used by most web servers for further analysis with tools such as analog or wwwstat.\n\n\ -Log filenames are datestamped.\ -" 20 60 - configure - ;; - $DIALOG_EXTRA) - urlsnarf -n -i br-lan > /tmp/urlsnarf.log & - dialog \ - --title "URL Snarf (keys 'h' and 'l' scroll)" \ - --tailbox /tmp/urlsnarf.log 18 72\ - 2>$CONF - kill $(pidof urlsnarf) - rm /tmp/urlsnarf.log - configure - ;; - $DIALOG_ESC) - clear;; - esac -}