From 93798228e09fae0e0536a1045e65652d95d3396d Mon Sep 17 00:00:00 2001
From: Lozy <lozy@sockd.info>
Date: Wed, 18 Jan 2017 09:49:27 +0800
Subject: [PATCH] update script

---
 README.md                                 |   4 +
 install.sh                                | 411 ++--------------------
 install_centos.sh                         |  12 +-
 install_debian.sh                         |  18 +-
 script/{sockctl => sockd}                 |   2 +-
 script/{sockctl.service => sockd.service} |   0
 6 files changed, 40 insertions(+), 407 deletions(-)
 rename script/{sockctl => sockd} (99%)
 rename script/{sockctl.service => sockd.service} (100%)

diff --git a/README.md b/README.md
index 7f7981a..7cd1550 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@
 <h3>******已解决问题</h3>
 <ul>
 <li>测试64位系统 centos 会出现认证失败 请添加一条命令 <code>cp /lib/security/pam_pwdfile.so /lib64/security/ </code></li>
+<li><code>
+/etc/danted/sbin/sockd: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.14' not found (required by /etc/danted/sbin/sockd)
+</code>
+</li>
 </ul>
 <h3>******未解决问题</h3>
 <ul>
diff --git a/install.sh b/install.sh
index fcd32a0..08c1652 100644
--- a/install.sh
+++ b/install.sh
@@ -1,397 +1,26 @@
 #!/bin/bash
