1
=== modified file 'po/webbrowser-app.pot'
2
--- po/webbrowser-app.pot	2014-10-03 14:41:14 +0000
3
+++ po/webbrowser-app.pot	2014-10-20 22:12:22 +0000
4
@@ -8,7 +8,7 @@
5
8
msgstr ""
8
msgstr ""
6
9
"Project-Id-Version: webbrowser-app\n"
9
"Project-Id-Version: webbrowser-app\n"
7
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
9
11
"POT-Creation-Date: 2014-09-22 14:59+0100\n"
11
"POT-Creation-Date: 2014-10-20 17:24-0400\n"
10
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
13
@@ -117,7 +117,7 @@
14
117
msgstr ""
117
msgstr ""
15
118
118
16
119
#: src/app/GeolocationPermissionRequest.qml:29
119
#: src/app/GeolocationPermissionRequest.qml:29
18
120
#: src/app/webcontainer/WebViewImplWebkit.qml:65
120
#: src/app/webcontainer/WebViewImplWebkit.qml:68
19
121
msgid "This page wants to know your device’s location."
121
msgid "This page wants to know your device’s location."
20
122
msgstr ""
122
msgstr ""
21
123
123
22
@@ -406,19 +406,19 @@
23
406
msgid "search or enter an address"
406
msgid "search or enter an address"
24
407
msgstr ""
407
msgstr ""
25
408
408
27
409
#: src/app/webbrowser/Browser.qml:179
409
#: src/app/webbrowser/Browser.qml:190
28
410
msgid "Share"
410
msgid "Share"
29
411
msgstr ""
411
msgstr ""
30
412
412
32
413
#: src/app/webbrowser/Browser.qml:193
413
#: src/app/webbrowser/Browser.qml:204
33
414
msgid "History"
414
msgid "History"
34
415
msgstr ""
415
msgstr ""
35
416
416
37
417
#: src/app/webbrowser/Browser.qml:200
417
#: src/app/webbrowser/Browser.qml:211
38
418
msgid "Open tabs"
418
msgid "Open tabs"
39
419
msgstr ""
419
msgstr ""
40
420
420
42
421
#: src/app/webbrowser/Browser.qml:206 src/app/webbrowser/TabsView.qml:57
421
#: src/app/webbrowser/Browser.qml:217 src/app/webbrowser/TabsView.qml:57
43
422
msgid "New tab"
422
msgid "New tab"
44
423
msgstr ""
423
msgstr ""
45
424
424
46
@@ -445,19 +445,19 @@
47
445
msgid "Done"
445
msgid "Done"
48
446
msgstr ""
446
msgstr ""
49
447
447
51
448
#: src/app/webbrowser/HistoryView.qml:113
448
#: src/app/webbrowser/HistoryView.qml:112
52
449
msgid "Clear"
449
msgid "Clear"
53
450
msgstr ""
450
msgstr ""
54
451
451
56
452
#: src/app/webbrowser/HistoryView.qml:127
452
#: src/app/webbrowser/HistoryView.qml:126
57
453
msgid "Delete all history?"
453
msgid "Delete all history?"
58
454
msgstr ""
454
msgstr ""
59
455
455
61
456
#: src/app/webbrowser/HistoryView.qml:130
456
#: src/app/webbrowser/HistoryView.qml:129
62
457
msgid "Yes"
457
msgid "Yes"
63
458
msgstr ""
458
msgstr ""
64
459
459
66
460
#: src/app/webbrowser/HistoryView.qml:139
460
#: src/app/webbrowser/HistoryView.qml:138
67
461
msgid "No"
461
msgid "No"
68
462
msgstr ""
462
msgstr ""
69
463
463
70
@@ -481,7 +481,7 @@
71
481
msgid "Tap to view"
481
msgid "Tap to view"
72
482
msgstr ""
482
msgstr ""
73
483
483
75
484
#: src/app/webbrowser/TabsView.qml:115
484
#: src/app/webbrowser/TabsView.qml:114
76
485
msgid "Add"
485
msgid "Add"
77
486
msgstr ""
486
msgstr ""
78
487
487
79
@@ -497,15 +497,15 @@
80
497
msgid "Ubuntu Web Browser"
497
msgid "Ubuntu Web Browser"
81
498
msgstr ""
498
msgstr ""
82
499
499
84
500
#: src/app/webcontainer/AccountsLoginPage.qml:87
500
#: src/app/webcontainer/AccountsLoginPage.qml:91
85
501
msgid "No local account found for "
501
msgid "No local account found for "
86
502
msgstr ""
502
msgstr ""
87
503
503
89
504
#: src/app/webcontainer/AccountsLoginPage.qml:92
504
#: src/app/webcontainer/AccountsLoginPage.qml:96
90
505
msgid "Skip account creation step"
505
msgid "Skip account creation step"
91
506
msgstr ""
506
msgstr ""
92
507
507
94
508
#: src/app/webcontainer/AccountsLoginPage.qml:141
508
#: src/app/webcontainer/AccountsLoginPage.qml:145
95
509
msgid "Add account"
509
msgid "Add account"
96
510
msgstr ""
510
msgstr ""
97
511
511
98
512
512
99
=== modified file 'src/app/webcontainer/Chrome.qml'
100
--- src/app/webcontainer/Chrome.qml	2014-07-29 21:51:07 +0000
101
+++ src/app/webcontainer/Chrome.qml	2014-10-20 22:12:22 +0000
102
@@ -82,7 +82,7 @@
103
82
82
104
83
            Favicon {
83
            Favicon {
105
84
                anchors.centerIn: parent
84
                anchors.centerIn: parent
107
85
                source: chrome.webview.icon
85
                source: chrome.webview ? chrome.webview.icon : null
108
86
            }
86
            }
109
87
        }
87
        }
110
88
88
111
89
89
112
=== modified file 'src/app/webcontainer/WebApp.qml'
113
--- src/app/webcontainer/WebApp.qml	2014-10-03 14:41:14 +0000
114
+++ src/app/webcontainer/WebApp.qml	2014-10-20 22:12:22 +0000
115
@@ -36,9 +36,10 @@
116
36
    property alias oxide: webview.withOxide
36
    property alias oxide: webview.withOxide
117
37
    property alias webappName: webview.webappName
37
    property alias webappName: webview.webappName
118
38
    property alias webappUrlPatterns: webview.webappUrlPatterns
38
    property alias webappUrlPatterns: webview.webappUrlPatterns
120
39
    property alias popupRedirectionUrlPrefix: webview.popupRedirectionUrlPrefix
39
    property alias popupRedirectionUrlPrefixPattern: webview.popupRedirectionUrlPrefixPattern
