Merge pull request #1161 from cdrini/fix/iframe-sandbox

Don't error if cookies are blocked
internetarchive · Mar 21, 2023 · 62661df · 62661df
2 parents a6dc863 + f4b7fca
commit 62661df
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/util/docCookies.js b/src/util/docCookies.js
@@ -9,6 +9,22 @@
  *  http://www.gnu.org/licenses/gpl-3.0-standalone.html
  */
 
+/**
+ * Check to see if the browser has cookies enabled.
+ * Accessing document.cookies errors if eg iframe with sandbox enabled.
+ * @returns {boolean}
+ */
+export function areCookiesBlocked(doc = document) {
+  try {
+    doc.cookie;
+    return false;
+  } catch (e) {
+    return true;
+  }
+}
+
+const COOKIES_BLOCKED = areCookiesBlocked();
+
 /**
  * Get specific key's value stored in cookie
  *
@@ -17,7 +33,7 @@
  * @returns {string|null}
  */
 export function getItem(sKey) {
-  if (!sKey) return null;
+  if (COOKIES_BLOCKED || !sKey) return null;
 
   return decodeURIComponent(
     // eslint-disable-next-line no-useless-escape
@@ -34,9 +50,11 @@ export function getItem(sKey) {
  * @param {string} [sDomain] domain name
  * @param {boolean} [bSecure]
  *
- * @returns {true}
+ * @returns {boolean}
  */
 export function setItem(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
+  if (COOKIES_BLOCKED) return false;
+
   document.cookie = encodeURIComponent(sKey) + '=' + encodeURIComponent(sValue)
   + (vEnd ? `; expires=${vEnd.toUTCString()}` : '')
   + (sDomain ? `; domain=${sDomain}` : '')
@@ -56,6 +74,7 @@ export function setItem(sKey, sValue, vEnd, sPath, sDomain, bSecure) {
  * @returns {boolean}
  */
 export function removeItem(sKey, sPath, sDomain) {
+  if (COOKIES_BLOCKED) return false;
   // eslint-disable-next-line
   if (!hasItem(sKey)) return false;
 

diff --git a/tests/jest/util/docCookies.test.js b/tests/jest/util/docCookies.test.js
@@ -13,3 +13,12 @@ describe('Helper function: set and get cookie item', () => {
     expect(docCookies.getItem('test-cookie')).toEqual('jack-sparow');
   });
 });
+
+describe('isCookiesBlocked', () => {
+  test('return true if cookies are blocked', () => {
+    expect(docCookies.areCookiesBlocked({ get cookie() { throw new Error(); }})).toBeTruthy();
+  });
+  test('return false if cookies are not blocked', () => {
+    expect(docCookies.areCookiesBlocked({ cookie: 'blah' })).toBeFalsy();
+  });
+});