-service danted stop > /dev/null 2>&1
-rm /etc/danted -rf 
-
-VERSION="v1.3.2"
-DEFAULT_PORT="2016"
-DEFAULT_USER="danted"
-DEFAULT_PAWD="danted"
-MASTER_IP="ip.baidu.com"
-SERVERIP=$(/sbin/ifconfig | grep 'inet addr' | grep -Ev 'inet addr:127.0.0|inet addr:192.168.0|inet addr:10.0.0' | sed -n 's/.*inet addr:\([^ ]*\) .*/\1/p')
-###############################################------------Menu()---------#####################################################
-for _PARAMETER in $*
-do
-    case "${_PARAMETER}" in
-      --port=*)
-        PORT="${_PARAMETER#--port=}"
-        [ -n "$PORT" ] && DEFAULT_PORT=${PORT}
-      ;;
-      --ip=*)   #split in ; ip1;ip2;
-        GETSERVERIP=$( echo "${_PARAMETER#--ip=}" | sed 's/;/\n/g' | sed '/^$/d')
-        [ -n "${GETSERVERIP}" ] && SERVERIP="${GETSERVERIP}"
-      ;;
-      --user=*)
-        user="${_PARAMETER#--user=}"
-        [ -n "${user}" ] && DEFAULT_USER="${user}"
-      ;;
-      --passwd=*)
-        passwd="${_PARAMETER#--passwd=}"
-        [ -n "${passwd}" ] && DEFAULT_PAWD="${passwd}"
-      ;;
-      --master=*)
-        master="${_PARAMETER#--master=}"
-        [ -n "${master}" ] && MASTER_IP="${master}"
-      ;;
-      --help|-h)
-        clear
-        options=( "--port=[2014]@port for dante socks5 server" \
-                  "--ip=@Socks5 Server Ip address" \
-                  "--user=@Socks5 Auth user" \
-                  "--passwd=@Socks5 Auth passwd"\
-                  "--master=@Socks5 Atuth IP" \
-                  "--help,-h@print help info" )
-        printf "Usage: %s [OPTIONS]\n\nOptions:\n\n" $0
-          
-        for option in "${options[@]}";do
-          printf "  %-20s%s\n" "$( echo ${option} | sed 's/@.*//g')"  "$( echo ${option} | sed 's/.*@//g')"
-        done
-        echo -e "\n"
-        exit 1
-      ;;
-      *)
-          exit 1
-      ;;
-        
-    esac
-done
-
-###########################################################################################################################
-
-genconfig(){
-  # CONFIGFILE $IP $PORT $INTERFACE
-  CONFIGFILE=$1
-  IP=$2
-  PORT=$3
-  INTERFACE=$4
-  cat >> $CONFIGFILE <<EOF
-# interface ${INTERFACE}
-internal: ${IP}  port = ${PORT}
-external: ${IP}
-
-EOF
-}
-
-path=$(cd `dirname $0`;pwd )
-( [ $(cat /etc/*-release | grep -c CentOS) > 0 ] \
-  && ( yum install gcc g++ make vim pam-devel tcp_wrappers-devel unzip httpd-tools -y ) ) \
-  || ( [ -n "$(grep -E 'Debian|Ubuntu' /etc/issue)" ] \
-  && ( apt-get update ) \
-  && ( apt-get install gcc g++ make vim libpam-dev libwrap0-dev unzip apache2-utils -y ) )\
-  || exit 0
-#&& ( apt-get purge dante-server -y ) \
-
-useradd sock -s /bin/false > /dev/null 2>&1
-#echo sock:sock | chpasswd
-mkdir -p /etc/danted
-CONFIGFILE="/etc/danted/sockd.conf"
-cp /dev/null ${CONFIGFILE}
-
-echo "$SERVERIP" | while read theip;do
-  echo "Adding Interface :${theip}"
-  port=$DEFAULT_PORT
-  intface=$(ifconfig | grep "$theip" -1 | sed -n 1p | awk '{print $1}' | sed 's/:/-/g')
-    
-  if [ -z "$intface" ];then
-      defaultip=$(echo "${Getserverip}" | head -1)
-      intface=$(ifconfig | grep "$defaultip" -1 | sed -n 1p | awk '{print $1}' | sed 's/:/-/g' )
-      echo "Input error. use default ip: ${defaultip}"
-      genconfig $CONFIGFILE $defaultip $port $intface
-      break
-  fi
-  genconfig $CONFIGFILE $theip $port $intface
-done
-
-# set same-same when external > 1
-[ $(echo "$SERVERIP" | wc -l ) -gt 1 ] && echo "external.rotation: same-same" >> $CONFIGFILE
-
-cat >> $CONFIGFILE <<EOF
-method: pam none
-clientmethod: none
-user.privileged: root
-user.notprivileged: sock
-logoutput: /var/log/danted.log
-
-client pass {
-        from: 0.0.0.0/0  to: 0.0.0.0/0
-}
-client block {
-        from: 0.0.0.0/0 to: 0.0.0.0/0
-}       
-
-#------------ Master ------------------
-pass {
-        from: ${MASTER_IP} to: 0.0.0.0/0
-        method: none
-}       
-#-------------------------------------
-pass {
-        from: 0.0.0.0/0 to: 0.0.0.0/0
-        protocol: tcp udp
-        method: pam
-        log: connect disconnect
-}
-block {
-        from: 0.0.0.0/0 to: 0.0.0.0/0
-        log: connect error
-}
-EOF
-
-rm /tmp/danted -rf
-mkdir -p /tmp/danted
-cd /tmp/danted
-
-#start-stop-daemon
-if [ -z "$(command -v start-stop-daemon)" ];then
-wget http://developer.axis.com/download/distribution/apps-sys-utils-start-stop-daemon-IR1_9_18-2.tar.gz
-tar zxvf apps-sys-utils-start-stop-daemon-IR1_9_18-2.tar.gz
-gcc apps/sys-utils/start-stop-daemon-IR1_9_18-2/start-stop-daemon.c -o start-stop-daemon -o /usr/local/sbin/start-stop-daemon
-fi
-#libpam-pwdfile
-if [ ! -s /lib/security/pam_pwdfile.so ];then
-wget --no-check-certificate https://github.com/tiwe-de/libpam-pwdfile/archive/master.zip -O master.zip
-unzip master.zip
-cd libpam-pwdfile-master/
-make && make install
-cd ../
-fi
-
-if [ ! -s /etc/danted/sbin/sockd ] || [ -z "$(/etc/danted/sbin/sockd -v | grep "$VERSION")" ];then
-wget http://www.inet.no/dante/files/dante-1.3.2.tar.gz
-tar zxvf dante*
-cd dante*
-./configure --with-sockd-conf=${CONFIGFILE} --prefix=/etc/danted
-make && make install
-cd ../../
-fi
-#Complile Done
-rm /tmp/danted -rf
-
-cat > /etc/pam.d/sockd  <<EOF
-auth required pam_pwdfile.so pwdfile /etc/danted/sockd.passwd
-account required pam_permit.so
-EOF
-/usr/bin/htpasswd -c -d -b /etc/danted/sockd.passwd ${DEFAULT_USER} ${DEFAULT_PAWD}
-
-cat > /etc/init.d/danted <<'EOF'
-#! /bin/bash
-### BEGIN INIT INFO
-# Provides:          danted
-# Reprogarm:         airski
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
-### END INIT INFO
 #
-# dante socks5 daemon for Debian/Centos
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/etc/danted/sbin/sockd
-VERSION="1.3.2"
-DESC="Dante SOCKS daemon"
-PIDFILE="/var/run/sockd.pid"
-CONFIGFILE=/etc/danted/sockd.conf
-
-test -f $DAEMON || exit 0
-test -f $CONFIGFILE || exit 0
-
-set -e
-#Color Variable
-CSI=$(echo -e "\033[")
-CEND="${CSI}0m"
-CDGREEN="${CSI}32m"
-CRED="${CSI}1;31m"
-CGREEN="${CSI}1;32m"
-CYELLOW="${CSI}1;33m"
-CBLUE="${CSI}1;34m"
-CMAGENTA="${CSI}1;35m"
-CCYAN="${CSI}1;36m"
-#Color Variable
-
-start_daemon_all(){
-      LOGFILE=$(grep '^logoutput' ${CONFIGFILE} | sed 's/.*logoutput: \(.*\).*/\1/g')
-
-      if [ -s $PIDFILE ] && [ -n "$( ps aux | awk '{print $2}'| grep "^$(cat $PIDFILE)$" )" ];then
-           echo -e "${CRED}Danted Server [ Runing;Failed ] ${CEND}" 
-           return 0
-      fi
-
-      cp /dev/null $PIDFILE
-      cp /dev/null $LOGFILE
-
-      if ! egrep -cve '^ *(#|$)' \
-         -e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFIGFILE > /dev/null
-      then
-          echo -e "${CRED}Danted Server [ not configured ] ${CEND}"
-          return 0
-      fi
-
-      start-stop-daemon --start --quiet --background --oknodo --pidfile $PIDFILE \
-                --exec $DAEMON -- -f ${CONFIGFILE} -D -p $PIDFILE -N 1 -n
-      sleep 2
-      
-      if [ -s $PIDFILE ];then
-          echo -e "${CGREEN}Danted Server [ Runing ] ${CEND}"
-      else
-          echo -e "${CRED}Danted Server [ Start Faild ] ${CEND}"
-      fi
-}
-stop_daemon_all(){
-    if [ ! -s $PIDFILE ];then 
-          echo -e "${CRED}Danted Server [ PID.LOST;Unable ] ${CEND}"
-    fi
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
-    --exec $DAEMON -- -f ${CONFIGFILE} -p $PIDFILE -N 1 -n
-
-    ( [ -n "$( ps aux | awk '{print $2}'| grep "^$(cat $PIDFILE)$" )" ] && \
-      echo -e "${CRED}Danted Server [ Stop Failed ] ${CEND}" ) || \
-      echo -e "${CYELLOW}Danted Server [ Stop Done ] ${CEND}"
-}
-force_stop_daemon(){
-    ps -ef | grep 'sockd' | grep -v 'grep' | awk '{print $2}' | while read pid; do kill -9 $pid > /dev/null 2>&1 ;done
-}
-
-reload_daemon_all(){
-    if [ -s $PIDFILE ];then
-      if [ -z "$( ps aux | awk '{print $2}'| grep "^$(cat $PIDFILE)$" )" ];then
-        echo -e "${CRED}Danted Server [ PID.DIE;Unable ] ${CEND}"  
-        continue
-      fi
-   else
-        echo -e "${CRED}Danted Server [ PID.LOST;Unable ] ${CEND}" 
-        continue
-    fi
-        start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile $PIDFILE \
-    --exec $DAEMON -- -f $CONFIGFILE -p $PIDFILE -N 1 -n
-
-    ( [ -n "$( ps aux | awk '{print $2}'| grep "^$(cat $PIDFILE)$" )" ] \
-      && echo -e "${CGREEN}Danted Server [ Runing ] ${CEND}" ) \
-      || echo -e "${CRED}Danted Server [ Failed ] ${CEND}"
-
-}
-status_daemon_all(){
-    printf "%s\n" "${CCYAN}+-----------------------------------------+$CEND"
+#   Dante Socks5 Server AutoInstall
+#   -- Owner:       https://www.inet.no/dante
+#   -- Provider:    https://sockd.info
+#   -- Author:      Lozy
+#
 
-    if [ ! -s $PIDFILE ];then
-      printf "%s\n" "${CRED} Danted Server [ Stop ] ${CEND}"
-    else
-      ( [ -n "$( ps aux | awk '{print $2}'| grep "^$(cat $PIDFILE)$" )" ] \
-      && printf "%s\n" "${CGREEN} Danted Server [ Runing ] ${CEND}" ) \
-      || printf "%s\n" "${CRED} Danted Server [ PID.DIE;Running ] ${CEND}"
+if [ -s "/etc/os-release" ];then
+    os_name=$(sed -n 's/PRETTY_NAME="\(.*\)"/\1/p' /etc/os-release)
+
+    if [ -n "$(echo ${os_name} | grep -Ei 'Debian|Ubuntu' )" ];then
+        printf "Current OS: %s\n" "${os_name}"
+        wget -qO- --no-check-certificate https://raw.github.com/Lozy/danted/master/install_debian.sh | \
+            bash -s -- $@
+    elif [ -n "$(echo ${os_name} | grep -Ei 'CentOS')" ];then
+        printf "Current OS: %s\n" "${os_name}"
+        wget -qO- --no-check-certificate https://raw.github.com/Lozy/danted/master/install_centos.sh | \
+            bash -s -- $@
+    else:
+        printf "Current OS: %s is not support.\n" "${os_name}"
     fi
-
-    printf "%s\n" "${CCYAN}+-----------------------------------------+$CEND"
-    printf "%-30s%s\n"  "${CGREEN} Dante Version:${CEND}"  "$CMAGENTA ${VERSION}${CEND}"
-    printf "%-30s\n"  "${CGREEN} Socks5 Info:${CEND}"
-
-    grep '^internal:' ${CONFIGFILE} | \
-    sed 's/internal:[[:space:]]*\([0-9.]*\).*port[[:space:]]*=[[:space:]]*\(.*\)/\1:\2/g' | \
-        while read proxy;do
-          printf "%20s%s\n" "" "${CMAGENTA}${proxy}${CEND}"
-        done
-    
-    SOCKD_USER=$(cat /etc/danted/sockd.passwd | while read line;do echo $line| sed 's/\(.*\):.*/\1/';done)
-    printf "%-30s%s\n" "${CGREEN} Socks5 User:${CEND}"  "$CMAGENTA ${SOCKD_USER}${CEND}"
-    printf "%s\n" "${CCYAN}+_________________________________________+$CEND"
-}
-add_user(){
-    User=$1
-    Passwd=$2
-    ( [ -z "$User" ] || [ -z "$Passwd" ] ) && echo " Error: User or password can't be blank" && return 0 
-    /usr/bin/htpasswd -d -b /etc/danted/sockd.passwd ${User} ${Passwd}
-}
-del_uer(){
-    User=$1
-    [ -z "$User" ] && echo " Error: User Name can't be blank" && return 0 
-    /usr/bin/htpasswd -D /etc/danted/sockd.passwd ${User}
-}
-
-case "$1" in
-  start)
-    echo "Starting $DESC: "
-    start_daemon_all
-  ;;
-  stop)
-    echo "Stopping $DESC: "
-    stop_daemon_all
-  ;;
-  reload)
-    echo "Reloading $DESC configuration files."
-    reload_daemon_all
-  ;;
-  restart)
-    echo "Restarting $DESC: "
-    stop_daemon_all
-    force_stop_daemon
-    sleep 1
-    start_daemon_all
-  ;;
-  status)
-    clear
-    status_daemon_all
-    ;;
-  add)
-    echo "Adding User For $DESC: "
-    add_user "$2" "$3"
-    ;;
-  del)
-    echo "Clearing User For $DESC: "
-    del_user "$2"
-    ;;
-  *)
-  N=/etc/init.d/danted
-  echo "Usage: $N {start|stop|restart|status|add|del}" >&2
-  exit 1
-  ;;
-esac
-
-exit 0
-EOF
-chmod +x /etc/init.d/danted
-[ -n "$(grep CentOS /etc/issue)" ]  && chkconfig --add danted
-[ -n "$(grep -E 'Debian|Ubuntu' /etc/issue)" ] && update-rc.d danted defaults
-rm /usr/bin/danted -f
-ln -s /etc/danted/sbin/sockd /usr/bin/danted
-service danted restart
-clear
-
-#Color Variable
-CSI=$(echo -e "\033[")
-CEND="${CSI}0m"
-CDGREEN="${CSI}32m"
-CRED="${CSI}1;31m"
-CGREEN="${CSI}1;32m"
-CYELLOW="${CSI}1;33m"
-CBLUE="${CSI}1;34m"
-CMAGENTA="${CSI}1;35m"
-CCYAN="${CSI}1;36m"
-CQUESTION="$CMAGENTA"
-CWARNING="$CRED"
-CMSG="$CCYAN"
-#Color Variable
-
-if [ -n "$(netstat -atn | grep "$DEFAULT_PORT")" ];then
-  cat <<EOF
-${CCYAN}+-----------------------------------------+$CEND
-${CGREEN} Dante Socks5 Install Done. $CEND
-${CCYAN}+-----------------------------------------+$CEND
-${CGREEN} Dante Version:       $CMAGENTA ${VERSION}$CEND
-${CGREEN} Socks5 Info:         $CMAGENTA$CEND
-EOF
- echo "${SERVERIP}" | while read theip;do
-    echo "${CGREEN}                      $CMAGENTA ${theip}:${DEFAULT_PORT}$CEND"
- done
- cat <<EOF
-${CGREEN} Socks5 User&Passwd:  $CMAGENTA ${DEFAULT_USER}:${DEFAULT_PAWD}$CEND
-${CCYAN}+_________________________________________+$CEND
-EOF
- echo -e "\033[32m Dante Server Install Successfuly! \033[0m"
 else