121
40
    property alias webviewOverrideFile: webview.webviewOverrideFile
40
    property alias webviewOverrideFile: webview.webviewOverrideFile
122
41
    property string localUserAgentOverride: ""
41
    property string localUserAgentOverride: ""
123
42
    property alias blockOpenExternalUrls: webview.blockOpenExternalUrls
124
42
43
125
43
    property bool backForwardButtonsVisible: false
44
    property bool backForwardButtonsVisible: false
126
44
    property bool chromeVisible: false
45
    property bool chromeVisible: false
127
@@ -69,10 +70,12 @@
128
69
    }
70
    }
129
70
71
130
71
    Item {
72
    Item {
131
73
        id: webviewContainer
132
72
        anchors.fill: parent
74
        anchors.fill: parent
133
73
75
134
74
        WebappContainerWebview {
76
        WebappContainerWebview {
135
75
            id: webview
77
            id: webview
136
78
            objectName: "webview"
137
76
79
138
77
            anchors {
80
            anchors {
139
78
                left: parent.left
81
                left: parent.left
140
@@ -179,15 +182,4 @@
141
179
        actionsContext: actionManager.globalContext
182
        actionsContext: actionManager.globalContext
142
180
        model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
183
        model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
143
181
    }
184
    }
144
182
145
183
    function isValidContainedUrl(url) {
146
184
        if (!url || url.length === 0 || url === 'about:blank') {
147
185
            return false
148
186
        }
149
187
        if (popupRedirectionUrlPrefix.length !== 0
150
188
                && url.indexOf(popupRedirectionUrlPrefix) === 0) {
151
189
            return false
152
190
        }
153
191
        return true
154
192
    }
155
193
}
185
}
156
194
186
157
=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
158
--- src/app/webcontainer/WebViewImplOxide.qml	2014-08-19 08:42:30 +0000
159
+++ src/app/webcontainer/WebViewImplOxide.qml	2014-10-20 22:12:22 +0000
160
@@ -33,7 +33,16 @@
161
33
    property string webappName: ""
33
    property string webappName: ""
162
34
    property string localUserAgentOverride: ""
34
    property string localUserAgentOverride: ""
163
35
    property var webappUrlPatterns: null
35
    property var webappUrlPatterns: null
165
36
    property string popupRedirectionUrlPrefix: ""
36
    property string popupRedirectionUrlPrefixPattern: ""
166
37
167
38
    // Mostly used for testing & avoid external urls to
168
39
    //  "leak" in the default browser
169
40
    property bool blockOpenExternalUrls: false
170
41
171
42
    // Those signals are used for testing purposes to externally
172
43
    //  track down the various internal logic & steps of a popup lifecycle.
173
44
    signal openExternalUrlTriggered(string url)
174
45
    signal gotRedirectionUrl(string url)
175
37
46
176
38
    currentWebview: webview
47
    currentWebview: webview
177
39
48
178
@@ -48,6 +57,9 @@
179
48
        }
57
        }
180
49
    }
58
    }
181
50
59
182
60
    StateSaver.properties: "url"
183
61
    StateSaver.enabled: true
184
62
185
51
    function shouldOpenPopupsInDefaultBrowser() {
63
    function shouldOpenPopupsInDefaultBrowser() {
186
52
        return formFactor !== "desktop";
64
        return formFactor !== "desktop";
187
53
    }
65
    }
188
@@ -70,6 +82,13 @@
189
70
               disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
82
               disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
190
71
    }
83
    }
191
72
84
192
85
    function openUrlExternally(url) {
193
86
        webview.openExternalUrlTriggered(url)
194
87
        if (! webview.blockOpenExternalUrls) {
195
88
            Qt.openUrlExternally(url)
196
89
        }
197
90
    }
198
91
199
73
    function shouldAllowNavigationTo(url) {
92
    function shouldAllowNavigationTo(url) {
200
74
        // The list of url patterns defined by the webapp takes precedence over command line
93
        // The list of url patterns defined by the webapp takes precedence over command line
201
75
        if (isRunningAsANamedWebapp()) {
94
        if (isRunningAsANamedWebapp()) {
202
@@ -113,36 +132,31 @@
203
113
                return
132
                return
204
114
            }
133
            }
205
115
134
206
135
            var redirectionPatternMatch = url.match(popupRedirectionUrlPrefixPattern);
207
116
            var isRedirectionUrl =
136
            var isRedirectionUrl =
211
117
                    popupRedirectionUrlPrefix.length !== 0
137
                    popupRedirectionUrlPrefixPattern
212
118
                    && url.indexOf(popupRedirectionUrlPrefix) === 0;
138
                    && redirectionPatternMatch
213
119
139
                    && redirectionPatternMatch.length >= 2;
214
120
            var targetUrl = url;
140
            var targetUrl = url;
215
121
            if (isRedirectionUrl) {
141
            if (isRedirectionUrl) {
227
122
                // Extract the target URL.
142
                // Assume that the first group is the matching one
228
123
                targetUrl = url.slice(popupRedirectionUrlPrefix.length);
143
                targetUrl = redirectionPatternMatch[1];
229
124
                // Quick fix for http://pad.lv/1358622 (trim trailing parameters).
144
                console.debug("Got a redirection URL with target URL: " + targetUrl)
230
125
                // A proper solution would probably involve regexps instead of a
145
                targetUrl = decodeURIComponent(targetUrl)
231
126
                // simple redirection prefix.
146
                gotRedirectionUrl(targetUrl)
221
127
                var extraParams = targetUrl.indexOf("&");
222
128
                if (extraParams !== -1) {
223
129
                    targetUrl = targetUrl.slice(0, extraParams);
224
130
                }
225
131
                // Decode it.
226
132
                targetUrl = decodeURIComponent(targetUrl);
232
133
            }
147
            }
233
134
148
234
135
            if (webview.shouldAllowNavigationTo(targetUrl)) {
149
            if (webview.shouldAllowNavigationTo(targetUrl)) {
235
136
                console.debug('Redirecting popup browsing ' + targetUrl + ' in the current container window.')
150
                console.debug('Redirecting popup browsing ' + targetUrl + ' in the current container window.')
236
137
                request.action = Oxide.NavigationRequest.ActionReject
151
                request.action = Oxide.NavigationRequest.ActionReject
238
138
                webappContainerHelper.browseToUrlRequested(webview, url.slice(url.indexOf(popupRedirectionUrlPrefix)))
152
                webappContainerHelper.browseToUrlRequested(webview, targetUrl)
239
139
                return
153
                return
240
140
            }
154
            }
241
141
155
242
142
            if (shouldOpenPopupsInDefaultBrowser()) {
156
            if (shouldOpenPopupsInDefaultBrowser()) {
243
143
                console.debug('Opening popup window ' + targetUrl + ' in the browser window.')
157
                console.debug('Opening popup window ' + targetUrl + ' in the browser window.')
244
144
                request.action = Oxide.NavigationRequest.ActionReject
158
                request.action = Oxide.NavigationRequest.ActionReject
246
145
                Qt.openUrlExternally(targetUrl)
159
                openUrlExternally(targetUrl)
247
146
                return;
160
                return;
248
147
            }
161
            }
249
148
            return
162
            return
250
@@ -179,7 +193,7 @@
251
179
193
252
180
        if (request.action === Oxide.NavigationRequest.ActionReject) {
194
        if (request.action === Oxide.NavigationRequest.ActionReject) {
253
181
            console.debug('Opening: ' + url + ' in the browser window.')
195
            console.debug('Opening: ' + url + ' in the browser window.')
255
182
            Qt.openUrlExternally(url)
196
            openUrlExternally(url)
256
183
        }
197
        }
257
184
    }
198
    }
