From 4771de764d446c6c5d197591be772e07a36fd231 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:06:47 +0800 Subject: [PATCH] add *TLS protocol change port --- src/caddy.sh | 7 ++++--- src/core.sh | 41 +++++++++++++++++++++++++++++------------ v2ray.sh | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/caddy.sh b/src/caddy.sh index 0aa1d52db..bd25fd13c 100644 --- a/src/caddy.sh +++ b/src/caddy.sh @@ -1,5 +1,6 @@ caddy_config() { is_caddy_site_file=$is_caddy_conf/${host}.conf + [[ ! $tlsport ]] && tlsport=443 case $1 in new) mkdir -p $is_caddy_dir $is_caddy_dir/sites $is_caddy_conf @@ -14,21 +15,21 @@ EOF ;; *ws*) cat >${is_caddy_site_file} <<<" -${host} { +${host}:${tlsport} { reverse_proxy ${path} 127.0.0.1:${port} import ${is_caddy_site_file}.add }" ;; *h2*) cat >${is_caddy_site_file} <<<" -${host} { +${host}:${tlsport} { reverse_proxy ${path} h2c://127.0.0.1:${port} import ${is_caddy_site_file}.add }" ;; *grpc*) cat >${is_caddy_site_file} <<<" -${host} { +${host}:${tlsport} { reverse_proxy /${path}/* h2c://127.0.0.1:${port} import ${is_caddy_site_file}.add }" diff --git a/src/core.sh b/src/core.sh index 9d930416d..6a235fd0c 100644 --- a/src/core.sh +++ b/src/core.sh @@ -517,10 +517,23 @@ change() { 1) # new port is_new_port=$3 - [[ $host ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义." + [[ $host && ! $is_caddy ]] && err "($is_config_file) 不支持更改端口, 因为没啥意义." + if [[ $is_new_port && ! $is_auto ]]; then + [[ ! $(is_test port $is_new_port) ]] && err "请输入正确的端口, 可选(1-65535)" + [[ $is_new_port != 443 && $(is_test port_used $is_new_port) ]] && err "无法使用 ($is_new_port) 端口" + fi [[ $is_auto ]] && get_port && is_new_port=$tmp_port [[ ! $is_new_port ]] && ask string is_new_port "请输入新端口:" - add $net $is_new_port + if [[ $is_caddy && $host ]]; then + net=$is_old_net + tlsport=$is_new_port + load caddy.sh + caddy_config $net + manage restart caddy & + info + else + add $net $is_new_port + fi ;; 2) # new host @@ -1197,7 +1210,11 @@ get() { is_dynamic_port_range=$(jq -r '.inbounds[0].port' $is_dynamic_port_file) [[ $? != 0 ]] && err "无法读取动态端口文件: $is_dynamic_port" fi - [[ $is_client && $host ]] && port=443 + if [[ $is_caddy && $host ]]; then + tlsport=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://) + fi + [[ ! $tlsport ]] && tlsport=443 + [[ $is_client && $host ]] && port=$tlsport get protocol $is_protocol-$net fi ;; @@ -1451,12 +1468,12 @@ info() { ss) is_can_change=(0 1 4 6) is_info_show=(0 1 2 10 11) - is_url="ss://$(echo -n ${ss_method}:${ss_password} | base64 -w 0)@${is_addr}:${port}#233boy-ss-${is_addr}" + is_url="ss://$(echo -n ${ss_method}:${ss_password} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}" is_info_str=($is_protocol $is_addr $port $ss_password $ss_method) ;; ws | h2 | grpc) is_color=45 - is_can_change=(0 2 3 5) + is_can_change=(0 1 2 3 5) is_info_show=(0 1 2 3 4 6 7 8) is_url_path=path [[ $net == 'grpc' ]] && { @@ -1464,26 +1481,26 @@ info() { is_url_path=serviceName } [[ $is_protocol == 'vmess' ]] && { - is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$host\"',add:'\"$is_addr\"',port:'\"443\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{}) + is_vmess_url=$(jq -c '{v:2,ps:'\"233boy-$net-$host\"',add:'\"$is_addr\"',port:'\"$tlsport\"',id:'\"$uuid\"',aid:"0",net:'\"$net\"',host:'\"$host\"',path:'\"$path\"',tls:'\"tls\"'}' <<<{}) is_url=vmess://$(echo -n $is_vmess_url | base64 -w 0) } || { [[ $is_trojan ]] && { uuid=$trojan_password - is_info_str=($is_protocol $is_addr 443 $trojan_password $net $host $path 'tls') - is_can_change=(0 2 3 4) + is_info_str=($is_protocol $is_addr $tlsport $trojan_password $net $host $path 'tls') + is_can_change=(0 1 2 3 4) is_info_show=(0 1 2 10 4 6 7 8) } - is_url="$is_protocol://$uuid@$host:443?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$host" + is_url="$is_protocol://$uuid@$host:$tlsport?encryption=none&security=tls&type=$net&host=$host&${is_url_path}=$(sed 's#/#%2F#g' <<<$path)#233boy-$net-$host" } [[ $is_caddy ]] && is_can_change+=(13) - is_info_str=($is_protocol $is_addr 443 $uuid $net $host $path 'tls') + is_info_str=($is_protocol $is_addr $tlsport $uuid $net $host $path 'tls') ;; reality) is_color=41 is_can_change=(0 1 5 10 11) is_info_show=(0 1 2 3 15 8 16 17 18) is_info_str=($is_protocol $is_addr $port $uuid xtls-rprx-vision reality $is_servername "ios" $is_public_key) - is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$is_addr" + is_url="$is_protocol://$uuid@$ip:$port?encryption=none&security=reality&flow=xtls-rprx-vision&type=tcp&sni=$is_servername&pbk=$is_public_key&fp=ios#233boy-$net-$is_addr" ;; door) is_can_change=(0 1 8 9) @@ -1494,7 +1511,7 @@ info() { is_can_change=(0 1 15 4) is_info_show=(0 1 2 19 10) is_info_str=($is_protocol $is_addr $port $is_socks_user $is_socks_pass) - is_url="socks://$(echo -n ${is_socks_user}:${is_socks_pass} | base64 -w 0)@${is_addr}:${port}#233boy-socks-${is_addr}" + is_url="socks://$(echo -n ${is_socks_user}:${is_socks_pass} | base64 -w 0)@${is_addr}:${port}#233boy-$net-${is_addr}" ;; http) is_can_change=(0 1) diff --git a/v2ray.sh b/v2ray.sh index 28710b165..7df6fbb39 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -1,6 +1,6 @@ #!/bin/bash args=$@ -is_sh_ver=v4.09 +is_sh_ver=v4.10 . /etc/v2ray/sh/src/init.sh