- echo -e "\033[1;31m Dante Server Install Failed! \033[0m"
- exit 
-fi
+    exit 1
 
-cd $path
-rm -rf $0
-exit
+exit 0
diff --git a/install_centos.sh b/install_centos.sh
index cda7433..cb9523e 100644
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -17,7 +17,7 @@ COLOR_PATH="/etc/default/color"
 BIN_DIR="/etc/danted"
 BIN_PATH="/etc/danted/sbin/sockd"
 CONFIG_PATH="/etc/danted/sockd.conf"
-BIN_SCRIPT="/etc/init.d/sockctl"
+BIN_SCRIPT="/etc/init.d/sockd"
 
 DEFAULT_IPADDR=$(ip addr | grep 'inet ' | grep -Ev 'inet 127|inet 192\.168|inet 10\.' | \
             sed "s/[[:space:]]*inet \([0-9.]*\)\/.*/\1/")
@@ -229,7 +229,7 @@ generate_config "${DEFAULT_IPADDR}" "${WHITE_LIST}"
 
 [ -n "$gen_config_only" ]  && echo "===========>> update config" && cat ${CONFIG_PATH} && exit 0
 
-download_file "script/sockctl" "${BIN_SCRIPT}" "execute"
+download_file "script/sockd" "${BIN_SCRIPT}" "execute"
 
 [ -n "$(detect_install)" ] && echo "dante sockd already install." && exit 1
 
