Changeset 7530

Timestamp:

Feb 25, 2010, 6:27:14 PM (15 years ago)

Author:

richardvm

Message:

New version of sshtun for the proxyfactory

Location:

2.0/nanobsd/nanobsd/files/usr/local

Files:

• etc/rc.d/sshtun (modified) (3 diffs)
• sshtun/sshtun.sh (modified) (1 diff)

2.0/nanobsd/nanobsd/files/usr/local/etc/rc.d/sshtun ¶

@@ -1 +1 @@
 #!/bin/sh
+#
+# PROVIDE: sshtun
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable ssh-tun:
 #
 # sshtun_enable="YES"
-# 
-# PROVIDE: sshtun
-# REQUIRE: LOGIN 
-
+#
 . /etc/rc.subr
 
@@ -13 +14 @@
 rcvar=`set_rcvar`
 
-flags=${sshtun_flags}
-
+command_interpreter=/bin/sh
 command=/usr/local/sshtun/sshtun.sh
 
-pidfile=/var/run/${name}.pid
+command_args="${sshtun_options} &"
 
 load_rc_config ${name}
@@ -23 +23 @@
 sshtun_enable=${sshtun_enable-"NO"}
 
-stop_cmd="sshtun_stop"
-start_cmd="sshtun_start"
-
-sshtun_start()
-{
-  ${command} start ${flags} &
-}
-
-sshtun_stop()
-{
-  ${command} stop
-}
-
+sshtun_pidfile=${sshtun_pidfile-"/var/run/sshtun.pid"}
+pidfile="${sshtun_pidfile}"
 
 run_rc_command "$1"
 
-

2.0/nanobsd/nanobsd/files/usr/local/sshtun/sshtun.sh ¶

@@ -1 +1 @@
 #!/bin/sh
+# Simple deamon which does remote connecting to a sertain host for tunnel
+# forwarding
+#
+# Created by Richard van Mansom - Jan 2010
+# Make deamon friendly by Rick van der Zwet  - Feb 2010
+
 
 # Define some vars
-DIR=`dirname $0`
-CMD=$1
+PWD=`dirname $0`
+SSH_FLAGS=$@
+
 HOST="sshtun.wirelessleiden.nl"
-REMOTEPORT=$2
-LOCALPORT="22"
 USER="ssh-tun"
-SSHKEY="${DIR}/sshkey"
-WAIT="10" 
+SSHKEY="${PWD}/sshkey"
+PID='/var/run/sshtun.pid'
+LOGFILE='/var/log/sshtun.log'
+
+# Program internal variables
+WAIT="10"
 REMOTEWAIT=`expr 3600 \* 24 \* 365`
-echo ${REMOTEPORT}
+
+log() {
+  echo `date "+%b %e %T"` ": " $* >> ${LOGFILE}
+}
+
+# Store script PID in right location
+echo $$ > $PID || exit 1
+
+SSHPIDFILE=`mktemp -t $(basename $0)`
+
+trap_exit() {
+   if [ -s $SSHPID ]; then
+     kill `cat $SSHPID`
+     rm $SSHPID
+   fi
+   exit
+}
+
+# Don't leave the ssh client process behind
+trap "trap_exit" 0 1 2 15
 
 # Make sure a port is specified
-if [ -n "$REMOTEPORT" ]; then
+if [ -z "$SSH_FLAGS" ]; then
+  echo "Usage: $0 <SSH_CLIENT_FLAGS>"
+  exit 64
+fi
 
-  case $1 in
-    start) 
-  
-      PROCESS=`ps -ax | grep localhost | grep sshtun | grep ${REMOTEPORT} | grep -v grep | awk '{print $1}'`
-      if [ -z "$PROCESS" ]; then
-  
-        sleep 1
+# Main program
+log "[INFO] Connecting with args: $SSH_FLAGS"
 
-        echo "Connecting using port $REMOTEPORT"
-  
-        # Make sure the script never dies
-        while [ true ]
-        do
-        
-          # Connect to remote site
-          ssh -R ${REMOTEPORT}:localhost:${LOCALPORT} -i ${SSHKEY} ${USER}@${HOST} -o ServerAliveInterval=5 -o ExitOnForwardFailure=yes  -o BatchMode=yes  -o StrictHostKeyChecking=no -n -N "sh -c 'sleep ${REMOTEWAIT}'" 
-          # Echo some stuff
-          date
-          echo "Sleeping $WAIT seconds"
-          echo ""
-        
-          # Go to sleep 
-          sleep ${WAIT}
-        done
-  
-      else
-        echo "Tunnel already running"
-        echo "Pid: "
-        echo ${PROCESS}
-      fi
-  
-    ;;
-    stop)
-  
-      # Killing the tunnel
-      PROCESS=`ps -ax | grep -v stop | grep -E '(ssh-tun|sshtun)' | grep ${REMOTEPORT} | grep -v grep | awk '{print $1}'`
-  
-      if [ -n "$PROCESS"  ]; then
-        echo "Killing session with port $REMOTEPORT :
-  $PROCESS"
-        echo ${PROCESS} | xargs kill -9
-      fi
-    ;;
-  
-    *)
-      # Display usage info
-      echo "Usage: ./sshtun <ACTION> <PORT>"
-    ;;
-  esac
-fi
+# Make sure the tunnel keeps on reconnecting
+while true
+do
+  # Connect to remote site
+  ssh ${SSH_FLAGS} -i ${SSHKEY} ${USER}@${HOST} -o ServerAliveInterval=5 \
+    -o ExitOnForwardFailure=yes -o BatchMode=yes  -o StrictHostKeyChecking=no \
+    -n -N "sh -c 'sleep ${REMOTEWAIT}'" &
+
+  # Save the sshtun PID
+  SSHPID=$!
+  echo ${SSHPID} > ${SSHPIDFILE}
+  log "[NOTICE] Used PID: $SSHPID"
+
+  # As long the client is running make sure to sleep and relax, don't make it very
+  # long as a sleeping shell script cannot receive sigtals
+  while [ `ps ax | awk '{ print $1 }' | grep "^$SSHPID\$"` ]; do
+     sleep 10
+  done
+  log "[NOTICE] SSHTUN Disconnected ${SSHPID}"
+
+  # Mark process disconnected
+  echo "" > ${SSHPIDFILE}
+
+  log "[INFO] Sleeping $WAIT seconds before reconnect"
+  sleep ${WAIT}
+done
+