add CLI easyconn_7.6.8

Author: shmilee

easyconnect-in-docker/deploy-cli.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+# Copyright (C) 2021 shmilee
+
+# EC version to run, 7.6.8
+VERSION="${1:-7.6.8}"
+# EC data repo dir
+DATAREPO="${2:-./ECDATA}"
+
+EasyConnectDir=/usr/share/sangfor/EasyConnect
+HOSTECDIR="${DATAREPO}/EasyConnect_cli_x64_v$VERSION"
+
+deploy_data() {
+    # deb url
+    urlprefix='http://download.sangfor.com.cn/download/product/sslvpn/pkg'
+    if [ x"$VERSION" = x"7.6.8" ]; then
+        deburl="$urlprefix/linux_broken/easyconn_7.6.8.2-ubuntu_amd64.deb"
+    else
+        echo ">> Not supported CLI EC version: $VERSION"
+        exit 1
+    fi
+    # download & extract deb
+    if [ ! -d "${DATAREPO}" ]; then
+        mkdir -pv "${DATAREPO}"
+    fi
+    debfile="${DATAREPO}/EasyConnect_cli_x64_v$VERSION.deb"
+    if [ ! -f "${debfile}" ]; then
+        wget -c "${deburl}" -O "${debfile}"
+    fi
+    if [ ! -d "${HOSTECDIR}" ]; then
+        mkdir /tmp/ec-tmp
+        bsdtar -v -x -f "${debfile}" -C /tmp/ec-tmp
+        bsdtar -v -x -f /tmp/ec-tmp/data.tar.* -C /tmp/ec-tmp
+        mv -v /tmp/ec-tmp/${EasyConnectDir} "${HOSTECDIR}"
+        rm -r /tmp/ec-tmp/
+    fi
+    echo -n $VERSION >"${HOSTECDIR}/ecversion"
+    if [ ! -f "${HOSTECDIR}/EasyConnect" ]; then
+        ln -s ./resources/bin/easyconn "${HOSTECDIR}/EasyConnect"
+    fi
+    if [ ! -f "${HOSTECDIR}/hook_script.sh" ]; then
+        cp -v ./hook_script.sh "${HOSTECDIR}/hook_script.sh"
+    fi
+    if [ ! -f "${HOSTECDIR}/start.sh" ]; then
+        cp -v ./start.sh "${HOSTECDIR}/start.sh"
+    fi
+    if [ ! -x "${HOSTECDIR}/start.sh" ]; then
+        chmod +x "${HOSTECDIR}/start.sh"
+    fi
+}
+
+deploy_data

easyconnect-in-docker/hook_script.sh

@@ -131,6 +131,21 @@ hook_fix763_login() { #{{{
     ) &
 } #}}}
 
