From fcaf26c2534575294d65303d89d2595b2a552b70 Mon Sep 17 00:00:00 2001 From: Vincent Maury Date: Tue, 11 Mar 2025 03:24:52 +0100 Subject: [PATCH 1/3] Fk account not saved (#33396) When bank account is set but there's an error, it's lost Co-authored-by: Laurent Destailleur --- htdocs/comm/propal/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index c3ffff3ecd2..e4ef94f8689 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1981,7 +1981,7 @@ if ($action == 'create') { if (GETPOSTISSET('mode_reglement_id')) { $mode_reglement_id = GETPOSTINT('mode_reglement_id'); } - if (GETPOSTISSET('cond_reglement_id')) { + if (GETPOSTISSET('fk_account')) { $fk_account = GETPOSTINT('fk_account'); } } From 68818a451ce70ce023b71c933e73c60a88a189fb Mon Sep 17 00:00:00 2001 From: Vincent Maury Date: Tue, 11 Mar 2025 03:26:45 +0100 Subject: [PATCH 2/3] Fix Deposit percent on new propal (#33395) When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf. I just reported the same modif than in command --- htdocs/comm/propal/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index e4ef94f8689..e81e89784f6 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1878,7 +1878,7 @@ if ($action == 'create') { $currency_code = $conf->currency; $cond_reglement_id = GETPOSTINT('cond_reglement_id'); - $deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha'); + $deposit_percent = GETPOSTFLOAT('cond_reglement_id_deposit_percent'); $mode_reglement_id = GETPOSTINT('mode_reglement_id'); $fk_account = GETPOSTINT('fk_account'); $datepropal = (empty($datepropal) ? (!getDolGlobalString('MAIN_AUTOFILL_DATE_PROPOSAL') ? -1 : '') : $datepropal); From 63dd269dfabd10b2e06a2f066d1e281265bd5f91 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Tue, 11 Mar 2025 10:43:25 +0100 Subject: [PATCH 3/3] =?UTF-8?q?SEC=20FIX=20Reflected=20XSS=20reported=20by?= =?UTF-8?q?=20=E6=9F=8F=E5=A4=A9=E6=B5=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev/tools/apstats.php | 1 + htdocs/core/modules/openid_connect/callback.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php index 825257dadbe..e78fad90e8d 100755 --- a/dev/tools/apstats.php +++ b/dev/tools/apstats.php @@ -974,6 +974,7 @@ $html .= ''; $html .= ''; $html .= '
'; +$html .= 'Note:Search is git repository on regexstring #yogosha|CVE|Sec:|Sec\s
'; $html .= 'You can use this URL for RSS notifications: '.$outputfilerss.'

'; $html .= ''; diff --git a/htdocs/core/modules/openid_connect/callback.php b/htdocs/core/modules/openid_connect/callback.php index c55a4772053..38dda4734ca 100644 --- a/htdocs/core/modules/openid_connect/callback.php +++ b/htdocs/core/modules/openid_connect/callback.php @@ -42,8 +42,13 @@ $arrayofjs = array( top_htmlhead('', '', 0, 0, $arrayofjs); $prefix = dol_getprefix(''); -$rollback_url = $_COOKIE["DOL_rollback_url_$prefix"]; -if (empty($rollback_url) || $rollback_url === '/') { + +$rollback_url = $_COOKIE["DOL_rollback_url_".$prefix]; // Was set by login page to $_SERVER['REQUEST_URI'] to allow come back to initial requested page +if (empty($rollback_url) || !preg_match('/^\//', $rollback_url)) { + // We accept only value that is an internal relative URL. URL starting with http are not allowed. + $rollback_url = '/'; +} +if ($rollback_url === '/') { $action = $dolibarr_main_url_root . '/index.php?mainmenu=home&leftmenu='; } else { $action = $rollback_url; @@ -51,7 +56,7 @@ if (empty($rollback_url) || $rollback_url === '/') { } ?> -
+