[pull] master from Hagb:master

.github/actions/build-and-push-docker-image/action.yml

@@ -0,0 +1,153 @@
+name: Build and Push Docker Image
+description: Build and Push Docker Image
+inputs:
+  registry_username:
+    description: "Username for image registry"
+    required: true
+  registry_password:
+    description: "Password for image registry"
+    required: true
+  ec_image_name:
+    description: 'Name of the easyconnect image to push'
+    required: true
+    default: 'hagb/docker-easyconnect'
+  atrust_image_name:
+    description: 'Name of the atrust image to push'
+    required: true
+    default: 'hagb/docker-atrust'
+  archs:
+    description: 'Archs of the easyconnect image to push'
+    required: true
+    default: 'mips64le arm64 i386 amd64'
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Login to Docker registry
+      uses: docker/login-action@v1
+      with:
+        username: ${{ inputs.registry_username }}
+        password: ${{ inputs.registry_password }}
+
+    - name: Build Docker image
+      shell: bash
+      run: |
+        to-tag() {
+          tag="$( IFS=-; printf %s "$*"; )"
+          if [ -n "$tag" ]; then
+            printf %s "$tag"
+          else
+            echo latest
+          fi
+        }
+        docker-build() {
+          #docker pull $1
+          docker buildx build --build-arg BUILD_ENV=actions "$@"
+        }
+        branch="$(git branch --show-current)"
+        case "$branch" in
+          master) prefix= ;;
+          develop) prefix=dev ;;
+          *) prefix="$branch" ;;
+        esac
+
+        build() {
+          for ver in 7.6.3 7.6.7; do
+            docker-build --platform "$1" -t hagb/docker-easyconnect:build $(cat build-args/$ver-"$1".txt) -f Dockerfile.build .
+            docker-build --platform "$1" -t ${{ inputs.ec_image_name }}:$(to-tag $prefix $ver $1) $(cat build-args/$ver-"$1".txt) -f Dockerfile .
+            docker-build --platform "$1" -t ${{ inputs.ec_image_name }}:$(to-tag $prefix vncless $ver $1) $(cat build-args/$ver-"$1".txt) -f Dockerfile.vncless .
+          done
+
+          if [ -e build-args/atrust-"$1".txt ]; then
+            docker-build --platform "$1" -t hagb/docker-easyconnect:build $(cat build-args/atrust-"$1".txt) -f Dockerfile.build .
+            docker-build --platform "$1" -t ${{ inputs.atrust_image_name }}:$(to-tag $prefix $1) $(cat build-args/atrust-"$1".txt) -f Dockerfile .
+            docker-build --platform "$1" -t ${{ inputs.atrust_image_name }}:$(to-tag $prefix vncless $1) $(cat build-args/atrust-"$1".txt) -f Dockerfile.vncless .
+          fi
+
+          if [ amd64 = "$1" ]; then
+            docker-build -t ${{ inputs.ec_image_name }}:$(to-tag $prefix cli) -f Dockerfile.cli .
+          fi
+        }
+
+        sudo apt-get update
+        sudo apt-get -y install binfmt-support qemu-user-static
+
+        for arch in ${{ inputs.archs }}; do
+          build $arch
+        done
+
+        docker image rm hagb/docker-easyconnect:build
+
+    - name: Push Docker image
+      shell: bash
+      run: |
+        to-tag() {
+          IFS=-
+          tag="$(printf %s "$*")"
+          if [ -n "$tag" ]; then
+            printf %s "$tag"
+          else
+            echo latest
+          fi
+        }
+        branch="$(git branch --show-current)"
+        case "$branch" in
+          master)
+            prefix=
+            ;;
+          develop)
+            prefix=dev
+            ;;
+          *)
+            prefix="$branch"
+            ;;
+        esac
+
+        token="$( curl -sH "Content-Type: application/json" \
+                    -X POST -d "{\"username\": \"${{ inputs.registry_username }}\", \"password\": \"${{ inputs.registry_password }}\"}" \
+                    https://hub.docker.com/v2/users/login/ |
+                  jq -r .token )"
+        delete_tag() {
+            curl -sH "Content-Type: application/json" -X DELETE -H "Authorization: JWT $token" \
+                  https://hub.docker.com/v2/repositories/$1/tags/$2/
+        }
+
+        docker push --all-tags ${{ inputs.ec_image_name }}
+        docker push --all-tags ${{ inputs.atrust_image_name }}
+
+        for ver in 7.6.3 7.6.7; do
+          for vncless in "" vncless; do
+            for arch in ${{ inputs.archs }}; do
+              docker manifest create ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless $ver) --amend ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless $ver $arch)
+            done
+
+            docker manifest push ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless $ver)
+
+            if [ 7.6.7 = $ver ]; then
+              for arch in ${{ inputs.archs }}; do
+                docker manifest create ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless) --amend ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless $ver $arch)
+              done
+              docker manifest push ${{ inputs.ec_image_name }}:$(to-tag $prefix $vncless)
+            fi
+
+            for arch in ${{ inputs.archs }}; do
+              delete_tag ${{ inputs.ec_image_name }} $(to-tag $prefix $vncless $ver $arch)
+            done
+          done
+        done
+
+        for vncless in "" vncless; do
+          for arch in ${{ inputs.archs }}; do
+            if [ -e build-args/atrust-"$arch".txt ]; then
+              docker manifest create ${{ inputs.atrust_image_name }}:$(to-tag $prefix $vncless) --amend ${{ inputs.atrust_image_name }}:$(to-tag $prefix $vncless $arch)
+            fi
+          done
+
+          docker manifest push ${{ inputs.atrust_image_name }}:$(to-tag $prefix $vncless)
+
+          for arch in ${{ inputs.archs }}; do
+            [ ! -e build-args/atrust-$arch.txt ] || delete_tag ${{ inputs.atrust_image_name }} $(to-tag $prefix $vncless $arch)
+          done
+        done

