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

fix(user-handlers): allow underscores in usernames and improve error handling

Browse Source
This commit is contained in:
ReturnFI
2025-12-18 10:17:32 +00:00
parent 72763111eb
commit 22b9a3c075
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
menu.sh
View File

@ -170,7 +170,7 @@ hysteria2_remove_user_handler() {
while true; do
read -p "Enter the username: " username
if [[ "$username" =~ ^[a-zA-Z0-9]+$ ]]; then
if [[ "$username" =~ ^[a-zA-Z0-9_-]+$ ]]; then
break
else
echo -e "${red}Error:${NC} Username can only contain letters and numbers."
@ -182,7 +182,7 @@ hysteria2_remove_user_handler() {
hysteria2_get_user_handler() {
while true; do
read -p "Enter the username: " username
if [[ "$username" =~ ^[a-zA-Z0-9]+$ ]]; then
if [[ "$username" =~ ^[a-zA-Z0-9_-]+$ ]]; then
break
else
echo -e "${red}Error:${NC} Username can only contain letters and numbers."
@ -190,12 +190,18 @@ hysteria2_get_user_handler() {
done
user_data=$(python3 "$CLI_PATH" get-user --username "$username" 2>/dev/null)
local exit_code=$?
if [[ $exit_code -ne 0 || -z "$user_data" ]]; then
echo -e "${red}Error:${NC} User '$username' not found or invalid response."
return 1
fi
if ! echo "$user_data" | jq -e . > /dev/null 2>&1; then
echo -e "${red}Error:${NC} Received invalid data for user '$username'."
return 1
fi
password=$(echo "$user_data" | jq -r '.password // "N/A"')
max_download_bytes=$(echo "$user_data" | jq -r '.max_download_bytes // 0')
upload_bytes=$(echo "$user_data" | jq -r '.upload_bytes // 0')
@ -209,40 +215,57 @@ hysteria2_get_user_handler() {
upload_gb=$(echo "scale=2; $upload_bytes / 1073741824" | bc)
download_gb=$(echo "scale=2; $download_bytes / 1073741824" | bc)
total_usage_gb=$(echo "scale=2; $total_usage / 1073741824" | bc)
expiration_date=$(date -d "$account_creation_date + $expiration_days days" +"%Y-%m-%d")
local expiration_date_str="N/A"
local used_days_str="N/A"
if [[ "$account_creation_date" != "N/A" ]]; then
expiration_date_str=$(date -d "$account_creation_date + $expiration_days days" +"%Y-%m-%d")
current_date=$(date +"%Y-%m-%d")
used_days=$(( ( $(date -d "$current_date" +%s) - $(date -d "$account_creation_date" +%s) ) / 86400 ))
if [[ $used_days -lt 0 ]]; then
used_days=0
fi
if [[ $used_days -gt $expiration_days ]]; then
used_days=$expiration_days
fi
used_days_str=$used_days
fi
echo -e "${green}User Details:${NC}"
echo -e "Username: $username"
echo -e "Password: $password"
echo -e "Total Traffic: $max_download_gb GB"
echo -e "Total Usage: $total_usage_gb GB"
echo -e "Time Expiration: $expiration_date ($used_days/$expiration_days Days)"
echo -e "Time Expiration: $expiration_date_str ($used_days_str/$expiration_days Days)"
echo -e "Blocked: $blocked"
echo -e "Status: $status"
}
hysteria2_list_users_handler() {
users_json=$(python3 $CLI_PATH list-users 2>/dev/null)
local exit_code=$?
if [ $? -ne 0 ] || [ -z "$users_json" ]; then
if [ $exit_code -ne 0 ] || [ -z "$users_json" ]; then
echo -e "${red}Error:${NC} Failed to list users."
return 1
fi
if ! echo "$users_json" | jq -e . > /dev/null 2>&1; then
echo -e "${red}Error:${NC} Received invalid data while listing users."
return 1
fi
user_count=$(echo "$users_json" | jq 'length')
if [ "$user_count" -eq 0 ]; then
echo -e "${red}Error:${NC} No users found."
echo -e "${yellow}No users found.${NC}"
return 1
fi
printf "%-20s %-20s %-15s %-20s %-30s %-10s %-15s %-15s %-15s %-10s\n" \
printf "%-20s %-20s %-15s %-20s %-30s %-10s %-15s %-15s %-15s\n" \
"Username" "Traffic(GB)" "Expiry(Days)" "Created" "Password" "Blocked" "Status" "Down(MB)" "Up(MB)"
echo "$users_json" | jq -r '.[] |
@ -254,11 +277,10 @@ hysteria2_list_users_handler() {
.blocked,
.status,
((.download_bytes // 0) / 1048576 | floor),
((.upload_bytes // 0) / 1048576 | floor),
.online_count] |
((.upload_bytes // 0) / 1048576 | floor)] |
@tsv' | \
while IFS=$'\t' read -r username traffic expiry created password blocked status down up online; do
printf "%-20s %-20s %-15s %-20s %-30s %-10s %-15s %-15s %-15s %-10s\n" \
while IFS=$'\t' read -r username traffic expiry created password blocked status down up; do
printf "%-20s %-20s %-15s %-20s %-30s %-10s %-15s %-15s %-15s\n" \
"$username" "$traffic" "$expiry" "$created" "$password" "$blocked" "$status" "$down" "$up"
done
}
@ -267,7 +289,7 @@ hysteria2_reset_user_handler() {
while true; do
read -p "Enter the username: " username
if [[ "$username" =~ ^[a-zA-Z0-9]+$ ]]; then
if [[ "$username" =~ ^[a-zA-Z0-9_-]+$ ]]; then
break
else
echo -e "${red}Error:${NC} Username can only contain letters and numbers."
@ -283,7 +305,7 @@ hysteria2_show_user_uri_handler() {
while true; do
read -p "Enter the username: " username
if [[ "$username" =~ ^[a-zA-Z0-9]+$ ]]; then
if [[ "$username" =~ ^[a-zA-Z0-9_-]+$ ]]; then
break
else
echo -e "${red}Error:${NC} Username can only contain letters and numbers."