v4.36.8

cary-sas · Dec 12, 2022 · da6d039 · da6d039
1 parent 37b9f14
commit da6d039
Show file tree

Hide file tree

Showing 12 changed files with 193 additions and 13 deletions.
diff --git a/380_armv5_packge/4.36.8/md5sum.txt b/380_armv5_packge/4.36.8/md5sum.txt
@@ -0,0 +1 @@
+fdc70591e739a101442120a193f14771
diff --git a/380_armv5_packge/4.36.8/shadowsocks.tar.gz b/380_armv5_packge/4.36.8/shadowsocks.tar.gz
diff --git a/380_armv5_packge/config.json.js b/380_armv5_packge/config.json.js
@@ -1,9 +1,9 @@
 {
-"build_date":"2022-11-24_00:28:51",
+"build_date":"2022-12-12_22:11:46",
 "description":"科学上网",
 "home_url":"Main_Ss_Content.asp",
-"md5":"c1fbaa4a04a4676006dd080d707e8dfd",
+"md5":"fdc70591e739a101442120a193f14771",
 "name":"shadowsocks",
-"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.7/shadowsocks.tar.gz",
-"version":"4.36.7"
+"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.8/shadowsocks.tar.gz",
+"version":"4.36.8"
 }
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.36.7
+4.36.8
diff --git a/shadowsocks/bin/naive b/shadowsocks/bin/naive
diff --git a/shadowsocks/bin/trojan-go b/shadowsocks/bin/trojan-go
diff --git a/shadowsocks/bin/xray b/shadowsocks/bin/xray
diff --git a/shadowsocks/scripts/ss_proc_status.sh b/shadowsocks/scripts/ss_proc_status.sh
@@ -119,7 +119,7 @@ echo_version(){
 	echo "client_linux_arm5	20210922	kcptun"
 	echo "v2ray			$ss_basic_v2ray_version	"	
 	echo "xray			$ss_basic_xray_version	"	
-	echo "trojan-go		0.10.9		2022年10月18日编译"
+	echo "trojan-go		0.10.10		2022年11月29日编译"
 	echo "naive		$ss_basic_naive_version	"
 	echo -----------------------------------------------------------
 }

diff --git a/shadowsocks/scripts/ss_webtest.sh b/shadowsocks/scripts/ss_webtest.sh
@@ -520,6 +520,59 @@ create_naive_json(){
 		EOF
 }
 
+create_ss2022_json(){
+	rm -f /tmp/tmp_v2ray.json
+		 #Shadowsocks 2022 
+		 # inbounds area (23458 for socks5)  
+		cat > /tmp/tmp_v2ray.json <<-EOF
+		{
+			"log": {
+				"access": "/dev/null",
+				"error": "/tmp/v2ray_webtest_log.log",
+				"loglevel": "error"
+			},
+				"inbounds": [
+					{
+						"port": 23458,
+						"listen": "0.0.0.0",
+						"protocol": "socks",
+						"settings": {
+							"auth": "noauth",
+							"udp": true,
+							"ip": "127.0.0.1",
+							"clients": null
+						},
+						"streamSettings": null
+					},
+					{
+						"listen": "0.0.0.0",
+						"port": 3335,
+						"protocol": "dokodemo-door",
+						"settings": {
+							"network": "tcp,udp",
+							"followRedirect": true
+						}
+					}
+				],
+			"outbounds": [
+			  {
+				"protocol": "shadowsocks",
+				"settings": {
+				  "servers": [
+					{
+					  "address": "$array1",
+					  "port": $array2,
+					  "method": "$array4",
+					  "password": "$array3"
+					}
+				  ]
+				}
+			  }
+			]
+		}
+		EOF
+}
+
 start_webtest(){
 	array1=`dbus get ssconf_basic_server_$nu`
 	array2=`dbus get ssconf_basic_port_$nu`
@@ -537,6 +590,17 @@ start_webtest(){
 	array14=`dbus get ssconf_basic_trojan_binary_$nu`
 	array15=`dbus get ssconf_basic_naive_protocol_$nu`
 	array16=`dbus get ssconf_basic_naive_user_$nu`
+	array17=`dbus get ssconf_basic_v2ray_xray_$nu`
+
+	if [ "$array12" == "0" ];then
+		case $array4 in
+			2022-blake3-aes-128-gcm|2022-blake3-aes-256-gcm|2022-blake3-chacha20-poly1305) SS2022_webtest="Y";;
+			*)             SS2022_webtest="N";;
+		esac
+	fi
+	[ "$SS2022_webtest" == "Y" ] && array12="3"
+
+	[ "$array17" == "xray" ] && array17="xray run"
 
 	if [ "$array10" != "" ];then
 		if [ "$array9" == "1" ];then
