From 344a7becbe2cc854476377b9ee51080cb4c10e92 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 26 Oct 2019 22:25:39 +0800 Subject: [PATCH 01/10] only check ipv4 addr, fix #367, fix #370 --- install.sh | 2 +- v2ray.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 05e1c2c..5c91b33 100644 --- a/install.sh +++ b/install.sh @@ -745,7 +745,7 @@ domain_check() { # $cmd install dnsutils -y # fi # test_domain=$(dig $domain +short) - test_domain=$(ping $domain -c 1 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" diff --git a/v2ray.sh b/v2ray.sh index a9ddfbe..daa01fd 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.17" +_version="v3.18" cmd="apt-get" @@ -1763,7 +1763,7 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - test_domain=$(ping $new_domain -c 1 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + test_domain=$(ping $new_domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" From 3c3eb91d7d2fac94b5e3387e290a4b579d8a4e83 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 27 Oct 2019 19:16:34 +0800 Subject: [PATCH 02/10] fix ping not support '-4' option. #367, #370 --- install.sh | 4 +++- v2ray.sh | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 5c91b33..e1974aa 100644 --- a/install.sh +++ b/install.sh @@ -745,7 +745,9 @@ domain_check() { # $cmd install dnsutils -y # fi # test_domain=$(dig $domain +short) - test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + # test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) + test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" diff --git a/v2ray.sh b/v2ray.sh index daa01fd..f45b60c 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.18" +_version="v3.19" cmd="apt-get" @@ -1763,7 +1763,9 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - test_domain=$(ping $new_domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + # test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) + test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" From 6288fcfbf18c86cc702e512c11217cf1c3c4a662 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 29 Oct 2019 12:25:09 +0800 Subject: [PATCH 03/10] remove random create caddy email --- src/caddy-config.sh | 7 ++----- v2ray.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/caddy-config.sh b/src/caddy-config.sh index 76c35be..b487bbb 100644 --- a/src/caddy-config.sh +++ b/src/caddy-config.sh @@ -1,10 +1,10 @@ -local email=$(((RANDOM << 22))) +# local email=$(((RANDOM << 22))) +# tls ${email}@gmail.com case $v2ray_transport in 4) if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com gzip timeouts none proxy / $proxy_site { @@ -20,7 +20,6 @@ import sites/* else cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com timeouts none proxy / 127.0.0.1:${v2ray_port} { websocket @@ -34,7 +33,6 @@ import sites/* if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com gzip timeouts none proxy / $proxy_site { @@ -51,7 +49,6 @@ import sites/* else cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com timeouts none proxy / https://127.0.0.1:${v2ray_port} { header_upstream Host {host} diff --git a/v2ray.sh b/v2ray.sh index f45b60c..15bf8a0 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.19" +_version="v3.20" cmd="apt-get" From e01ba622665aa546fcf52a9807f0e934fbb5ac2c Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:14:58 +0800 Subject: [PATCH 04/10] fix quic issues #371 --- config/server/dynamic/quic.json | 2 -- config/server/quic.json | 1 - v2ray.sh | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 16911b4..dad9718 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -23,7 +23,6 @@ "streamSettings": { "network": "quic", "quicSettings": { - "security": "aes-128-gcm", "key": "", "header": { "type": "none" @@ -56,7 +55,6 @@ "streamSettings": { "network": "quic", "quicSettings": { - "security": "aes-128-gcm", "key": "", "header": { "type": "none" diff --git a/config/server/quic.json b/config/server/quic.json index 2379fd1..4da010a 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -20,7 +20,6 @@ "streamSettings": { "network": "quic", "quicSettings": { - "security": "aes-128-gcm", "key": "", "header": { "type": "none" diff --git a/v2ray.sh b/v2ray.sh index 15bf8a0..4532b63 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.20" +_version="v3.21" cmd="apt-get" From 29c99e16b1ed4c40087814a0388b42edd1c698b0 Mon Sep 17 00:00:00 2001 From: zqigolden Date: Fri, 1 Nov 2019 17:42:30 +0800 Subject: [PATCH 05/10] Update v2ray.sh --- v2ray.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2ray.sh b/v2ray.sh index 4532b63..6bbc0ae 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -1765,7 +1765,7 @@ domain_check() { # test_domain=$(dig $new_domain +short) # test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) - test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) + test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" From 5ea36e805ed5d6e9038454fa2927b0056940dd9e Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 1 Nov 2019 19:02:04 +0800 Subject: [PATCH 06/10] fix domain check bug. --- v2ray.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 6bbc0ae..240b7e7 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.21" +_version="v3.22" cmd="apt-get" @@ -1763,8 +1763,8 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - # test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") - # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) + # test_domain=$(ping $new_domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}") + # test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1) if [[ $test_domain != $ip ]]; then echo From af60aac5dd7e45a84685465316c6d5f58989a57e Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 7 Nov 2019 10:38:15 +0800 Subject: [PATCH 07/10] enable sniffing --- config/client/h2.json | 4 ++++ config/client/http.json | 4 ++++ config/client/kcp.json | 4 ++++ config/client/quic.json | 4 ++++ config/client/tcp.json | 4 ++++ config/client/ws.json | 4 ++++ config/client/ws_tls.json | 4 ++++ v2ray.sh | 2 +- 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/config/client/h2.json b/config/client/h2.json index c11edcf..277d286 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -54,6 +54,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/http.json b/config/client/http.json index 4dd7fcc..f33004a 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -84,6 +84,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/kcp.json b/config/client/kcp.json index 4a6f583..04247d0 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -55,6 +55,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/quic.json b/config/client/quic.json index 26eef04..9877e79 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -54,6 +54,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/tcp.json b/config/client/tcp.json index e2493a9..6e7756a 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -44,6 +44,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/ws.json b/config/client/ws.json index 55d842b..38d2e3c 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -47,6 +47,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index 1782dfb..f53ab58 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -57,6 +57,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/v2ray.sh b/v2ray.sh index 240b7e7..7a1d26c 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.22" +_version="v3.23" cmd="apt-get" From 3a2b81cdf74877339827d26a886e325a2c36c0ff Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 8 Nov 2019 14:28:04 +0800 Subject: [PATCH 08/10] fix caddy cannot running. fix #392, fix #392 --- src/download-caddy.sh | 1 + v2ray.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 36f9b5e..8985b0a 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -30,6 +30,7 @@ _install_caddy_service() { if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then echo -e "$red 下载 caddy.service 失败!$none" && exit 1 fi + sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service diff --git a/v2ray.sh b/v2ray.sh index 7a1d26c..5c49848 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.23" +_version="v3.24" cmd="apt-get" From d568ae0299648ff7f142664c679a55505ec209c1 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:43:31 +0800 Subject: [PATCH 09/10] update caddy.service --- src/download-caddy.sh | 9 ++++++--- v2ray.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 8985b0a..b5fd2ec 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -27,10 +27,13 @@ _install_caddy_service() { if [[ $systemd ]]; then # cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ - if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then - echo -e "$red 下载 caddy.service 失败!$none" && exit 1 + # if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then + # echo -e "$red 下载 caddy.service 失败!$none" && exit 1 + # fi + # sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service + if [[ ! $(grep "ReadWriteDirectories" /lib/systemd/system/caddy.service) ]]; then + sed -i "/ReadWritePaths/a ReadWriteDirectories=/etc/ssl/caddy" /lib/systemd/system/caddy.service fi - sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service diff --git a/v2ray.sh b/v2ray.sh index 5c49848..0116f15 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.24" +_version="v3.25" cmd="apt-get" From 5c0193f847575881a20c928079dcd84e1afba978 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:30:54 +0800 Subject: [PATCH 10/10] fix caddy.service not found. fix #397 #398 --- src/download-caddy.sh | 2 +- v2ray.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index b5fd2ec..56a661f 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -26,7 +26,7 @@ _install_caddy_service() { setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/caddy if [[ $systemd ]]; then - # cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ + cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ # if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then # echo -e "$red 下载 caddy.service 失败!$none" && exit 1 # fi diff --git a/v2ray.sh b/v2ray.sh index 0116f15..1420c13 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.25" +_version="v3.26" cmd="apt-get"