+## exec easyconn
+start_easyconn() {
+    local params="-v"
+    [ -n "$ECADDRESS" ] && params+=" -d $ECADDRESS"
+    [ -n "$ECUSER" ] && params+=" -u $ECUSER"
+    [ -n "$ECPASSWD" ] && params+=" -p $ECPASSWD"
+
+    run_cmd easyconn foreground login $params
+    keep='K'
+    while [ x"$keep" != x'XXX' ]; do
+        read -p " -> Enter 'XXX' to exit:" keep
+    done
+    run_cmd easyconn foreground logout
+}
+
 ## reload main
 main() {
     echo "Running hook main ..."
@@ -144,6 +159,11 @@ main() {
     # ignore: URLWIN=1, shell/open_browser.sh. Use xdg-open in host.
 
     run_cmd EasyMonitor
-    start_EC
+
+    if [ x"$TYPE" = x"CLI" ]; then
+        start_easyconn
+    else
+        start_EC
+    fi
 }
 

easyconnect-in-docker/readme.md

@@ -10,12 +10,13 @@ docker build --rm -t shmilee/easyconnect:$tag -f Dockerfile .
 
 # run
 
-## deb url
+## package files
 
 * [7.6.3](http://download.sangfor.com.cn/download/product/sslvpn/pkg/linux_01/EasyConnect_x64.deb)
 * [7.6.7](http://download.sangfor.com.cn/download/product/sslvpn/pkg/linux_767/EasyConnect_x64_7_6_7_3.deb)
+* 7.6.8 CLI: `easyconn_7.6.8.2-ubuntu_amd64.deb`, `md5: 88371f0dc336c5021e213e10745cf47c`
 
-## deploy & start
+## GUI deploy & start
 
 ```bash
 ./deploy.sh <ec version> <ec data repo>
@@ -93,6 +94,51 @@ non-network local connections being removed from access control list
 Stop watching url.
 ```
 
+## CLI deploy & start
+
+```bash
+./deploy-cli.sh 7.6.8 $HOME/.ECDATA # example
+```
+
+```bash
+tag=210223
+TYPE=CLI $HOME/.ECDATA/EasyConnect_cli_x64_v7.6.8/start.sh $tag -e TYPE=CLI -p 3600:1080
+# output
+>>> Host Dir to mount: /home/xxx/.ECDATA/EasyConnect_cli_x64_v7.6.8
+source hook_script.sh ...
+Running hook main ...
+Run hook_danted
+Run CMD: /usr/share/sangfor/EasyConnect/resources/bin/EasyMonitor 
+Start EasyMonitor success!
+Run CMD: /usr/share/sangfor/EasyConnect/resources/bin/easyconn login -v
+No previous user logged in!
+No previous user logged in!
+vpn adress: vpn.xxx.cn:443
+Get https://vpn.xxx.cn:443/por/login_auth.csp ...
+Get https://vpn.xxx.cn:443/por/login_auth.csp Done, code=200
+Cipher Suite: AES128-SHA
+Begin detect listen port of ECAgent ...
+Read listen port of ECAgent from file: 54530
+Done detect listen port of ECAgent, result: 54530!
+Get https://127.0.0.1:54530/ECAgent ...
+Get https://127.0.0.1:54530/ECAgent Done, code=200
+username: xxxx
+password: xxxx
+Authenticating user "xxxx" by password ...
+Post https://vpn.xxx.cn:443/por/login_psw.csp ...
+Post https://vpn.xxx.cn:443/por/login_psw.csp Done, code=200
+Get https://127.0.0.1:54530/ECAgent ...
+Get https://127.0.0.1:54530/ECAgent Done, code=200
+Get https://127.0.0.1:54530/ECAgent ...
+Get https://127.0.0.1:54530/ECAgent Done, code=200
+user "xxxx" login successfully!
+Start easyconn success!
+ -> Enter 'XXX' to exit:XXX
+Run CMD: /usr/share/sangfor/EasyConnect/resources/bin/easyconn logout
+user "xxxx" is already logged out!
+Start easyconn success!
+```
+
 ## desktop file
 
 * edit `Exec` options in `ec-7.6.x.desktop`

easyconnect-in-docker/start.sh

@@ -12,11 +12,13 @@ if [ x"$1" = x"-h" -o  x"$1" = x"--help" ]; then
 >> Usage:
     $0 <image tag> <params>
     TYPE=VNC $0 <image tag> <params>
+    TYPE=CLI $0 <image tag> <params>
 >> params example:
 # iptable  :  -e IPTABLES=1 -e IPTABLES_LEGACY=1
 # danted   :  -e NODANTED=1 OR -p 127.0.0.1:1080:1080
 # TYPE=VNC :  -e TYPE=VNC -e PASSWORD=x -e ECPASSWORD= -p 127.0.0.1:5901:5901
 # sshd     :  -e SSHD=1 -e ROOTPASSWD=x1 -p 127.0.0.1:2222:22
+# TYPE=CLI :  -e TYPE=CLI -e ECADDRESS=x:p -e ECUSER= -e ECPASSWORD=
 EOF
     exit 0
 fi
@@ -39,9 +41,21 @@ watch_url() {
     rm "${HOSTECDIR}"/tmp-url
 }
 
-watch_url &
 use="${TYPE:-X11}"
-if [ x"$use" = xX11 ]; then
+if [ x"$use" = xVNC ]; then
+    watch_url &
+    docker run --rm --device /dev/net/tun --cap-add NET_ADMIN -t \
+        -v ${HOSTECDIR}:${EasyConnectDir} \
+        $params \
+        shmilee/easyconnect:$tag
+    echo 'NEWURL: #BREAK#' >>"${HOSTECDIR}"/tmp-url
+elif [ x"$use" = xCLI ]; then
+    docker run --rm --device /dev/net/tun --cap-add NET_ADMIN -i -t \
+        -v ${HOSTECDIR}:${EasyConnectDir} \
+        $params \
+        shmilee/easyconnect:$tag
+else
+    watch_url &
     xhost +LOCAL:
     docker run --rm --device /dev/net/tun --cap-add NET_ADMIN \
         -v ${HOSTECDIR}:${EasyConnectDir} \
@@ -51,12 +65,7 @@ if [ x"$use" = xX11 ]; then
         $params \
         shmilee/easyconnect:$tag
     xhost -LOCAL:
-else
-    docker run --rm --device /dev/net/tun --cap-add NET_ADMIN -t \
-        -v ${HOSTECDIR}:${EasyConnectDir} \
-        $params \
-        shmilee/easyconnect:$tag
+    echo 'NEWURL: #BREAK#' >>"${HOSTECDIR}"/tmp-url
 fi
 
-echo 'NEWURL: #BREAK#' >>"${HOSTECDIR}"/tmp-url
 exit 0