258
185
199
259
@@ -203,7 +217,7 @@
260
203
                    if ( ! isNewForegroundWebViewDisposition(request.disposition) &&
217
                    if ( ! isNewForegroundWebViewDisposition(request.disposition) &&
261
204
                            ! webview.shouldAllowNavigationTo(url)) {
218
                            ! webview.shouldAllowNavigationTo(url)) {
262
205
                        request.action = Oxide.NavigationRequest.ActionReject
219
                        request.action = Oxide.NavigationRequest.ActionReject
264
206
                        Qt.openUrlExternally(url);
220
                        openUrlExternally(url);
265
207
                        popup.close()
221
                        popup.close()
266
208
                        return;
222
                        return;
267
209
                    }
223
                    }
268
@@ -233,7 +247,7 @@
269
233
                        return;
247
                        return;
270
234
248
271
235
                    if (_url != 'about:blank' && ! webview.shouldAllowNavigationTo(_url)) {
249
                    if (_url != 'about:blank' && ! webview.shouldAllowNavigationTo(_url)) {
273
236
                        Qt.openUrlExternally(_url);
250
                        openUrlExternally(_url);
274
237
                        popup.close()
251
                        popup.close()
275
238
                    }
252
                    }
276
239
                }
253
                }
277
240
254
278
=== modified file 'src/app/webcontainer/WebViewImplWebkit.qml'
279
--- src/app/webcontainer/WebViewImplWebkit.qml	2014-07-29 21:51:07 +0000
280
+++ src/app/webcontainer/WebViewImplWebkit.qml	2014-10-20 22:12:22 +0000
281
@@ -34,7 +34,7 @@
282
34
    property string webappName: ""
34
    property string webappName: ""
283
35
    property var webappUrlPatterns: null
35
    property var webappUrlPatterns: null
284
36
    property string localUserAgentOverride: ""
36
    property string localUserAgentOverride: ""
286
37
    property string popupRedirectionUrlPrefix: ""
37
    property string popupRedirectionUrlPrefixPattern: ""
287
38
38
288
39
    function getUAString() {
39
    function getUAString() {
289
40
        return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
40
        return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
290
@@ -53,6 +53,9 @@
291
53
        }
53
        }
292
54
    }
54
    }
293
55
55
294
56
    StateSaver.properties: "url"
295
57
    StateSaver.enabled: true
296
58
297
56
    property bool lastLoadFailed: false
59
    property bool lastLoadFailed: false
298
57
    onLoadingChanged: {
60
    onLoadingChanged: {
299
58
        lastLoadFailed = (loadRequest.status === WebView.LoadFailedStatus)
61
        lastLoadFailed = (loadRequest.status === WebView.LoadFailedStatus)
300
59
62
301
=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
302
--- src/app/webcontainer/WebappContainerWebview.qml	2014-09-02 06:29:12 +0000
303
+++ src/app/webcontainer/WebappContainerWebview.qml	2014-10-20 22:12:22 +0000
304
@@ -33,11 +33,13 @@
305
33
    property var currentWebview: webappContainerWebViewLoader.item
33
    property var currentWebview: webappContainerWebViewLoader.item
306
34
    property var webappUrlPatterns
34
    property var webappUrlPatterns
307
35
    property string localUserAgentOverride: ""
35
    property string localUserAgentOverride: ""
309
36
    property string popupRedirectionUrlPrefix: ""
36
    property string popupRedirectionUrlPrefixPattern: ""
310
37
    property url webviewOverrideFile: ""
37
    property url webviewOverrideFile: ""
311
38
    property bool blockOpenExternalUrls: false
312
38
39
313
39
    Loader {
40
    Loader {
314
40
        id: webappContainerWebViewLoader
41
        id: webappContainerWebViewLoader
315
42
        objectName: "containerWebviewLoader"
316
41
        anchors.fill: parent
43
        anchors.fill: parent
317
42
        asynchronous: true
44
        asynchronous: true
318
43
    }
45
    }
319
@@ -62,7 +64,8 @@
320
62
                    , webappName: containerWebview.webappName
64
                    , webappName: containerWebview.webappName
321
63
                    , webappUrlPatterns: containerWebview.webappUrlPatterns
65
                    , webappUrlPatterns: containerWebview.webappUrlPatterns
322
64
                    , developerExtrasEnabled: containerWebview.developerExtrasEnabled
66
                    , developerExtrasEnabled: containerWebview.developerExtrasEnabled
324
65
                    , popupRedirectionUrlPrefix: containerWebview.popupRedirectionUrlPrefix})
67
                    , popupRedirectionUrlPrefixPattern: containerWebview.popupRedirectionUrlPrefixPattern
325
68
                    , blockOpenExternalUrls: containerWebview.blockOpenExternalUrls})
326
66
    }
69
    }