@@ -283,13 +283,13 @@ rm /usr/bin/sockd -f && ln -s /etc/danted/sbin/sockd /usr/bin/sockd
 ${BIN_SCRIPT} adduser "${DEFAULT_USER}" "${DEFAULT_PAWD}"
 
 if [ -n "$(ls -l /sbin/init | grep systemd)" ];then
-    download_file "script/sockctl.service" "/lib/systemd/system/sockctl.service"
-    systemctl enable sockctl
+    download_file "script/sockd.service" "/lib/systemd/system/sockd.service"
+    systemctl enable sockd
 else
-    chkconfig --add sockctl
+    chkconfig --add sockd
 fi
 
-service sockctl restart
+service sockd restart
 clear
 
 if [ -n "$(netstat -atn | grep "$DEFAULT_PORT")" ];then
diff --git a/install_debian.sh b/install_debian.sh
index 24506d5..3f330af 100644
--- a/install_debian.sh
+++ b/install_debian.sh
@@ -17,7 +17,7 @@ COLOR_PATH="/etc/default/color"
 BIN_DIR="/etc/danted"
 BIN_PATH="/etc/danted/sbin/sockd"
 CONFIG_PATH="/etc/danted/sockd.conf"
-BIN_SCRIPT="/etc/init.d/sockctl"
+BIN_SCRIPT="/etc/init.d/sockd"
 
 DEFAULT_IPADDR=$(ip addr | grep 'inet ' | grep -Ev 'inet 127|inet 192\.168|inet 10\.' | \
             sed "s/[[:space:]]*inet \([0-9.]*\)\/.*/\1/")
