Allow QML URLs to contain pre-encoded octets

Use QUrl Tolerant parsing mode to permit user-supplied URLs to contain
pre-encoded octets which are not mangled by string conversion.

Task-number: QTBUG-22756
Change-Id: I4b160b04340b95221d1eb3336bda8c0b38d2e232
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

3 files changed, 89 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml
new file mode 100644
index 0000000000..eeb0815f09
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/urlListProperty.qml
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    // single url assignment to url list property
+    MySequenceConversionObject {
+        id: msco1
+        objectName: "msco1"
+    }
+
+    // single url binding to url list property
+    MySequenceConversionObject {
+        id: msco2
+        objectName: "msco2"
+        urlListProperty: "http://qt-project.org/?get%3cDATA%3e";
+    }
+
+    // multiple url assignment to url list property
+    MySequenceConversionObject {
+        id: msco3
+        objectName: "msco3"
+    }
+
+    // multiple url binding to url list property
+    MySequenceConversionObject {
+        id: msco4
+        objectName: "msco4"
+        urlListProperty: [
+            "http://qt-project.org/?get%3cDATA%3e",
+            "http://qt-project.org/?get%3cDATA%3e"
+        ];
+    }
+
+    Component.onCompleted: {
+        msco1.urlListProperty = "http://qt-project.org/?get%3cDATA%3e";
+        msco3.urlListProperty = [
+            "http://qt-project.org/?get%3cDATA%3e",
+            "http://qt-project.org/?get%3cDATA%3e"
+        ];
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml
new file mode 100644
index 0000000000..0e8bdaec96
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/urlProperty.2.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+MyQmlObject {
+    property bool result
+    stringProperty: "http://example.org"
+    urlProperty: stringProperty + "/?get%3cDATA%3e"
+    value: urlProperty == stringProperty + "/?get%3cDATA%3e"
+    result: urlProperty == urlProperty
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 5f1f44e278..18c56af6e2 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -213,6 +213,8 @@ private slots:
     void aliasToCompositeElement();
     void realToInt();
     void urlProperty();
+    void urlPropertyWithEncoding();
+    void urlListPropertyWithEncoding();
     void dynamicString();
     void include();
     void signalHandlers();
@@ -5519,6 +5521,42 @@ void tst_qdeclarativeecmascript::urlProperty()
     }
 }
 
+void tst_qdeclarativeecmascript::urlPropertyWithEncoding()
+{
+    {
+        QDeclarativeComponent component(&engine, testFileUrl("urlProperty.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
+        QVERIFY(object != 0);
+        object->setStringProperty("http://qt-project.org");
+        QUrl encoded;
+        encoded.setEncodedUrl("http://qt-project.org/?get%3cDATA%3e", QUrl::TolerantMode);
+        QCOMPARE(object->urlProperty(), encoded);
+        QCOMPARE(object->value(), 0);   // Interpreting URL as string yields canonicalised version
+        QCOMPARE(object->property("result").toBool(), true);
+    }
+}
+
+void tst_qdeclarativeecmascript::urlListPropertyWithEncoding()
+{
+    {
+        QDeclarativeComponent component(&engine, testFileUrl("urlListProperty.qml"));
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        MySequenceConversionObject *msco1 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco1"));
+        MySequenceConversionObject *msco2 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco2"));
+        MySequenceConversionObject *msco3 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco3"));
+        MySequenceConversionObject *msco4 = object->findChild<MySequenceConversionObject *>(QLatin1String("msco4"));
+        QVERIFY(msco1 != 0 && msco2 != 0 && msco3 != 0 && msco4 != 0);
+        QUrl encoded;
+        encoded.setEncodedUrl("http://qt-project.org/?get%3cDATA%3e", QUrl::TolerantMode);
+        QCOMPARE(msco1->urlListProperty(), (QList<QUrl>() << encoded));
+        QCOMPARE(msco2->urlListProperty(), (QList<QUrl>() << encoded));
+        QCOMPARE(msco3->urlListProperty(), (QList<QUrl>() << encoded << encoded));
+        QCOMPARE(msco4->urlListProperty(), (QList<QUrl>() << encoded << encoded));
+        delete object;
+    }
+}
+
 void tst_qdeclarativeecmascript::dynamicString()
 {
     QDeclarativeComponent component(&engine, testFileUrl("dynamicString.qml"));