Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
chore(release): merge release-22.04.next into 22.04.x (#11821)
Browse files Browse the repository at this point in the history
* fix(git): resync 22.04.x to dev-22.04.x (#11503)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* fix(cron): Escape database name in CentACL 22.04.x (#11510)

* fix(test): wait 8s before checking downtime is active in rest api v1 test (#11498) (#11504)

Refs: MON-14585

* fix(UI): Include host_id when selecting ServiceGroups on dashreports (#11428) (#11519)

Co-authored-by: VHS <listas.vhs@gmail.com>

Co-authored-by: VHS <listas.vhs@gmail.com>

* fix(Resources/Graph): export graph image after selecting png (#11491)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

* fix export graph image after selecting png

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* Fix(platform): Removing appkey key (#11511)

* fix(trap): Removal of the restriction on the uniqueness of the OID of a trap (#11327)

Currently, an error appears when we try to save an existing trap because a test is performed on the uniqueness of the OID.
This PR aims to remove the restriction on the uniqueness of the OID of a trap.

* fix(pendo): correctly set locale when language is detection by browser (#11484) (#11528)

* fix(test): fix random fails on virtual metric test (#11523)

Refs: MON-14359

* fix(autoload): Add classmap to fix autoload with legacy classes (#11492) (#11532)

Refs: MON-14496

* fix(ldap): small refacto of ldap authentication and log failures (#11422) (#11534)

Refs: MON-7417

* fix(api): allow api platform updates from installed 22.04.0 (#11495) (#11533)

Refs: MON-12296

* fix(api): fix call to api on fresh install (#11536) (#11537)

Refs: MON-12296

* doc(ack): acknowledge Hakaï security (#11540)

* fix(api): do not init db connection in event subscriber (#11543) (#11545)

Refs: MON-12296

* fix(web): fix the comment deletion for host monitored by poller (#11138) (#11556)

Refs: MON-12828

Co-authored-by: Stéphane Duret <sduret@centreon.com>

* SNYK: Sanitize and bind ACL actions queries (#11547)

* sanitizing and binding acl actions queries

* fix missing bind

* SNYK: Sanitize and bind Broker listing queries (#11550)

* Sanitizing and binding broker listing queries

* applying suggested changes

* fix(conf) fix encoding in template service listing (#11558) (#11564)

* fix encoding

* remove useless function

* SNYK: Sanitize and bind generateImage queries (#11561)

* sanitize and bind generate image queries

* adding throw exception

* applying suggested changes

* Update www/include/views/graphs/generateGraphs/generateImage.php

Co-authored-by: Kevin Duret <kduret@centreon.com>

Co-authored-by: Kevin Duret <kduret@centreon.com>

* MON-14501 - sanitize query in centreonXmlbgRequest class (#11570)

* sanitize query in centreonXmlbgRequest class

* add closeCursor func to resolve conv

* SNYK: Sanitize and bind Meta-Services dependency queries  (#11567)

* sanityze 2 insert queries

* spaces removed in a query

* chore(release):rebase dev-22.04.x on 22.04.x (#11627)

* Merge release-22.04.3 into 22.04.x (#11623)

* fix(git): resync 22.04.x to dev-22.04.x (#11503)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* fix(cron): Escape database name in CentACL 22.04.x (#11510)

* fix(test): wait 8s before checking downtime is active in rest api v1 test (#11498) (#11504)

Refs: MON-14585

* fix(UI): Include host_id when selecting ServiceGroups on dashreports (#11428) (#11519)

Co-authored-by: VHS <listas.vhs@gmail.com>

Co-authored-by: VHS <listas.vhs@gmail.com>

* fix(Resources/Graph): export graph image after selecting png (#11491)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

* fix export graph image after selecting png

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* Fix(platform): Removing appkey key (#11511)

* fix(trap): Removal of the restriction on the uniqueness of the OID of a trap (#11327)

Currently, an error appears when we try to save an existing trap because a test is performed on the uniqueness of the OID.
This PR aims to remove the restriction on the uniqueness of the OID of a trap.

* fix(pendo): correctly set locale when language is detection by browser (#11484) (#11528)

* fix(test): fix random fails on virtual metric test (#11523)

Refs: MON-14359

* fix(autoload): Add classmap to fix autoload with legacy classes (#11492) (#11532)

Refs: MON-14496

* fix(ldap): small refacto of ldap authentication and log failures (#11422) (#11534)

Refs: MON-7417

* fix(api): allow api platform updates from installed 22.04.0 (#11495) (#11533)

Refs: MON-12296

* fix(api): fix call to api on fresh install (#11536) (#11537)

Refs: MON-12296

* doc(ack): acknowledge Hakaï security (#11540)

* fix(api): do not init db connection in event subscriber (#11543) (#11545)

Refs: MON-12296

* fix(web): fix the comment deletion for host monitored by poller (#11138) (#11556)

Refs: MON-12828

Co-authored-by: Stéphane Duret <sduret@centreon.com>

* SNYK: Sanitize and bind ACL actions queries (#11547)

* sanitizing and binding acl actions queries

* fix missing bind

* SNYK: Sanitize and bind Broker listing queries (#11550)

* Sanitizing and binding broker listing queries

* applying suggested changes

* fix(conf) fix encoding in template service listing (#11558) (#11564)

* fix encoding

* remove useless function

* SNYK: Sanitize and bind generateImage queries (#11561)

* sanitize and bind generate image queries

* adding throw exception

* applying suggested changes

* Update www/include/views/graphs/generateGraphs/generateImage.php

Co-authored-by: Kevin Duret <kduret@centreon.com>

Co-authored-by: Kevin Duret <kduret@centreon.com>

* MON-14501 - sanitize query in centreonXmlbgRequest class (#11570)

* sanitize query in centreonXmlbgRequest class

* add closeCursor func to resolve conv

* SNYK: Sanitize and bind Meta-Services dependency queries  (#11567)

* sanityze 2 insert queries

* spaces removed in a query

* chore(install):Update version to 22.04.3

* fix(sql): fix query to select contact during ldap import (#11578)

Refs: MON-14263

* fix(UI): Fix layout for Safari and form validation (#11373) (#11604)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: VHS <listas.vhs@gmail.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
Co-authored-by: Stéphane Duret <sduret@centreon.com>

* fix(api): fix call to api on fresh install (#11536) (#11537)

Refs: MON-12296

* fix(api): do not init db connection in event subscriber (#11543) (#11545)

Refs: MON-12296

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: VHS <listas.vhs@gmail.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
Co-authored-by: Stéphane Duret <sduret@centreon.com>

* fix(partition): adapt control of database version (#11609) (#11610)

* fix(openid): correctly set contact_location while creating session (#11613) (#11614)

* fix(lang): Fixed FR typo (#11621)

* enh(UI): Add a “Parent alias“ column  on the monitoring resources sta… (#11542)

* enh(UI): Add a “Parent alias“ column  on the monitoring resources status page (#11190)

* Add column ParentAlias

* Add new label ParentAlias

* Add column ParentAlias and new column component

* Add new card to display Parent Alias

* Remove  tile in Details Panel, enhancement not expected

* FIx eslint issue

* Fix naming on label parent alias

* Add translation

* Add line at the end of files

* Add line at the end of file

* fix issues

* Update lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/es_ES.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/pt_PT.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/es_ES.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>

* Update lang/pt_BR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>

* Update lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Bruno d'Auria <bdauria@centreon.com>

* Fix issue on messages.po file

Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>
Co-authored-by: Bruno d'Auria <bdauria@centreon.com>

* query sanitized in listServiceCategoriesà (#11597) (#11632)

* MON-14797 reorganizes dependencies (#11612)

* Fix encoding issue on status serviceXML (#11581)

* sanitize and bind in centreon connector query (#11635)

* sanitize insrert queries in db-func (#11650)

MON-14667

* chore(git): update codeowners (#11594)

* chore(release):rebase dev-22.04.x on 22.04.x (#11688)

* Merge release-22.04.3 into 22.04.x (#11623)

* fix(git): resync 22.04.x to dev-22.04.x (#11503)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* fix(cron): Escape database name in CentACL 22.04.x (#11510)

* fix(test): wait 8s before checking downtime is active in rest api v1 test (#11498) (#11504)

Refs: MON-14585

* fix(UI): Include host_id when selecting ServiceGroups on dashreports (#11428) (#11519)

Co-authored-by: VHS <listas.vhs@gmail.com>

Co-authored-by: VHS <listas.vhs@gmail.com>

* fix(Resources/Graph): export graph image after selecting png (#11491)

* [SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11394)

* Sanitize and bind ACL host dependency queries

* fix issues

* removed old variable userCrypted and the use of it (#11334) (#11352)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* enh(Header/userMenu):reduce spacing user menu (#11393)

* update user menu

* fix(hostgroup): fix display of hostgroups in select2 (#11431) (#11443)

* fix(ci): fix debian packaging with freshly instanciated jenkins slave (#11398) (#11399)

Refs: MON-14377

* Sanitized and bound queries (#11413) (#11445)

lines : 130 -142

* Snyk: Sanitize and bind media sync queries 22.04.x (#11418)

* sanitizing and binding sync dir file queries

* Applying some fixes

* Snyk: Sanitize and bind ACL service dependency queries dev-22.04.x (#11395)

* Snyk: Sanitize and bind Auth class queries 22.04.x (#11448)

* [Backport/need review] fix(UI): Fix layout for Safari and form validation (#11440)

* fix(UI): Fix layout for Safari and form validation (#11373)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

* Fix package-lock

* Add debug statement for debian

* Install nodejs rather npm

* Attempt fix

* Attempt to fix nodejs installation

* add sudo

* Fix redoc-cli usage

* Try to fix permission on npm

* Fix

* Fix permission

* Fix permission (please work)

* Fix source

* Stop using npx because.....

* Allow legacy-peer-deps

* Remove nodejs installation

* Fix image to pull for debian 11

* [SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11421)

1122

1153

1134

* [Snyk] Sanitize and bind ACL action access queries (#11385) (#11402)

* Sanitize and bind ACL action access queries

_ sanitize if possible each variables inserted in a query

_ use PDO prepared statement and bind() method

_ Do not use $pearDB->escape on which is for examples useless on integers and on non closed HTML tags (svg, img, etc)

* fix line length

* fix failed checks

* feat(api): implement endpoint to update centreon web (#11391) (#11401)

Refs: MON-12296

* Clean(platform): Clean appKey method and usage 22.04.x (#11452)

* Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>

* adding 22.04.2 update script file with changes

* revert 22.04 beta 1 script to its original

Co-authored-by: Kevin Duret <kduret@centreon.com>

* enh(platform): Use API to select metrics in virtual metrics configuration form 22.04.x (#11461)

* changing select with select2 of metrics

* fix alignement

* remove unecessary files and replace selec by select2 in formComponentTemplate

* fix select id name for acceptance tests

* update composer for acceptance tests

* fix acceptance test 2

* add allow clear to metrics select2

* applying suggested changes

* final changes for merging

* remove unecessary select tag

* [SNYK] Sanitize and bind ACL class queries (#11392) (#11472)

* Sanitize and bind ACL class queries

Queries   sanitized  and bound using PDO statement

* fix spaces

spaces between (int) cast and variables

* update file delete spaces after comma

* change variables names due to a review

* Line exceeds 120 characters; contains 123 characters

* fix(conf) fix broker conf name display in listing (#11372) (#11376)

* fix export graph image after selecting png

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>

* Fix(platform): Removing appkey key (#11511)

* fix(trap): Removal of the restriction on the uniqueness of the OID of a trap (#11327)

Currently, an error appears when we try to save an existing trap because a test is performed on the uniqueness of the OID.
This PR aims to remove the restriction on the uniqueness of the OID of a trap.

* fix(pendo): correctly set locale when language is detection by browser (#11484) (#11528)

* fix(test): fix random fails on virtual metric test (#11523)

Refs: MON-14359

* fix(autoload): Add classmap to fix autoload with legacy classes (#11492) (#11532)

Refs: MON-14496

* fix(ldap): small refacto of ldap authentication and log failures (#11422) (#11534)

Refs: MON-7417

* fix(api): allow api platform updates from installed 22.04.0 (#11495) (#11533)

Refs: MON-12296

* fix(api): fix call to api on fresh install (#11536) (#11537)

Refs: MON-12296

* doc(ack): acknowledge Hakaï security (#11540)

* fix(api): do not init db connection in event subscriber (#11543) (#11545)

Refs: MON-12296

* fix(web): fix the comment deletion for host monitored by poller (#11138) (#11556)

Refs: MON-12828

Co-authored-by: Stéphane Duret <sduret@centreon.com>

* SNYK: Sanitize and bind ACL actions queries (#11547)

* sanitizing and binding acl actions queries

* fix missing bind

* SNYK: Sanitize and bind Broker listing queries (#11550)

* Sanitizing and binding broker listing queries

* applying suggested changes

* fix(conf) fix encoding in template service listing (#11558) (#11564)

* fix encoding

* remove useless function

* SNYK: Sanitize and bind generateImage queries (#11561)

* sanitize and bind generate image queries

* adding throw exception

* applying suggested changes

* Update www/include/views/graphs/generateGraphs/generateImage.php

Co-authored-by: Kevin Duret <kduret@centreon.com>

Co-authored-by: Kevin Duret <kduret@centreon.com>

* MON-14501 - sanitize query in centreonXmlbgRequest class (#11570)

* sanitize query in centreonXmlbgRequest class

* add closeCursor func to resolve conv

* SNYK: Sanitize and bind Meta-Services dependency queries  (#11567)

* sanityze 2 insert queries

* spaces removed in a query

* chore(install):Update version to 22.04.3

* fix(sql): fix query to select contact during ldap import (#11578)

Refs: MON-14263

* fix(UI): Fix layout for Safari and form validation (#11373) (#11604)

* Fix form validation

* Fix padlock layout for safari

* Update centreon-frontend

* Remove debug variable

* Fix test

* Fix page respsoniveness

* Rename variable

* update deps

* Fix package-lock

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: VHS <listas.vhs@gmail.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
Co-authored-by: Stéphane Duret <sduret@centreon.com>

* chore(release): merge hotfix-MON-14893-index-data (#11681)

* fix(upgrade): Correctly Parse SQL Comments (#11658) (#11668)

Refs: MON-14848

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* fix invalid values for index_data.special (#11669)

* chore(install):update version to 22.04.4

Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

* fix(api): fix call to api on fresh install (#11536) (#11537)

Refs: MON-12296

* fix(api): do not init db connection in event subscriber (#11543) (#11545)

Refs: MON-12296

* fix(partition): adapt control of database version (#11609) (#11610)

* fix(openid): correctly set contact_location while creating session (#11613) (#11614)

* fix(lang): Fixed FR typo (#11621)

* enh(UI): Add a “Parent alias“ column  on the monitoring resources sta… (#11542)

* enh(UI): Add a “Parent alias“ column  on the monitoring resources status page (#11190)

* Add column ParentAlias

* Add new label ParentAlias

* Add column ParentAlias and new column component

* Add new card to display Parent Alias

* Remove  tile in Details Panel, enhancement not expected

* FIx eslint issue

* Fix naming on label parent alias

* Add translation

* Add line at the end of files

* Add line at the end of file

* fix issues

* Update lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/es_ES.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/pt_PT.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Tom Darneix <tomdar87@outlook.com>

* Update lang/es_ES.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>

* Update lang/pt_BR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>

* Update lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

Co-authored-by: Bruno d'Auria <bdauria@centreon.com>

* Fix issue on messages.po file

Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>
Co-authored-by: Bruno d'Auria <bdauria@centreon.com>

* query sanitized in listServiceCategoriesà (#11597) (#11632)

* MON-14797 reorganizes dependencies (#11612)

* Fix encoding issue on status serviceXML (#11581)

* sanitize and bind in centreon connector query (#11635)

* sanitize insrert queries in db-func (#11650)

MON-14667

Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: VHS <listas.vhs@gmail.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
Co-authored-by: Stéphane Duret <sduret@centreon.com>
Co-authored-by: Laurent Pinsivy <lpinsivy@centreon.com>
Co-authored-by: jcaro <jcaro@centreon.com>
Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>
Co-authored-by: Bruno d'Auria <bdauria@centreon.com>
Co-authored-by: Luiz Costa <me@luizgustavo.pro.br>
Co-authored-by: TamazC <103252125+TamazC@users.noreply.github.com>

* fix(details): remove dead code (#11672) (#11686)

* fix(conf) fix parent template display in service template listing (#11671) (#11676)

* fix(poller): fix remote server duplication (#11552) (#11674)

* fix(poller): fix remote server duplication (#11552)

Refs: MON-14579

Co-authored-by: Jérémy Jaouen <jjaouen@centreon.com>

* fix translation for host and service category (#11626)

* fix(clapi): Check that user is admin to use clapi (#11631) (#11640)

* Sanitized and bound queries in service argumentsXml fil (#11653)

MON-14669

* Sanitize and bind listVirtualMetrics queries (#11647)

* sanitize and bind host categories queries (#11645)

* Ãbind queries an fix array binding(#11656)

* fix(ui): fix svg display in legacy monitoring pages (#11659) (#11690)

Refs: MON-14869

* Sanitize and bind service group dependecies queries 22.04.x (#11665)

* MON-14425 fix centreon.ini and autoconfigure timezone (#11608)

* enh(Resources/header): Display the 2 access pictograms logs and report on details panel (#11618)

* Display the 2 access pictograms logs and report on details panel

* Update www/front_src/src/Resources/Details/Header.tsx

Co-authored-by: JKancel <JKancel@users.noreply.github.com>

* Update www/front_src/src/Resources/Details/Header.tsx

Co-authored-by: JKancel <JKancel@users.noreply.github.com>

Co-authored-by: JKancel <JKancel@users.noreply.github.com>

* fix(resource-status): add missing alias to Host detail factory (#11642)

* fix(widgets): retrieve possibility to not select poller in pref (#11696) (#11698)

Refs: MON-14919

* fix(install): fix source install with quiet mode related to gorgone vars (#11694) (#11701)

Refs: MON-14806

Co-authored-by: Eric Coquard <eric.coquard@gmail.com>

* Fix: In Acces group the second select not working [ACL] 22.04.x (#11709)

* fix second select not working

* applying suggested changes

* fix(details): second part of code cleanup for "tools" (#11718) (#11721)

* fix (#11724)

* FIX: Sanitize and bind graph configuration queries 22.04.x (#11729)

* [Fix]:Sanitize and bind queries in template of service listing (#11746)

* [Fix]:Sanitize and bind queries in template of service listing

* work on tamazC suggestion

* fix(resource): Fix bad SQL request (#11702) (#11749)

* FIX: Sanitize and bind Meta Service configuration 22.04.x (#11733)

* sanitize and bind meta service config

* applying suggested changes

* Fix: Sanitize and bind CLAPI poller configuration 22.04.x (#11731)

* sanitize and bind CLAPI poller config

* remove unecessary comment

* revert deleted imports

* FIX: Sanitize and bind command configuration queries 22.04.x (#11754)

* fix(partition): fix condition for database version (#11657) (#11756)

Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>

Co-authored-by: Charles Gautier <33026375+chgautier@users.noreply.github.com>
Co-authored-by: Elmahdi ABBASSI <108519266+emabassi-ext@users.noreply.github.com>
Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com>
Co-authored-by: Nouha-ElAbrouki <97687698+Noha-ElAbrouki@users.noreply.github.com>
Co-authored-by: Kevin Duret <kduret@centreon.com>
Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Co-authored-by: Tom Darneix <tomdar87@outlook.com>
Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: VHS <listas.vhs@gmail.com>
Co-authored-by: Laurent Calvet <lcalvet@centreon.com>
Co-authored-by: Stéphane Chapron <34628915+sc979@users.noreply.github.com>
Co-authored-by: Stéphane Duret <sduret@centreon.com>
Co-authored-by: Laurent Pinsivy <lpinsivy@centreon.com>
Co-authored-by: jcaro <jcaro@centreon.com>
Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>
Co-authored-by: Bruno d'Auria <bdauria@centreon.com>
Co-authored-by: Luiz Costa <me@luizgustavo.pro.br>
Co-authored-by: TamazC <103252125+TamazC@users.noreply.github.com>
Co-authored-by: Adrien Morais-Mestre <31647811+adr-mo@users.noreply.github.com>
Co-authored-by: Jérémy Jaouen <jjaouen@centreon.com>
Co-authored-by: JKancel <JKancel@users.noreply.github.com>
Co-authored-by: Eric Coquard <eric.coquard@gmail.com>
  • Loading branch information
1 parent fe86ab8 commit b709503
Show file tree
Hide file tree
Showing 78 changed files with 867 additions and 534 deletions.
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -6,9 +6,6 @@
/project/ @centreon/centreon-devops
*.sh @centreon/centreon-devops

/.snyk @centreon/centreon-security
/sonar-project.properties @centreon/centreon-security

*.po @centreon/centreon-documentation

/src/ @centreon/centreon-php
Expand Down
2 changes: 1 addition & 1 deletion bin/registerServerTopology.sh
Expand Up @@ -431,7 +431,7 @@ function request_to_remote() {
fi

# Prepare Remote Payload
REMOTE_PAYLOAD='{"isRemote":true,"platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
REMOTE_PAYLOAD='{"isRemote":true,"address":"'${PARSED_CURRENT_NODE_URL[HOST]}'","platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
if [[ -n PROXY_PAYLOAD ]]; then
REMOTE_PAYLOAD="${REMOTE_PAYLOAD}""${PROXY_PAYLOAD}"
fi
Expand Down
13 changes: 13 additions & 0 deletions ci/debian/centreon-web.postinst
Expand Up @@ -63,4 +63,17 @@ if [ -n "$2" ]; then
su - www-data -s /bin/bash -c "/usr/share/centreon/bin/console cache:clear --no-warmup"
fi

# Try auto configure timezone for php
timezone=$(/usr/bin/php -r '
$timezoneName = timezone_name_from_abbr(trim(shell_exec("date \"+%Z\"")));
if (preg_match("/Time zone: (\S+)/", shell_exec("timedatectl"), $matches)) {
$timezoneName = $matches[1];
}
if (date_default_timezone_set($timezoneName) === false) {
$timezoneName = "UTC";
}
echo $timezoneName;
' 2>/dev/null)
sed -i "s#^date.timezone = .*#date.timezone = ${timezone}#" /etc/php/8.0/mods-available/centreon.ini

exit 0
11 changes: 4 additions & 7 deletions ci/debian/control
Expand Up @@ -17,8 +17,7 @@ Package: centreon
Architecture: all
Depends:
centreon-central (>= ${centreon:version}~),
centreon-database (>= ${centreon:version}~),
sudo
centreon-database (>= ${centreon:version}~)
Description: Centreon is a network, system, applicative supervision and monitoring tool,
it is based upon the most effective Open Source monitoring engine : Nagios.
Centreon provides a new frontend and new functionnalities to Nagios.
Expand Down Expand Up @@ -124,11 +123,9 @@ Depends:
php8.0-readline,
php8.0-sqlite3,
php-pear,
ntp,
rrdtool,
bsd-mailx,
sudo,
nagios-images
rrdtool
Recommends: ntp | bsd-mailx
Suggests: nagios-images
Description: This package contains WebUI files.

Package: centreon-perl-libs
Expand Down
6 changes: 5 additions & 1 deletion ci/debian/extra/centreon-web/centreon.ini
@@ -1 +1,5 @@
date.timezone = UTC
max_execution_time = 300
session.use_strict_mode = 1
session.gc_maxlifetime = 7200
expose_php = Off
date.timezone = UTC
Expand Up @@ -10,6 +10,9 @@
"isRemote": {
"type": "boolean"
},
"address": {
"type": "string"
},
"centralServerAddress": {
"type": "string"
},
Expand Down
4 changes: 4 additions & 0 deletions doc/API/centreon-api-v22.04.yaml
Expand Up @@ -6730,6 +6730,10 @@ components:
type: boolean
example: true
description: "Platform is a remote server"
address:
type: string
example: "10.0.0.1"
description: "The address of the platform"
centralServerAddress:
type: string
example: "192.168.0.1"
Expand Down
28 changes: 15 additions & 13 deletions install.sh
Expand Up @@ -210,19 +210,21 @@ for binary in $BINARIES; do
fi
done

###### Mandatory step
# ask if gorgone is already installed
echo -e "\n$line"
echo -e "\t$(gettext "Check mandatory gorgone service status")"
echo -e "$line"

yes_no_default "$(gettext "Is the Gorgone module already installed?")"
if [ "$?" -ne 0 ] ; then
echo_failure "\n$(gettext "Gorgone is required.\nPlease install it before launching this script")" "$fail"
echo -e "\n\t$(gettext "Please read the documentation to manage the Gorgone daemon installation")"
echo -e "\t$(gettext "Available on github") : https://github.com/centreon/centreon-gorgone"
echo -e "\t$(gettext "or on the centreon documentation") : https://documentation.centreon.com/\n"
exit 1
if [ "$silent_install" -ne 1 ] ; then
###### Mandatory step
# ask if gorgone is already installed
echo -e "\n$line"
echo -e "\t$(gettext "Check mandatory gorgone service status")"
echo -e "$line"

yes_no_default "$(gettext "Is the Gorgone module already installed?")"
if [ "$?" -ne 0 ] ; then
echo_failure "\n$(gettext "Gorgone is required.\nPlease install it before launching this script")" "$fail"
echo -e "\n\t$(gettext "Please read the documentation to manage the Gorgone daemon installation")"
echo -e "\t$(gettext "Available on github") : https://github.com/centreon/centreon-gorgone"
echo -e "\t$(gettext "or on the centreon documentation") : https://documentation.centreon.com/\n"
exit 1
fi
fi

# Script stop if one binary wasn't found
Expand Down
12 changes: 8 additions & 4 deletions lang/es_ES.UTF-8/LC_MESSAGES/messages.po
Expand Up @@ -13125,11 +13125,11 @@ msgstr "cubo de basura"
#~ msgid "No downtime scheduled for services"
#~ msgstr "No hay tiempo de inactividad planificado para los servicios"

#~ msgid "Host category"
#~ msgstr "Categoría de anfitriones"
msgid "Host category"
msgstr "Categoría de anfitriones"

#~ msgid "Service category"
#~ msgstr "Categorias de servicio"
msgid "Service category"
msgstr "Categoria de servicio"

#~ msgid "Inclusion"
#~ msgstr "Inclusión"
Expand Down Expand Up @@ -15162,3 +15162,7 @@ msgstr ""

# msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
# msgstr ""

# msgid "Parent alias"
# msgstr ""

10 changes: 5 additions & 5 deletions lang/fr_FR.UTF-8/LC_MESSAGES/messages.po
Expand Up @@ -4408,7 +4408,7 @@ msgstr "Sauvegarde du mot de passe LDAP"

#: centreon-web/www/include/Administration/parameters/ldap/form.php:78
msgid "Auto import users"
msgstr "Import automatiques des utilisateurs"
msgstr "Import automatique des utilisateurs"

#: centreon-web/www/include/Administration/parameters/ldap/form.php:96
msgid "Use service DNS"
Expand Down Expand Up @@ -13649,11 +13649,11 @@ msgstr "Configurer une plage de maintenance pour les services des hôtes"
#~ msgid "No downtime scheduled for services"
#~ msgstr "Aucune plage de maintenance planifiée pour les services"

#~ msgid "Host category"
#~ msgstr "Catégorie d'hôtes"
msgid "Host category"
msgstr "Catégorie d'hôtes"

#~ msgid "Service category"
#~ msgstr "Catégories de service"
msgid "Service category"
msgstr "Catégorie de service"

#~ msgid "Inclusion"
#~ msgstr "Inclusion"
Expand Down
6 changes: 5 additions & 1 deletion lang/pt_BR.UTF-8/LC_MESSAGES/messages.po
Expand Up @@ -11796,7 +11796,7 @@ msgstr "Escala"

#: centreon-web/www/install/smarty_translate.php:414
msgid "Service category"
msgstr "Categoria do Serviço"
msgstr "Categoria de Serviço"

#: centreon-web/www/install/smarty_translate.php:438
msgid "Service Scheduling Options"
Expand Down Expand Up @@ -15613,3 +15613,7 @@ msgstr ""

# msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
# msgstr ""
# msgid "Parent alias"
# msgstr ""


6 changes: 5 additions & 1 deletion lang/pt_PT.UTF-8/LC_MESSAGES/messages.po
Expand Up @@ -11781,7 +11781,7 @@ msgstr "Grupo de traps SNMP"

#: centreon-web/www/install/smarty_translate.php:387
msgid "Host category"
msgstr "Categoria do Host"
msgstr "Categoria de Host"

#: centreon-web/www/install/smarty_translate.php:393
msgid "Informations"
Expand Down Expand Up @@ -15601,3 +15601,7 @@ msgstr ""

# msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
# msgstr ""

# msgid "Parent alias
# msgstr ""

10 changes: 5 additions & 5 deletions src/Centreon/Application/ApiPlatform.php
Expand Up @@ -28,27 +28,27 @@
class ApiPlatform
{
/**
* @var float
* @var string
*/
private $version;

/**
* Get the API version
*
* @return float
* @return string
*/
public function getVersion(): float
public function getVersion(): string
{
return $this->version;
}

/**
* Set the API version
*
* @param float $version
* @param string $version
* @return $this
*/
public function setVersion(float $version): self
public function setVersion(string $version): self
{
$this->version = $version;
return $this;
Expand Down
24 changes: 24 additions & 0 deletions src/Centreon/Domain/Contact/Contact.php
Expand Up @@ -162,6 +162,11 @@ class Contact implements UserInterface, ContactInterface
*/
private $timezone;

/**
* @var int
*/
private int $timezoneId;

/**
* @var string|null $locale locale of the user
*/
Expand Down Expand Up @@ -189,6 +194,25 @@ class Contact implements UserInterface, ContactInterface
*/
private $theme;

/**
* @param int $timezoneId
* @return self
*/
public function setTimezoneId(int $timezoneId): self
{
$this->timezoneId = $timezoneId;

return $this;
}

/**
* @return int
*/
public function getTimezoneId(): int
{
return $this->timezoneId;
}

/**
* @return int
*/
Expand Down
5 changes: 5 additions & 0 deletions src/Centreon/Domain/Contact/Interfaces/ContactInterface.php
Expand Up @@ -26,6 +26,11 @@

interface ContactInterface
{
/**
* @return int Returns the timezone id
*/
public function getTimezoneId(): int;

/**
* @return int Returns the contact id
*/
Expand Down
Expand Up @@ -40,6 +40,11 @@ class PlatformInformation
*/
private $platformName;

/**
* @var string server address
*/
private string $address = '127.0.0.1';

/**
* @var string|null central's address
*/
Expand Down Expand Up @@ -126,6 +131,25 @@ public function setPlatformName(?string $name): self
return $this;
}

/**
* @return string
*/
public function getAddress(): string
{
return $this->address;
}

/**
* @param string $address
* @return $this
*/
public function setAddress(string $address): self
{
$this->address = $address;

return $this;
}

/**
* @return string|null
*/
Expand Down
Expand Up @@ -54,6 +54,9 @@ public function createRemoteInformation(array $information): PlatformInformation
$platformInformation = new PlatformInformation($isRemote);
foreach ($information as $key => $value) {
switch ($key) {
case 'address':
$platformInformation->setAddress($value);
break;
case 'centralServerAddress':
$platformInformation->setCentralServerAddress($value);
break;
Expand Down
Expand Up @@ -241,6 +241,7 @@ private function convertCentralToRemote(
$platformInformationToUpdate,
$currentPlatformInformation
);

$this->remoteServerService->convertCentralToRemote(
$platformInformationToUpdate
);
Expand Down
14 changes: 6 additions & 8 deletions src/Centreon/Domain/PlatformTopology/Model/PlatformPending.php
Expand Up @@ -196,13 +196,11 @@ private function checkIpAddress(?string $address): ?string
{
// Check for valid IPv4 or IPv6 IP
// or not sent address (in the case of Central's "parent_address")
if (null === $address || false !== filter_var($address, FILTER_VALIDATE_IP)) {
return $address;
}

// check for DNS to be resolved
$addressResolved = filter_var(gethostbyname($address), FILTER_VALIDATE_IP);
if (false === $addressResolved) {
if (
$address !== null
&& ! filter_var($address, FILTER_VALIDATE_IP)
&& ! filter_var($address, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)
) {
throw new \InvalidArgumentException(
sprintf(
_("The address '%s' of '%s' is not valid or not resolvable"),
Expand All @@ -212,7 +210,7 @@ private function checkIpAddress(?string $address): ?string
);
}

return $addressResolved;
return $address;
}

/**
Expand Down
Expand Up @@ -194,14 +194,11 @@ public function setHostname(?string $hostname): PlatformInterface
*/
private function checkIpAddress(?string $address): ?string
{
// Check for valid IPv4 or IPv6 IP
// or not sent address (in the case of Central's "parent_address")
if (null === $address || false !== filter_var($address, FILTER_VALIDATE_IP)) {
return $address;
}

// check for DNS to be resolved
if (false === filter_var(gethostbyname($address), FILTER_VALIDATE_IP)) {
if (
$address !== null
&& ! filter_var($address, FILTER_VALIDATE_IP)
&& ! filter_var($address, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)
) {
throw new \InvalidArgumentException(
sprintf(
_("The address '%s' of '%s' is not valid or not resolvable"),
Expand Down

0 comments on commit b709503

Please sign in to comment.