lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missing X-Content-Type-Options: nosniff on header of website pages

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-07 11:51:21 +01:00
parent 2e2c9562e8
commit 8138fa9780
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/website.lib.php
View File

@ -384,12 +384,13 @@ function dolWebsiteSaveContent($content)
/** /**
* Make a redirect to another container. * Make a redirect to another container.
* *
* @param string $containerref Ref of container to redirect to (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php'). * @param string $containerref Ref of container to redirect to (Example: 'mypage' or 'mypage.php').
* @param string $containeraliasalt Ref of alternative aliases to redirect to. * @param string $containeraliasalt Ref of alternative aliases to redirect to.
* @param int $containerid Id of container. * @param int $containerid Id of container.
* @param int $permanent 0=Use temporary redirect 302, 1=Use permanent redirect 301
* @return void * @return void
*/ */
function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0) function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0, $permanent = 0)
{ {
global $db, $website; global $db, $website;
@ -436,6 +437,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
if ($result > 0) if ($result > 0)
{ {
$currenturi = $_SERVER["REQUEST_URI"]; $currenturi = $_SERVER["REQUEST_URI"];
$regtmp = array();
if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
{ {
if ($regtmp[0] == $containerref) if ($regtmp[0] == $containerref)
@ -461,6 +463,9 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
if ($newurl) if ($newurl)
{ {
if ($permanent) {
header("Status: 301 Moved Permanently", false, 301);
}
header("Location: ".$newurl); header("Location: ".$newurl);
exit; exit;
} }

4
htdocs/core/website.inc.php
View File

@ -61,6 +61,10 @@ if ($pageid > 0)
} }
} }
if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
header("X-Content-Type-Options: nosniff");
}
// A lang was forced, so we change weblangs init // A lang was forced, so we change weblangs init
if (GETPOST('l', 'aZ09')) $weblangs->setDefaultLang(GETPOST('l', 'aZ09')); if (GETPOST('l', 'aZ09')) $weblangs->setDefaultLang(GETPOST('l', 'aZ09'));
// A lang was forced, so we check to find if we must make a redirect on translation page // A lang was forced, so we check to find if we must make a redirect on translation page