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

fix(auth): correctly handle unlimited users in auth script

Browse Source
This commit is contained in:
Whispering Wind
2025-08-08 01:32:39 +03:30
committed by GitHub
parent 5bcbf0abb3
commit 073c8ed787
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ MAX_DOWNLOAD_BYTES=$(jq -r --arg user "$USERNAME" '.[$user].max_download_bytes'
EXPIRATION_DAYS=$(jq -r --arg user "$USERNAME" '.[$user].expiration_days' "$USERS_FILE") EXPIRATION_DAYS=$(jq -r --arg user "$USERNAME" '.[$user].expiration_days' "$USERS_FILE")
ACCOUNT_CREATION_DATE=$(jq -r --arg user "$USERNAME" '.[$user].account_creation_date' "$USERS_FILE") ACCOUNT_CREATION_DATE=$(jq -r --arg user "$USERNAME" '.[$user].account_creation_date' "$USERS_FILE")
BLOCKED=$(jq -r --arg user "$USERNAME" '.[$user].blocked' "$USERS_FILE") BLOCKED=$(jq -r --arg user "$USERNAME" '.[$user].blocked' "$USERS_FILE")
CURRENT_DOWNLOAD_BYTES=$(jq -r --arg user "$USERNAME" '.[$user].download_bytes' "$USERS_FILE") CURRENT_DOWNLOAD_BYTES=$(jq -r --arg user "$USERNAME" '.[$user].download_bytes // 0' "$USERS_FILE")
CURRENT_UPLOAD_BYTES=$(jq -r --arg user "$USERNAME" '.[$user].upload_bytes' "$USERS_FILE") CURRENT_UPLOAD_BYTES=$(jq -r --arg user "$USERNAME" '.[$user].upload_bytes // 0' "$USERS_FILE")
TOTAL_BYTES=$((CURRENT_DOWNLOAD_BYTES + CURRENT_UPLOAD_BYTES)) TOTAL_BYTES=$((CURRENT_DOWNLOAD_BYTES + CURRENT_UPLOAD_BYTES))
@ -28,6 +28,7 @@ if [ "$STORED_PASSWORD" != "$PASSWORD" ]; then
exit 1 exit 1
fi fi
if [ "$EXPIRATION_DAYS" -ne 0 ]; then
CURRENT_DATE=$(date +%s) CURRENT_DATE=$(date +%s)
EXPIRATION_DATE=$(date -d "$ACCOUNT_CREATION_DATE + $EXPIRATION_DAYS days" +%s) EXPIRATION_DATE=$(date -d "$ACCOUNT_CREATION_DATE + $EXPIRATION_DAYS days" +%s)
@ -35,7 +36,9 @@ if [ "$CURRENT_DATE" -ge "$EXPIRATION_DATE" ]; then
jq --arg user "$USERNAME" '.[$user].blocked = true' "$USERS_FILE" > temp.json && mv temp.json "$USERS_FILE" jq --arg user "$USERNAME" '.[$user].blocked = true' "$USERS_FILE" > temp.json && mv temp.json "$USERS_FILE"
exit 1 exit 1
fi fi
fi
if [ "$MAX_DOWNLOAD_BYTES" -ne 0 ]; then
if [ "$TOTAL_BYTES" -ge "$MAX_DOWNLOAD_BYTES" ]; then if [ "$TOTAL_BYTES" -ge "$MAX_DOWNLOAD_BYTES" ]; then
SECRET=$(jq -r '.trafficStats.secret' "$CONFIG_FILE") SECRET=$(jq -r '.trafficStats.secret' "$CONFIG_FILE")
KICK_ENDPOINT="http://127.0.0.1:25413/kick" KICK_ENDPOINT="http://127.0.0.1:25413/kick"
@ -44,6 +47,7 @@ if [ "$TOTAL_BYTES" -ge "$MAX_DOWNLOAD_BYTES" ]; then
jq --arg user "$USERNAME" '.[$user].blocked = true' "$USERS_FILE" > temp.json && mv temp.json "$USERS_FILE" jq --arg user "$USERNAME" '.[$user].blocked = true' "$USERS_FILE" > temp.json && mv temp.json "$USERS_FILE"
exit 1 exit 1
fi fi
fi
echo "$USERNAME" echo "$USERNAME"
exit 0 exit 0