327
67
}
70
}
328
68
71
329
69
72
330
=== modified file 'src/app/webcontainer/url-pattern-utils.cpp'
331
--- src/app/webcontainer/url-pattern-utils.cpp	2014-09-05 20:14:53 +0000
332
+++ src/app/webcontainer/url-pattern-utils.cpp	2014-10-20 22:12:22 +0000
333
@@ -21,6 +21,8 @@
334
21
#include <QtCore/QRegularExpression>
21
#include <QtCore/QRegularExpression>
335
22
#include <QDebug>
22
#include <QDebug>
336
23
23
337
24
namespace
338
25
{
339
24
26
340
25
/**
27
/**
341
26
 * Tests for the validity of a given webapp url pattern. It follows
28
 * Tests for the validity of a given webapp url pattern. It follows
342
@@ -35,7 +37,7 @@
343
35
 * @param pattern pattern that is to be tested for validity
37
 * @param pattern pattern that is to be tested for validity
344
36
 * @return true if the url is valid, false otherwise
38
 * @return true if the url is valid, false otherwise
345
37
 */
39
 */
347
38
static bool isValidWebappUrlPattern(const QString& pattern)
40
bool isValidWebappUrlPattern(const QString& pattern)
348
39
{
41
{
349
40
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.]+\\.[^\\.\\*\\?]+\\.[^\\.\\*\\?]+(\\.[^\\.\\*\\?/]+)*/.*$");
42
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.]+\\.[^\\.\\*\\?]+\\.[^\\.\\*\\?]+(\\.[^\\.\\*\\?/]+)*/.*$");
350
41
    return grammar.match(pattern).hasMatch();
43
    return grammar.match(pattern).hasMatch();
351
@@ -71,7 +73,7 @@
352
71
 * @param pattern pattern that is to be tested for validity
73
 * @param pattern pattern that is to be tested for validity
353
72
 * @return true if the url is valid, false otherwise
74
 * @return true if the url is valid, false otherwise
354
73
 */
75
 */
356
74
static bool isValidGoogleUrlPattern(const QString& pattern)
76
bool isValidGoogleUrlPattern(const QString& pattern)
357
75
{
77
{
358
76
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.[^\\.\\?]+/.*$");
78
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.[^\\.\\?]+/.*$");
359
77
    return grammar.match(pattern).hasMatch();
79
    return grammar.match(pattern).hasMatch();
360
@@ -83,14 +85,31 @@
361
83
 * @param pattern pattern that is to be tested for validity
85
 * @param pattern pattern that is to be tested for validity
362
84
 * @return true if the url is valid, false otherwise
86
 * @return true if the url is valid, false otherwise
363
85
 */
87
 */
365
86
static bool isValidStrictUrlPattern(const QString& pattern)
88
bool isValidStrictUrlPattern(const QString& pattern)
366
87
{
89
{
367
88
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\*\\?]+\\.[^\\.\\*\\?]+(\\.[^\\.\\*\\?/]+)*/.*$");
90
    static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\*\\?]+\\.[^\\.\\*\\?]+(\\.[^\\.\\*\\?/]+)*/.*$");
368
89
    return grammar.match(pattern).hasMatch();
91
    return grammar.match(pattern).hasMatch();
369
90
}
92
}
370
91
93
371
92
94
373
93
QString UrlPatternUtils::transformWebappSearchPatternToSafePattern(const QString& pattern)
95
QString toSafeHostnamePartPattern(const QString& hostnamePart)
374
96
{
375
97
    QString localHostnamePart = hostnamePart;
376
98
    return localHostnamePart.replace("*", "[^\\./]*");
377
99
}
378
100
379
101
QString toSafeUrlPathPartPattern(const QString& urlPathPart)
380
102
{
381
103
    QString localUrlPathPart = urlPathPart;
382
104
    return localUrlPathPart.replace("*", "[^\\s]*");
383
105
}
384
106
385
107
} // namespace {
386
108
387
109
388
110
QString UrlPatternUtils::transformWebappSearchPatternToSafePattern(
389
111
        const QString& pattern,
390
112
        bool doTransformUrlPath)
