CribSWGadget: Check Crib Enable URL before setting it

* Also add the possibility to handle relative url

CribSWGadget: Check Crib Enable URL before setting it
* Also add the possibility to handle relative url
ed667023 · Cédric Le Ninivin · 4bd0ef76 · ed667023 · ed667023
Commit ed667023 authored Oct 02, 2020 by Cédric Le Ninivin
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 2 deletions

gadget/crib-sw-gadget.html gadget/crib-sw-gadget.html +5 -0

gadget/crib-sw-gadget.js gadget/crib-sw-gadget.js +22 -2

No files found.
--- a/gadget/crib-sw-gadget.html
+++ b/gadget/crib-sw-gadget.html
@@ -16,5 +16,10 @@
  </head>
  <body>
    <div class="storage-access" style="display:none;"></div>
+    <div class="crib_enable_validator" style="display:none;">
+      <div data-gadget-url="./crib_enable_validator.html"
+           data-gadget-scope="crib_enable_validator"
+           data-gadget-sandbox="public"></div>
+    </div>
  </body>
 </html>
\ No newline at end of file
--- a/gadget/crib-sw-gadget.js
+++ b/gadget/crib-sw-gadget.js
-/*global window, rJS, RSVP, Blob, console */
+/*global window, rJS, RSVP, Blob, console, URL */
 /*jslint indent: 2, maxerr: 3 */
 (function (window, rJS, RSVP, jIO) {
  "use strict";
@@ -50,6 +50,15 @@
      });
  }

+  function isValidUrl(string) {
+    try {
+      new URL(string);
+    } catch (_) {
+      return false
+    }
+    return true;
+  }
+
  rJS(window)
    .ready(function (g) {
      g.props = {};
@@ -121,9 +130,20 @@
    })
    .declareMethod('setCribEnableGadgetUrl', function (url) {
      var gadget = this;
-      // XXX Should perform checks
+      if (!isValidUrl(url)) {
+        url = new URL(url, window.location.href).href;
+      }
      return new RSVP.Queue()
        .push(function () {
+          return gadget.getDeclaredGadget("crib_enable_validator");
+        })
+        .push(function (validator_gadget) {
+          return validator_gadget.validateCribEnableGadgetUrl(url);
+        })
+        .push(function (result) {
+          if (!result) {
+            throw "Could not Validate CribJS Gadget URL: " + url;
+          }
          return gadget.setSetting("site_editor_gadget_url", url);
        })
        .push(function () {