From 3c3911fb007335728aac729c58cc6dbc5b49bf18 Mon Sep 17 00:00:00 2001 From: lucus Date: Sun, 16 Feb 2020 04:22:29 +0900 Subject: [PATCH 1/3] Add test to CI --- .github/workflows/build.yml | 7 ++ script/http.go | 22 ++++++ script/test.sh | 154 ++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 script/http.go create mode 100755 script/test.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe18be92..193024f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,3 +26,10 @@ jobs: - name: Build run: go build -v . + + - name: Test + run: | + export PATH="$(go env GOPATH)/bin:$PATH" + go get . + go get -u -v github.com/shadowsocks/v2ray-plugin + ./script/test.sh diff --git a/script/http.go b/script/http.go new file mode 100644 index 00000000..d5cd3692 --- /dev/null +++ b/script/http.go @@ -0,0 +1,22 @@ +package main + +/* Simple http server for testing. */ + +import ( + "fmt" + "net/http" + "os" +) + +func handler(w http.ResponseWriter, r *http.Request) { + fmt.Fprintf(w, "Hello, go-shadowsocks2!") +} + +func main() { + if len(os.Args) != 2 { + fmt.Println("Usage: http ") + os.Exit(1) + } + http.HandleFunc("/", handler) + http.ListenAndServe("127.0.0.1:"+os.Args[1], nil) +} diff --git a/script/test.sh b/script/test.sh new file mode 100755 index 00000000..3b4b93db --- /dev/null +++ b/script/test.sh @@ -0,0 +1,154 @@ +#!/bin/bash + +# Use [ -n "$TRAVIS" ] to test for running on Travis-CI. + +# Run in the scripts directory. +cd "$( dirname "${BASH_SOURCE[0]}" )" + +PLUGIN="v2ray-plugin" +SERVER_PORT="4433" +LOCAL_PORT="1080" +SOCKS="127.0.0.1:1080" +HTTP_PORT="8080" + +if [[ -z "${GOPATH}" ]]; then + GOPATH=~/go +fi + +wait_server() { + local port + port=$1 + for i in {1..20}; do + # sleep first because this maybe called immediately after server start + sleep 0.1 + nc -z -w 4 127.0.0.1 $port && break + done +} + +start_http_server() { + go build http.go + ./http $HTTP_PORT & + wait_server $HTTP_PORT + http_pid=$! +} + +stop_http_server() { + kill -SIGTERM $http_pid +} + +test_get() { + local url + local target + local code + url=$1 + target=$2 + code=$3 + + if [[ -z $code ]]; then + code="200" + fi + + # -s silent to disable progress meter, but enable --show-error + # -i to include http header + # -L to follow redirect so we should always get HTTP 200 + cont=`curl -m 5 --socks5 $SOCKS -s --show-error -i -L $url 2>&1` + ok=`echo $cont | grep -E -o "HTTP/1\.1 +$code"` + html=`echo $cont | grep -E -o -i "$target"` + if [[ -z $ok || -z $html ]] ; then + echo "GET $url FAILED!!!" + echo "$ok" + echo "$html" + echo $cont + return 1 + fi + return 0 +} + +test_shadowsocks() { + local url + local method + local server_pid + local local_pid + local client_option + local server_option + local msg + local expectation + url=$1 + method=$2 + msg="Testing HTTP/GET $url $method w/o plugin" + expectation=$3 + + if [ $# -eq 4 ]; then + server_option="-plugin $PLUGIN -plugin-opts server;" + client_option="-plugin $PLUGIN" + msg="Testing HTTP/GET $url $method with plugin" + fi + echo "============================================================" + echo $msg + + go-shadowsocks2 -s "ss://$method:your-password@:$SERVER_PORT" -verbose $server_option & + server_pid=$! + wait_server $SERVER_PORT + + go-shadowsocks2 -c "ss://$method:your-password@127.0.0.1:$SERVER_PORT" \ + -verbose -socks :$LOCAL_PORT -u $client_option & + local_pid=$! + wait_server $LOCAL_PORT + + for i in {1..3}; do + test_get $url "go-shadowsocks2" + if ! [ $? -eq $expectation ]; then + echo -e "STATUS:\033[31m FAIL \033[0m" + kill -SIGTERM $server_pid + kill -SIGTERM $local_pid + stop_http_server + exit 1 + fi + done + echo -e "STATUS:\033[32m PASS \033[0m" + kill -SIGTERM $server_pid + kill -SIGTERM $local_pid + sleep 0.1 +} + +test_methods() { + local url + url=http://127.0.0.1:$HTTP_PORT/README.md + + test_shadowsocks $url AEAD_AES_128_GCM 0 + test_shadowsocks $url AEAD_AES_192_GCM 0 + test_shadowsocks $url AEAD_AES_256_GCM 0 + test_shadowsocks $url AEAD_CHACHA20_POLY1305 0 + test_shadowsocks $url AES-128-CFB 0 + test_shadowsocks $url AES-128-CTR 0 + test_shadowsocks $url AES-192-CFB 0 + test_shadowsocks $url AES-192-CTR 0 + test_shadowsocks $url AES-256-CFB 0 + test_shadowsocks $url AES-256-CTR 0 + test_shadowsocks $url CHACHA20-IETF 0 + test_shadowsocks $url XCHACHA20 0 +} + +test_plugin() { + local url + url=http://127.0.0.1:$HTTP_PORT/README.md + + test_shadowsocks $url AEAD_AES_128_GCM 0 plugin + mv $GOPATH/bin/$PLUGIN ./ + test_shadowsocks $url AES-128-CFB 0 plugin + mv ./$PLUGIN $GOPATH/bin/ + + # chmod -x ./$PLUGIN + # test_shadowsocks $url AEAD_AES_128_GCM 1 plugin + # mv ./$PLUGIN $GOPATH/bin/ + # test_shadowsocks $url AES-128-CFB 1 plugin + # chmod +x $GOPATH/bin/$PLUGIN +} + +start_http_server + +test_methods + +test_plugin + +stop_http_server From 53175874df1dd1292606f1bcf69fb2c380bffabd Mon Sep 17 00:00:00 2001 From: lucus Date: Sun, 16 Feb 2020 04:27:15 +0900 Subject: [PATCH 2/3] Update badge in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17f98180..65204863 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A fresh implementation of Shadowsocks in Go. GoDoc at https://godoc.org/github.com/shadowsocks/go-shadowsocks2/ -[![Build Status](https://travis-ci.com/shadowsocks/go-shadowsocks2.svg?branch=master)](https://travis-ci.com/shadowsocks/go-shadowsocks2) +[![Build Status](https://github.com/shadowsocks/go-shadowsocks2/workflows/Build/badge.svg)](https://github.com/shadowsocks/go-shadowsocks2/actions?query=workflow%3ABuild) ## Features From 37ea497aed5145fe597df3c4e5a8981d481f84f3 Mon Sep 17 00:00:00 2001 From: lucus Date: Sun, 16 Feb 2020 04:48:02 +0900 Subject: [PATCH 3/3] Add uploading artifacts to CI --- .github/workflows/build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 193024f1..07c584fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,17 @@ jobs: fi - name: Build - run: go build -v . + run: | + mkdir build + go build -o go-shadowsocks2 -v . && zip ./build/go-shadowsocks2_linux-x64.zip go-shadowsocks2 + GOOS=darwin go build -o go-shadowsocks2 -v . && zip ./build/go-shadowsocks2_darwin-x64.zip go-shadowsocks2 + GOOS=windows go build -o go-shadowsocks2.exe && zip ./build/go-shadowsocks2_win-x64.zip go-shadowsocks2.exe + + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: artifacts + path: ./build - name: Test run: |