@@ -181,7 +181,7 @@ do
       --update-whitelist|-u)
         gen_config_only="True"
       ;;
-      --force-update|-f)
+      --force-update|-f|force-update)
         remove_install
       ;;
       --uninstall)
@@ -195,8 +195,8 @@ do
                   "--port=[${DEFAULT_PORT}]@port for dante socks5 server" \
                   "--user=@Socks5 Auth user" \
                   "--passwd=@Socks5 Auth passwd"\
-                  "--master=@Socks5 Atuth IP" \
-                  "--whitelist=@Socks Auth whitelist" \
+                  "--whitelist=@Socks5 Auth IP list" \
+                  "--whitelist-url=@Socks Auth whitelist http online" \
                   "--from-package@Install package from Bin package" \
                   "--update-whitelist | -u @update white list" \
                   "--force-update | -f @force update sockd" \
@@ -227,7 +227,7 @@ generate_config "${DEFAULT_IPADDR}" "${WHITE_LIST}"
 
 [ -n "$gen_config_only" ]  && echo "===========>> update config" && cat ${CONFIG_PATH} && exit 0
 
-download_file "script/sockctl" "${BIN_SCRIPT}" "execute"
+download_file "script/sockd" "${BIN_SCRIPT}" "execute"
 
 [ -n "$(detect_install)" ] && echo "dante sockd already install." && exit 1
 
