eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert user/pass from/to UTF-8 

Haven't successfully logged in with credentials featuring UTF-8 characters, but ASCII run through the conversion is working and UTF-8 usernames display correctly when the user is re-prompted.
This commit is contained in:
Chris Young 2018-08-15 18:54:47 +01:00
parent b46f1257c3
commit 0f18440fd5
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontends/amiga/login.c
View File

@ -111,13 +111,22 @@ nserror gui_401login_open(nsurl *url, const char *realm,
lw->messages[AMI_LOGIN_MSG_LOGIN] = ami_utf8_easy(messages_get("Login"));
lw->messages[AMI_LOGIN_MSG_CANCEL] = ami_utf8_easy(messages_get("Cancel"));
len = strlen(username);
assert(len < sizeof(lw->uname));
memcpy(lw->uname, username, len + 1);
/* Convert existing username and password to local charset */
char *user_utf8 = ami_utf8_easy(username);
if(user_utf8 != NULL) {
len = strlen(user_utf8);
assert(len < sizeof(lw->uname));
memcpy(lw->uname, user_utf8, len + 1);
ami_utf8_free(user_utf8);
}
len = strlen(password);
assert(len < sizeof(lw->pwd));
memcpy(lw->pwd, password, len + 1);
char *pass_utf8 = ami_utf8_easy(password);
if(pass_utf8 != NULL) {
len = strlen(pass_utf8);
assert(len < sizeof(lw->pwd));
memcpy(lw->pwd, pass_utf8, len + 1);
ami_utf8_free(pass_utf8);
}
lw->objects[OID_MAIN] = WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
@ -220,14 +229,19 @@ static void ami_401login_login(struct gui_login_window *lw)
char *user;
char *pass;
/* Get username and password from string gadgets */
GetAttr(STRINGA_TextVal,lw->objects[GID_USER],(ULONG *)&user);
GetAttr(STRINGA_TextVal,lw->objects[GID_PASS],(ULONG *)&pass);
/* Convert from local charset to UTF-8 */
char *user_utf8 = ami_to_utf8_easy(user);
char *pass_utf8 = ami_to_utf8_easy(pass);
if(user_utf8 && pass_utf8) {
lw->cb(user_utf8, pass_utf8, lw->cbpw);
ami_utf8_free(user_utf8);
ami_utf8_free(pass_utf8);
} else {
amiga_warn_user("NoMemory", "");
}