@@ -587,13 +651,20 @@ start_webtest(){
 			fi	
 			kill -9 $ss_local_pid >/dev/null 2>&1
 
-		elif [ "$array12" == "3" ];then   #v2ray
+		elif [ "$array12" == "3" ] && [ "$SS2022_webtest" != "Y" ];then   #v2ray
 			create_v2ray_json 
+			$array17 -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &
+			speed_test_curl
+			kill -9 `ps|grep "$array17" |grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1	
+			rm -f /tmp/tmp_v2ray.json /tmp/v2ray_webtest_log.log
+
+		elif [ "$array12" == "3" ] && [ "$SS2022_webtest" == "Y" ];then   #ShadowSocks 2022
+			create_ss2022_json 
 			xray run -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &
 			speed_test_curl
 			kill -9 `ps|grep xray|grep 'tmp_v2ray'|awk '{print $1}'` >/dev/null 2>&1	
 			rm -f /tmp/tmp_v2ray.json /tmp/v2ray_webtest_log.log
-			
+
 		elif [ "$array12" == "4" -a "$array14" == "Trojan" ];then   #trojan
 			create_trojan_json 
 			xray run -config=/tmp/tmp_v2ray.json >/dev/null 2>&1 &

diff --git a/shadowsocks/ss/ssconfig.sh b/shadowsocks/ss/ssconfig.sh
@@ -35,6 +35,14 @@ game_on=`dbus list ss_acl_mode|cut -d "=" -f 2 | grep 3`
 ss_basic_password=`echo $ss_basic_password|base64_decode`
 ARG_V2RAY_PLUGIN=""
 
+if [ "$ss_basic_type" == "0" ];then
+	case $ss_basic_method in
+		2022-blake3-aes-128-gcm|2022-blake3-aes-256-gcm|2022-blake3-chacha20-poly1305) SS2022="Y";;
+		*)             SS2022="N";;
+	esac
+fi
+[ "$SS2022" == "Y" ] && ss_basic_type="3"
+
 # 兼容3.8.9及其以下
 [ -z "$ss_basic_type" ] && {
 	if [ -n "$ss_basic_rss_protocol" ];then
@@ -1776,7 +1784,6 @@ create_trojan_json(){
 		EOF
 
 		echo_date 解析Trojan配置文件...
-	#	cp "$V2RAY_CONFIG_FILE_TMP" /tmp/home/root/trojantmp.json
 		cat "$V2RAY_CONFIG_FILE_TMP" | jq --tab . >"$V2RAY_CONFIG_FILE"
 
 		echo_date Trojan配置文件写入成功到"$V2RAY_CONFIG_FILE"
@@ -1937,6 +1944,82 @@ create_naive_json(){
 	fi
 }
 
+
+create_ss2022_json(){
+	rm -rf "$V2RAY_CONFIG_FILE_TMP"
+	rm -rf "$V2RAY_CONFIG_FILE"
+	if  [ "$ss_basic_type" == "3" ] && [ "$SS2022" == "Y" ]; then
+		echo_date 生成 Shadowsocks 2022 配置文件...
+		 #Shadowsocks 2022 
+		 # inbounds area (23456 for socks5)  
+		cat >"$V2RAY_CONFIG_FILE_TMP" <<-EOF
+		{
+			"log": {
+				"access": "/dev/null",
+				"error": "/tmp/v2ray_log.log",
+				"loglevel": "error"
+			},
+				"inbounds": [
+					{
+						"port": 23456,
+						"listen": "0.0.0.0",
+						"protocol": "socks",
+						"settings": {
+							"auth": "noauth",
+							"udp": true,
+							"ip": "127.0.0.1",
+							"clients": null
+						},
+						"streamSettings": null
+					},
+					{
+						"listen": "0.0.0.0",
+						"port": 3333,
+						"protocol": "dokodemo-door",
+						"settings": {
+							"network": "tcp,udp",
+							"followRedirect": true
+						}
+					}
+				],
+			"outbounds": [
+			  {
+				"protocol": "shadowsocks",
+				"settings": {
+				  "servers": [
+					{
+					  "address": "$(dbus get ss_basic_server)",
+					  "port": $ss_basic_port,
+					  "method": "$ss_basic_method",
+					  "password": "$ss_basic_password"
+					}
+				  ]
+				}
+			  }
+			]
+		}
+		EOF
+
+		echo_date 解析 Shadowsocks 2022 配置文件...
+		cat "$V2RAY_CONFIG_FILE_TMP" | jq --tab . >"$V2RAY_CONFIG_FILE"
+
+		echo_date Shadowsocks 2022 配置文件写入成功到"$V2RAY_CONFIG_FILE"
+
+		cd /koolshare/bin
+		echo_date 测试 Shadowsocks 2022 配置文件.....
+		result=$(xray -test -config="$V2RAY_CONFIG_FILE" | grep "Configuration OK.")
+		if [ -n "$result" ]; then
+			echo_date $result
+			echo_date Shadowsocks 2022 配置文件通过测试!!!
+		else
+			echo_date Shadowsocks 2022 配置文件没有通过测试，请检查设置!!!
+			rm -rf "$V2RAY_CONFIG_FILE_TMP"
+			rm -rf "$V2RAY_CONFIG_FILE"
+			close_in_five
+		fi
+	fi
+}
+
 start_v2ray() {
 	# v2ray start
 	cd /koolshare/bin
@@ -1961,11 +2044,11 @@ start_v2ray_xray() {
 		start_xray
 	elif [ "$ss_basic_type" == "4" ]; then
 		start_trojan
+	elif [ "$SS2022" == "Y" ]; then
+		start_ss2022		
 	else
 		start_v2ray
 	fi
-
-
 }
 
 start_xray() {
@@ -2042,6 +2125,24 @@ start_naiveproxy() {
 	echo_date NaiveProxy启动成功，pid：$naivePID
 }
 
+start_ss2022() {
+	# Shadowsocks 2022  start
+	cd /koolshare/bin
+	#export GOGC=30
+	xray run -config=/koolshare/ss/v2ray.json >/dev/null 2>&1 &
+	local ss2022PID
+	local i=10
+	until [ -n "$ss2022PID" ]; do
+		i=$(($i - 1))
+		ss2022PID=$(pidof xray)
+		if [ "$i" -lt 1 ]; then
+			echo_date "Shadowsocks 2022 进程启动失败！"
+			close_in_five
+		fi
+		sleep 1
+	done
+	echo_date Shadowsocks 2022 启动成功，pid：$ss2022PID
+}
 
 write_cron_job(){
 	sed -i '/ssupdate/d' /var/spool/cron/crontabs/* >/dev/null 2>&1
@@ -2708,7 +2809,8 @@ apply_ss(){
 	create_dnsmasq_conf
 	# do not re generate json on router start, use old one
 	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" != "3" ] && [ "$ss_basic_type" != "4" ] && create_ss_json
-	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && create_v2ray_json
+	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && [ "$SS2022" != "Y" ] && create_v2ray_json
+	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "3" ] && [ "$SS2022" == "Y" ] && create_ss2022_json
 	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "4" -a "$ss_basic_trojan_binary" == "Trojan" ] && create_trojan_json
 	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "4" -a "$ss_basic_trojan_binary" == "Trojan-Go" ] && create_trojango_json
 	[ -z "$WAN_ACTION" ] && [ "$ss_basic_type" = "5" ] && create_naive_json

diff --git a/shadowsocks/ss/version b/shadowsocks/ss/version
@@ -1 +1 @@
-4.36.7
+4.36.8
diff --git a/shadowsocks/webs/Main_Ss_Content.asp b/shadowsocks/webs/Main_Ss_Content.asp
@@ -3771,6 +3771,9 @@ function set_cron(action) {
 																		<option value="chacha20-ietf">chacha20-ietf</option>
 																		<option value="chacha20-ietf-poly1305">chacha20-ietf-poly1305</option>
 																		<option value="xchacha20-ietf-poly1305">xchacha20-ietf-poly1305</option>
+																		<option value="2022-blake3-aes-128-gcm">2022-blake3-aes-128-gcm</option>
+																		<option value="2022-blake3-aes-256-gcm">2022-blake3-aes-256-gcm</option>
+																		<option value="2022-blake3-chacha20-poly1305">2022-blake3-chacha20-poly1305</option>																		
 																	</select>
 																</td>	
 															</tr>
@@ -4129,6 +4132,9 @@ function set_cron(action) {
 															<option value="chacha20-ietf">chacha20-ietf</option>
 															<option value="chacha20-ietf-poly1305">chacha20-ietf-poly1305</option>
 															<option value="xchacha20-ietf-poly1305">xchacha20-ietf-poly1305</option>
+															<option value="2022-blake3-aes-128-gcm">2022-blake3-aes-128-gcm</option>
+															<option value="2022-blake3-aes-256-gcm">2022-blake3-aes-256-gcm</option>
+															<option value="2022-blake3-chacha20-poly1305">2022-blake3-chacha20-poly1305</option>
 														</select>
 													</td>
 												</tr>