.github/workflows/build-and-push-docker-image.yml

@@ -2,46 +2,12 @@ name: Build And Push Docker Image
 
 on: workflow_dispatch
 
-env:
-  IMAGE_NAME: hagb/docker-easyconnect
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Login to Docker registry
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build Docker image
-        run: |
-          docker-build() {
-            #docker pull $1
-            docker build -t $1 --build-arg BUILD_ENV=actions "${@:2}"
-          }
-          pirefix=""
-          latest_name="latest"
-          if [ "$(git branch --show-current)" = develop ]; then prefix=dev- ; latest_name=dev ; fi
-
-          docker-build fake-hwaddr -f Dockerfile.fake-hwaddr .
-
-          docker-build ${{ env.IMAGE_NAME }}:${prefix}cli -f Dockerfile.cli .
-
-          docker-build ${{ env.IMAGE_NAME }}:${prefix}7.6.3 --build-arg EC_URL=$(cat ec_urls/7.6.3.txt) -f Dockerfile .
-          docker-build ${{ env.IMAGE_NAME }}:${prefix}7.6.7 --build-arg EC_URL=$(cat ec_urls/7.6.7.txt) -f Dockerfile .
-
-          docker-build ${{ env.IMAGE_NAME }}:${prefix}vncless-7.6.3 --build-arg EC_URL=$(cat ec_urls/7.6.3.txt) -f Dockerfile.vncless .
-          docker-build ${{ env.IMAGE_NAME }}:${prefix}vncless-7.6.7 --build-arg EC_URL=$(cat ec_urls/7.6.7.txt) -f Dockerfile.vncless .
-
-          docker tag ${{ env.IMAGE_NAME }}:${prefix}7.6.3 ${{ env.IMAGE_NAME }}:${latest_name}
-
-      - name: Push Docker image
-        run: |
-          docker push --all-tags ${{ env.IMAGE_NAME }}
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/build-and-push-docker-image
+      with:
+        registry_username: ${{secrets.DOCKERHUB_USERNAME}}
+        registry_password: ${{secrets.DOCKERHUB_TOKEN}}

.github/workflows/check-easyconnect-versions.yml

@@ -0,0 +1,46 @@
+name: Check EasyConnect versions
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '30 3 * * *'
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Compare pkg_version.xml
+        id: compare
+        run: |
+          wget http://download.sangfor.com.cn/download/product/sslvpn/pkg/pkg_version.xml -O pkg_version_remote.xml
+          if diff pkg_version.xml pkg_version_remote.xml >/dev/null; then
+            echo "different=false" >> $GITHUB_OUTPUT
+          else
+            echo "different=true" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
+      - name: Replace pkg_version.xml
+        run: |
+          git config --global user.name 'github-actions'
+          git config --global user.email '[email protected]'
+          cp pkg_version_remote.xml pkg_version.xml
+          git add pkg_version.xml
+          git commit -m "Update pkg_version.xml"
+          git push
+        if: steps.compare.outputs.different == 'true'
+
+      - name: Rebuild EasyConnect
+        uses: ./.github/actions/build-and-push-docker-image
+        with:
+          registry_username: ${{secrets.DOCKERHUB_USERNAME}}
+          registry_password: ${{secrets.DOCKERHUB_TOKEN}}
+        if: steps.compare.outputs.different == 'true'

