Merge pull request #678 from adobe/fix-20240226

Fix 20240226
adobe · Feb 29, 2024 · aa43d26 · aa43d26
2 parents 89a7b50 + 9c2268f
commit aa43d26
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 5 deletions.
diff --git a/src/extension/_locales/en/messages.json b/src/extension/_locales/en/messages.json
@@ -170,6 +170,9 @@
   "config_invalid_giturl": {
     "message": "Invalid repository URL"
   },
+  "config_invalid_host": {
+    "message": "Invalid hostname"
+  },
   "config_invalid_import": {
     "message": "Choose a valid file to import"
   },

diff --git a/src/extension/background.js b/src/extension/background.js
@@ -576,6 +576,26 @@ const internalActions = {
     chrome.contextMenus.onClicked.addListener(async ({ menuItemId }, tab) => {
       if (!tab.url) return;
       internalActions[menuItemId](tab);
+      await chrome.scripting.executeScript({
+        target: { tabId: tab.id },
+        func: async (menuItemIdVal) => {
+          try {
+            const mod = await import(chrome.runtime.getURL('rum.js'));
+            const { default: sampleRUM } = mod;
+
+            // Ensure window.hlx and window.hlx.sidekick exists
+            window.hlx = window.hlx || {};
+            window.hlx.sidekick = window.hlx.sidekick || { location: window.location };
+
+            const checkpoint = `sidekick:context-menu:${menuItemIdVal}`;
+            sampleRUM(checkpoint, { source: window.location.href });
+          } catch (e) {
+            // eslint-disable-next-line no-console
+            console.log('Unable to collect RUM data', e);
+          }
+        },
+        args: [menuItemId],
+      });
     });
   }
 

diff --git a/src/extension/module.js b/src/extension/module.js
@@ -457,7 +457,7 @@ import sampleRUM from './rum.js';
       const sp = new URLSearchParams(url.search);
       const docPath = sp.get('id') || sp.get('RootFolder');
       const dotIndex = docPath?.split('/').pop().indexOf('.');
-      return [-1, 0].includes(dotIndex); // dot only allowed as first char
+      return !docPath || [-1, 0].includes(dotIndex); // if doc path, dot can only be first char
     }
     return false;
   }

diff --git a/src/extension/options.js b/src/extension/options.js
@@ -36,6 +36,11 @@ function isValidGitHubURL(giturl) {
     && Object.keys(getGitHubSettings(giturl)).length === 3;
 }
 
+function isValidHost(host) {
+  const hostPattern = /^$|^([a-zA-Z0-9-._]*\.)*([a-zA-Z0-9-_]+\.)+[a-zA-Z]+$/;
+  return hostPattern.test(host);
+}
+
 function sanitize(str) {
   return str.replace(/[$<>"'`=]/g, '-');
 }
@@ -50,7 +55,7 @@ function drawLink(url) {
   } catch (e) {
     return ''; // not a valid url
   }
-  if (!/^[a-z]+/.test(url.host)) {
+  if (!isValidHost(url.host)) {
     return '';
   }
   const href = url.toString();
@@ -209,15 +214,30 @@ function editProject(i) {
       }
     };
     const save = async () => {
+      const giturl = document.querySelector('#edit-giturl').value;
+      if (!isValidGitHubURL(giturl)) {
+        // eslint-disable-next-line no-alert
+        window.alert(i18n('config_invalid_giturl'));
+        return;
+      }
+      const host = document.querySelector('#edit-host').value;
+      const previewHost = document.querySelector('#edit-previewHost').value;
+      const liveHost = document.querySelector('#edit-liveHost').value;
+      // eslint-disable-next-line max-len
+      if (!isValidHost(host) || !isValidHost(previewHost) || !isValidHost(liveHost)) {
+        // eslint-disable-next-line no-alert
+        window.alert(i18n('config_invalid_host'));
+        return;
+      }
       const input = {
         giturl: document.querySelector('#edit-giturl').value,
         mountpoints: [
           document.querySelector('#edit-mountpoints').value,
         ],
         project: document.querySelector('#edit-project').value,
-        previewHost: document.querySelector('#edit-previewHost').value,
-        liveHost: document.querySelector('#edit-liveHost').value,
-        host: document.querySelector('#edit-host').value,
+        previewHost,
+        liveHost,
+        host,
         devMode: document.querySelector('#edit-devMode').checked,
         devOrigin: document.querySelector('#edit-devOrigin').value,
       };

diff --git a/test/module.test.js b/test/module.test.js
@@ -1028,6 +1028,29 @@ describe('Test sidekick', () => {
         assert.ok((await test.run()).checkPageResult, 'Did not detect production URL');
       }).timeout(IT_DEFAULT_TIMEOUT);
 
+      it('Detects admin environment correctly', async () => {
+        const setup = new Setup('blog');
+        nock.sidekick(setup, { persist: true });
+        nock.admin(setup, { persist: true });
+        const test = new SidekickTest({
+          browser,
+          page,
+          loadModule,
+          checkPage: async (p) => p.evaluate(() => window.hlx.sidekick.isAdmin()),
+        });
+        const urls = [
+          { url: 'https://adobe.sharepoint.com/sites/test/Shared%20Documents/Forms/AllItems.aspx', res: true },
+          { url: 'https://adobe.sharepoint.com/sites/test/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2Ftest%2FShared%20Documents%2Ffoo', res: true },
+          { url: 'https://adobe.sharepoint.com/sites/test/Shared%20Documents/Forms/AllItems.aspx?RootFolder=%2Fsites%2Ftest%2FShared%20Documents%2Ffoo', res: true },
+          { url: 'https://adobe.sharepoint.com/sites/test/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2Ftest%2FShared%20Documents%2F.helix', res: true },
+          { url: 'https://adobe.sharepoint.com/sites/test/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2Ftest%2FShared%20Documents%2Ffoo%2Ftest.pdf', res: false },
+        ];
+        for (const { url, res } of urls) {
+          // eslint-disable-next-line no-await-in-loop
+          assert.equal((await test.run(url)).checkPageResult, res, 'Did not detect admin URL');
+        }
+      }).timeout(IT_DEFAULT_TIMEOUT);
+
       it('Switches to live instead of production without host', async () => {
         const setup = new Setup('blog');
         nock.sidekick(setup, {