391
94
{
113
{
392
95
    QString transformedPattern;
114
    QString transformedPattern;
393
96
115
394
@@ -112,8 +131,10 @@
395
112
            // matches
131
            // matches
396
113
            // https?://*.ebay.com/*
132
            // https?://*.ebay.com/*
397
114
            QString scheme = match.captured(1);
133
            QString scheme = match.captured(1);
400
115
            QString hostname = match.captured(2).replace("*", "[^\\./]*");
134
            QString hostname = toSafeHostnamePartPattern(match.captured(2));
401
116
            QString tail = match.captured(3).replace("*", "[^\\s]*");
135
            QString tail = doTransformUrlPath ?
402
136
                        toSafeUrlPathPartPattern(match.captured(3))
403
137
                      : match.captured(3);
404
117
138
405
118
            // reconstruct
139
            // reconstruct
406
119
            transformedPattern = QString("%1%2%3").arg(scheme).arg(hostname).arg(tail);
140
            transformedPattern = QString("%1%2%3").arg(scheme).arg(hostname).arg(tail);
407
@@ -128,7 +149,7 @@
408
128
            QString scheme = match.captured(1);
149
            QString scheme = match.captured(1);
409
129
            QString hostname = match.captured(2);
150
            QString hostname = match.captured(2);
410
130
            QString tld = match.captured(3).replace("*", "[^\\./]*");
151
            QString tld = match.captured(3).replace("*", "[^\\./]*");
412
131
            QString tail = match.captured(4).replace("*", "[^\\s]*");
152
            QString tail = toSafeUrlPathPartPattern(match.captured(4));
413
132
153
414
133
            // reconstruct
154
            // reconstruct
415
134
            transformedPattern = QString("%1%2%3%4")
155
            transformedPattern = QString("%1%2%3%4")
416
135
156
417
=== modified file 'src/app/webcontainer/url-pattern-utils.h'
418
--- src/app/webcontainer/url-pattern-utils.h	2014-04-01 18:45:08 +0000
419
+++ src/app/webcontainer/url-pattern-utils.h	2014-10-20 22:12:22 +0000
420
@@ -25,7 +25,8 @@
421
25
25
422
26
namespace UrlPatternUtils {
26
namespace UrlPatternUtils {
423
27
27
425
28
QString transformWebappSearchPatternToSafePattern(const QString&);
28
QString transformWebappSearchPatternToSafePattern(const QString&
426
29
                                                  , bool doTransformUrlPath = true);
427
29
30
428
30
QStringList filterAndTransformUrlPatterns(const QStringList & includePatterns);
31
QStringList filterAndTransformUrlPatterns(const QStringList & includePatterns);
429
31
32
430
32
33
431
=== modified file 'src/app/webcontainer/webapp-container.cpp'
432
--- src/app/webcontainer/webapp-container.cpp	2014-10-03 14:41:14 +0000
433
+++ src/app/webcontainer/webapp-container.cpp	2014-10-20 22:12:22 +0000
434
@@ -158,8 +158,15 @@
435
158
158
436
159
        context->setContextProperty("webappContainerHelper", m_webappContainerHelper.data());
159
        context->setContextProperty("webappContainerHelper", m_webappContainerHelper.data());
437
160
160
440
161
        if ( ! m_popupRedirectionUrlPrefix.isEmpty()) {
161
        if ( ! m_popupRedirectionUrlPrefixPattern.isEmpty()) {
441
162
            m_window->setProperty("popupRedirectionUrlPrefix", m_popupRedirectionUrlPrefix);
162
            const QString WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL_ENV_VAR =
442
163
                qgetenv("WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL");
443
164
            m_window->setProperty(
444
165
                        "popupRedirectionUrlPrefixPattern",
445
166
                        WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL_ENV_VAR == "1"
446
167
                        ? m_popupRedirectionUrlPrefixPattern
447
168
                        : UrlPatternUtils::transformWebappSearchPatternToSafePattern(
448
169
                              m_popupRedirectionUrlPrefixPattern, false));
449
163
        }
170
        }
450
164
171
451
165
        if (!m_userAgentOverride.isEmpty()) {
172
        if (!m_userAgentOverride.isEmpty()) {
452
@@ -172,16 +179,20 @@
453
172
            m_window->setProperty("webviewOverrideFile", QUrl::fromLocalFile(overrideFile.absoluteFilePath()));
179
            m_window->setProperty("webviewOverrideFile", QUrl::fromLocalFile(overrideFile.absoluteFilePath()));
454
173
        }
180
        }
455
174
181
466
175
        // When a webapp is being launched by name, the URL is pulled from its 'homepage'.
182
        const QString WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY_ENV_VAR =
467
176
        if (m_webappName.isEmpty()) {
183
            qgetenv("WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY");
468
177
            QList<QUrl> urls = this->urls();
184
        if (WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY_ENV_VAR == "1") {
469
178
            if (!urls.isEmpty()) {
185
            m_window->setProperty("blockOpenExternalUrls", true);
470
179
                m_window->setProperty("url", urls.last());
186
        }
471
180
            } else if (m_webappModelSearchPath.isEmpty()) {
187
472
181
                return false;
188
        QList<QUrl> urls = this->urls();
473
182
            }
189
        if (!urls.isEmpty()) {
474
183
            // Otherwise, assume that the homepage will come from a locally defined
190
            m_window->setProperty("url", urls.last());
475
184
            // webapp-properties.json file pulled from the webapp model element.
191
        } else if (m_webappModelSearchPath.isEmpty()) {
476
192
            // Either we have a command line argument for the start URL or we have
477
193
            // local search path for a webapp definition (that would include in its
478
194
            // meta data a homepage). Any other case is faulty.
479
195
            return false;
480
185
        }
196
        }
481
186
197
482
187
        m_component->completeCreate();
198
        m_component->completeCreate();
483
@@ -278,7 +289,7 @@
484
278
        } else if (argument == "--local-webapp-manifest") {
289
        } else if (argument == "--local-webapp-manifest") {
485
279
            m_localWebappManifest = true;
290
            m_localWebappManifest = true;
486
280
        } else if (argument.startsWith("--popup-redirection-url-prefix=")) {
291
        } else if (argument.startsWith("--popup-redirection-url-prefix=")) {
488
281
            m_popupRedirectionUrlPrefix = argument.split("--popup-redirection-url-prefix=")[1];
292
            m_popupRedirectionUrlPrefixPattern = argument.split("--popup-redirection-url-prefix=")[1];
489
282
        } else if (argument.startsWith("--local-cookie-db-path=")) {
293
        } else if (argument.startsWith("--local-cookie-db-path=")) {
490
283
            m_localCookieStoreDbPath = argument.split("--local-cookie-db-path=")[1];
294
            m_localCookieStoreDbPath = argument.split("--local-cookie-db-path=")[1];
491
284
        } else if (argument.startsWith("--user-agent-string=")) {
295
        } else if (argument.startsWith("--user-agent-string=")) {
492
285
296
493
=== modified file 'src/app/webcontainer/webapp-container.h'
494
--- src/app/webcontainer/webapp-container.h	2014-09-25 20:36:59 +0000
495
+++ src/app/webcontainer/webapp-container.h	2014-10-20 22:12:22 +0000
496
@@ -56,7 +56,7 @@
497
56
    bool m_backForwardButtonsVisible;
56
    bool m_backForwardButtonsVisible;
498
57
    bool m_addressBarVisible;
57
    bool m_addressBarVisible;
499
58
    bool m_localWebappManifest;
58
    bool m_localWebappManifest;
501
59
    QString m_popupRedirectionUrlPrefix;
59
    QString m_popupRedirectionUrlPrefixPattern;
502
60
    QString m_localCookieStoreDbPath;
60
    QString m_localCookieStoreDbPath;
503
61
    QString m_userAgentOverride;
61
    QString m_userAgentOverride;
504
62
    QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
62
    QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
505
63
63
506
=== modified file 'src/app/webcontainer/webapp-container.qml'
507
--- src/app/webcontainer/webapp-container.qml	2014-10-08 09:23:14 +0000
508
+++ src/app/webcontainer/webapp-container.qml	2014-10-20 22:12:22 +0000
509
@@ -39,10 +39,11 @@
510
39
    property var webappUrlPatterns
39
    property var webappUrlPatterns
511
40
    property bool oxide: false
40
    property bool oxide: false
512
41
    property string accountProvider: ""
41
    property string accountProvider: ""
514
42
    property string popupRedirectionUrlPrefix: ""
42
    property string popupRedirectionUrlPrefixPattern: ""
515
43
    property url webviewOverrideFile: ""
43
    property url webviewOverrideFile: ""
516
44
    property var __webappCookieStore: null
44
    property var __webappCookieStore: null
517
45
    property string localUserAgentOverride: ""
45
    property string localUserAgentOverride: ""
518
46
    property bool blockOpenExternalUrls: false
519
46
47
520
47
    contentOrientation: Screen.orientation
48
    contentOrientation: Screen.orientation
521
48
49
522
@@ -77,10 +78,10 @@
523
77
        oxide: root.oxide
78
        oxide: root.oxide
524
78
        webappModelSearchPath: root.webappModelSearchPath
79
        webappModelSearchPath: root.webappModelSearchPath
525
79
        webappUrlPatterns: root.webappUrlPatterns
80
        webappUrlPatterns: root.webappUrlPatterns
526
81
        blockOpenExternalUrls: root.blockOpenExternalUrls
527
80
82
528
81
        localUserAgentOverride: root.localUserAgentOverride
83
        localUserAgentOverride: root.localUserAgentOverride
531
82
84
        popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
530
83
        popupRedirectionUrlPrefix: root.popupRedirectionUrlPrefix
532
84
        webviewOverrideFile: root.webviewOverrideFile
85
        webviewOverrideFile: root.webviewOverrideFile
533
85
86
534
86
        anchors.fill: parent
87
        anchors.fill: parent
535
@@ -107,7 +108,7 @@
536
107
        searchPath: root.webappModelSearchPath
108
        searchPath: root.webappModelSearchPath
537
108
109
538
109
        onModelContentChanged: {
110
        onModelContentChanged: {
540
110
            if (root.webappName) {
111
            if (root.webappName && root.url.length === 0) {
541
111
                var idx = webappModel.getWebappIndex(root.webappName)
112
                var idx = webappModel.getWebappIndex(root.webappName)
542
112
                root.url = webappModel.data(idx, UnityWebApps.UnityWebappsAppModel.Homepage)
113
                root.url = webappModel.data(idx, UnityWebApps.UnityWebappsAppModel.Homepage)
543
113
            }
114
            }
544
@@ -185,8 +186,22 @@
545
185
        browser.visible = true;
186
        browser.visible = true;
546
186
        if (browser.currentWebview) {
187
        if (browser.currentWebview) {
547
187
            browser.currentWebview.visible = true;
188
            browser.currentWebview.visible = true;
550
188
            browser.currentWebview.url = root.url
189
            browser.webappName = root.webappName;
551
189
            browser.webappName = root.webappName
190
552
191
            // As we use StateSaver to restore the URL, we need to check first if
553
192
            // it has not been set previously before setting the URL to the default property 
554
193
            // homepage.
555
194
            var current_url = browser.currentWebview.url.toString();
556
195
            if (!current_url || current_url.length === 0) {
557
196
                browser.currentWebview.url = root.url;
558
197
            }
559
198
        }
560
199
    }
561
200
562
201
    function updateBrowserUrl(url) {
563
202
        root.url = url;
564
203
        if (browser.currentWebview) {
565
204
            browser.currentWebview.url = url;
566
190
        }
205
        }
567
191
    }
206
    }
568
192
207
569
@@ -205,11 +220,11 @@
570
205
            }
220
            }
571
206
            var requestedUrl = uris[0].toString();
221
            var requestedUrl = uris[0].toString();
572
207
222
575
208
            if (popupRedirectionUrlPrefix.length !== 0
223
            if (popupRedirectionUrlPrefixPattern.length !== 0
576
209
                    && requestedUrl.indexOf(popupRedirectionUrlPrefix) === 0) {
224
                    && requestedUrl.match(popupRedirectionUrlPrefixPattern)) {
577
210
                return;
225
                return;
578
211
            }
226
            }
580
212
            browser.currentWebview.url = requestedUrl;
227
            updateBrowserUrl(requestedUrl);
581
213
        }
228
        }