@@ -282,14 +282,14 @@ rm /usr/bin/sockd -f && ln -s /etc/danted/sbin/sockd /usr/bin/sockd
 ${BIN_SCRIPT} adduser "${DEFAULT_USER}" "${DEFAULT_PAWD}"
 
 if [ -n "$(ls -l /sbin/init | grep systemd)" ];then
-    download_file "script/sockctl.service" "/lib/systemd/system/sockctl.service"
-    systemctl enable sockctl
+    download_file "script/sockd.service" "/lib/systemd/system/sockd.service"
+    systemctl enable sockd
 else
-    update-rc.d sockctl defaults
+    update-rc.d sockd defaults
 fi
 
 clear
-service sockctl restart
+service sockd restart
 
 
 if [ -n "$(netstat -atn | grep "$DEFAULT_PORT")" ];then
diff --git a/script/sockctl b/script/sockd
similarity index 99%
rename from script/sockctl
rename to script/sockd
index 779dfe2..c40b539 100644
--- a/script/sockctl
+++ b/script/sockd
@@ -190,7 +190,7 @@ case "$1" in
      tail_log "${LOG_FILE}"
     ;;
   *)
-  N=/etc/init.d/sockctl
+  N=/etc/init.d/sockd
   echo " Usage: $N {start|stop|reload|status|adduser|deluser|tail}" >&2
   exit 1
   ;;
diff --git a/script/sockctl.service b/script/sockd.service
similarity index 100%
rename from script/sockctl.service
rename to script/sockd.service