1 files changed, 92 insertions, 0 deletions
diff --git a/dom/push/test/xpcshell/test_unregister_invalid_json.js b/dom/push/test/xpcshell/test_unregister_invalid_json.js
new file mode 100644
index 000000000..28c10e999
--- /dev/null
+++ b/dom/push/test/xpcshell/test_unregister_invalid_json.js
@@ -0,0 +1,92 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+const {PushDB, PushService, PushServiceWebSocket} = serviceExports;
+
+const userAgentID = '7f0af1bb-7e1f-4fb8-8e4a-e8de434abde3';
+
+function run_test() {
+  do_get_profile();
+  setPrefs({
+    userAgentID,
+    requestTimeout: 150,
+    retryBaseInterval: 150
+  });
+  run_next_test();
+}
+
+add_task(function* test_unregister_invalid_json() {
+  let db = PushServiceWebSocket.newPushDB();
+  do_register_cleanup(() => {return db.drop().then(_ => db.close());});
+  let records = [{
+    channelID: '87902e90-c57e-4d18-8354-013f4a556559',
+    pushEndpoint: 'https://example.org/update/1',
+    scope: 'https://example.edu/page/1',
+    originAttributes: '',
+    version: 1,
+    quota: Infinity,
+  }, {
+    channelID: '057caa8f-9b99-47ff-891c-adad18ce603e',
+    pushEndpoint: 'https://example.com/update/2',
+    scope: 'https://example.net/page/1',
+    originAttributes: '',
+    version: 1,
+    quota: Infinity,
+  }];
+  for (let record of records) {
+    yield db.put(record);
+  }
+
+  let unregisterDone;
+  let unregisterPromise = new Promise(resolve => unregisterDone = after(2, resolve));
+  PushService.init({
+    serverURI: "wss://push.example.org/",
+    db,
+    makeWebSocket(uri) {
+      return new MockWebSocket(uri, {
+        onHello(request) {
+          this.serverSendMsg(JSON.stringify({
+            messageType: 'hello',
+            status: 200,
+            uaid: userAgentID,
+            use_webpush: true,
+          }));
+        },
+        onUnregister(request) {
+          this.serverSendMsg(');alert(1);(');
+          unregisterDone();
+        }
+      });
+    }
+  });
+
+  yield rejects(
+    PushService.unregister({
+      scope: 'https://example.edu/page/1',
+      originAttributes: '',
+    }),
+    'Expected error for first invalid JSON response'
+  );
+
+  let record = yield db.getByKeyID(
+    '87902e90-c57e-4d18-8354-013f4a556559');
+  ok(!record, 'Failed to delete unregistered record');
+
+  yield rejects(
+    PushService.unregister({
+      scope: 'https://example.net/page/1',
+      originAttributes: ChromeUtils.originAttributesToSuffix(
+        { appId: Ci.nsIScriptSecurityManager.NO_APP_ID, inIsolatedMozBrowser: false }),
+    }),
+    'Expected error for second invalid JSON response'
+  );
+
+  record = yield db.getByKeyID(
+    '057caa8f-9b99-47ff-891c-adad18ce603e');
+  ok(!record,
+    'Failed to delete unregistered record after receiving invalid JSON');
+
+  yield unregisterPromise;
+});