582
214
    }
229
    }
583
215
}
230
}
584
216
231
585
=== modified file 'tests/autopilot/webapp_container/tests/__init__.py'
586
--- tests/autopilot/webapp_container/tests/__init__.py	2014-07-17 11:08:58 +0000
587
+++ tests/autopilot/webapp_container/tests/__init__.py	2014-10-20 22:12:22 +0000
588
@@ -20,6 +20,8 @@
589
20
20
590
21
from autopilot.testcase import AutopilotTestCase
21
from autopilot.testcase import AutopilotTestCase
591
22
from autopilot.platform import model
22
from autopilot.platform import model
592
23
from testtools.matchers import Equals
593
24
from autopilot.matchers import Eventually
594
23
25
595
24
from ubuntuuitoolkit import emulators as toolkit_emulators
26
from ubuntuuitoolkit import emulators as toolkit_emulators
596
25
from webapp_container.tests import fake_servers
27
from webapp_container.tests import fake_servers
597
@@ -38,16 +40,24 @@
598
38
40
599
39
41
600
40
class WebappContainerTestCaseBase(AutopilotTestCase):
42
class WebappContainerTestCaseBase(AutopilotTestCase):
601
43
    def setUp(self):
602
44
        self.pointing_device = toolkit_emulators.get_pointing_device()
603
45
        super(WebappContainerTestCaseBase, self).setUp()
604
46
605
41
    def get_webcontainer_app_path(self):
47
    def get_webcontainer_app_path(self):
606
42
        if os.path.exists(LOCAL_BROWSER_CONTAINER_PATH_NAME):
48
        if os.path.exists(LOCAL_BROWSER_CONTAINER_PATH_NAME):
607
43
            return LOCAL_BROWSER_CONTAINER_PATH_NAME
49
            return LOCAL_BROWSER_CONTAINER_PATH_NAME
608
44
        return INSTALLED_BROWSER_CONTAINER_PATH_NAME
50
        return INSTALLED_BROWSER_CONTAINER_PATH_NAME
609
45
51
611
46
    def launch_webcontainer_app(self, args):
52
    def launch_webcontainer_app(self, args, envvars={}):
612
47
        if model() != 'Desktop':
53
        if model() != 'Desktop':
613
48
            args.append(
54
            args.append(
614
49
                '--desktop_file_hint=/usr/share/applications/'
55
                '--desktop_file_hint=/usr/share/applications/'
615
50
                'webbrowser-app.desktop')
56
                'webbrowser-app.desktop')
616
57
        if envvars:
617
58
            for envvar_key in envvars:
618
59
                self.patch_environment(envvar_key, envvars[envvar_key])
619
60
620
51
        try:
61
        try:
