luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 615 (#621) 

* Password encoding to UTF-8 for Basic HTTP authentication - this is basically a hack. Needs to be reverted as soon as Qt switches to UTF-8 encoding.

* Workaround for issue #615
This commit is contained in:
Matthias Köfferlein 2020-09-14 18:33:01 +02:00 committed by GitHub
parent 12ac7c1036
commit 948819472b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/tl/tl/tlHttpStreamQt.cc
View File

@ -66,8 +66,20 @@ AuthenticationHandler::authenticationRequired (QNetworkReply *reply, QAuthentica
// TODO: how to cancel?
std::string user, passwd;
if (sp_credential_provider->user_password (tl::to_string (reply->url ().toString ()), tl::to_string (auth->realm ()), true, ++m_retry, user, passwd)) {
auth->setPassword (tl::to_qstring (passwd));
auth->setUser (tl::to_qstring (user));
// this is freaky: Qt sends password as Latin1 encoded for Basic authentication, but apparently some servers
// expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
// We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
// expect UTF-8 encoding.
bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
if (is_basic_or_digest) {
auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
auth->setUser (QString::fromLatin1 (user.c_str ()));
} else {
auth->setPassword (tl::to_qstring (passwd));
auth->setUser (tl::to_qstring (user));
}
}
}
@ -81,8 +93,20 @@ AuthenticationHandler::proxyAuthenticationRequired (const QNetworkProxy &proxy,
// TODO: how to cancel?
std::string user, passwd;
if (sp_credential_provider->user_password (tl::to_string (proxy.hostName ()), tl::to_string (auth->realm ()), true, ++m_proxy_retry, user, passwd)) {
auth->setPassword (tl::to_qstring (passwd));
auth->setUser (tl::to_qstring (user));
// this is freaky: Qt sends password as Latin1 encoded for Basic authentication, but apparently some servers
// expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
// We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
// expect UTF-8 encoding.
bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
if (is_basic_or_digest) {
auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
auth->setUser (QString::fromLatin1 (user.c_str ()));
} else {
auth->setPassword (tl::to_qstring (passwd));
auth->setUser (tl::to_qstring (user));
}
}
}