Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions adm/style/consentmanager_acp.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,22 @@ <h3>{{ lang('WARNING') }}</h3>
var textarea = document.getElementById('consentmanager_integrations');
var warning = document.getElementById('consentmanager_integrations_warning');

if (!textarea || !warning)
{
if (!textarea || !warning) {
return;
}

var updateWarning = function() {
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;
}

Expand Down
64 changes: 54 additions & 10 deletions service/consent_manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,36 @@ 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,
'error' => 'invalid_hash',
];
}

$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 [
Expand All @@ -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,
];
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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.
*
Expand Down
79 changes: 29 additions & 50 deletions styles/all/template/event/overall_header_head_append.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,93 +16,76 @@
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)
{
return decodeURIComponent(parts[i].substring(name.length + 1));
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) {
return '';
}
}
}

return '';
}

{% 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;
}

Expand All @@ -126,27 +109,23 @@
};
window.consentManager = stub;

if (googleConsentMode.enabled)
{
if (googleConsentMode.enabled) {
window.dataLayer = window.dataLayer || [];
window.gtag = window.gtag || function(){window.dataLayer.push(arguments);};

const defaults = {};
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);
}
Expand Down
Loading
Loading