621
52
            self.app = self.launch_test_application(
62
            self.app = self.launch_test_application(
622
53
                self.get_webcontainer_app_path(),
63
                self.get_webcontainer_app_path(),
623
@@ -68,15 +78,43 @@
624
68
    def get_webcontainer_chrome(self):
78
    def get_webcontainer_chrome(self):
625
69
        return self.app.select_single("Chrome")
79
        return self.app.select_single("Chrome")
626
70
80
627
81
    def get_webview(self):
628
82
        return self.app.select_single(objectName="webview")
629
83
630
84
    def get_oxide_webview(self):
631
85
        container = self.get_webview().select_single(
632
86
            objectName='containerWebviewLoader')
633
87
        return container.select_single('WebViewImplOxide')
634
88
635
89
    def assert_page_eventually_loaded(self, url):
636
90
        webview = self.get_oxide_webview()
637
91
        self.assertThat(webview.url, Eventually(Equals(url)))
638
92
        # loadProgress == 100 ensures that a page has actually loaded
639
93
        self.assertThat(webview.loadProgress,
640
94
                        Eventually(Equals(100), timeout=20))
641
95
        self.assertThat(webview.loading, Eventually(Equals(False)))
642
96
643
97
    def browse_to(self, url):
644
98
        webview = self.get_oxide_webview()
645
99
        webview.url = url
646
100
        self.assert_page_eventually_loaded(url)
647
101
648
71
102
649
72
class WebappContainerTestCaseWithLocalContentBase(WebappContainerTestCaseBase):
103
class WebappContainerTestCaseWithLocalContentBase(WebappContainerTestCaseBase):
650
104
    BASE_URL_SCHEME = 'http://'
651
105
652
73
    def setUp(self):
106
    def setUp(self):
653
74
        super(WebappContainerTestCaseWithLocalContentBase, self).setUp()
107
        super(WebappContainerTestCaseWithLocalContentBase, self).setUp()
654
75
        self.http_server = fake_servers.WebappContainerContentHttpServer()
108
        self.http_server = fake_servers.WebappContainerContentHttpServer()
655
76
        self.addCleanup(self.http_server.shutdown)
109
        self.addCleanup(self.http_server.shutdown)
659
77
        self.base_url = "http://localhost:{}".format(self.http_server.port)
110
        self.base_url = "{}localhost:{}".format(
660
78
111
            self.BASE_URL_SCHEME, self.http_server.port)
661
79
    def launch_webcontainer_app_with_local_http_server(self, args, path='/'):
112
662
113
    def get_base_url_hostname(self):
663
114
        return self.base_url[len(self.BASE_URL_SCHEME):]
664
115
665
116
    def launch_webcontainer_app_with_local_http_server(
666
117
            self, args, path='/', envvars={}):
667
80
        self.url = self.base_url + path
118
        self.url = self.base_url + path
668
81
        args.append(self.url)
119
        args.append(self.url)
670
82
        self.launch_webcontainer_app(args)
120
        self.launch_webcontainer_app(args, envvars)
671
83
121
672
=== modified file 'tests/autopilot/webapp_container/tests/fake_servers.py'
673
--- tests/autopilot/webapp_container/tests/fake_servers.py	2014-04-24 10:50:42 +0000
674
+++ tests/autopilot/webapp_container/tests/fake_servers.py	2014-10-20 22:12:22 +0000
675
@@ -26,14 +26,28 @@
676
26
        self.end_headers()
26
        self.end_headers()
677
27
        self.wfile.write(content.encode())
27
        self.wfile.write(content.encode())
678
28
28
687
29
    def basic_html_content(self):
29
    def basic_html_content(self, content="basic"):
688
30
        return """
30
        return """
689
31
<html>
31
<html>
690
32
<head>
32
<head>
691
33
<title>Some content</title>
33
<title>Some content</title>
692
34
</head>
34
</head>
693
35
<body>
35
<body>
694
36
This is some content
36
This is some {} content
695
37
</body>
696
38
</html>
697
39
        """.format(content)
698
40
699
41
    def redirect_html_content(self):
700
42
        return """
701
43
<html>
702
44
<head>
703
45
<title>Some content</title>
704
46
</head>
705
47
<body>
706
48
<div><a href='/redirect?url=myredirect&s=1&r=2' target='_blank'>
707
49
<div style="height: 100%; width: 100%"></div>
708
50
</a></div>
709
37
</body>
51
</body>
710
38
</html>
52
</html>
711
39
        """
53
        """
712
@@ -42,6 +56,12 @@
713
42
        if self.path == '/':
56
        if self.path == '/':
714
43
            self.send_response(200)
57
            self.send_response(200)
715
44
            self.serve_content(self.basic_html_content())
58
            self.serve_content(self.basic_html_content())
716
59
        elif self.path == '/other':
717
60
            self.send_response(200)
718
61
            self.serve_content(self.basic_html_content("other"))
719
62
        elif self.path == '/get-redirect':
720
63
            self.send_response(200)
721
64
            self.serve_content(self.redirect_html_content())
722
45
        else:
65
        else:
723
46
            self.send_error(404)
66
            self.send_error(404)
724
47
67
725
48
68
726
=== modified file 'tests/autopilot/webapp_container/tests/test_app_launch.py'
727
--- tests/autopilot/webapp_container/tests/test_app_launch.py	2014-07-17 11:08:58 +0000
728
+++ tests/autopilot/webapp_container/tests/test_app_launch.py	2014-10-20 22:12:22 +0000
729
@@ -23,7 +23,7 @@
730
23
        WebappContainerTestCaseWithLocalContentBase):
23
        WebappContainerTestCaseWithLocalContentBase):
731
24
24
732
25
    def test_container_does_not_load_with_no_webapp_name_and_url(self):
25
    def test_container_does_not_load_with_no_webapp_name_and_url(self):
734
26
        args = ['--webapp']
26
        args = []
735
27
        self.launch_webcontainer_app(args)
27
        self.launch_webcontainer_app(args)
736
28
        self.assertIsNone(self.get_webcontainer_proxy())
28
        self.assertIsNone(self.get_webcontainer_proxy())
737
29
29
738
30
30
739
=== added file 'tests/autopilot/webapp_container/tests/test_redirection_pattern.py'
740
--- tests/autopilot/webapp_container/tests/test_redirection_pattern.py	1970-01-01 00:00:00 +0000
741
+++ tests/autopilot/webapp_container/tests/test_redirection_pattern.py	2014-10-20 22:12:22 +0000
742
@@ -0,0 +1,59 @@
743
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
744
2
# Copyright 2014 Canonical
745
3
#
746
4
# This program is free software: you can redistribute it and/or modify it
747
5
# under the terms of the GNU General Public License version 3, as published
748
6
# by the Free Software Foundation.
749
7
#
750
8
# This program is distributed in the hope that it will be useful,
751
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
752
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
753
11
# GNU General Public License for more details.
754
12
#
755
13
# You should have received a copy of the GNU General Public License
756
14
# along with this program. If not, see <http://www.gnu.org/licenses/>.
757
15
758
16
from testtools.matchers import Equals
759
17
from autopilot.matchers import Eventually
760
18
761
19
from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
762
20
763
21
764
22
class WebappContainerRedirectionPatternTestCase(
765
23
        WebappContainerTestCaseWithLocalContentBase):
766
24
767
25
    def test_browse_to_redirection_pattern_url(self):
768
26
        REDIRECTION_HOSTNAME = self.get_base_url_hostname()
769
27
        args = ["--popup-redirection-url-prefix={}{}{}".format(
770
28
            'http://', REDIRECTION_HOSTNAME.replace('.', '\.'),
771
29
            '/redirect\\?url=([^&]*).*')]
772
30
        self.launch_webcontainer_app_with_local_http_server(
773
31
            args,
774
32
            '/get-redirect',
775
33
            {'WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY': '1',
776
34
                'WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL': '1'})
