rogs/yams
rogs/yams
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor VPN configuration input, handle special cases

Browse Source
This commit is contained in:
Roger Gonzalez 2024-12-30 18:21:03 -03:00
parent f755a2ce20
commit c820e50871
Signed by: rogs
GPG Key ID: C7ECE9C6C36EC2E6
2 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
docs.org
View File

@ -269,36 +269,47 @@ configure_vpn() {
log_info "Please check $vpn_service's documentation for specific configuration:" log_info "Please check $vpn_service's documentation for specific configuration:"
log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md" log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md"
log_warning "If you are using ProtonVPN, remember to suffix '+pmp' to your username"
echo echo
read -p "VPN username (without spaces): " vpn_user read -p "VPN username (without spaces): " vpn_user
[ -z "$vpn_user" ] && log_error "VPN username cannot be empty" [ -z "$vpn_user" ] && log_error "VPN username cannot be empty"
# Use hidden input for password # Handle special cases for VPN providers
unset vpn_password if [ "$vpn_service" = "protonvpn" ] && [[ ! "$vpn_user" =~ \+pmp$ ]]; then
charcount=0 vpn_user="${vpn_user}+pmp"
prompt="VPN password (if using mullvad, enter username again): " log_info "Added +pmp suffix to username for ProtonVPN port forwarding"
while IFS= read -p "$prompt" -r -s -n 1 char; do fi
if [[ $char == $'\0' ]]; then
break
fi
if [[ $char == $'\177' ]]; then
if [ $charcount -gt 0 ]; then
charcount=$((charcount-1))
prompt=$'\b \b'
vpn_password="${vpn_password%?}"
else
prompt=''
fi
else
charcount=$((charcount+1))
prompt='*'
vpn_password+="$char"
fi
done
echo
[ -z "$vpn_password" ] && log_error "VPN password cannot be empty" # Handle password input based on VPN service
if [ "$vpn_service" = "mullvad" ]; then
vpn_password="$vpn_user"
log_info "Using Mullvad username as password"
else
# Use hidden input for password
unset vpn_password
charcount=0
prompt="VPN password: "
while IFS= read -p "$prompt" -r -s -n 1 char; do
if [[ $char == $'\0' ]]; then
break
fi
if [[ $char == $'\177' ]]; then
if [ $charcount -gt 0 ]; then
charcount=$((charcount-1))
prompt=$'\b \b'
vpn_password="${vpn_password%?}"
else
prompt=''
fi
else
charcount=$((charcount+1))
prompt='*'
vpn_password+="$char"
fi
done
echo
[ -z "$vpn_password" ] && log_error "VPN password cannot be empty"
fi
# Export for use in other functions # Export for use in other functions
export vpn_service vpn_user vpn_password setup_vpn export vpn_service vpn_user vpn_password setup_vpn

61
install.sh
View File

@ -202,36 +202,47 @@ configure_vpn() {
log_info "Please check $vpn_service's documentation for specific configuration:" log_info "Please check $vpn_service's documentation for specific configuration:"
log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md" log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md"
log_warning "If you are using ProtonVPN, remember to suffix '+pmp' to your username"
echo echo
read -p "VPN username (without spaces): " vpn_user read -p "VPN username (without spaces): " vpn_user
[ -z "$vpn_user" ] && log_error "VPN username cannot be empty" [ -z "$vpn_user" ] && log_error "VPN username cannot be empty"
# Use hidden input for password # Handle special cases for VPN providers
unset vpn_password if [ "$vpn_service" = "protonvpn" ] && [[ ! "$vpn_user" =~ \+pmp$ ]]; then
charcount=0 vpn_user="${vpn_user}+pmp"
prompt="VPN password (if using mullvad, enter username again): " log_info "Added +pmp suffix to username for ProtonVPN port forwarding"
while IFS= read -p "$prompt" -r -s -n 1 char; do fi
if [[ $char == $'\0' ]]; then
break
fi
if [[ $char == $'\177' ]]; then
if [ $charcount -gt 0 ]; then
charcount=$((charcount-1))
prompt=$'\b \b'
vpn_password="${vpn_password%?}"
else
prompt=''
fi
else
charcount=$((charcount+1))
prompt='*'
vpn_password+="$char"
fi
done
echo
[ -z "$vpn_password" ] && log_error "VPN password cannot be empty" # Handle password input based on VPN service
if [ "$vpn_service" = "mullvad" ]; then
vpn_password="$vpn_user"
log_info "Using Mullvad username as password"
else
# Use hidden input for password
unset vpn_password
charcount=0
prompt="VPN password: "
while IFS= read -p "$prompt" -r -s -n 1 char; do
if [[ $char == $'\0' ]]; then
break
fi
if [[ $char == $'\177' ]]; then
if [ $charcount -gt 0 ]; then
charcount=$((charcount-1))
prompt=$'\b \b'
vpn_password="${vpn_password%?}"
else
prompt=''
fi
else
charcount=$((charcount+1))
prompt='*'
vpn_password+="$char"
fi
done
echo
[ -z "$vpn_password" ] && log_error "VPN password cannot be empty"
fi
# Export for use in other functions # Export for use in other functions
export vpn_service vpn_user vpn_password setup_vpn export vpn_service vpn_user vpn_password setup_vpn