Fix login with UTF-8 user names

plfiorini · plfiorini · commit afd6d1c82f87 · 2015-08-21T11:43:34.000+02:00
Passing user names to C functions using qPrintable() discards UTF-8 characters, better use qUtf8Printable() instead. Closes #365
diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
@@ -340,7 +340,7 @@ namespace SDDM {
             m_auth->request()->prompts()[0]->setResponse(qPrintable(m_passPhrase));
             m_auth->request()->done();
         } else if (m_auth->request()->prompts().length() == 2) {
-            m_auth->request()->prompts()[0]->setResponse(qPrintable(m_auth->user()));
+            m_auth->request()->prompts()[0]->setResponse(qUtf8Printable(m_auth->user()));
             m_auth->request()->prompts()[1]->setResponse(qPrintable(m_passPhrase));
             m_auth->request()->done();
         }
diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
@@ -54,7 +54,7 @@ namespace SDDM {
 
     bool Backend::openSession() {
         struct passwd *pw;
-        pw = getpwnam(qPrintable(qobject_cast<HelperApp*>(parent())->user()));
+        pw = getpwnam(qUtf8Printable(qobject_cast<HelperApp*>(parent())->user()));
         if (pw) {
             QProcessEnvironment env = m_app->session()->processEnvironment();
             env.insert("HOME", pw->pw_dir);
diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
@@ -110,7 +110,7 @@ namespace SDDM {
             }
         }
 
-        const char  *username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
+        const char *username = qUtf8Printable(qobject_cast<HelperApp*>(parent())->user());
         struct passwd *pw = getpwnam(username);
         if (setgid(pw->pw_gid) != 0) {
             qCritical() << "setgid(" << pw->pw_gid << ") failed for user: " << username;
diff --git a/src/helper/backend/PamHandle.cpp b/src/helper/backend/PamHandle.cpp
@@ -142,7 +142,7 @@ namespace SDDM {
         if (user.isEmpty())
             m_result = pam_start(qPrintable(service), NULL, &m_conv, &m_handle);
         else
-            m_result = pam_start(qPrintable(service), qPrintable(user), &m_conv, &m_handle);
+            m_result = pam_start(qPrintable(service), qUtf8Printable(user), &m_conv, &m_handle);
         if (m_result != PAM_SUCCESS) {
             qWarning() << "[PAM] start" << pam_strerror(m_handle, m_result);
             return false;
diff --git a/src/helper/backend/PasswdBackend.cpp b/src/helper/backend/PasswdBackend.cpp
@@ -66,7 +66,7 @@ namespace SDDM {
             }
         }
 
-        struct passwd *pw = getpwnam(qPrintable(m_user));
+        struct passwd *pw = getpwnam(qUtf8Printable(m_user));
         if (!pw) {
             m_app->error(QString("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION);
             return false;

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ namespace SDDM {`
`340`	`340`	`m_auth->request()->prompts()[0]->setResponse(qPrintable(m_passPhrase));`
`341`	`341`	`m_auth->request()->done();`
`342`	`342`	`} else if (m_auth->request()->prompts().length() == 2) {`
`343`		`- m_auth->request()->prompts()[0]->setResponse(qPrintable(m_auth->user()));`
	`343`	`+ m_auth->request()->prompts()[0]->setResponse(qUtf8Printable(m_auth->user()));`
`344`	`344`	`m_auth->request()->prompts()[1]->setResponse(qPrintable(m_passPhrase));`
`345`	`345`	`m_auth->request()->done();`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ namespace SDDM {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- const char username = qobject_cast<HelperApp>(parent())->user().toLocal8Bit();`
	`113`	`+ const char username = qUtf8Printable(qobject_cast<HelperApp>(parent())->user());`
`114`	`114`	`struct passwd *pw = getpwnam(username);`
`115`	`115`	`if (setgid(pw->pw_gid) != 0) {`
`116`	`116`	`qCritical() << "setgid(" << pw->pw_gid << ") failed for user: " << username;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace SDDM {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- struct passwd *pw = getpwnam(qPrintable(m_user));`
	`69`	`+ struct passwd *pw = getpwnam(qUtf8Printable(m_user));`
`70`	`70`	`if (!pw) {`
`71`	`71`	`m_app->error(QString("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION);`
`72`	`72`	`return false;`