Skip to content

feat: make plugin CSP compliant #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Rom1-B wants to merge 1 commit into
base: support/1.3.0
Choose a base branch
from
Draft

feat: make plugin CSP compliant #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ function plugin_version_carbon()
'author' => '<a href="http://www.teclib.com">Teclib\'</a>',
'license' => 'GPLv3',
'homepage' => '',
'csp_compliant' => true,
'requirements' => [
'glpi' => [
'min' => PLUGIN_CARBON_MIN_GLPI_VERSION,
Expand Down
11 changes: 6 additions & 5 deletions src/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
use GlpiPlugin\Carbon\DataSource\Lca\ClientFactory as LcaClientFactory;
use GlpiPlugin\Carbon\Impact\Embodied\Engine;
use GuzzleHttp\Client;
use Html;
use Monitor as GlpiMonitor;
use NetworkEquipment as GlpiNetworkEquipment;
use Override;
Expand Down Expand Up @@ -132,8 +131,8 @@ public function showForm($ID, $options = [])
'_glpi_csrf_token' => Session::getNewCSRFToken(),
'reset_all' => '',
]);
$usage_impact_action_url = 'submitGetLink("' . $CFG_GLPI['root_doc'] . '/plugins/carbon/front/usageimpact.form.php", ' . $reset_args . ')';
$embodied_impact_action_url = 'submitGetLink("' . $CFG_GLPI['root_doc'] . '/plugins/carbon/front/embodiedimpact.form.php", ' . $reset_args . ')';
$usage_impact_action_url = $CFG_GLPI['root_doc'] . '/plugins/carbon/front/usageimpact.form.php';
$embodied_impact_action_url = $CFG_GLPI['root_doc'] . '/plugins/carbon/front/embodiedimpact.form.php';

$renderer = TemplateRenderer::getInstance();
$environment = $renderer->getEnvironment();
Expand All @@ -147,8 +146,10 @@ public function showForm($ID, $options = [])
'impact_engines' => Engine::getAvailableBackends(),
'include_configs' => $include_configs,
'action' => (isset($options['plugin_config']) ? Config::getFormURL() : GlpiConfig::getFormURL()),
'usage_impact_action_url' => Html::getConfirmationOnActionScript($confirm_message, $usage_impact_action_url),
'embodied_impact_action_url' => Html::getConfirmationOnActionScript($confirm_message, $embodied_impact_action_url),
'confirm_message' => $confirm_message,
'reset_args' => $reset_args,
'usage_impact_action_url' => $usage_impact_action_url,
'embodied_impact_action_url' => $embodied_impact_action_url,
]);

return true;
Expand Down
12 changes: 11 additions & 1 deletion src/Source_Zone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ public static function showForSource(CommonDBTM $item)
reloadTab();
});
};
document.querySelectorAll("[data-carbon-toggle-zone]").forEach(function (button) {
button.addEventListener("click", function () {
plugin_carbon_toggleZone(button.dataset.carbonToggleZone);
});
});
');
}
}
Expand Down Expand Up @@ -314,6 +319,11 @@ public static function showForZone(CommonDBTM $item)
reloadTab();
});
};
document.querySelectorAll("[data-carbon-toggle-zone]").forEach(function (button) {
button.addEventListener("click", function () {
plugin_carbon_toggleZone(button.dataset.carbonToggleZone);
});
});
');
}
}
Expand Down Expand Up @@ -428,7 +438,7 @@ public function getFallbackFromDB(Source_Zone $source_zone): bool
protected static function getToggleLink(int $zone_id, ?string $state): string
{
$state = $state == 0 ? __('No') : __('Yes');
$link = '<a href="javascript:void(0)" onclick="plugin_carbon_toggleZone(' . $zone_id . ')" title="' . __('Enable / Disable', 'carbon') . '">' . $state . '</a>';
$link = '<button type="button" class="btn-as-link" data-carbon-toggle-zone="' . $zone_id . '" title="' . __('Enable / Disable', 'carbon') . '">' . $state . '</button>';
return $link;
}

