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

(fix) service status : encoding issue on status page #11583

Merged
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
065031c
fix(git): sync dev-21.04.x with 21.04.x (#11526)
kduret Aug 6, 2022
b2f03b0
[SNYK] Sanitize and bind ACL host dependency queries (#11389) (#11521)
emabassi-ext Aug 8, 2022
e8e1194
[SNYK] Sanitize and bind centreonGraph class queries (#11409) (#11517)
emabassi-ext Aug 8, 2022
b667811
removed old variable userCrypted and the use of it (#11334) (#11516)
emabassi-ext Aug 8, 2022
cabad1b
fix(test): wait 8s before checking downtime is active in rest api v1 …
kduret Aug 8, 2022
0d02289
[Snyk] Sanitize and bind ACL action access queries (#11385) (#11514)
emabassi-ext Aug 8, 2022
6935384
[SNYK] Sanitize and bind ACL class queries (#11392) (#11513)
emabassi-ext Aug 8, 2022
6bc2b2e
fix(pendo): correctly set locale when language is detection by browse…
jeremyjaouen Aug 8, 2022
3907bab
doc(ack): acknowledge Hakaï security (#11538)
sc979 Aug 8, 2022
5967804
SNYK: Sanitize and bind ACL actions queries (#11549)
hyahiaoui-ext Aug 9, 2022
b8eb592
SNYK: Sanitize and bind Broker listing queries (#11553)
hyahiaoui-ext Aug 9, 2022
5998080
fix(conf) fix encoding in template service listing (#11558) (#11566)
a-launois Aug 11, 2022
3282dd1
SNYK: Sanitize and bind generateImage queries (#11563)
hyahiaoui-ext Aug 11, 2022
53a6c28
MON-14501 - sanitize query in centreonXmlbgRequest class (#11572)
emabassi-ext Aug 11, 2022
46fde16
SNYK: Sanitize and bind Meta-Services dependency queries (#11554) (#1…
emabassi-ext Aug 11, 2022
b7adc2b
Fix encoding issue on status serviceXML
TamazC Aug 12, 2022
4df9fc8
Merge branch 'dev-21.04.x' into bugfix_MON-14190-deprecated_status_de…
TamazC Aug 30, 2022
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
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/.github/ @centreon/centreon-ci
/.git* @centreon/centreon-ci
/.project @centreon/centreon-ci
/Jenkinsfile @centreon/centreon-ci
/selinux/ @centreon/centreon-ci
/project/ @centreon/centreon-ci
*.sh @centreon/centreon-ci
/.github/ @centreon/centreon-devops
/.git* @centreon/centreon-devops
/.project @centreon/centreon-devops
/Jenkinsfile @centreon/centreon-devops
/selinux/ @centreon/centreon-devops
/project/ @centreon/centreon-devops
*.sh @centreon/centreon-devops

*.po @ghost
*.po @centreon/centreon-documentation

/src/ @centreon/centreon-php
/config/ @centreon/centreon-php
Expand Down
33 changes: 3 additions & 30 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,15 @@ try {
sh 'rm -rf output'
}
}

if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error("Unit test // packaging stage failure.");
}
}

stage("$DELIVERY_STAGE") {
node {
checkoutCentreonBuild(buildBranch)
checkoutCentreonBuild(buildBranch)
sh 'rm -rf output'
unstash 'tar-sources'
unstash 'api-doc'
Expand All @@ -225,7 +226,7 @@ try {
error('Delivery stage failure');
}
}

stage("$DOCKER_STAGE") {
def parallelSteps = [:]
def osBuilds = isStableBuild() ? ['centos7', 'alma8'] : ['centos7']
Expand All @@ -238,12 +239,6 @@ try {
}
}
}
//'Docker centos8': {
// node {
// checkoutCentreonBuild(buildBranch)
// sh "./centreon-build/jobs/web/${serie}/mon-web-bundle.sh centos8"
// }
//}
parallel parallelSteps
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('Bundle stage failure.');
Expand Down Expand Up @@ -289,27 +284,6 @@ try {
}
}
}

// TODO : add canary management in centreon-build
/*if ((env.BUILD == 'CI')) {
stage('Docker packaging with canary rpms') {
def parallelSteps = [:]
def osBuilds = isStableBuild() ? ['centos7', 'centos8'] : ['centos7']
for (x in osBuilds) {
def osBuild = x
parallelSteps[osBuild] = {
node {
checkoutCentreonBuild()
sh "./centreon-build/jobs/web/${serie}/mon-web-bundle.sh ${osBuild}"
}
}
}
}
parallel parallelSteps
if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') {
error('API integration tests stage failure.');
}
}*/

stage('Acceptance tests') {
def parallelSteps = [:]
Expand Down Expand Up @@ -342,5 +316,4 @@ try {
"*COMMIT*: <https://github.com/centreon/centreon/commit/${source.COMMIT}|here> by ${source.COMMITTER}\n" +
"*INFO*: ${e}"
}

}
1 change: 1 addition & 0 deletions SECURITY_ACK.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Centreon reserves the right to make final decisions regarding publishing acknowl

<h3> 2022 </h3>

* 2022/05/23 - Lucas Carmo and Daniel França Lima from [Hakaï Security](https://www.hakaioffensivesecurity.com/)
* 2022/02/16 - Anonymous working with Trend Micro Zero Day Initiative

<h3> 2021 </h3>
Expand Down
17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"secure-http": false,
"platform": {
"php": "7.3"
},
"allow-plugins": {
"pestphp/pest-plugin": true,
"symfony/flex": true
}
},
"require-dev": {
Expand All @@ -22,13 +26,12 @@
"centreon/centreon-test-lib": "21.04.x-dev",
"sensiolabs/security-checker": "^6.0",
"symfony/var-dumper": "4.4.*",
"symfony/profiler-pack": "^1.0",
"phpstan/phpstan": "^0.12.59",
"webmozart/assert": "^1.8",
"symfony/stopwatch": "^4.4",
"symfony/twig-bundle": "^4.4",
"symfony/web-profiler-bundle": "^4.4",
"twig/twig": "^2.0",
"twig/twig": "2.*",
"phpstan/phpstan-beberlei-assert": "^0.12"
},
"require": {
Expand All @@ -39,7 +42,7 @@
"symfony/filesystem": "4.4.*",
"symfony/finder": "4.4.*",
"openpsa/quickform": "3.3.*",
"smarty/smarty": "~2.6",
"smarty/smarty": "2.*",
"curl/curl" : "^1.5",
"ext-ctype": "*",
"ext-iconv": "*",
Expand All @@ -53,7 +56,6 @@
"symfony/security-bundle": "4.4.*",
"symfony/yaml": "4.4.*",
"symfony/options-resolver": "4.4.*",
"symfony/serializer-pack": "^1.0",
"symfony/maker-bundle": "^1.11",
"nelmio/cors-bundle": "^2.1",
"symfony/validator": "4.4.*",
Expand All @@ -66,7 +68,12 @@
"dragonmantank/cron-expression": "3.0.1",
"beberlei/assert": "v3.3.0",
"enshrined/svg-sanitize": "^0.14.0",
"symfony/monolog-bundle": "^3.7"
"symfony/monolog-bundle": "^3.7",
"doctrine/annotations": "^1.0",
"phpdocumentor/reflection-docblock": "^5.2",
"symfony/property-access": "4.4.*",
"symfony/property-info": "4.4.*",
"symfony/serializer": "4.4.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading