github-mirrors/easy-xray
1
0
Fork 0
mirror of https://github.com/EvgenyNerush/easy-xray.git synced 2025-12-13 21:35:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

add *suspend* and *resume* commands

Browse Source
This commit is contained in:
Evgeny Nerush
2024-03-04 12:07:30 +03:00
parent 8e956157f5
commit f06bb50fc1
1 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
ex.sh
View File

@@ -286,7 +286,13 @@ but not present; to generate them, try
./ex.sh conf${normal}" ./ex.sh conf${normal}"
exit 1 exit 1
fi fi
if [ -v $1 ] if $1
then
resume=false
else
resume=true
fi
if [ -v $2 ]
then then
echo -e "${red}usernames not set${normal} echo -e "${red}usernames not set${normal}
For default user, use config_client.json generated For default user, use config_client.json generated
@@ -297,7 +303,7 @@ preferably of letters and digits only."
# backup server config # backup server config
cp_to_backup ./conf/config_server.json cp_to_backup ./conf/config_server.json
# loop over usernames # loop over usernames
for username in "$@" for username in "${@:2}"
do do
username_exists=false username_exists=false
client_emails=$(jq ".inbounds[1].settings.clients[].email" ./conf/config_server.json) client_emails=$(jq ".inbounds[1].settings.clients[].email" ./conf/config_server.json)
@@ -312,15 +318,28 @@ preferably of letters and digits only."
done done
if $username_exists if $username_exists
then then
echo -e "${yellow}username ${username} already exists, no new config created fot it${normal}" echo -e "${yellow}username ${username} already exists is the server config,
no new config created fot it${normal}"
else else
id=$(xray uuid) # generate random uuid for vless if [ $resume ]
# generate random short_id for grpc-reality then
short_id=$(openssl rand -hex 8) if [ ! -f "./conf/config_client_$username.json" ]
# make new user config from default user config then
ok1=$(cat ./conf/config_client.json | jq ".outbounds[0].settings.vnext[0].users[0].id=\"${id}\" | .outbounds[0].settings.vnext[0].users[0].email=\"${username}@example.com\" | .outbounds[0].streamSettings.realitySettings.shortId=\"${short_id}\"" > ./conf/config_client_${username}.json) echo -e "${red}no ./conf/config_client_${username}.json found, can\'t resume${normal}"
# then make the user (not root) an owner of a file exit 1
[[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_client_${username}.json fi
id=$(strip_quotes $(jq ".outbounds[0].settings.vnext[0].users[0].id" ./conf/config_client_${username}.json))
short_id=$(strip_quotes $(jq ".outbounds[0].streamSettings.realitySettings.shortId" ./conf/config_client_${username}.json))
ok1=true
else
id=$(xray uuid) # generate random uuid for vless
# generate random short_id for grpc-reality
short_id=$(openssl rand -hex 8)
# make new user config from default user config
ok1=$(cat ./conf/config_client.json | jq ".outbounds[0].settings.vnext[0].users[0].id=\"${id}\" | .outbounds[0].settings.vnext[0].users[0].email=\"${username}@example.com\" | .outbounds[0].streamSettings.realitySettings.shortId=\"${short_id}\"" > ./conf/config_client_${username}.json)
# then make the user (not root) an owner of a file
[[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_client_${username}.json
fi
# update server config # update server config
client=" client="
{ {
@@ -330,16 +349,21 @@ preferably of letters and digits only."
} }
" "
# update server config # update server config
cp ./conf/config_server.json ./conf/tmpconfig.json cp ./conf/config_server.json ./conf/tmp_server_config.json
ok2=$(cat ./conf/tmpconfig.json | jq ".inbounds[1].settings.clients += [${client}] | .inbounds[1].streamSettings.realitySettings.shortIds += [\"${short_id}\"]" > ./conf/config_server.json) ok2=$(cat ./conf/tmp_server_config.json | jq ".inbounds[1].settings.clients += [${client}] | .inbounds[1].streamSettings.realitySettings.shortIds += [\"${short_id}\"]" > ./conf/config_server.json)
rm ./conf/tmpconfig.json
# then make the user (not root) an owner of a file # then make the user (not root) an owner of a file
[[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_server.json [[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_server.json
if $ok1 && $ok2 if $ok1 && $ok2
then then
echo -e "${green}config_client_${username}.json is written, config_server.json is updated${normal}" rm ./conf/tmp_server_config.json
if [ ! $resume ]
then
echo -e "${green}config_client_${username}.json is written,${normal}"
fi
echo -e "${green}config_server.json is updated${normal}"
else else
echo -e "${yellow}something went wrong with username ${username}${normal}" echo -e "${yellow}something went wrong with username ${username}${normal}"
exit 1
fi fi
fi fi
done done
@@ -479,9 +503,9 @@ then
push push
fi fi
elif [ $command = "add" ] elif [ $command = "add" ] || [ $command = "resume" ]
then then
add "${@:2}" add true "${@:2}"
# #
echo -e "Copy config to xray's dir and restart xray? (Y/n)" echo -e "Copy config to xray's dir and restart xray? (Y/n)"
read answer read answer
@@ -490,7 +514,7 @@ then
push push
fi fi
elif [ $command = "del" ] elif [ $command = "del" ] || [ $command = "suspend" ]
then then
if [ -v $2 ] if [ -v $2 ]
then then
@@ -514,19 +538,33 @@ then
echo -e "${yellow}no config for user ${username}${normal}" echo -e "${yellow}no config for user ${username}${normal}"
else else
short_id=$(jq ".outbounds[0].streamSettings.realitySettings.shortId" $config) short_id=$(jq ".outbounds[0].streamSettings.realitySettings.shortId" $config)
cp ./conf/config_server.json ./conf/tmpconfig.json cp ./conf/config_server.json ./conf/tmp_server_config.json
# update server config # update server config
ok1=$(cat ./conf/tmpconfig.json | jq "del(.inbounds[1].settings.clients[] | select(.email == \"${username}@example.com\")) | del(.inbounds[1].streamSettings.realitySettings.shortIds[] | select(. == ${short_id}))" > ./conf/config_server.json) ok1=$(cat ./conf/tmp_server_config.json | jq "del(.inbounds[1].settings.clients[] | select(.email == \"${username}@example.com\")) | del(.inbounds[1].streamSettings.realitySettings.shortIds[] | select(. == ${short_id}))" > ./conf/config_server.json)
rm ./conf/tmpconfig.json
# then make the user (not root) an owner of a file # then make the user (not root) an owner of a file
[[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_server.json [[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ./conf/config_server.json
ok2=$(rm ./conf/config_client_${username}.json) if [ $command = "del" ]
if $ok1 && $ok2
then then
echo -e "${green}config_client_${username}.json is deleted, ok2=$(rm ./conf/config_client_${username}.json)
config_server.json is updated${normal}" if $ok1 && $ok2
then
rm ./conf/tmp_server_config.json
echo -e "${green}config_client_${username}.json is deleted,
config_server.json is updated${normal}"
else
echo -e "${red}something went wrong with username ${username}${normal}"
exit 1
fi
else else
echo -e "${red}something went wrong with username ${username}${normal}" if $ok1
then
rm ./conf/tmp_server_config.json
echo -e "${green}user ${username} is suspended,
config_server.json is updated${normal}"
else
echo -e "${red}something went wrong with username ${username}${normal}"
exit 1
fi
fi fi
fi fi
done done
@@ -664,16 +702,17 @@ then
\"flow\": \"xtls-rprx-vision\" \"flow\": \"xtls-rprx-vision\"
} }
" "
cp ${to}/config_server.json ${to}/tmpconfig.json cp ${to}/config_server.json ${to}/tmp_server_config.json
ok2=$(cat ${to}/tmpconfig.json | jq ".inbounds[1].settings.clients += [${client}] | .inbounds[1].streamSettings.realitySettings.shortIds += [\"${short_id}\"]" > ${to}/config_server.json) ok2=$(cat ${to}/tmp_server_config.json | jq ".inbounds[1].settings.clients += [${client}] | .inbounds[1].streamSettings.realitySettings.shortIds += [\"${short_id}\"]" > ${to}/config_server.json)
rm ${to}/tmpconfig.json
# then make the user (not root) an owner of a file # then make the user (not root) an owner of a file
[[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ${to}/config_server.json [[ $SUDO_USER ]] && chown "$SUDO_USER:$SUDO_USER" ${to}/config_server.json
if $ok1 && $ok2 if $ok1 && $ok2
then then
rm ${to}/tmp_server_config.json
echo -e "${green}${to}/config_client_${uname_from_email}.json is written, ${to}/config_server.json is updated${normal}" echo -e "${green}${to}/config_client_${uname_from_email}.json is written, ${to}/config_server.json is updated${normal}"
else else
echo -e "${yellow}something went wrong with username ${uname_from_email}${normal}" echo -e "${yellow}something went wrong with username ${uname_from_email}${normal}"
exit 1
fi fi
fi fi
fi fi
@@ -728,6 +767,9 @@ Here is a list of all the commands available:
${bold}add ${underl}usernames${normal} add users with given usernames to configs, ${bold}add ${underl}usernames${normal} add users with given usernames to configs,
usernames should by separated by spaces usernames should by separated by spaces
${bold}del ${underl}usernames${normal} delete users with given usernames from configs ${bold}del ${underl}usernames${normal} delete users with given usernames from configs
${bold}suspend ${underl}usernames${normal} delete users with given usernames from the server config
but don't delete the user configs
${bold}resume ${underl}usernames${normal} add users from suspended configs to the server config
${bold}push${normal} copy config to xray's dir and restart xray ${bold}push${normal} copy config to xray's dir and restart xray
${bold}link ${underl}config${normal} convert user config to a link acceptable by ${bold}link ${underl}config${normal} convert user config to a link acceptable by
client applications such as Hiddify or V2ray client applications such as Hiddify or V2ray