Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: do not redirect to URL that shows the password from curl slave

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-06-01 03:49:39 +03:00
parent 610ce35050
commit 3c7b0419cf
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kioslave/curl/kio_curl.cpp
View file

@ -1067,8 +1067,6 @@ bool CurlProtocol::setupCurl(const KUrl &url, const bool ftp)
return true;
}
// NOTE: redirection is done so that the URL in navigation is corrected, notably its user and
// password part
CURLcode CurlProtocol::performCurl(const KUrl &url, KUrl *redirecturl)
{
CURLcode curlresult = CURLE_OK;
@ -1083,16 +1081,6 @@ CURLcode CurlProtocol::performCurl(const KUrl &url, KUrl *redirecturl)
return curlresult;
}
curlresult = curl_easy_perform(m_curl);
if (curlresult != CURLE_OK) {
KIO::Error kioerror = curlToKIOError(curlresult, m_curl);
if (kioerror != KIO::ERR_COULD_NOT_LOGIN) {
kDebug(7103) << "Going to redirect for cached authorization";
KUrl newurl(url);
newurl.setUserName(kioauthinfo.username);
newurl.setPassword(kioauthinfo.password);
*redirecturl = newurl;
}
}
} else {
kDebug(7103) << "No cached authorization" << url.prettyUrl();
curlresult = curl_easy_perform(m_curl);
@ -1122,20 +1110,19 @@ CURLcode CurlProtocol::performCurl(const KUrl &url, KUrl *redirecturl)
cacheAuthentication(kioauthinfo);
}
curlresult = curl_easy_perform(m_curl);
if (curlresult != CURLE_OK) {
kioerror = curlToKIOError(curlresult, m_curl);
if (kioerror != KIO::ERR_COULD_NOT_LOGIN) {
kDebug(7103) << "Going to redirect for authorization";
KUrl newurl(url);
newurl.setUserName(kioauthinfo.username);
newurl.setPassword(kioauthinfo.password);
*redirecturl = newurl;
}
}
}
}
}
// NOTE: redirection is done so that the URL in navigation is corrected, notably its user part.
// the password is not made visible for security reasons
if (kioauthinfo.username != url.userName()) {
kDebug(7103) << "Going to redirect for authorization";
KUrl newurl(url);
newurl.setUserName(kioauthinfo.username);
*redirecturl = newurl;
}
return curlresult;
}