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

fix(core): handle on-hold users and null dates in edit_user

Browse Source
This commit is contained in:
Whispering Wind
2025-08-31 21:07:25 +03:30
committed by GitHub
parent 8c019c5b9f
commit 2b923a25b0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/scripts/hysteria2/edit_user.sh
View File

@ -47,6 +47,9 @@ validate_date() {
if [ -z "$date_str" ]; then if [ -z "$date_str" ]; then
return 0 return 0
fi fi
if [ "$date_str" == "null" ]; then
return 0
fi
if ! [[ "$date_str" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then if ! [[ "$date_str" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]]; then
echo "Invalid date format. Expected YYYY-MM-DD." echo "Invalid date format. Expected YYYY-MM-DD."
return 1 return 1
@ -155,12 +158,17 @@ update_user_info() {
.password = ($password // .password) | .password = ($password // .password) |
.max_download_bytes = ($max_download_bytes // .max_download_bytes) | .max_download_bytes = ($max_download_bytes // .max_download_bytes) |
.expiration_days = ($expiration_days // .expiration_days) | .expiration_days = ($expiration_days // .expiration_days) |
.account_creation_date = ($account_creation_date // .account_creation_date) | .account_creation_date = (if $account_creation_date == "null" then null else $account_creation_date end) |
.blocked = $blocked | .blocked = $blocked |
.unlimited_user = $unlimited | .unlimited_user = $unlimited |
.upload_bytes = $upload_bytes |
.download_bytes = $download_bytes |
.status = $status .status = $status
) |
(if .[$new_username].status != "On-hold" then
.[$new_username] |= (
.upload_bytes = $upload_bytes |
.download_bytes = $download_bytes
)
else . end
) )
' "$USERS_FILE" > tmp.$$.json && mv tmp.$$.json "$USERS_FILE" ' "$USERS_FILE" > tmp.$$.json && mv tmp.$$.json "$USERS_FILE"