mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1217065 - Unconditionally ack incoming updates. r=dragana,benbangert
This commit is contained in:
Kit Cambridge
parent
ddc140fa78
commit
9da9c34269
@ -399,7 +399,8 @@ this.PushDB.prototype = {
|
||||
}
|
||||
let newRecord = aUpdateFunc(this.toPushRecord(record));
|
||||
if (!this.isValidRecord(newRecord)) {
|
||||
debug("update: Ignoring invalid update for key ID " + aKeyID);
|
||||
debug("update: Ignoring invalid update for key ID " + aKeyID +
|
||||
": " + JSON.stringify(newRecord));
|
||||
return;
|
||||
}
|
||||
aStore.put(newRecord).onsuccess = aEvent => {
|
||||
|
||||
@ -893,6 +893,15 @@ this.PushServiceWebSocket = {
|
||||
debug("handleDataUpdate: Discarding message without channel ID");
|
||||
return;
|
||||
}
|
||||
// Unconditionally ack the update. This is important because the Push
|
||||
// server requires the client to ack all outstanding updates before
|
||||
// resuming delivery. However, the server doesn't verify the encryption
|
||||
// params, and can't ensure that an update is encrypted correctly because
|
||||
// it doesn't have the private key. Thus, if we only acked valid updates,
|
||||
// it would be possible for a single invalid one to block delivery of all
|
||||
// subsequent updates. A nack would be more appropriate for this case, but
|
||||
// the protocol doesn't currently support them.
|
||||
this._sendAck(update.channelID, update.version);
|
||||
if (typeof update.data != "string") {
|
||||
promise = this._mainPushService.receivedPushMessage(
|
||||
update.channelID,
|
||||
@ -914,7 +923,7 @@ this.PushServiceWebSocket = {
|
||||
record => record
|
||||
);
|
||||
}
|
||||
promise.then(() => this._sendAck(update.channelID)).catch(err => {
|
||||
promise.catch(err => {
|
||||
debug("handleDataUpdate: Error delivering message: " + err);
|
||||
});
|
||||
},
|
||||
|
||||
198
dom/push/test/xpcshell/test_notification_data.js
Normal file
198
dom/push/test/xpcshell/test_notification_data.js
Normal file
@ -0,0 +1,198 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
'use strict';
|
||||
|
||||
const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
|
||||
|
||||
let db;
|
||||
let userAgentID = 'f5b47f8d-771f-4ea3-b999-91c135f8766d';
|
||||
|
||||
function run_test() {
|
||||
do_get_profile();
|
||||
setPrefs({
|
||||
userAgentID: userAgentID,
|
||||
});
|
||||
run_next_test();
|
||||
}
|
||||
|
||||
function putRecord(channelID, scope, publicKey, privateKey) {
|
||||
return db.put({
|
||||
channelID: channelID,
|
||||
pushEndpoint: 'https://example.org/push/' + channelID,
|
||||
scope: scope,
|
||||
pushCount: 0,
|
||||
lastPush: 0,
|
||||
originAttributes: '',
|
||||
quota: Infinity,
|
||||
p256dhPublicKey: publicKey,
|
||||
p256dhPrivateKey: privateKey,
|
||||
});
|
||||
}
|
||||
|
||||
add_task(function* test_notification_ack_data() {
|
||||
db = PushServiceWebSocket.newPushDB();
|
||||
do_register_cleanup(() => {return db.drop().then(_ => db.close());});
|
||||
|
||||
yield putRecord(
|
||||
'subscription1',
|
||||
'https://example.com/page/1',
|
||||
'BPCd4gNQkjwRah61LpdALdzZKLLnU5UAwDztQ5_h0QsT26jk0IFbqcK6-JxhHAm-rsHEwy0CyVJjtnfOcqc1tgA',
|
||||
{
|
||||
crv: 'P-256',
|
||||
d: '1jUPhzVsRkzV0vIzwL4ZEsOlKdNOWm7TmaTfzitJkgM',
|
||||
ext: true,
|
||||
key_ops: ["deriveBits"],
|
||||
kty: "EC",
|
||||
x: '8J3iA1CSPBFqHrUul0At3NkosudTlQDAPO1Dn-HRCxM',
|
||||
y: '26jk0IFbqcK6-JxhHAm-rsHEwy0CyVJjtnfOcqc1tgA'
|
||||
}
|
||||
);
|
||||
yield putRecord(
|
||||
'subscription2',
|
||||
'https://example.com/page/2',
|
||||
'BPnWyUo7yMnuMlyKtERuLfWE8a09dtdjHSW2lpC9_BqR5TZ1rK8Ldih6ljyxVwnBA-nygQHGRpEmu1jV5K8437E',
|
||||
{
|
||||
crv: 'P-256',
|
||||
d: 'lFm4nPsUKYgNGBJb5nXXKxl8bspCSp0bAhCYxbveqT4',
|
||||
ext: true,
|
||||
key_ops: ["deriveBits"],
|
||||
kty: 'EC',
|
||||
x: '-dbJSjvIye4yXIq0RG4t9YTxrT1212MdJbaWkL38GpE',
|
||||
y: '5TZ1rK8Ldih6ljyxVwnBA-nygQHGRpEmu1jV5K8437E'
|
||||
}
|
||||
);
|
||||
yield putRecord(
|
||||
'subscription3',
|
||||
'https://example.com/page/3',
|
||||
'BDhUHITSeVrWYybFnb7ylVTCDDLPdQWMpf8gXhcWwvaaJa6n3YH8TOcH8narDF6t8mKVvg2ioLW-8MH5O4dzGcI',
|
||||
{
|
||||
crv: 'P-256',
|
||||
d: 'Q1_SE1NySTYzjbqgWwPgrYh7XRg3adqZLkQPsy319G8',
|
||||
ext: true,
|
||||
key_ops: ["deriveBits"],
|
||||
kty: 'EC',
|
||||
x: 'OFQchNJ5WtZjJsWdvvKVVMIMMs91BYyl_yBeFxbC9po',
|
||||
y: 'Ja6n3YH8TOcH8narDF6t8mKVvg2ioLW-8MH5O4dzGcI'
|
||||
}
|
||||
);
|
||||
|
||||
let updates = [];
|
||||
let notifyPromise = promiseObserverNotification('push-notification', function(subject, data) {
|
||||
let notification = subject.QueryInterface(Ci.nsIPushObserverNotification);
|
||||
updates.push({
|
||||
scope: data,
|
||||
data: notification.data,
|
||||
});
|
||||
return updates.length == 3;
|
||||
});
|
||||
|
||||
let acks = 0;
|
||||
let ackDone;
|
||||
let ackPromise = new Promise(resolve => ackDone = resolve);
|
||||
PushService.init({
|
||||
serverURI: "wss://push.example.org/",
|
||||
networkInfo: new MockDesktopNetworkInfo(),
|
||||
db,
|
||||
makeWebSocket(uri) {
|
||||
return new MockWebSocket(uri, {
|
||||
onHello(request) {
|
||||
equal(request.uaid, userAgentID,
|
||||
'Should send matching device IDs in handshake');
|
||||
deepEqual(
|
||||
request.channelIDs.sort(),
|
||||
['subscription1', 'subscription2', 'subscription3'],
|
||||
'Should send matching channel IDs in handshake'
|
||||
);
|
||||
this.serverSendMsg(JSON.stringify({
|
||||
messageType: 'hello',
|
||||
uaid: userAgentID,
|
||||
status: 200,
|
||||
use_webpush: true,
|
||||
}));
|
||||
// subscription1 will send a message with no rs and padding
|
||||
// length 1.
|
||||
this.serverSendMsg(JSON.stringify({
|
||||
messageType: 'notification',
|
||||
channelID: 'subscription1',
|
||||
headers: {
|
||||
encryption_key: 'keyid="notification1"; dh="BO_tgGm-yvYAGLeRe16AvhzaUcpYRiqgsGOlXpt0DRWDRGGdzVLGlEVJMygqAUECarLnxCiAOHTP_znkedrlWoU"',
|
||||
encryption: 'keyid="notification1";salt="uAZaiXpOSfOLJxtOCZ09dA"',
|
||||
},
|
||||
data: 'NwrrOWPxLE8Sv5Rr0Kep7n0-r_j3rsYrUw_CXPo',
|
||||
version: 'v1',
|
||||
}));
|
||||
},
|
||||
onACK(request) {
|
||||
switch (++acks) {
|
||||
case 1:
|
||||
deepEqual([{
|
||||
channelID: 'subscription1',
|
||||
version: 'v1',
|
||||
}], request.updates, 'Wrong updates for acknowledgement 1');
|
||||
// subscription2 will send a message with no rs and padding
|
||||
// length 16.
|
||||
this.serverSendMsg(JSON.stringify({
|
||||
messageType: 'notification',
|
||||
channelID: 'subscription2',
|
||||
headers: {
|
||||
encryption_key: 'keyid="notification2"; dh="BKVdQcgfncpNyNWsGrbecX0zq3eHIlHu5XbCGmVcxPnRSbhjrA6GyBIeGdqsUL69j5Z2CvbZd-9z1UBH0akUnGQ"',
|
||||
encryption: 'keyid="notification2";salt="vFn3t3M_k42zHBdpch3VRw"',
|
||||
},
|
||||
data: 'Zt9dEdqgHlyAL_l83385aEtb98ZBilz5tgnGgmwEsl5AOCNgesUUJ4p9qUU',
|
||||
version: 'v2',
|
||||
}));
|
||||
break;
|
||||
|
||||
case 2:
|
||||
deepEqual([{
|
||||
channelID: 'subscription2',
|
||||
version: 'v2',
|
||||
}], request.updates, 'Wrong updates for acknowledgement 2');
|
||||
// subscription3 will send a message with rs equal 24 and
|
||||
// padding length 16.
|
||||
this.serverSendMsg(JSON.stringify({
|
||||
messageType: 'notification',
|
||||
channelID: 'subscription3',
|
||||
headers: {
|
||||
encryption_key: 'keyid="notification3";dh="BD3xV_ACT8r6hdIYES3BJj1qhz9wyv7MBrG9vM2UCnjPzwE_YFVpkD-SGqE-BR2--0M-Yf31wctwNsO1qjBUeMg"',
|
||||
encryption: 'keyid="notification3"; salt="DFq188piWU7osPBgqn4Nlg"; rs=24',
|
||||
},
|
||||
data: 'LKru3ZzxBZuAxYtsaCfaj_fehkrIvqbVd1iSwnwAUgnL-cTeDD-83blxHXTq7r0z9ydTdMtC3UjAcWi8LMnfY-BFzi0qJAjGYIikDA',
|
||||
version: 'v3',
|
||||
}));
|
||||
break;
|
||||
|
||||
case 3:
|
||||
deepEqual([{
|
||||
channelID: 'subscription3',
|
||||
version: 'v3',
|
||||
}], request.updates, 'Wrong updates for acknowledgement 3');
|
||||
ackDone();
|
||||
break;
|
||||
|
||||
default:
|
||||
ok(false, 'Unexpected acknowledgement ' + acks);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
yield waitForPromise(notifyPromise, DEFAULT_TIMEOUT,
|
||||
'Timed out waiting for notifications');
|
||||
yield waitForPromise(ackPromise, DEFAULT_TIMEOUT,
|
||||
'Timed out waiting for multiple acknowledgements');
|
||||
|
||||
updates.sort((a, b) => a.scope < b.scope ? -1 : a.scope > b.scope ? 1 : 0);
|
||||
deepEqual([{
|
||||
scope: 'https://example.com/page/1',
|
||||
data: 'Some message',
|
||||
}, {
|
||||
scope: 'https://example.com/page/2',
|
||||
data: 'Some message',
|
||||
}, {
|
||||
scope: 'https://example.com/page/3',
|
||||
data: 'Some message',
|
||||
}], updates, 'Wrong data for notifications');
|
||||
});
|
||||
@ -5,6 +5,7 @@ tail =
|
||||
skip-if = toolkit == 'android'
|
||||
|
||||
[test_notification_ack.js]
|
||||
[test_notification_data.js]
|
||||
[test_notification_duplicate.js]
|
||||
[test_notification_error.js]
|
||||
[test_notification_incomplete.js]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user