1
=== modified file 'debian/control'
2
--- debian/control	2015-08-25 13:56:58 +0000
3
+++ debian/control	2015-09-01 07:22:19 +0000
4
@@ -6,7 +6,7 @@
5
6
               debhelper (>= 9),
6
               debhelper (>= 9),
6
7
               dh-translations,
7
               dh-translations,
7
8
               hardening-wrapper,
8
               hardening-wrapper,
9
9
               liboxideqt-qmlplugin (>= 1.8),
9
               liboxideqt-qmlplugin (>= 1.9),
10
10
               libqt5sql5-sqlite,
10
               libqt5sql5-sqlite,
11
11
               python3-all,
11
               python3-all,
12
12
               python3-flake8,
12
               python3-flake8,
13
@@ -97,7 +97,7 @@
14
97
Pre-Depends: ${misc:Pre-Depends}
97
Pre-Depends: ${misc:Pre-Depends}
15
98
Depends: ${misc:Depends},
98
Depends: ${misc:Depends},
16
99
         ${shlibs:Depends},
99
         ${shlibs:Depends},
18
100
         liboxideqt-qmlplugin (>= 1.8),
100
         liboxideqt-qmlplugin (>= 1.9),
19
101
         qml-module-qtquick2 (>= 5.4),
101
         qml-module-qtquick2 (>= 5.4),
20
102
         qml-module-qtquick-window2 (>= 5.3),
102
         qml-module-qtquick-window2 (>= 5.3),
21
103
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
103
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
22
104
104
23
=== removed symlink 'src/Ubuntu/Components/Extras/Browser/ua-override-worker.js'
24
=== target was u'../../../Web/ua-override-worker.js'
25
=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
26
--- src/Ubuntu/Web/UbuntuWebContext.qml	2015-08-10 15:22:00 +0000
27
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2015-09-01 07:22:19 +0000
28
@@ -17,7 +17,7 @@
29
17
 */
17
 */
30
18
18
31
19
import QtQuick 2.4
19
import QtQuick 2.4
33
20
import com.canonical.Oxide 1.6 as Oxide
20
import com.canonical.Oxide 1.9 as Oxide
34
21
21
35
22
Oxide.WebContext {
22
Oxide.WebContext {
36
23
    readonly property string defaultUserAgent: __ua.defaultUA
23
    readonly property string defaultUserAgent: __ua.defaultUA
37
@@ -29,27 +29,6 @@
38
29
29
39
30
    userAgent: defaultUserAgent
30
    userAgent: defaultUserAgent
40
31
31
41
32
    networkRequestDelegate: Oxide.WebContextDelegateWorker {
42
33
        source: Qt.resolvedUrl("ua-override-worker.js")
43
34
        // Disable this log message since it outputs sensitive content when
44
35
        // in private mode. (See  http://pad.lv/1457925)
45
36
        //onMessage: console.log("Overriden UA for", message.url, ":", message.override)
46
37
        Component.onCompleted: {
47
38
            var script = "ua-overrides-%1.js".arg(formFactor)
48
39
            var temp = null
49
40
            try {
50
41
                temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this)
51
42
            } catch (e) {
52
43
                console.error("No overrides found for", formFactor)
53
44
            }
54
45
            if (temp !== null) {
55
46
                console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
56
47
                sendMessage({overrides: temp.overrides})
57
48
                temp.destroy()
58
49
            }
59
50
        }
60
51
    }
61
52
    userAgentOverrideDelegate: networkRequestDelegate
62
53
    sessionCookieMode: {
32
    sessionCookieMode: {
63
54
        if (typeof webContextSessionCookieMode !== 'undefined') {
33
        if (typeof webContextSessionCookieMode !== 'undefined') {
64
55
            if (webContextSessionCookieMode === "persistent") {
34
            if (webContextSessionCookieMode === "persistent") {
65
@@ -60,6 +39,7 @@
66
60
        }
39
        }
67
61
        return Oxide.WebContext.SessionCookieModeEphemeral
40
        return Oxide.WebContext.SessionCookieModeEphemeral
68
62
    }
41
    }
69
42
70
63
    userScripts: [
43
    userScripts: [
71
64
        Oxide.UserScript {
44
        Oxide.UserScript {
72
65
            context: "oxide://smartbanners/"
45
            context: "oxide://smartbanners/"
73
@@ -94,4 +74,19 @@
74
94
    devtoolsIp: webviewDevtoolsDebugHost
74
    devtoolsIp: webviewDevtoolsDebugHost
75
95
75
76
96
    hostMappingRules: webviewHostMappingRules
76
    hostMappingRules: webviewHostMappingRules
77
77
78
78
    Component.onCompleted: {
79
79
        var script = "ua-overrides-%1.js".arg(formFactor)
80
80
        var temp = null
81
81
        try {
82
82
            temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this)
83
83
        } catch (e) {
84
84
            console.error("No overrides found for", formFactor)
85
85
        }
86
86
        if (temp !== null) {
87
87
            console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
88
88
            userAgentOverrides = temp.overrides
89
89
            temp.destroy()
90
90
        }
91
91
    }
92
97
}
92
}
93
98
93
94
=== removed file 'src/Ubuntu/Web/ua-override-worker.js'
95
--- src/Ubuntu/Web/ua-override-worker.js	2015-05-25 21:22:58 +0000
96
+++ src/Ubuntu/Web/ua-override-worker.js	1970-01-01 00:00:00 +0000
97
@@ -1,54 +0,0 @@
98
1
/*
99
2
 * Copyright 2014-2015 Canonical Ltd.
100
3
 *
101
4
 * This file is part of webbrowser-app.
102
5
 *
103
6
 * webbrowser-app is free software; you can redistribute it and/or modify
104
7
 * it under the terms of the GNU General Public License as published by
105
8
 * the Free Software Foundation; version 3.
106
9
 *
107
10
 * webbrowser-app is distributed in the hope that it will be useful,
108
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
109
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
110
13
 * GNU General Public License for more details.
111
14
 *
112
15
 * You should have received a copy of the GNU General Public License
113
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
114
17
 */
115
18
116
19
var overrides = [];
117
20
118
21
oxide.onMessage = function(msg) {
119
22
    if ("overrides" in msg) {
120
23
        var o = msg["overrides"];
121
24
        for (var i in o) {
122
25
            var r = o[i];
123
26
            overrides.push([new RegExp(r[0]), r[1]]);
124
27
        }
125
28
    }
126
29
}
127
30
128
31
function getUAoverride(url) {
129
32
    for (var i = 0; i < overrides.length; i++) {
130
33
        var override = overrides[i];
131
34
        if (override[0].test(url)) {
132
35
            return override[1];
133
36
        }
134
37
    }
135
38
    return null;
136
39
}
137
40
138
41
exports.onBeforeSendHeaders = function(event) {
139
42
    var override = getUAoverride(event.url);
140
43
    if (override !== null) {
141
44
        event.setHeader("User-Agent", override);
142
45
        oxide.sendMessage({url: event.url, override: override});
143
46
    }
144
47
}
145
48
146
49
exports.onGetUserAgentOverride = function(event) {
147
50
    var override = getUAoverride(event.url);
148
51
    if (override !== null) {
149
52
        event.userAgentOverride = override;
150
53
    }
151
54
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-09-09
Alexandre Abreu (community)		2015-08-17	Approve on 2015-08-17
Review via email: mp+268210@code.launchpad.net