777
35
        self.get_webcontainer_window().visible.wait_for(True)
778
36
779
37
        webview = self.get_oxide_webview()
780
38
        external_open_watcher = webview.watch_signal(
781
39
            'openExternalUrlTriggered(QString)')
782
40
        got_redirection_url_watcher = webview.watch_signal(
783
41
            'gotRedirectionUrl(QString)')
784
42
785
43
        self.assertThat(external_open_watcher.was_emitted, Equals(False))
786
44
        self.assertThat(got_redirection_url_watcher.was_emitted, Equals(False))
787
45
        self.browse_to(
788
46
            "http://{}/get-redirect".format(REDIRECTION_HOSTNAME))
789
47
790
48
        self.pointing_device.click_object(webview)
791
49
792
50
        self.assertThat(
793
51
            lambda: got_redirection_url_watcher.was_emitted,
794
52
            Eventually(Equals(True)))
795
53
        self.assertThat(
796
54
            webview.get_signal_emissions(
797
55
                'gotRedirectionUrl(QString)')[0][0],
798
56
            Equals('myredirect'))
799
57
        self.assertThat(
800
58
            lambda: external_open_watcher.was_emitted,
801
59
            Eventually(Equals(True)))
802
0
60
803
=== modified file 'tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp'
804
--- tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp	2014-09-05 20:14:53 +0000
805
+++ tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp	2014-10-20 22:12:22 +0000
806
@@ -33,25 +33,32 @@
807
33
    {
33
    {
808
34
        QTest::addColumn<QString>("pattern");
34
        QTest::addColumn<QString>("pattern");
809
35
        QTest::addColumn<QString>("transformedPattern");
35
        QTest::addColumn<QString>("transformedPattern");
810
36
        QTest::addColumn<bool>("doTransformUrlPath");
811
36
37
812
37
        // regular patterns
38
        // regular patterns
813
38
39
814
39
        QTest::newRow("Valid pattern")
40
        QTest::newRow("Valid pattern")
815
40
                << "https?://*.mydomain.com/*"
41
                << "https?://*.mydomain.com/*"
817
41
                << "https?://[^\\./]*.mydomain.com/[^\\s]*";
42
                << "https?://[^\\./]*.mydomain.com/[^\\s]*"
818
43
                << true;
819
44
820
45
        QTest::newRow("Valid pattern with no tail replacement")
821
46
                << "https?://*.mydomain.com/l.php\\?\\w+=([^&]+).*"
822
47
                << "https?://[^\\./]*.mydomain.com/l.php\\?\\w+=([^&]+).*"
823
48
                << false;
824
42
49
825
43
        QTest::newRow("Valid pattern - short url")
50
        QTest::newRow("Valid pattern - short url")
826
44
                << "https?://mydomain.com/*"
51
                << "https?://mydomain.com/*"
828
45
                << "https?://mydomain.com/[^\\s]*";
52
                << "https?://mydomain.com/[^\\s]*" << true;
829
46
53
830
47
        QTest::newRow("Valid pattern - strict url")
54
        QTest::newRow("Valid pattern - strict url")
831
48
                << "https?://www.mydomain.com/*"
55
                << "https?://www.mydomain.com/*"
833
49
                << "https?://www.mydomain.com/[^\\s]*";
56
                << "https?://www.mydomain.com/[^\\s]*" << true;
834
50
57
835
51
#define WEBAPP_INVALID_URL_PATTERN_TEST(id,invalid_url_pattern) \
58
#define WEBAPP_INVALID_URL_PATTERN_TEST(id,invalid_url_pattern) \
836
52
        QTest::newRow("Invalid pattern " #id) \
59
        QTest::newRow("Invalid pattern " #id) \
837
53
                << invalid_url_pattern \
60
                << invalid_url_pattern \
839
54
                << QString()
61
                << QString() << true
840
55
62
841
56
        WEBAPP_INVALID_URL_PATTERN_TEST(1, "http");
63
        WEBAPP_INVALID_URL_PATTERN_TEST(1, "http");
842
57
        WEBAPP_INVALID_URL_PATTERN_TEST(2, "://");
64
        WEBAPP_INVALID_URL_PATTERN_TEST(2, "://");
843
@@ -74,16 +81,16 @@
844
74
81
845
75
        QTest::newRow("Valid Google pattern")
82
        QTest::newRow("Valid Google pattern")
846
76
                << "https?://mail.google.*/*"
83
                << "https?://mail.google.*/*"
848
77
                << "https?://mail.google.[^\\./]*/[^\\s]*";
84
                << "https?://mail.google.[^\\./]*/[^\\s]*" << true;
849
78
85
850
79
        QTest::newRow("Valid non Google pattern")
86
        QTest::newRow("Valid non Google pattern")
851
80
                << "https://*.google.com/*"
87
                << "https://*.google.com/*"
853
81
                << "https://[^\\./]*.google.com/[^\\s]*";
88
                << "https://[^\\./]*.google.com/[^\\s]*" << true;
854
82
89
855
83
#define WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(id,invalid_google_url_pattern) \
90
#define WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(id,invalid_google_url_pattern) \
856
84
        QTest::newRow("Invalid Google App pattern " #id) \
91
        QTest::newRow("Invalid Google App pattern " #id) \
857
85
                << invalid_google_url_pattern \
92
                << invalid_google_url_pattern \
859
86
                << QString()
93
                << QString() << true
860
87
94
861
88
        WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(1, "https://*.google.*/*");
95
        WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(1, "https://*.google.*/*");
862
89
        WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(2, "https://service.gooo*gle.com/*");
96
        WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(2, "https://service.gooo*gle.com/*");
863
@@ -99,7 +106,8 @@
864
99
    {
106
    {
865
100
        QFETCH(QString, pattern);
107
        QFETCH(QString, pattern);
866
101
        QFETCH(QString, transformedPattern);
108
        QFETCH(QString, transformedPattern);
868
102
        QCOMPARE(UrlPatternUtils::transformWebappSearchPatternToSafePattern(pattern), transformedPattern);
109
        QFETCH(bool, doTransformUrlPath);
869
110
        QCOMPARE(UrlPatternUtils::transformWebappSearchPatternToSafePattern(pattern, doTransformUrlPath), transformedPattern);
870
103
    }
111
    }
871
104
112
872
105
    void filteredUrlPatterns_data()
113
    void filteredUrlPatterns_data()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-11
Olivier Tilloy			Approve on 2014-10-10
David Barth (community)		2014-10-07	Approve on 2014-10-09
Review via email: mp+237456@code.launchpad.net