Skip to content

Preserve colons in stored router passwords #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maghuro wants to merge 1 commit into from
Closed

Preserve colons in stored router passwords #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2456,7 +2456,8 @@ function AssignAjaxSetting (keyName, keyValue)
try
{
var decoded = atob(keyValue);
var password = decoded.split(':')[1] || '';
var separatorIndex = decoded.indexOf(':');
var password = (separatorIndex >= 0) ? decoded.slice(separatorIndex + 1) : '';
ajax_custom_settings.routerPassword = password;
}
catch (e)
Expand Down
5 changes: 4 additions & 1 deletion MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,7 +5334,10 @@ _GetLoginCredentials_()
_UpdateLoginPswdCheckHelper_ InitPWD
else
loginCredsDEC="$(echo "$loginCredsENC" | openssl base64 -d)"
thePWSDstring="$(echo "$loginCredsDEC" | sed "s/${userName}://")"
case "$loginCredsDEC" in
*:*) thePWSDstring="${loginCredsDEC#*:}" ;;
*) thePWSDstring="" ;;
esac
fi
oldPWSDstring="$thePWSDstring"
newPSWDstring="$thePWSDstring"
Expand Down
Loading