summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2017-02-28 18:08:50 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2017-02-28 18:08:50 (GMT)
commit1804c2fde7bf4e432c6cf5bb8cce5701c7010559 (patch)
tree4fdcba7095858208f0ac7e13760c702fcaf71013
parentca490a7ab01760ba2676699546eabbe291b0f0d4 (diff)
Sanitize URLs before passing them to FindProxyForURL
Remove user/password information For https: remove path and query Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4
-rw-r--r--kio/misc/kpac/script.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index a595301..9ab360a 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -754,9 +754,16 @@ namespace KPAC
}
}
+ KUrl cleanUrl = url;
+ cleanUrl.setUserInfo(QString());
+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) {
+ cleanUrl.setPath(QString());
+ cleanUrl.setQuery(QString());
+ }
+
QScriptValueList args;
- args << url.url();
- args << url.host();
+ args << cleanUrl.url();
+ args << cleanUrl.host();
QScriptValue result = func.call(QScriptValue(), args);
if (result.isError()) {