[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.14] kio/misc/kpac: Sanitize URLs before passing them to FindProxyForURL
From:       Albert Astals Cid <null () kde ! org>
Date:       2017-02-28 18:09:45
Message-ID: E1cimDZ-0007Nq-5u () code ! kde ! org
[Download RAW message or body]

Git commit 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 by Albert Astals Cid.
Committed on 28/02/2017 at 18:08.
Pushed by aacid into branch 'KDE/4.14'.

Sanitize URLs before passing them to FindProxyForURL

Remove user/password information
For https: remove path and query

Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4

M  +9    -2    kio/misc/kpac/script.cpp

https://commits.kde.org/kdelibs/1804c2fde7bf4e432c6cf5bb8cce5701c7010559

diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index a595301307..9ab360a0b5 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()) {
[prev in list] [next in list] [prev in thread] [next in thread]