LocationBar: Also whitelist data: scheme for loading urls

QupZilla · Jan 28, 2018 · 9595359 · 9595359
1 parent 67f9177
commit 9595359
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp
@@ -269,7 +269,7 @@ LocationBar::LoadAction LocationBar::loadAction(const QString &text)
  // Only allow whitelisted schemes
  const QSet<QString> whitelistedSchemes = {
  QSL("http"), QSL("https"), QSL("ftp"), QSL("file"),
- QSL("about"), QSL("qupzilla")
+ QSL("data"), QSL("about"), QSL("qupzilla")
  };
  if (whitelistedSchemes.contains(guessedUrl.scheme())) {
  action.type = LoadAction::Url;

diff --git a/tests/autotests/locationbartest.cpp b/tests/autotests/locationbartest.cpp
@@ -153,3 +153,24 @@ void LocationBarTest::loadAction_kdebug389491()
  QCOMPARE(action.type, LocationBar::LoadAction::Url);
  QCOMPARE(action.loadRequest.url(), QUrl("http://website.com?search=searchterm and another"));
 }
+
+void LocationBarTest::loadActionSpecialSchemesTest()
+{
+ LocationBar::LoadAction action;
+
+ action = LocationBar::loadAction("data:image/png;base64,xxxxx");
+ QCOMPARE(action.type, LocationBar::LoadAction::Url);
+ QCOMPARE(action.loadRequest.url(), QUrl("data:image/png;base64,xxxxx"));
+
+ action = LocationBar::loadAction("qupzilla:about");
+ QCOMPARE(action.type, LocationBar::LoadAction::Url);
+ QCOMPARE(action.loadRequest.url(), QUrl("qupzilla:about"));
+
+ action = LocationBar::loadAction("file:test.html");
+ QCOMPARE(action.type, LocationBar::LoadAction::Url);
+ QCOMPARE(action.loadRequest.url(), QUrl("file:test.html"));
+
+ action = LocationBar::loadAction("about:blank");
+ QCOMPARE(action.type, LocationBar::LoadAction::Url);
+ QCOMPARE(action.loadRequest.url(), QUrl("about:blank"));
+}
diff --git a/tests/autotests/locationbartest.h b/tests/autotests/locationbartest.h
@@ -32,4 +32,5 @@ private slots:
  void loadActionBookmarksTest();
  void loadActionSearchTest();
  void loadAction_kdebug389491();
+ void loadActionSpecialSchemesTest();
 };