Dockerfile

@@ -1,37 +1,47 @@
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
-ARG BUILD_ENV=local
+ARG ANDROID_PATCH MIRROR_URL=http://ftp.cn.debian.org/debian/ EC_HOST VPN_TYPE=EC_GUI
 
-RUN if [ "${BUILD_ENV}" = "local" ]; then sed -i s/deb.debian.org/mirrors.aliyun.com/ /etc/apt/sources.list; fi &&\
+COPY ["./build-scripts/config-apt.sh", "./build-scripts/get-echost-names.sh",  "./build-scripts/add-qemu.sh", \
+      "/tmp/build-scripts/"]
+
+RUN . /tmp/build-scripts/config-apt.sh && \
+    . /tmp/build-scripts/get-echost-names.sh && \
+    . /tmp/build-scripts/add-qemu.sh && \
     apt-get update && \
+    if [ "ATRUST" = "$VPN_TYPE" ]; then \
+        extra_pkgs="libssl1.1 libatk-bridge2.0-0 libgtk-3-0 libgbm1 libqt5x11extras5 procps \
+                    libqt5core5a libqt5network5 libqt5widgets5 libldap-2.4-2 stalonetray"; \
+    else \
+        extra_pkgs="libgtk2.0-0 libdbus-glib-1-2 libgconf-2-4 libnspr4:$EC_HOST libnss3:$EC_HOST"; \
+    fi && \
     apt-get install -y --no-install-recommends --no-install-suggests \
-        libgtk2.0-0 libx11-xcb1 libxtst6 libnss3 libasound2 libdbus-glib-1-2 iptables xclip\
-        dante-server tigervnc-standalone-server tigervnc-common psmisc flwm x11-utils\
-        busybox libssl-dev iproute2 tinyproxy-bin socat \
-        fonts-wqy-microhei
+        libx11-xcb1 libnss3 libasound2 iptables xclip libxtst6 \
+        dante-server tigervnc-standalone-server tigervnc-tools psmisc flwm x11-utils \
+        busybox libssl-dev iproute2 tinyproxy-bin libxss1 ca-certificates \
+        fonts-wqy-microhei socat $qemu_pkgs $extra_pkgs && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -r socks && useradd -r -g socks socks
 
-ARG EC_URL
+COPY ["./build-scripts/install-vpn-gui.sh", "./build-scripts/mk-qemu-wrapper.sh", "/tmp/build-scripts/"]
 
-RUN cd tmp &&\
-    busybox wget "${EC_URL}" -O EasyConnect.deb &&\
-    dpkg -i EasyConnect.deb && rm EasyConnect.deb
+COPY ./docker-root-preinst /
 
-COPY ./docker-root /
+ARG VPN_URL ELECTRON_URL USE_VPN_ELECTRON VPN_DEB_PATH
 
-RUN rm -f /usr/share/sangfor/EasyConnect/resources/conf/easy_connect.json &&\
-    mv /usr/share/sangfor/EasyConnect/resources/conf/ /usr/share/sangfor/EasyConnect/resources/conf_backup
+RUN /tmp/build-scripts/install-vpn-gui.sh
 
-RUN busybox wget https://github.com/pgaskin/easy-novnc/releases/download/v1.1.0/easy-novnc_linux-64bit -O /usr/bin/easy-novnc &&\
-    chmod +x /usr/bin/easy-novnc
+COPY ./docker-root /
 
-COPY --from=fake-hwaddr fake-hwaddr/fake-hwaddr.so /usr/local/lib/fake-hwaddr.so
+COPY --from=hagb/docker-easyconnect:build /results/fake-hwaddr/ /results/fake-getlogin/ /results/tinyproxy-ws/ /results/novnc/ /
 
 #ENV TYPE="" PASSWORD="" LOOP=""
 #ENV DISPLAY
 #ENV USE_NOVNC=""
 
