Merge pull request #33470 from ferjm/bug1225450.iac.check.sync

Bug 1225450 - Check origin for Sync Inter-App-Communication (IAC). r=…
mozilla-b2g · Dec 2, 2015 · 35943e5 · 35943e5
2 parents 3f50020 + 83f8800
commit 35943e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/apps/system/js/sync_manager.js b/apps/system/js/sync_manager.js
@@ -610,7 +610,10 @@
       return new Promise((resolve, reject) => {
         navigator.mozApps.getSelf().onsuccess = event => {
           var app = event.target.result;
-          app.connect(SYNC_REQUEST_IAC_KEYWORD).then(ports => {
+          app.connect(SYNC_REQUEST_IAC_KEYWORD, {
+            // For now we only allow one synchronizer app.
+            pageURLs: 'app://sync.gaiamobile.org'
+          }).then(ports => {
             if (!ports || !ports.length) {
               return reject();
             }

diff --git a/tv_apps/smart-system/js/sync_manager.js b/tv_apps/smart-system/js/sync_manager.js
@@ -778,7 +778,10 @@
       return new Promise((resolve, reject) => {
         navigator.mozApps.getSelf().onsuccess = event => {
           var app = event.target.result;
-          app.connect(SYNC_REQUEST_IAC_KEYWORD).then(ports => {
+          app.connect(SYNC_REQUEST_IAC_KEYWORD, {
+            // For now we only allow one synchronizer app.
+            pageURLs: 'app://sync.gaiamobile.org'
+          }).then(ports => {
             if (!ports || !ports.length) {
               return reject();
             }