Skip to content

Update plugin extension value from string to array #409

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

Merged
Rom1-B merged 3 commits into from
Jan 20, 2025
Merged

Update plugin extension value from string to array #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54e01a6
Update plugin extension value from string to array
RomainLvr Jan 20, 2025
392458b
Update front/signature.php
RomainLvr Jan 20, 2025
fba01a2
Fix code
RomainLvr Jan 20, 2025
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: 7 additions & 6 deletions front/signature.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,20 @@
$sign = array_key_exists('sign', $_GET) ? $_GET['sign'] : '';

// Avoid access to another directory or to files that does not match allowed extension
if (
preg_match('/(\\\\|\/)/', $sign) !== 0
|| preg_match('/\.' . preg_quote(PLUGIN_ORDER_SIGNATURE_EXTENSION, '/') . '$/', $sign) === 0
) {
$extensionPattern = '/\.(' . implode('|', array_map(function ($ext) {
return preg_quote($ext, '/');
}, PLUGIN_ORDER_SIGNATURE_EXTENSION)) . ')$/';

if (preg_match('/[\\\\\/]/', $sign) !== 0 || preg_match($extensionPattern, $sign) === 0) {
header('HTTP/1.1 403 Forbidden');
exit();
}

$filename = PLUGIN_ORDER_SIGNATURE_DIR . $sign;
$filename = PLUGIN_ORDER_SIGNATURE_DIR . $sign;

if (empty($sign) || !@is_file($filename)) {
header('HTTP/1.1 404 Not Found');
exit();
}

Toolbox::sendFile($filename, $sign);
Toolbox::sendFile($filename, $sign);
4 changes: 2 additions & 2 deletions inc/preference.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ public static function getFiles($directory, $ext)
if ($filename == ".." or $filename == ".") {
echo "";
} else {
if ($filetype == 'file' && $extension == $ext) {
if ($ext == PLUGIN_ORDER_SIGNATURE_EXTENSION) {
if ($filetype == 'file' && in_array($extension, $ext)) {
if (in_array($ext, PLUGIN_ORDER_SIGNATURE_EXTENSION)) {
$name = array_shift($basename);
if (strtolower($name) == strtolower($_SESSION["glpiname"])) {
$array_file[] = [$filename, $filedate, $extension];
Expand Down
4 changes: 2 additions & 2 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
}

if (!defined('PLUGIN_ORDER_TEMPLATE_EXTENSION')) {
define("PLUGIN_ORDER_TEMPLATE_EXTENSION", "odt");
define("PLUGIN_ORDER_TEMPLATE_EXTENSION", ["odt"]);
}
if (!defined('PLUGIN_ORDER_SIGNATURE_EXTENSION')) {
define("PLUGIN_ORDER_SIGNATURE_EXTENSION", "png");
define("PLUGIN_ORDER_SIGNATURE_EXTENSION", ["png"]);
}
/** @var array $CFG_GLPI */
global $CFG_GLPI;
Expand Down
Loading