From 90533ec5f4e4c4ef85407b7271407ecb520f1da8 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 8 Nov 2026 17:06:09 -0800 Subject: [PATCH 1/3] Harden Consent Input Parsing --- service/consent_manager.php | 64 ++++++++++++++++--- .../event/overall_header_head_append.html | 9 ++- styles/all/template/js/consentmanager.js | 9 ++- tests/javascript/consentmanager.test.js | 26 ++++++++ tests/service/consent_manager_test.php | 56 +++++++++++++++- 5 files changed, 151 insertions(+), 13 deletions(-) diff --git a/service/consent_manager.php b/service/consent_manager.php index 164148f..0e947ea 100644 --- a/service/consent_manager.php +++ b/service/consent_manager.php @@ -273,9 +273,17 @@ public function get_frontend_category_data() */ public function validate_log_payload(array $payload) { - $hash = isset($payload['hash']) ? (string) $payload['hash'] : ''; + if (!isset($payload['hash']) || !is_string($payload['hash'])) + { + return [ + 'success' => false, + 'error' => 'invalid_payload', + ]; + } + + $hash = $payload['hash']; $expected_hash = $this->generate_log_hash(); - if (strlen($hash) !== 64 || $expected_hash === '' || !hash_equals($expected_hash, $hash)) + if ($expected_hash === '' || strlen($hash) !== 64 || !hash_equals($expected_hash, $hash)) { return [ 'success' => false, @@ -283,7 +291,18 @@ public function validate_log_payload(array $payload) ]; } - $version = isset($payload['version']) ? (int) $payload['version'] : 0; + if (!isset($payload['version'], $payload['categories']) + || !is_int($payload['version']) + || !is_array($payload['categories']) + || !$this->contains_only_strings($payload['categories'])) + { + return [ + 'success' => false, + 'error' => 'invalid_payload', + ]; + } + + $version = $payload['version']; if ($version !== $this->get_version()) { return [ @@ -294,9 +313,7 @@ public function validate_log_payload(array $payload) return [ 'success' => true, - 'categories' => $this->normalize_categories( - isset($payload['categories']) && is_array($payload['categories']) ? $payload['categories'] : [] - ), + 'categories' => $this->normalize_categories($payload['categories']), 'version' => $version, ]; } @@ -559,7 +576,12 @@ public function normalize_categories(array $categories) foreach ($categories as $category) { - $category = trim((string) $category); + if (!is_string($category)) + { + continue; + } + + $category = trim($category); if ($category !== self::NECESSARY_CATEGORY && $this->is_category_enabled($category)) { $normalized[] = $category; @@ -706,20 +728,42 @@ protected function get_server_consent_state() $decoded = json_decode($raw, true); if (!is_array($decoded) || !isset($decoded['version'], $decoded['categories']) - || (int) $decoded['version'] !== $this->get_version() - || !is_array($decoded['categories'])) + || !is_int($decoded['version']) + || !is_array($decoded['categories']) + || $decoded['version'] !== $this->get_version() + || !$this->contains_only_strings($decoded['categories'])) { return null; } $this->server_consent_state = [ 'categories' => $this->normalize_categories($decoded['categories']), - 'version' => (int) $decoded['version'], + 'version' => $decoded['version'], ]; return $this->server_consent_state; } + /** + * Determine whether every array value is a string. + * + * @param array $values Values to inspect + * + * @return bool + */ + protected function contains_only_strings(array $values) + { + foreach ($values as $value) + { + if (!is_string($value)) + { + return false; + } + } + + return true; + } + /** * Prefix browser storage names consistently with phpBB cookies. * diff --git a/styles/all/template/event/overall_header_head_append.html b/styles/all/template/event/overall_header_head_append.html index efec795..50a9210 100644 --- a/styles/all/template/event/overall_header_head_append.html +++ b/styles/all/template/event/overall_header_head_append.html @@ -40,7 +40,14 @@ { if (parts[i].indexOf(name + '=') === 0) { - return decodeURIComponent(parts[i].substring(name.length + 1)); + try + { + return decodeURIComponent(parts[i].substring(name.length + 1)); + } + catch (error) + { + return ''; + } } } diff --git a/styles/all/template/js/consentmanager.js b/styles/all/template/js/consentmanager.js index 610eaa4..a811312 100644 --- a/styles/all/template/js/consentmanager.js +++ b/styles/all/template/js/consentmanager.js @@ -133,7 +133,14 @@ { if (cookies[index].indexOf(name + '=') === 0) { - return decodeURIComponent(cookies[index].substring(name.length + 1)); + try + { + return decodeURIComponent(cookies[index].substring(name.length + 1)); + } + catch (error) + { + return ''; + } } } diff --git a/tests/javascript/consentmanager.test.js b/tests/javascript/consentmanager.test.js index b12d962..b416164 100644 --- a/tests/javascript/consentmanager.test.js +++ b/tests/javascript/consentmanager.test.js @@ -186,6 +186,9 @@ function setupConsentManager(options) { if (settings.cookieState) { window.document.cookie = payload.cookieName + '=' + encodeURIComponent(JSON.stringify(settings.cookieState)); } + else if (settings.rawCookieValue) { + window.document.cookie = payload.cookieName + '=' + settings.rawCookieValue; + } if (settings.withJquery) { window.jQuery = function() { @@ -264,6 +267,29 @@ test('prefers the newest stored state and synchronizes cookie and local storage' expect(JSON.parse(getCookieValue(document, payload.cookieName))).toEqual(cookieState); }); +test('repairs malformed cookie encoding from valid local storage', () => { + const localState = createState([ 'necessary', 'analytics' ], '2026-04-28T00:00:00.000Z'); + const { window, document, payload, jsdomErrors } = setupConsentManager({ + localState, + rawCookieValue: '%E0%A4%A' + }); + + expect(window.consentManager.getState()).toEqual(localState); + expect(JSON.parse(getCookieValue(document, payload.cookieName))).toEqual(localState); + expect(jsdomErrors).toHaveLength(0); +}); + +test('clears malformed cookie encoding and initializes without stored state', () => { + const { window, document, payload, jsdomErrors } = setupConsentManager({ + rawCookieValue: '%E0%A4%A' + }); + + expect(window.consentManager.getState()).toBeNull(); + expect(getCookieValue(document, payload.cookieName)).toBe(''); + expect(document.getElementById('consent-manager-banner').hidden).toBe(false); + expect(jsdomErrors).toHaveLength(0); +}); + test('replays queued API calls and executes consented registered scripts', () => { const ready = jest.fn(); const { window } = setupConsentManager({ diff --git a/tests/service/consent_manager_test.php b/tests/service/consent_manager_test.php index 6a103d2..f81d22c 100644 --- a/tests/service/consent_manager_test.php +++ b/tests/service/consent_manager_test.php @@ -886,7 +886,7 @@ public function test_normalize_categories_keeps_required_and_enabled_categories( self::assertSame( array('necessary', 'analytics', 'media'), - $manager->normalize_categories(array('analytics', 'necessary', 'media', 'marketing', 'analytics', 'unknown')) + $manager->normalize_categories(array('analytics', 'necessary', 'media', 'marketing', 'analytics', 'unknown', array('media'), 42)) ); } @@ -1034,6 +1034,40 @@ public function test_validate_log_payload_rejects_invalid_hash() ), $submission); } + /** + * @dataProvider malformed_log_payload_data + */ + public function test_validate_log_payload_rejects_malformed_field_types($field, $value) + { + $manager = $this->get_manager(); + $payload = array( + 'hash' => $manager->generate_log_hash(), + 'version' => 1, + 'categories' => array('analytics'), + ); + $payload[$field] = $value; + + self::assertSame(array( + 'success' => false, + 'error' => 'invalid_payload', + ), $manager->validate_log_payload($payload)); + } + + public function malformed_log_payload_data() + { + return array( + 'array hash' => array('hash', array()), + 'null hash' => array('hash', null), + 'array version' => array('version', array(1)), + 'string version' => array('version', '1'), + 'null version' => array('version', null), + 'scalar categories' => array('categories', 'analytics'), + 'null categories' => array('categories', null), + 'nested category array' => array('categories', array(array('analytics'))), + 'numeric category' => array('categories', array(1)), + ); + } + public function test_validate_log_payload_rejects_version_mismatch() { $manager = $this->get_manager(array( @@ -1213,6 +1247,26 @@ public function invalid_server_consent_cookie_data() ], 'analytics', ], + 'nested category value' => [ + json_encode([ + 'categories' => [['analytics']], + 'version' => 2, + ]), + [ + 'consentmanager_consent_version' => 2, + ], + 'analytics', + ], + 'string version' => [ + json_encode([ + 'categories' => ['analytics'], + 'version' => '2', + ]), + [ + 'consentmanager_consent_version' => 2, + ], + 'analytics', + ], ]; } From d8b8362e574e164a2b7b08730cfe824eaa68d434 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 8 Nov 2026 17:12:18 -0800 Subject: [PATCH 2/3] Make JavaScript Tracking Maps Prototype-Safe --- styles/all/template/js/consentmanager.js | 31 ++++++++++++--------- tests/javascript/consentmanager.test.js | 34 ++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/styles/all/template/js/consentmanager.js b/styles/all/template/js/consentmanager.js index a811312..27afe8b 100644 --- a/styles/all/template/js/consentmanager.js +++ b/styles/all/template/js/consentmanager.js @@ -6,9 +6,9 @@ const existingApi = window.consentManager || {}; const queued = existingApi._queue ? existingApi._queue.slice(0) : []; const listeners = []; - const registry = {}; - const executedScripts = {}; - const executedCategories = {}; + const registry = Object.create(null); + const executedScripts = Object.create(null); + const executedCategories = Object.create(null); let root = null; let state = null; let isRendered = false; @@ -16,7 +16,7 @@ let pendingOpenSettings = false; let keydownBound = false; let lastFocusedElement = null; - const categoriesById = {}; + const categoriesById = Object.create(null); const deferredSelector = 'script[type="text/plain"][data-consent-category]'; const deferredEmbedSelector = '[data-consent-media-container][data-consent-category]'; let requiredCategories = []; @@ -38,6 +38,11 @@ return Object.prototype.toString.call(value) === '[object Array]'; } + function hasOwn(object, property) + { + return Object.prototype.hasOwnProperty.call(object, property); + } + for (let i = 0; i < payload.categories.length; i++) { categoriesById[payload.categories[i].id] = payload.categories[i]; @@ -193,7 +198,7 @@ for (let index = 0; index < categories.length; index++) { const categoryId = String(categories[index]); - if (requiredCategories.indexOf(categoryId) === -1 && enabledCategories.indexOf(categoryId) !== -1 && categoriesById[categoryId]) + if (requiredCategories.indexOf(categoryId) === -1 && enabledCategories.indexOf(categoryId) !== -1 && hasOwn(categoriesById, categoryId)) { normalized.push(categoryId); } @@ -376,7 +381,7 @@ function buildGoogleConsentModeState() { - const consentState = {}; + const consentState = Object.create(null); if (!googleConsentMode.enabled) { @@ -385,7 +390,7 @@ for (const consentType in googleConsentTypes) { - if (Object.prototype.hasOwnProperty.call(googleConsentTypes, consentType)) + if (hasOwn(googleConsentTypes, consentType)) { consentState[consentType] = hasConsent(googleConsentTypes[consentType]) ? 'granted' : 'denied'; } @@ -405,7 +410,7 @@ for (const consentType in consentState) { - if (Object.prototype.hasOwnProperty.call(consentState, consentType)) + if (hasOwn(consentState, consentType)) { window.gtag('consent', 'update', consentState); return; @@ -437,7 +442,7 @@ for (const scriptId in executedScripts) { - if (executedScripts.hasOwnProperty(scriptId) && removedCategories.indexOf(executedScripts[scriptId]) !== -1) + if (hasOwn(executedScripts, scriptId) && removedCategories.indexOf(executedScripts[scriptId]) !== -1) { return true; } @@ -452,7 +457,7 @@ return true; } - if (executedCategories[removedCategories[index]]) + if (hasOwn(executedCategories, removedCategories[index])) { return true; } @@ -620,7 +625,7 @@ { for (const name in attributes) { - if (attributes.hasOwnProperty(name) && isSafeAttributeName(name)) + if (hasOwn(attributes, name) && isSafeAttributeName(name)) { element.setAttribute(name, attributes[name]); } @@ -629,7 +634,7 @@ function executeScript(script) { - if (!script || !script.id || executedScripts[script.id] || !hasConsent(script.category)) + if (!script || !script.id || hasOwn(executedScripts, script.id) || !hasConsent(script.category)) { return false; } @@ -696,7 +701,7 @@ { for (const scriptId in registry) { - if (registry.hasOwnProperty(scriptId)) + if (hasOwn(registry, scriptId)) { executeScript(registry[scriptId]); } diff --git a/tests/javascript/consentmanager.test.js b/tests/javascript/consentmanager.test.js index b416164..c71f5d1 100644 --- a/tests/javascript/consentmanager.test.js +++ b/tests/javascript/consentmanager.test.js @@ -314,6 +314,29 @@ test('replays queued API calls and executes consented registered scripts', () => expect(ready).toHaveBeenCalledWith(window.consentManager); }); +test('executes scripts whose ids match inherited object properties', () => { + const { window, jsdomErrors } = setupConsentManager({ + payload: { + scripts: [ + { + id: 'hasOwnProperty', + category: 'necessary', + inline: 'window.hasOwnPropertyScriptCount = (window.hasOwnPropertyScriptCount || 0) + 1;' + }, + { + id: 'constructor', + category: 'necessary', + inline: 'window.constructorScriptCount = (window.constructorScriptCount || 0) + 1;' + } + ] + } + }); + + expect(window.hasOwnPropertyScriptCount).toBe(1); + expect(window.constructorScriptCount).toBe(1); + expect(jsdomErrors).toHaveLength(0); +}); + test('executes necessary scripts without consent UI or stored state', () => { const { window, document, payload, requests } = setupConsentManager({ withoutUi: true, @@ -484,6 +507,17 @@ test('registerScript blocks unsafe sources and executes safe inline scripts', () const asyncDeferredScript = document.head.querySelector('script[src="/assets/async-deferred.js"]'); expect(asyncDeferredScript.async).toBe(true); expect(asyncDeferredScript.defer).toBe(true); + + expect(window.consentManager.registerScript('reserved-attribute', { + category: 'analytics', + inline: 'window.reservedAttributeLoaded = true;', + attributes: { + hasOwnProperty: 'value', + 'data-safe': 'yes' + } + })).toBe(true); + expect(window.reservedAttributeLoaded).toBe(true); + expect(document.head.querySelector('script[data-safe="yes"]')).not.toBeNull(); }); test('processes deferred consent scripts and copies only safe attributes', () => { From 511368e441d60ab20fa5a6e6798cf770702d147d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 8 Nov 2026 17:27:12 -0800 Subject: [PATCH 3/3] Refactor bracket bracing --- adm/style/consentmanager_acp.html | 13 +- .../event/overall_header_head_append.html | 80 +-- styles/all/template/js/consentmanager.js | 668 ++++++------------ tests/javascript/consentmanager.test.js | 3 +- 4 files changed, 249 insertions(+), 515 deletions(-) diff --git a/adm/style/consentmanager_acp.html b/adm/style/consentmanager_acp.html index 390d8cd..e3efd14 100644 --- a/adm/style/consentmanager_acp.html +++ b/adm/style/consentmanager_acp.html @@ -118,8 +118,7 @@

{{ lang('WARNING') }}

var textarea = document.getElementById('consentmanager_integrations'); var warning = document.getElementById('consentmanager_integrations_warning'); - if (!textarea || !warning) - { + if (!textarea || !warning) { return; } @@ -127,18 +126,14 @@

{{ lang('WARNING') }}

var value = textarea.value.trim(); var isValidArray = false; - if (value === '') - { + if (value === '') { warning.style.display = 'none'; return; } - try - { + try { isValidArray = Array.isArray(JSON.parse(value)); - } - catch (error) - { + } catch (error) { isValidArray = false; } diff --git a/styles/all/template/event/overall_header_head_append.html b/styles/all/template/event/overall_header_head_append.html index 50a9210..ffec818 100644 --- a/styles/all/template/event/overall_header_head_append.html +++ b/styles/all/template/event/overall_header_head_append.html @@ -16,36 +16,26 @@ mediaPlaceholderLabel: '{{ lang('CONSENTMANAGER_MEDIA_PLACEHOLDER')|e('js') }}' }; - if ((!requiredCategories.length || !enabledCategories.length) && payload.categories) - { - for (let index = 0; index < payload.categories.length; index++) - { - if (payload.categories[index].enabled) - { + if ((!requiredCategories.length || !enabledCategories.length) && payload.categories) { + for (let index = 0; index < payload.categories.length; index++) { + if (payload.categories[index].enabled) { enabledCategories.push(payload.categories[index].id); } - if (payload.categories[index].required) - { + if (payload.categories[index].required) { requiredCategories.push(payload.categories[index].id); } } } - function parseCookie(name) - { + function parseCookie(name) { const parts = document.cookie ? document.cookie.split('; ') : []; - for (let i = 0; i < parts.length; i++) - { - if (parts[i].indexOf(name + '=') === 0) - { - try - { + for (let i = 0; i < parts.length; i++) { + if (parts[i].indexOf(name + '=') === 0) { + try { return decodeURIComponent(parts[i].substring(name.length + 1)); - } - catch (error) - { + } catch (error) { return ''; } } @@ -55,61 +45,47 @@ } {% if S_CONSENTMANAGER_CLEAR_STORAGE %} - try - { + try { window.localStorage.removeItem(payload.storageKey); - } - catch (error) - { + } catch (error) { + // localStorage may be unavailable; continue without client-side cleanup. } {% endif %} - function loadState() - { + function loadState() { let raw = ''; let state = null; - try - { - if (window.localStorage) - { + try { + if (window.localStorage) { raw = window.localStorage.getItem(payload.storageKey) || ''; } - } - catch (error) - { + } catch (error) { raw = ''; } - if (!raw) - { + if (!raw) { raw = parseCookie(payload.cookieName); } - if (!raw) - { + if (!raw) { return null; } - try - { + try { state = JSON.parse(raw); - } - catch (error) - { + } catch (error) { return null; } - if (!state || state.version !== payload.version || !state.categories || !state.categories.length) - { + if (!state || state.version !== payload.version || !state.categories || !state.categories.length) { return null; } return state; } - function hasValue(items, value) - { + function hasValue(items, value) { return items.indexOf(value) !== -1; } @@ -133,8 +109,7 @@ }; window.consentManager = stub; - if (googleConsentMode.enabled) - { + if (googleConsentMode.enabled) { window.dataLayer = window.dataLayer || []; window.gtag = window.gtag || function(){window.dataLayer.push(arguments);}; @@ -142,18 +117,15 @@ const updates = {}; let hasConsentTypes = false; - for (const consentType in googleConsentTypes) - { - if (Object.prototype.hasOwnProperty.call(googleConsentTypes, consentType)) - { + for (const consentType in googleConsentTypes) { + if (Object.prototype.hasOwnProperty.call(googleConsentTypes, consentType)) { defaults[consentType] = 'denied'; updates[consentType] = stub.hasConsent(googleConsentTypes[consentType]) ? 'granted' : 'denied'; hasConsentTypes = true; } } - if (hasConsentTypes) - { + if (hasConsentTypes) { window.gtag('consent', 'default', defaults); window.gtag('consent', 'update', updates); } diff --git a/styles/all/template/js/consentmanager.js b/styles/all/template/js/consentmanager.js index 27afe8b..58a0fc1 100644 --- a/styles/all/template/js/consentmanager.js +++ b/styles/all/template/js/consentmanager.js @@ -24,8 +24,7 @@ let optionalCategories = []; let hasStructuredPolicy = false; - if (!payload || !payload.categories) - { + if (!payload || !payload.categories) { return; } @@ -33,53 +32,42 @@ const googleConsentTypes = googleConsentMode.types || {}; const mediaPlaceholderLabel = typeof lang.mediaPlaceholderLabel === 'string' ? lang.mediaPlaceholderLabel : ''; - function isArray(value) - { + function isArray(value) { return Object.prototype.toString.call(value) === '[object Array]'; } - function hasOwn(object, property) - { + function hasOwn(object, property) { return Object.prototype.hasOwnProperty.call(object, property); } - for (let i = 0; i < payload.categories.length; i++) - { + for (let i = 0; i < payload.categories.length; i++) { categoriesById[payload.categories[i].id] = payload.categories[i]; } - if (isArray(payload.requiredCategories)) - { + if (isArray(payload.requiredCategories)) { requiredCategories = unique(payload.requiredCategories); } - if (isArray(payload.enabledCategories)) - { + if (isArray(payload.enabledCategories)) { enabledCategories = unique(payload.enabledCategories); } - if (isArray(payload.optionalCategories)) - { + if (isArray(payload.optionalCategories)) { optionalCategories = unique(payload.optionalCategories); } hasStructuredPolicy = isArray(payload.requiredCategories) && isArray(payload.enabledCategories) && isArray(payload.optionalCategories); - if (!hasStructuredPolicy) - { - for (let i = 0; i < payload.categories.length; i++) - { - if (payload.categories[i].enabled) - { + if (!hasStructuredPolicy) { + for (let i = 0; i < payload.categories.length; i++) { + if (payload.categories[i].enabled) { enabledCategories.push(payload.categories[i].id); } - if (payload.categories[i].required) - { + if (payload.categories[i].required) { requiredCategories.push(payload.categories[i].id); } - if (payload.categories[i].enabled && !payload.categories[i].required) - { + if (payload.categories[i].enabled && !payload.categories[i].required) { optionalCategories.push(payload.categories[i].id); } } @@ -91,59 +79,44 @@ state = loadAndSyncState(); - function safeParse(raw) - { - try - { + function safeParse(raw) { + try { return JSON.parse(raw); - } - catch (error) - { + } catch (error) { return null; } } - function setCookie(name, value, maxAge) - { + function setCookie(name, value, maxAge) { let cookie = name + '=' + encodeURIComponent(value) + '; path=' + payload.cookiePath + '; SameSite=Lax'; - if (payload.cookieDomain) - { + if (payload.cookieDomain) { cookie += '; domain=' + payload.cookieDomain; } - if (window.location.protocol === 'https:') - { + if (window.location.protocol === 'https:') { cookie += '; Secure'; } - if (typeof maxAge === 'number') - { + if (typeof maxAge === 'number') { cookie += '; max-age=' + maxAge; } document.cookie = cookie; } - function clearCookie(name) - { + function clearCookie(name) { setCookie(name, '', 0); } - function getCookie(name) - { + function getCookie(name) { const cookies = document.cookie ? document.cookie.split('; ') : []; - for (let index = 0; index < cookies.length; index++) - { - if (cookies[index].indexOf(name + '=') === 0) - { - try - { + for (let index = 0; index < cookies.length; index++) { + if (cookies[index].indexOf(name + '=') === 0) { + try { return decodeURIComponent(cookies[index].substring(name.length + 1)); - } - catch (error) - { + } catch (error) { return ''; } } @@ -152,54 +125,42 @@ return ''; } - function removeStoredState() - { - try - { - if (window.localStorage) - { + function removeStoredState() { + try { + if (window.localStorage) { window.localStorage.removeItem(payload.storageKey); } - } - catch (error) - { + } catch (error) { + // localStorage may be unavailable; continue clearing cookie state. } clearCookie(payload.cookieName); } - function persistState(nextState) - { + function persistState(nextState) { const serialized = JSON.stringify(nextState); - try - { - if (window.localStorage) - { + try { + if (window.localStorage) { window.localStorage.setItem(payload.storageKey, serialized); } - } - catch (error) - { + } catch (error) { + // localStorage may be unavailable; continue with cookie persistence. } setCookie(payload.cookieName, serialized, 31536000); } - function normalizeCategories(categories) - { + function normalizeCategories(categories) { const normalized = requiredCategories.slice(0); - if (!isArray(categories)) - { + if (!isArray(categories)) { return unique(normalized); } - for (let index = 0; index < categories.length; index++) - { + for (let index = 0; index < categories.length; index++) { const categoryId = String(categories[index]); - if (requiredCategories.indexOf(categoryId) === -1 && enabledCategories.indexOf(categoryId) !== -1 && hasOwn(categoriesById, categoryId)) - { + if (requiredCategories.indexOf(categoryId) === -1 && enabledCategories.indexOf(categoryId) !== -1 && hasOwn(categoriesById, categoryId)) { normalized.push(categoryId); } } @@ -207,10 +168,8 @@ return unique(normalized); } - function validateState(candidate) - { - if (!candidate || candidate.version !== payload.version || !isArray(candidate.categories)) - { + function validateState(candidate) { + if (!candidate || candidate.version !== payload.version || !isArray(candidate.categories)) { return null; } @@ -223,23 +182,19 @@ }; } - function compareStates(left, right) - { + function compareStates(left, right) { return left && right && left.version === right.version && left.categories.join('|') === right.categories.join('|') && left.timestamp === right.timestamp; } - function choosePreferredState(localState, cookieState) - { - if (localState && cookieState) - { + function choosePreferredState(localState, cookieState) { + if (localState && cookieState) { const localTime = Date.parse(localState.timestamp || ''); const cookieTime = Date.parse(cookieState.timestamp || ''); - if (!isNaN(localTime) && !isNaN(cookieTime)) - { + if (!isNaN(localTime) && !isNaN(cookieTime)) { return localTime >= cookieTime ? localState : cookieState; } } @@ -247,55 +202,44 @@ return localState || cookieState || null; } - function loadAndSyncState() - { + function loadAndSyncState() { let localRaw = ''; const cookieRaw = getCookie(payload.cookieName); let localState = null; let cookieState = null; - try - { - if (window.localStorage) - { + try { + if (window.localStorage) { localRaw = window.localStorage.getItem(payload.storageKey) || ''; } - } - catch (error) - { + } catch (error) { localRaw = ''; } - if (localRaw) - { + if (localRaw) { localState = validateState(safeParse(localRaw)); } - if (cookieRaw) - { + if (cookieRaw) { cookieState = validateState(safeParse(cookieRaw)); } state = choosePreferredState(localState, cookieState); - if (!state) - { + if (!state) { removeStoredState(); return null; } - if (!compareStates(localState, state) || !compareStates(cookieState, state)) - { + if (!compareStates(localState, state) || !compareStates(cookieState, state)) { persistState(state); } return state; } - function sameRequestUrl(left, right) - { - if (!left || !right) - { + function sameRequestUrl(left, right) { + if (!left || !right) { return false; } @@ -307,10 +251,8 @@ return leftLink.pathname === rightLink.pathname; } - function bindDeleteCookiesCleanup() - { - if (!window.jQuery || !window.phpbbConsentManagerDeleteCookiesUrl) - { + function bindDeleteCookiesCleanup() { + if (!window.jQuery || !window.phpbbConsentManagerDeleteCookiesUrl) { return; } @@ -318,21 +260,17 @@ if (sameRequestUrl(settings.url, window.phpbbConsentManagerDeleteCookiesUrl) && response && typeof response.S_CONFIRM_ACTION === 'undefined' - && response.REFRESH_DATA) - { + && response.REFRESH_DATA) { removeStoredState(); } }); } - function unique(items) - { + function unique(items) { const deduplicated = []; - for (let index = 0; index < items.length; index++) - { - if (deduplicated.indexOf(items[index]) === -1) - { + for (let index = 0; index < items.length; index++) { + if (deduplicated.indexOf(items[index]) === -1) { deduplicated.push(items[index]); } } @@ -340,18 +278,15 @@ return deduplicated; } - function hasConsent(category) - { - if (requiredCategories.indexOf(category) !== -1) - { + function hasConsent(category) { + if (requiredCategories.indexOf(category) !== -1) { return true; } return !!(state && enabledCategories.indexOf(category) !== -1 && state.categories.indexOf(category) !== -1); } - function getStateSnapshot() - { + function getStateSnapshot() { return state ? { categories: state.categories.slice(0), timestamp: state.timestamp, @@ -359,39 +294,29 @@ } : null; } - function emitChange() - { + function emitChange() { const snapshot = getStateSnapshot(); - for (let index = 0; index < listeners.length; index++) - { - try - { + for (let index = 0; index < listeners.length; index++) { + try { listeners[index](snapshot); - } - catch (error) - { - if (window.console && typeof window.console.error === 'function') - { + } catch (error) { + if (window.console && typeof window.console.error === 'function') { window.console.error(error); } } } } - function buildGoogleConsentModeState() - { + function buildGoogleConsentModeState() { const consentState = Object.create(null); - if (!googleConsentMode.enabled) - { + if (!googleConsentMode.enabled) { return consentState; } - for (const consentType in googleConsentTypes) - { - if (hasOwn(googleConsentTypes, consentType)) - { + for (const consentType in googleConsentTypes) { + if (hasOwn(googleConsentTypes, consentType)) { consentState[consentType] = hasConsent(googleConsentTypes[consentType]) ? 'granted' : 'denied'; } } @@ -399,66 +324,52 @@ return consentState; } - function applyGoogleConsentMode() - { - if (!googleConsentMode.enabled || typeof window.gtag !== 'function') - { + function applyGoogleConsentMode() { + if (!googleConsentMode.enabled || typeof window.gtag !== 'function') { return; } const consentState = buildGoogleConsentModeState(); - for (const consentType in consentState) - { - if (hasOwn(consentState, consentType)) - { + for (const consentType in consentState) { + if (hasOwn(consentState, consentType)) { window.gtag('consent', 'update', consentState); return; } } } - function sameCategories(left, right) - { + function sameCategories(left, right) { return left.join('|') === right.join('|'); } - function shouldReload(previousState, nextState) - { + function shouldReload(previousState, nextState) { const removedCategories = []; - if (!previousState) - { + if (!previousState) { return false; } - for (let index = 0; index < previousState.categories.length; index++) - { - if (requiredCategories.indexOf(previousState.categories[index]) === -1 && nextState.categories.indexOf(previousState.categories[index]) === -1) - { + for (let index = 0; index < previousState.categories.length; index++) { + if (requiredCategories.indexOf(previousState.categories[index]) === -1 && nextState.categories.indexOf(previousState.categories[index]) === -1) { removedCategories.push(previousState.categories[index]); } } - for (const scriptId in executedScripts) - { - if (hasOwn(executedScripts, scriptId) && removedCategories.indexOf(executedScripts[scriptId]) !== -1) - { + for (const scriptId in executedScripts) { + if (hasOwn(executedScripts, scriptId) && removedCategories.indexOf(executedScripts[scriptId]) !== -1) { return true; } } - for (let index = 0; index < removedCategories.length; index++) - { - if (removedCategories[index] === 'media') - { + for (let index = 0; index < removedCategories.length; index++) { + if (removedCategories[index] === 'media') { // Media embeds may be rendered live by the server when consent was already granted, // so revoking media consent must reload even if no client-side activation was tracked. return true; } - if (hasOwn(executedCategories, removedCategories[index])) - { + if (hasOwn(executedCategories, removedCategories[index])) { return true; } } @@ -466,10 +377,8 @@ return false; } - function logDecision() - { - if (!payload.logEndpoint || !state) - { + function logDecision() { + if (!payload.logEndpoint || !state) { return; } @@ -479,8 +388,7 @@ request.send(buildLogDecisionBody()); } - function buildLogDecisionBody() - { + function buildLogDecisionBody() { return JSON.stringify({ hash: payload.logHash, version: payload.version, @@ -488,37 +396,30 @@ }); } - function logDecisionBeforeReload(onComplete) - { - if (!payload.logEndpoint || !state) - { + function logDecisionBeforeReload(onComplete) { + if (!payload.logEndpoint || !state) { onComplete(); return; } const body = buildLogDecisionBody(); - if (window.navigator && typeof window.navigator.sendBeacon === 'function') - { - try - { + if (window.navigator && typeof window.navigator.sendBeacon === 'function') { + try { const beaconBody = new Blob([ body ], { type: 'application/json' }); - if (window.navigator.sendBeacon(payload.logEndpoint, beaconBody)) - { + if (window.navigator.sendBeacon(payload.logEndpoint, beaconBody)) { onComplete(); return; } - } - catch (error) - { + } catch (error) { + // Fall back to XMLHttpRequest when beacon delivery cannot start. } } const request = new XMLHttpRequest(); let completed = false; const finish = function() { - if (completed) - { + if (completed) { return; } @@ -533,18 +434,14 @@ window.setTimeout(finish, 1000); - try - { + try { request.send(body); - } - catch (error) - { + } catch (error) { finish(); } } - function setState(categories) - { + function setState(categories) { const nextState = { categories: normalizeCategories(categories), timestamp: new Date().toISOString(), @@ -552,8 +449,7 @@ }; const reloadRequired = shouldReload(state, nextState); - if (state && sameCategories(state.categories, nextState.categories)) - { + if (state && sameCategories(state.categories, nextState.categories)) { state.timestamp = nextState.timestamp; persistState(state); updateUi(); @@ -570,8 +466,7 @@ processDeferredEmbeds(document); emitChange(); - if (reloadRequired) - { + if (reloadRequired) { logDecisionBeforeReload(function() { window.location.reload(); }); @@ -581,10 +476,8 @@ logDecision(); } - function isSafeScriptSource(src) - { - if (!src || /[<>"']/.test(src) || src.indexOf('//') === 0 || /^(?:javascript|data|vbscript|file):/i.test(src)) - { + function isSafeScriptSource(src) { + if (!src || /[<>"']/.test(src) || src.indexOf('//') === 0 || /^(?:javascript|data|vbscript|file):/i.test(src)) { return false; } @@ -593,16 +486,13 @@ return !scheme || scheme[1].toLowerCase() === 'https'; } - function isSafeEmbedSource(src) - { - if (!src || /[<>"']/.test(src) || /^(?:javascript|data|vbscript|file):/i.test(src)) - { + function isSafeEmbedSource(src) { + if (!src || /[<>"']/.test(src) || /^(?:javascript|data|vbscript|file):/i.test(src)) { return false; } let normalized = src; - if (src.indexOf('//') === 0) - { + if (src.indexOf('//') === 0) { normalized = window.location.protocol + src; } @@ -613,57 +503,44 @@ return protocol === 'http:' || protocol === 'https:'; } - function isSafeAttributeName(name) - { + function isSafeAttributeName(name) { return !!name && /^[a-zA-Z_:][a-zA-Z0-9_:\.-]*$/.test(name) && !/^on/i.test(name) && [ 'src', 'type', 'async', 'defer' ].indexOf(String(name).toLowerCase()) === -1; } - function applyAttributes(element, attributes) - { - for (const name in attributes) - { - if (hasOwn(attributes, name) && isSafeAttributeName(name)) - { + function applyAttributes(element, attributes) { + for (const name in attributes) { + if (hasOwn(attributes, name) && isSafeAttributeName(name)) { element.setAttribute(name, attributes[name]); } } } - function executeScript(script) - { - if (!script || !script.id || hasOwn(executedScripts, script.id) || !hasConsent(script.category)) - { + function executeScript(script) { + if (!script || !script.id || hasOwn(executedScripts, script.id) || !hasConsent(script.category)) { return false; } - if (script.src && !isSafeScriptSource(script.src)) - { + if (script.src && !isSafeScriptSource(script.src)) { return false; } - if (script.wait_for_dom_ready && document.readyState === 'loading') - { + if (script.wait_for_dom_ready && document.readyState === 'loading') { return false; } const element = document.createElement('script'); element.type = 'text/javascript'; - if (script.src) - { + if (script.src) { element.src = script.src; element.async = !!script.async; element.defer = !!script.defer; - } - else if (script.inline) - { + } else if (script.inline) { element.text = script.inline; - } - else - { + } else { return false; } @@ -676,10 +553,8 @@ return true; } - function registerScript(id, options) - { - if (!id || !options || !options.category) - { + function registerScript(id, options) { + if (!id || !options || !options.category) { return false; } @@ -697,36 +572,28 @@ return executeScript(registry[id]); } - function processRegisteredScripts() - { - for (const scriptId in registry) - { - if (hasOwn(registry, scriptId)) - { + function processRegisteredScripts() { + for (const scriptId in registry) { + if (hasOwn(registry, scriptId)) { executeScript(registry[scriptId]); } } } - function collectMatchingNodes(scope, selector) - { + function collectMatchingNodes(scope, selector) { const nodes = []; - if (!scope) - { + if (!scope) { return nodes; } - if (scope.nodeType === 1 && scope.matches && scope.matches(selector)) - { + if (scope.nodeType === 1 && scope.matches && scope.matches(selector)) { nodes.push(scope); } - if (scope.querySelectorAll) - { + if (scope.querySelectorAll) { const matched = scope.querySelectorAll(selector); - for (let index = 0; index < matched.length; index++) - { + for (let index = 0; index < matched.length; index++) { nodes.push(matched[index]); } } @@ -734,51 +601,41 @@ return nodes; } - function processDeferredNodes(scope) - { + function processDeferredNodes(scope) { const nodes = collectMatchingNodes(scope, deferredSelector); - for (let index = 0; index < nodes.length; index++) - { + for (let index = 0; index < nodes.length; index++) { const source = nodes[index]; const category = source.getAttribute('data-consent-category'); - if (source.getAttribute('data-consent-processed') === '1' || !hasConsent(category)) - { + if (source.getAttribute('data-consent-processed') === '1' || !hasConsent(category)) { continue; } const sourceUrl = source.getAttribute('src'); - if (sourceUrl && !isSafeScriptSource(sourceUrl)) - { + if (sourceUrl && !isSafeScriptSource(sourceUrl)) { continue; } const liveScript = document.createElement('script'); liveScript.type = 'text/javascript'; - for (let attributeIndex = 0; attributeIndex < source.attributes.length; attributeIndex++) - { + for (let attributeIndex = 0; attributeIndex < source.attributes.length; attributeIndex++) { const attribute = source.attributes[attributeIndex]; - if (attribute.name === 'type' || attribute.name.indexOf('data-consent-') === 0 || attribute.name === 'src') - { + if (attribute.name === 'type' || attribute.name.indexOf('data-consent-') === 0 || attribute.name === 'src') { continue; } - if (isSafeAttributeName(attribute.name)) - { + if (isSafeAttributeName(attribute.name)) { liveScript.setAttribute(attribute.name, attribute.value); } } - if (sourceUrl) - { + if (sourceUrl) { liveScript.src = sourceUrl; liveScript.async = source.hasAttribute('async'); liveScript.defer = source.hasAttribute('defer'); - } - else - { + } else { liveScript.text = source.textContent; } @@ -788,23 +645,19 @@ } } - function renderMediaPlaceholder(placeholder) - { - if (!placeholder) - { + function renderMediaPlaceholder(placeholder) { + if (!placeholder) { return; } const source = placeholder.getAttribute('data-consent-link'); placeholder.textContent = mediaPlaceholderLabel || ''; - if (!source || !isSafeEmbedSource(source)) - { + if (!source || !isSafeEmbedSource(source)) { return; } - if (mediaPlaceholderLabel) - { + if (mediaPlaceholderLabel) { placeholder.appendChild(document.createTextNode(' ')); } @@ -816,12 +669,10 @@ placeholder.appendChild(link); } - function processDeferredEmbeds(scope) - { + function processDeferredEmbeds(scope) { const nodes = collectMatchingNodes(scope, deferredEmbedSelector); - for (let index = 0; index < nodes.length; index++) - { + for (let index = 0; index < nodes.length; index++) { const container = nodes[index]; const category = container.getAttribute('data-consent-category'); const content = container.querySelector('[data-consent-media-content]'); @@ -830,37 +681,30 @@ renderMediaPlaceholder(placeholder); - if (!content || !frames.length) - { + if (!content || !frames.length) { continue; } - if (!hasConsent(category)) - { + if (!hasConsent(category)) { content.hidden = true; - if (placeholder) - { + if (placeholder) { placeholder.hidden = false; } continue; } - if (container.getAttribute('data-consent-processed') !== '1') - { + if (container.getAttribute('data-consent-processed') !== '1') { let activated = 0; - for (let frameIndex = 0; frameIndex < frames.length; frameIndex++) - { + for (let frameIndex = 0; frameIndex < frames.length; frameIndex++) { const frame = frames[frameIndex]; const source = frame.getAttribute('data-consent-src'); - if (!source || !isSafeEmbedSource(source)) - { + if (!source || !isSafeEmbedSource(source)) { continue; } - if (frame.hasAttribute('data-consent-onload')) - { + if (frame.hasAttribute('data-consent-onload')) { frame.setAttribute('onload', frame.getAttribute('data-consent-onload')); frame.removeAttribute('data-consent-onload'); } @@ -871,8 +715,7 @@ activated++; } - if (!activated) - { + if (!activated) { continue; } @@ -880,26 +723,21 @@ } content.hidden = false; - if (placeholder) - { + if (placeholder) { placeholder.hidden = true; } executedCategories[category] = true; } } - function observeDeferredNodes() - { - if (typeof MutationObserver === 'undefined' || !document.documentElement) - { + function observeDeferredNodes() { + if (typeof MutationObserver === 'undefined' || !document.documentElement) { return; } const observer = new MutationObserver(function(mutations) { - for (let mutationIndex = 0; mutationIndex < mutations.length; mutationIndex++) - { - for (let nodeIndex = 0; nodeIndex < mutations[mutationIndex].addedNodes.length; nodeIndex++) - { + for (let mutationIndex = 0; mutationIndex < mutations.length; mutationIndex++) { + for (let nodeIndex = 0; nodeIndex < mutations[mutationIndex].addedNodes.length; nodeIndex++) { processDeferredNodes(mutations[mutationIndex].addedNodes[nodeIndex]); processDeferredEmbeds(mutations[mutationIndex].addedNodes[nodeIndex]); } @@ -912,34 +750,28 @@ }); } - function initUi() - { + function initUi() { root = document.getElementById('consent-manager-root'); - if (!root) - { + if (!root) { return; } isRendered = true; updateUi(); - if (!isBound) - { + if (!isBound) { bindUi(); } - if (pendingOpenSettings) - { + if (pendingOpenSettings) { pendingOpenSettings = false; openSettings(); } } - function updateUi() - { - if (!isRendered) - { + function updateUi() { + if (!isRendered) { return; } @@ -947,36 +779,29 @@ const link = document.getElementById('consent-manager-link'); const linkItem = document.getElementById('consent-manager-link-item'); - if (banner) - { + if (banner) { banner.hidden = !!state || !optionalCategories.length; } - if (linkItem) - { + if (linkItem) { linkItem.hidden = !state || !optionalCategories.length; } - if (link) - { + if (link) { link.setAttribute('aria-hidden', !state || !optionalCategories.length ? 'true' : 'false'); } } - function selectedOptionalCategories() - { + function selectedOptionalCategories() { const selected = []; - if (!root) - { + if (!root) { return selected; } const checkboxes = root.querySelectorAll('[data-consent-toggle]'); - for (let index = 0; index < checkboxes.length; index++) - { - if (checkboxes[index].checked) - { + for (let index = 0; index < checkboxes.length; index++) { + if (checkboxes[index].checked) { selected.push(checkboxes[index].getAttribute('data-consent-toggle')); } } @@ -984,31 +809,25 @@ return selected; } - function getModal() - { + function getModal() { return document.getElementById('consent-manager-modal'); } - function getModalPanel() - { + function getModalPanel() { const modal = getModal(); return modal ? modal.querySelector('.consent-manager-modal-panel') : null; } - function getFocusableNodes(container) - { + function getFocusableNodes(container) { const focusable = []; - if (!container) - { + if (!container) { return focusable; } const nodes = container.querySelectorAll('a[href], button:not([disabled]), textarea, input:not([disabled]), select, [tabindex]:not([tabindex="-1"])'); - for (let index = 0; index < nodes.length; index++) - { - if (!nodes[index].hidden) - { + for (let index = 0; index < nodes.length; index++) { + if (!nodes[index].hidden) { focusable.push(nodes[index]); } } @@ -1016,51 +835,41 @@ return focusable; } - function handleModalKeydown(event) - { + function handleModalKeydown(event) { const modal = getModal(); - if (!modal || modal.hidden) - { + if (!modal || modal.hidden) { return; } - if (event.key === 'Escape') - { + if (event.key === 'Escape') { closeSettings(); return; } - if (event.key !== 'Tab') - { + if (event.key !== 'Tab') { return; } const focusable = getFocusableNodes(getModalPanel()); - if (!focusable.length) - { + if (!focusable.length) { return; } const first = focusable[0]; const last = focusable[focusable.length - 1]; - if (event.shiftKey && document.activeElement === first) - { + if (event.shiftKey && document.activeElement === first) { last.focus(); event.preventDefault(); - } - else if (!event.shiftKey && document.activeElement === last) - { + } else if (!event.shiftKey && document.activeElement === last) { first.focus(); event.preventDefault(); } } - function openSettings() - { - if (!isRendered) - { + function openSettings() { + if (!isRendered) { pendingOpenSettings = true; return; } @@ -1069,108 +878,85 @@ const panel = getModalPanel(); const checkboxes = root.querySelectorAll('[data-consent-toggle]'); - for (let index = 0; index < checkboxes.length; index++) - { + for (let index = 0; index < checkboxes.length; index++) { checkboxes[index].checked = hasConsent(checkboxes[index].getAttribute('data-consent-toggle')); } - if (!modal) - { + if (!modal) { return; } lastFocusedElement = document.activeElement; modal.hidden = false; - if (document.body) - { + if (document.body) { document.body.classList.add('consent-manager-open'); } - if (!keydownBound) - { + if (!keydownBound) { document.addEventListener('keydown', handleModalKeydown); keydownBound = true; } - if (panel) - { + if (panel) { panel.focus(); } } - function closeSettings() - { + function closeSettings() { const modal = getModal(); - if (!modal) - { + if (!modal) { return; } modal.hidden = true; - if (document.body) - { + if (document.body) { document.body.classList.remove('consent-manager-open'); } - if (keydownBound) - { + if (keydownBound) { document.removeEventListener('keydown', handleModalKeydown); keydownBound = false; } - if (lastFocusedElement && typeof lastFocusedElement.focus === 'function') - { + if (lastFocusedElement && typeof lastFocusedElement.focus === 'function') { lastFocusedElement.focus(); } } - function bindUi() - { + function bindUi() { const footerLink = document.getElementById('consent-manager-link'); root.addEventListener('click', function(event) { const action = event.target.getAttribute('data-consent-action'); - if (!action) - { - if (event.target.id === 'consent-manager-link') - { + if (!action) { + if (event.target.id === 'consent-manager-link') { openSettings(); } return; } - if (action === 'accept-all') - { + if (action === 'accept-all') { setState(optionalCategories.concat(requiredCategories)); closeSettings(); - } - else if (action === 'reject-all') - { + } else if (action === 'reject-all') { setState(requiredCategories); closeSettings(); - } - else if (action === 'open-settings') - { + } else if (action === 'open-settings') { openSettings(); - } - else if (action === 'close-settings') - { + } else if (action === 'close-settings') { closeSettings(); - } - else if (action === 'save-settings') - { + } else if (action === 'save-settings') { setState(selectedOptionalCategories().concat(requiredCategories)); closeSettings(); } }); - if (footerLink) - { + if (footerLink) { footerLink.addEventListener('click', function(event) { event.preventDefault(); openSettings(); @@ -1180,10 +966,8 @@ document.addEventListener('click', function(event) { let node = event.target; - while (node && node !== document) - { - if (node.getAttribute && node.getAttribute('data-consent-open-settings') === '1') - { + while (node && node !== document) { + if (node.getAttribute && node.getAttribute('data-consent-open-settings') === '1') { event.preventDefault(); openSettings(); return; @@ -1196,10 +980,8 @@ isBound = true; } - function onChange(callback) - { - if (typeof callback !== 'function') - { + function onChange(callback) { + if (typeof callback !== 'function') { return; } @@ -1207,10 +989,8 @@ callback(getStateSnapshot()); } - function ready(callback) - { - if (typeof callback !== 'function') - { + function ready(callback) { + if (typeof callback !== 'function') { return; } @@ -1231,27 +1011,18 @@ applyGoogleConsentMode(); - for (let i = 0; i < payload.scripts.length; i++) - { + for (let i = 0; i < payload.scripts.length; i++) { registerScript(payload.scripts[i].id, payload.scripts[i]); } - for (let i = 0; i < queued.length; i++) - { - if (queued[i][0] === 'registerScript') - { + for (let i = 0; i < queued.length; i++) { + if (queued[i][0] === 'registerScript') { registerScript(queued[i][1], queued[i][2]); - } - else if (queued[i][0] === 'onChange') - { + } else if (queued[i][0] === 'onChange') { onChange(queued[i][1]); - } - else if (queued[i][0] === 'openSettings') - { + } else if (queued[i][0] === 'openSettings') { pendingOpenSettings = true; - } - else if (queued[i][0] === 'ready') - { + } else if (queued[i][0] === 'ready') { ready(queued[i][1]); } } @@ -1261,15 +1032,12 @@ processDeferredEmbeds(document); observeDeferredNodes(); - if (document.readyState === 'loading') - { + if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', function() { processRegisteredScripts(); initUi(); }); - } - else - { + } else { initUi(); } })(window, document); diff --git a/tests/javascript/consentmanager.test.js b/tests/javascript/consentmanager.test.js index c71f5d1..440987d 100644 --- a/tests/javascript/consentmanager.test.js +++ b/tests/javascript/consentmanager.test.js @@ -185,8 +185,7 @@ function setupConsentManager(options) { if (settings.cookieState) { window.document.cookie = payload.cookieName + '=' + encodeURIComponent(JSON.stringify(settings.cookieState)); - } - else if (settings.rawCookieValue) { + } else if (settings.rawCookieValue) { window.document.cookie = payload.cookieName + '=' + settings.rawCookieValue; }