Expand Down
12 changes: 8 additions & 4 deletions templates/config.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@
<tr>
<td>{{ __('Reset usage impacts. This will delete all calculated usage impacts for all assets.', 'carbon') }}</td>
<td class="text-end">
{% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset_all: ''}" %}
<a class="btn btn-outline-warning me-2" onclick='{{ usage_impact_action_url|raw }};'>
<a class="btn btn-outline-warning me-2"
data-glpi-confirm="{{ confirm_message }}"
data-glpi-submit-get-link="{{ usage_impact_action_url }}"
data-glpi-submit-get-link-fields="{{ reset_args }}">
<i class="ti ti-device-floppy"></i>
<span>{{ _x('button', 'Reset usage impacts') }}</span>
</a>
Expand All @@ -89,8 +91,10 @@
<tr>
<td>{{ __('Reset embodied impacts. This will delete all calculated embodied impacts for all assets.', 'carbon') }}</td>
<td class="text-end">
{% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset_all: ''}" %}
<a class="btn btn-outline-warning me-2" onclick='{{ embodied_impact_action_url|raw }};'>
<a class="btn btn-outline-warning me-2"
data-glpi-confirm="{{ confirm_message }}"
data-glpi-submit-get-link="{{ embodied_impact_action_url }}"
data-glpi-submit-get-link-fields="{{ reset_args }}">
<i class="ti ti-device-floppy"></i>
<span>{{ _x('button', 'Reset embodied impacts') }}</span>
</a>
Expand Down
16 changes: 8 additions & 8 deletions templates/environmentalimpact-item.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
</div>
<div>
{% if not usage_impact.isNewItem() or usage_carbon_emission_count > 0 %}
{% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
<a class="btn btn-outline-warning me-2" onclick="submitGetLink('{{ usage_impact_action_url }}', {{ reset_args }})"><i class="ti ti-trash"></i><span>{{ __('Reset data', 'carbon') }}</span></a>
{% set reset_args = {_glpi_csrf_token: csrf_token(), reset: '', itemtype: asset.getType(), items_id: asset.getID()}|json_encode %}
<a class="btn btn-outline-warning me-2" data-glpi-submit-get-link="{{ usage_impact_action_url }}" data-glpi-submit-get-link-fields="{{ reset_args }}"><i class="ti ti-trash"></i><span>{{ __('Reset data', 'carbon') }}</span></a>
{% endif %}
{% set calculate_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
<a class="btn btn-primary" onclick="submitGetLink('{{ usage_impact_action_url }}', {{ calculate_args }})">{{ __('Calculate data', 'carbon') }}</a>
{% set calculate_args = {_glpi_csrf_token: csrf_token(), calculate: '', itemtype: asset.getType(), items_id: asset.getID()}|json_encode %}
<a class="btn btn-primary" data-glpi-submit-get-link="{{ usage_impact_action_url }}" data-glpi-submit-get-link-fields="{{ calculate_args }}">{{ __('Calculate data', 'carbon') }}</a>
</div>

{{ fields.largeTitle(
Expand Down Expand Up @@ -96,10 +96,10 @@
</div>
<div>
{% if not embodied_impact.isNewItem() %}
{% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset: '', id: '" ~ embodied_impact.getID() ~ "'}" %}
<a class="btn btn-outline-warning me-2" onclick="submitGetLink('{{ embodied_impact_action_url }}', {{ reset_args }})"><i class="ti ti-trash"></i><span>{{ __('Reset data', 'carbon') }}</span></a>
{% set reset_args = {_glpi_csrf_token: csrf_token(), reset: '', id: embodied_impact.getID()}|json_encode %}
<a class="btn btn-outline-warning me-2" data-glpi-submit-get-link="{{ embodied_impact_action_url }}" data-glpi-submit-get-link-fields="{{ reset_args }}"><i class="ti ti-trash"></i><span>{{ __('Reset data', 'carbon') }}</span></a>
{% endif %}
{% set calculate_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
<a class="btn btn-primary" onclick="submitGetLink('{{ embodied_impact_action_url }}', {{ calculate_args }})">{{ __('Calculate data', 'carbon') }}</a>
{% set calculate_args = {_glpi_csrf_token: csrf_token(), calculate: '', itemtype: asset.getType(), items_id: asset.getID()}|json_encode %}
<a class="btn btn-primary" data-glpi-submit-get-link="{{ embodied_impact_action_url }}" data-glpi-submit-get-link-fields="{{ calculate_args }}">{{ __('Calculate data', 'carbon') }}</a>
</div>
</div>
Loading