bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path related issues

Browse Source
This commit is contained in:
Sarina
2024-07-21 21:32:11 +03:30
parent 484821c499
commit 14f61134dc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/scripts/hysteria2/add_user.sh
View File

@ -41,13 +41,13 @@ add_user() {
traffic=$((traffic_gb * 1073741824)) traffic=$((traffic_gb * 1073741824))
if [ ! -f "/etc/hysteria/users/users.json" ]; then if [ ! -f "/etc/hysteria/users.json" ]; then
echo "{}" > /etc/hysteria/users/users.json echo "{}" > /etc/hysteria/users.json
fi fi
jq --arg username "$username" --arg password "$password" --argjson traffic "$traffic" --argjson expiration_days "$expiration_days" --arg creation_date "$creation_date" \ jq --arg username "$username" --arg password "$password" --argjson traffic "$traffic" --argjson expiration_days "$expiration_days" --arg creation_date "$creation_date" \
'.[$username] = {password: $password, max_download_bytes: $traffic, expiration_days: $expiration_days, account_creation_date: $creation_date, blocked: false}' \ '.[$username] = {password: $password, max_download_bytes: $traffic, expiration_days: $expiration_days, account_creation_date: $creation_date, blocked: false}' \
/etc/hysteria/users/users.json > /etc/hysteria/users/users_temp.json && mv /etc/hysteria/users/users_temp.json /etc/hysteria/users/users.json /etc/hysteria/users.json > /etc/hysteria/users_temp.json && mv /etc/hysteria/users_temp.json /etc/hysteria/users.json
python3 /etc/hysteria/core/cli.py restart-hysteria2 > /dev/null 2>&1 python3 /etc/hysteria/core/cli.py restart-hysteria2 > /dev/null 2>&1

8
core/scripts/hysteria2/remove_user.sh
View File

@ -9,10 +9,10 @@ remove_user() {
username=$1 username=$1
if [ -f "/etc/hysteria/users/users.json" ]; then if [ -f "/etc/hysteria/users.json" ]; then
# Check if the username exists in the users.json file # Check if the username exists in the users.json file
if jq -e "has(\"$username\")" /etc/hysteria/users/users.json > /dev/null; then if jq -e "has(\"$username\")" /etc/hysteria/users.json > /dev/null; then
jq --arg username "$username" 'del(.[$username])' /etc/hysteria/users/users.json > /etc/hysteria/users/users_temp.json && mv /etc/hysteria/users/users_temp.json /etc/hysteria/users/users.json jq --arg username "$username" 'del(.[$username])' /etc/hysteria/users.json > /etc/hysteria/users_temp.json && mv /etc/hysteria/users_temp.json /etc/hysteria/users.json
if [ -f "/etc/hysteria/traffic_data.json" ]; then if [ -f "/etc/hysteria/traffic_data.json" ]; then
jq --arg username "$username" 'del(.[$username])' /etc/hysteria/traffic_data.json > /etc/hysteria/traffic_data_temp.json && mv /etc/hysteria/traffic_data_temp.json /etc/hysteria/traffic_data.json jq --arg username "$username" 'del(.[$username])' /etc/hysteria/traffic_data.json > /etc/hysteria/traffic_data_temp.json && mv /etc/hysteria/traffic_data_temp.json /etc/hysteria/traffic_data.json
@ -24,7 +24,7 @@ remove_user() {
echo -e "\033[0;31mError:\033[0m User $username not found." echo -e "\033[0;31mError:\033[0m User $username not found."
fi fi
else else
echo -e "\033[0;31mError:\033[0m Config file /etc/hysteria/users/users.json not found." echo -e "\033[0;31mError:\033[0m Config file /etc/hysteria/users.json not found."
fi fi
} }

8
core/scripts/hysteria2/show_user_uri.sh
View File

@ -2,7 +2,7 @@
# Function to show URI if Hysteria2 is installed and active # Function to show URI if Hysteria2 is installed and active
show_uri() { show_uri() {
if [ -f "/etc/hysteria/users/users.json" ]; then if [ -f "/etc/hysteria/users.json" ]; then
if systemctl is-active --quiet hysteria-server.service; then if systemctl is-active --quiet hysteria-server.service; then
# Check if the username is provided as an argument # Check if the username is provided as an argument
if [ -z "$1" ]; then if [ -z "$1" ]; then
@ -13,9 +13,9 @@ show_uri() {
username=$1 username=$1
# Validate the username # Validate the username
if jq -e "has(\"$username\")" /etc/hysteria/users/users.json > /dev/null; then if jq -e "has(\"$username\")" /etc/hysteria/users.json > /dev/null; then
# Get the selected user's details # Get the selected user's details
authpassword=$(jq -r ".\"$username\".password" /etc/hysteria/users/users.json) authpassword=$(jq -r ".\"$username\".password" /etc/hysteria/users.json)
port=$(jq -r '.listen' /etc/hysteria/config.json | cut -d':' -f2) port=$(jq -r '.listen' /etc/hysteria/config.json | cut -d':' -f2)
sha256=$(jq -r '.tls.pinSHA256' /etc/hysteria/config.json) sha256=$(jq -r '.tls.pinSHA256' /etc/hysteria/config.json)
obfspassword=$(jq -r '.obfs.salamander.password' /etc/hysteria/config.json) obfspassword=$(jq -r '.obfs.salamander.password' /etc/hysteria/config.json)
@ -56,7 +56,7 @@ show_uri() {
echo -e "\033[0;31mError:\033[0m Hysteria2 is not active." echo -e "\033[0;31mError:\033[0m Hysteria2 is not active."
fi fi
else else
echo -e "\033[0;31mError:\033[0m Config file /etc/hysteria/users/users.json not found." echo -e "\033[0;31mError:\033[0m Config file /etc/hysteria/users.json not found."
fi fi
} }

2
core/scripts/hysteria2/user.sh
View File

@ -4,7 +4,7 @@ ADDR="$1"
AUTH="$2" AUTH="$2"
TX="$3" TX="$3"
USERS_FILE="/etc/hysteria/users/users.json" USERS_FILE="/etc/hysteria/users.json"
TRAFFIC_FILE="/etc/hysteria/traffic_data.json" TRAFFIC_FILE="/etc/hysteria/traffic_data.json"
CONFIG_FILE="/etc/hysteria/config.json" CONFIG_FILE="/etc/hysteria/config.json"