composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop

Browse Source
This commit is contained in:
jf-cbd
2024-07-05 14:06:00 +02:00
parent d3dc59c5da 0d9f348e93
commit e5825b5fcd
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/log.class.inc.php
View File

@@ -542,32 +542,32 @@ class FileLog
*/ */
class LogChannels class LogChannels
{ {
public const APC = 'apc'; public const APC = 'Apc';
/** /**
* @var string Everything related to the backup / restore * @var string Everything related to the backup / restore
* @since 3.1.0 * @since 3.1.0
*/ */
public const BACKUP = 'backup'; public const BACKUP = 'Backup';
/** /**
* @since 3.0.0 * @since 3.0.0
*/ */
public const CLI = 'CLI'; public const CLI = 'Cli';
/** /**
* @var string * @var string
* @since 2.7.7 N°4558 use this new channel when logging DB transactions * @since 2.7.7 N°4558 use this new channel when logging DB transactions
* @since 3.0.0 logs info in CMDBSource (see commit a117906f) * @since 3.0.0 logs info in CMDBSource (see commit a117906f)
*/ */
public const CMDB_SOURCE = 'cmdbsource'; public const CMDB_SOURCE = 'CmdbSource';
/** /**
* @since 3.0.0 * @since 3.0.0
*/ */
public const CONSOLE = 'console'; public const CONSOLE = 'Console';
public const CORE = 'core'; public const CORE = 'Core';
/** /**
* @var string Everything related to the datatable component * @var string Everything related to the datatable component
@@ -592,10 +592,10 @@ class LogChannels
* @var string Everything related to the datamodel CRUD * @var string Everything related to the datamodel CRUD
* @since 3.1.0 * @since 3.1.0
*/ */
public const DM_CRUD = 'DMCRUD'; public const DM_CRUD = 'DMCrud';
/** /**
* @var string Everything related to the datamodel CRUD * @var string Everything related to webrequests
* @since 3.1.0 * @since 3.1.0
*/ */
public const WEB_REQUEST = 'WebRequest'; public const WEB_REQUEST = 'WebRequest';
@@ -610,7 +610,7 @@ class LogChannels
* @var string * @var string
* @since 2.7.9 3.0.3 3.1.0 N°5588 * @since 2.7.9 3.0.3 3.1.0 N°5588
*/ */
public const EXPORT = 'export'; public const EXPORT = 'Export';
public const INLINE_IMAGE = 'InlineImage'; public const INLINE_IMAGE = 'InlineImage';
@@ -619,9 +619,9 @@ class LogChannels
* @since 3.0.1 N°4849 * @since 3.0.1 N°4849
* @since 2.7.7 N°4635 * @since 2.7.7 N°4635
*/ */
public const NOTIFICATIONS = 'notifications'; public const NOTIFICATIONS = 'Notifications';
public const PORTAL = 'portal'; public const PORTAL = 'Portal';
public const TEMPORARY_OBJECTS = 'TemporaryObjects'; public const TEMPORARY_OBJECTS = 'TemporaryObjects';
@@ -629,7 +629,13 @@ class LogChannels
* @var string * @var string
* @since 3.1.0 * @since 3.1.0
*/ */
public const ROUTER = 'router'; public const ROUTER = 'Router';
/**
* @var string
* @since 3.2.0
*/
public const SECURITY = 'Security';
} }

2
css/backoffice/components/_newsroom-menu.scss
View File

@@ -13,6 +13,7 @@ $ibo-navigation-menu--notifications--item--image--max-height: 20px !default;
$ibo-navigation-menu--notifications--item--image--border-radius: $ibo-border-radius-full !default; $ibo-navigation-menu--notifications--item--image--border-radius: $ibo-border-radius-full !default;
$ibo-navigation-menu--notifications--item--bottom-text--margin-left: auto !default; $ibo-navigation-menu--notifications--item--bottom-text--margin-left: auto !default;
$ibo-navigation-menu--notifications--item--bottom-text--margin-right: auto !default;
$ibo-navigation-menu--notifications--item--content--padding-y: $ibo-spacing-0 !default; $ibo-navigation-menu--notifications--item--content--padding-y: $ibo-spacing-0 !default;
$ibo-navigation-menu--notifications--item--content--padding-x: 14px !default; $ibo-navigation-menu--notifications--item--content--padding-x: 14px !default;
@@ -76,6 +77,7 @@ $ibo-popover-menu--item--no-message--image--svg--padding : 15px !default;
float: right; float: right;
align-self: center; align-self: center;
margin-left: $ibo-navigation-menu--notifications--item--bottom-text--margin-left; margin-left: $ibo-navigation-menu--notifications--item--bottom-text--margin-left;
margin-right: $ibo-navigation-menu--notifications--item--bottom-text--margin-right;
} }
.ibo-navigation-menu--notifications--item--content { .ibo-navigation-menu--notifications--item--content {
padding: $ibo-navigation-menu--notifications--item--content--padding-y $ibo-navigation-menu--notifications--item--content--padding-x; padding: $ibo-navigation-menu--notifications--item--content--padding-y $ibo-navigation-menu--notifications--item--content--padding-x;

4
css/setup.css
View File

File diff suppressed because one or more lines are too long

2
pages/ajax.render.php
View File

@@ -36,7 +36,7 @@ try
if (!isset($_SERVER['HTTP_X_COMBODO_AJAX']) && $_SERVER['REQUEST_METHOD'] !== 'GET') { if (!isset($_SERVER['HTTP_X_COMBODO_AJAX']) && $_SERVER['REQUEST_METHOD'] !== 'GET') {
$sReferer = $_SERVER['HTTP_REFERER']; $sReferer = $_SERVER['HTTP_REFERER'];
$sErrorMsg = 'Unauthorized access. Please see https://www.itophub.io/wiki/page?id=3_2_0:release:developer#checking_for_the_presence_of_specific_header_in_the_post_to_enhance_protection_against_csrf_attacks'; $sErrorMsg = 'Unauthorized access. Please see https://www.itophub.io/wiki/page?id=3_2_0:release:developer#checking_for_the_presence_of_specific_header_in_the_post_to_enhance_protection_against_csrf_attacks';
IssueLog::Error("Unprotected ajax call from: $sReferer. $sErrorMsg"); IssueLog::Error("Unprotected ajax call : $sErrorMsg", LogChannels::SECURITY, ['referer' => $sReferer]);
header('HTTP/1.1 401 Unauthorized'); header('HTTP/1.1 401 Unauthorized');
die($sErrorMsg); die($sErrorMsg);
} }