+ENV PING_INTERVAL=1800
+
 VOLUME /root/ /usr/share/sangfor/EasyConnect/resources/logs/
 
 CMD ["start.sh"]

Dockerfile.build

@@ -0,0 +1,52 @@
+FROM debian:bookworm-slim AS build
+
+ARG ANDROID_PATCH BUILD_ENV=local MIRROR_URL=http://ftp.cn.debian.org/debian/ EC_HOST
+
+COPY ["./build-scripts/config-apt.sh", "./build-scripts/get-echost-names.sh", "/tmp/build-scripts/"]
+
+RUN . /tmp/build-scripts/config-apt.sh && \
+    . /tmp/build-scripts/get-echost-names.sh && \
+    case "$(dpkg --print-architecture)" in \
+        amd64 | i386 | arm64 ) go=golang-go ;; \
+        * ) go=gccgo-go ;; \
+    esac && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends --no-install-suggests ca-certificates \
+                    busybox libssl-dev automake $go $ecgccpkg build-essential
+
+RUN mkdir results && cd results && mkdir fake-hwaddr tinyproxy-ws novnc fake-getlogin && mkdir /tmp/src -p
+
+COPY fake-hwaddr /tmp/src/fake-hwaddr/
+COPY fake-getlogin /tmp/src/fake-getlogin/
+
+RUN . /tmp/build-scripts/get-echost-names.sh && \
+    cd /tmp/src/fake-hwaddr && CC=${ec_cc} make clean all && install -D fake-hwaddr.so /results/fake-hwaddr/usr/local/lib/fake-hwaddr.so && \
+    cd /tmp/src/fake-getlogin && CC=${ec_cc} make clean all && install -D fake-getlogin.so /results/fake-getlogin/usr/local/lib/fake-getlogin.so
+
+# https://github.com/tinyproxy/tinyproxy/pull/211#issue-382736027
+ARG TINYPROXY_COMMIT=991e47d8ebd4b12710828b2b486535e4c25ba26c
+
+RUN cd /tmp/src/ && \
+    busybox wget https://github.com/tinyproxy/tinyproxy/archive/${TINYPROXY_COMMIT}.zip -O tinyproxy.zip && \
+    busybox unzip tinyproxy.zip && mv tinyproxy-${TINYPROXY_COMMIT} tinyproxy && cd tinyproxy && \
+    ./autogen.sh --prefix=/usr && make && install -D src/tinyproxy /results/tinyproxy-ws/usr/bin/tinyproxy
+
+ARG NOVNC_METHOD=min-size GOPROXY=http://proxy.golang.com.cn,direct
+
+RUN cd /tmp/src/ && \
+    case "${NOVNC_METHOD}" in \
+      min-size ) \
+        busybox wget https://github.com/novnc/noVNC/archive/refs/heads/master.zip -O novnc.zip && \
+        busybox wget https://github.com/novnc/websockify-other/archive/refs/heads/master.zip -O novnc-websockify.zip && \
+        busybox unzip novnc.zip && mv noVNC-master novnc && ln -s vnc.html novnc/index.html && \
+        sed -i "s#UI.initSetting('path', 'websockify')#UI.initSetting('path','websockify/websockify')#" novnc/app/ui.js && \
+        mkdir -p /results/novnc/usr/local/share/ && mv novnc /results/novnc/usr/local/share/novnc && \
+        busybox unzip novnc-websockify.zip && mv websockify-other-master novnc-websockify && \
+        cd novnc-websockify/c/ && make && install -D websockify /results/novnc/usr/local/bin/websockify ;; \
+      easy-novnc ) \
+        busybox wget https://github.com/pgaskin/easy-novnc/archive/refs/heads/master.zip -O easy-novnc.zip && \
+        busybox unzip easy-novnc.zip && mv easy-novnc-master easy-novnc && cd easy-novnc && \
+        go build -ldflags "-s -w" -gccgoflags "-Wl,-s,-gc-sections -fdata-sections -ffunction-sections -static-libgo" && \
+        install -D easy-novnc /results/novnc/usr/local/bin/easy-novnc ;; \
+      * ) printf "Not a vaild value of NOVNC_METHOD: %s\n" "${NOVNC_METHOD}" >&2 && false ;; \
+    esac && ln -s novnc-${NOVNC_METHOD}.sh /results/novnc/usr/local/bin/novnc