Merge remote-tracking branch 'origin/master' into feature/php8

pull/478/head
Juan Rocha 2023-01-05 09:41:58 +01:00
commit a47d58e64e
4 changed files with 51 additions and 164 deletions

10
AUTHORS
View File

@ -22,11 +22,11 @@ Thomas Metois
# Copyright holders
- Copyright (C) 2016-2022 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2022 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2022 SMILE gie securitymadein.lu
- Copyright (C) 2017-2022 Cédric Bonhomme - https://www.cedricbonhomme.org
- Copyright (C) 2016-2023 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2023 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2016-2023 Luxembourg House of Cybersecurity
- Copyright (C) 2017-2023 Cédric Bonhomme - https://www.cedricbonhomme.org
- Copyright (C) 2016-2017 Guillaume Lesniak
- Copyright (C) 2016-2017 Thomas Metois
- Copyright (C) 2016-2017 Jérôme De Almeida
- Copyright (C) 2019-2022 Ruslan Baidan - https://github.com/ruslanbaydan
- Copyright (C) 2019-2023 Ruslan Baidan - https://github.com/ruslanbaidan

View File

@ -1,12 +1,11 @@
MONARC - Method for an Optimised aNAlysis of Risks by CASES
===========================================================
MONARC
======
[![Latest Release](https://img.shields.io/github/release/monarc-project/MonarcAppFO.svg?style=flat-square)](https://github.com/monarc-project/MonarcAppFO/releases/latest)
![License](https://img.shields.io/github/license/monarc-project/MonarcAppFO.svg?style=flat-square)
![Contributors](https://img.shields.io/github/contributors/monarc-project/MonarcAppFO.svg?style=flat-square)
![Stars](https://img.shields.io/github/stars/monarc-project/MonarcAppFO.svg?style=flat-square)
[![Workflow](https://github.com/monarc-project/MonarcAppFO/workflows/build/badge.svg)](https://github.com/monarc-project/MonarcAppFO/actions?query=build)
[![Twitter](https://img.shields.io/twitter/follow/MONARCProject.svg?style=social&label=Follow)](https://twitter.com/MONARCproject)
Introduction
@ -76,14 +75,14 @@ License
This software is licensed under
[GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html)
- Copyright (C) 2016-2022 SECURITYMADEIN.LU
- Copyright (C) 2016-2022 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2022 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2017-2022 Cédric Bonhomme - https://www.cedricbonhomme.org
- Copyright (C) 2016-2023 Luxembourg House of Cybersecurity
- Copyright (C) 2016-2023 Jérôme Lombardi - https://github.com/jerolomb
- Copyright (C) 2016-2023 Juan Rocha - https://github.com/jfrocha
- Copyright (C) 2017-2023 Cédric Bonhomme - https://www.cedricbonhomme.org
- Copyright (C) 2016-2017 Guillaume Lesniak
- Copyright (C) 2016-2017 Thomas Metois
- Copyright (C) 2016-2017 Jérôme De Almeida
- Copyright (C) 2019-2022 Ruslan Baidan - https://github.com/ruslanbaydan
- Copyright (C) 2019-2023 Ruslan Baidan - https://github.com/ruslanbaidan
For more information, [the list of authors and contributors](AUTHORS) is available.
@ -96,4 +95,4 @@ These objects are available through the
If a specific author wants to license an object under a different license,
a pull request can be requested.
You can find more information about MOSP on the
[dedicated repository](https://github.com/CASES-LU/MOSP).
[dedicated repository](https://github.com/NC3-LU/MOSP).

View File

@ -8,7 +8,7 @@ Last stable version of MONARC always provides security updates.
If you think you have found a potential security issue in MONARC, do not open
directly a GitHub issue. Please email us. You can contact
[info@cases.lu](mailto:info@cases.lu).
[opensource@nc3.lu](mailto:opensource@nc3.lu).
You can also specify how you would like to be credited for your finding
(commit message, release notes or blog post for the new release). We will

186
composer.lock generated
View File

@ -167,7 +167,7 @@
},
{
"name": "cakephp/cache",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cache.git",
@ -217,7 +217,7 @@
},
{
"name": "cakephp/collection",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/collection.git",
@ -269,7 +269,7 @@
},
{
"name": "cakephp/core",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/core.git",
@ -325,7 +325,7 @@
},
{
"name": "cakephp/database",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/database.git",
@ -379,7 +379,7 @@
},
{
"name": "cakephp/datasource",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/datasource.git",
@ -435,7 +435,7 @@
},
{
"name": "cakephp/log",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/log.git",
@ -486,7 +486,7 @@
},
{
"name": "cakephp/utility",
"version": "3.9.4",
"version": "3.10.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/utility.git",
@ -4560,16 +4560,16 @@
},
{
"name": "monarc/frontoffice",
"version": "dev-feature/php8",
"version": "v2.12.5-p1",
"source": {
"type": "git",
"url": "https://github.com/monarc-project/zm-client.git",
"reference": "6833141fbeaaf57cc8c5eda95ff84ace181440e7"
"reference": "9bf810d50f9e87c0e5f8eb4774d1779dbd18ca09"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/6833141fbeaaf57cc8c5eda95ff84ace181440e7",
"reference": "6833141fbeaaf57cc8c5eda95ff84ace181440e7",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/9bf810d50f9e87c0e5f8eb4774d1779dbd18ca09",
"reference": "9bf810d50f9e87c0e5f8eb4774d1779dbd18ca09",
"shasum": ""
},
"require": {
@ -4648,9 +4648,9 @@
"description": "Frontoffice for monarc/monarc application",
"support": {
"issues": "https://github.com/monarc-project/zm-client/issues",
"source": "https://github.com/monarc-project/zm-client/tree/feature/php8"
"source": "https://github.com/monarc-project/zm-client/tree/v2.12.5-p1"
},
"time": "2022-11-22T12:42:03+00:00"
"time": "2023-01-04T09:27:57+00:00"
},
{
"name": "nikic/php-parser",
@ -6821,16 +6821,16 @@
},
{
"name": "symfony/string",
"version": "v6.0.17",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "3f57003dd8a67ed76870cc03092f8501db7788d9"
"reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/3f57003dd8a67ed76870cc03092f8501db7788d9",
"reference": "3f57003dd8a67ed76870cc03092f8501db7788d9",
"url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b",
"reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b",
"shasum": ""
},
"require": {
@ -6886,7 +6886,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.0.17"
"source": "https://github.com/symfony/string/tree/v5.4.17"
},
"funding": [
{
@ -6902,7 +6902,7 @@
"type": "tidelift"
}
],
"time": "2022-12-14T15:52:41+00:00"
"time": "2022-12-12T15:54:21+00:00"
},
{
"name": "symfony/yaml",
@ -7768,12 +7768,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "e8f95474ff76aecbfaedb2e4db50eb259ff72e58"
"reference": "ef9dca6c49faa06e7203bbed30411e26e474a8fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e8f95474ff76aecbfaedb2e4db50eb259ff72e58",
"reference": "e8f95474ff76aecbfaedb2e4db50eb259ff72e58",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ef9dca6c49faa06e7203bbed30411e26e474a8fb",
"reference": "ef9dca6c49faa06e7203bbed30411e26e474a8fb",
"shasum": ""
},
"conflict": {
@ -7912,7 +7912,7 @@
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
"friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
"froala/wysiwyg-editor": "<3.2.7",
"froxlor/froxlor": "<0.10.39",
"froxlor/froxlor": "<0.10.39|>=2-beta.0,<2-beta.1",
"fuel/core": "<1.8.1",
"gaoming13/wechat-php-sdk": "<=1.10.2",
"genix/cms": "<=1.1.11",
@ -8197,7 +8197,7 @@
"tinymce/tinymce": "<5.10.7|>=6,<6.3.1",
"titon/framework": ">=0,<9.9.99",
"tobiasbg/tablepress": "<= 2.0-RC1",
"topthink/framework": "<=6.0.13",
"topthink/framework": "<6.0.14",
"topthink/think": "<=6.0.9",
"topthink/thinkphp": "<=3.2.3",
"tribalsystems/zenario": "<=9.3.57595",
@ -8308,119 +8308,7 @@
"type": "tidelift"
}
],
"time": "2022-12-30T18:04:41+00:00"
},
{
"name": "sebastian/cli-parser",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
"reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
"reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
"shasum": ""
},
"require": {
"php": ">=7.3"
},
"require-dev": {
"phpunit/phpunit": "^9.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Library for parsing CLI options",
"homepage": "https://github.com/sebastianbergmann/cli-parser",
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
"source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-09-28T06:08:49+00:00"
},
{
"name": "sebastian/code-unit",
"version": "1.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
"reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
"reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
"shasum": ""
},
"require": {
"php": ">=7.3"
},
"require-dev": {
"phpunit/phpunit": "^9.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Collection of value objects that represent the PHP code units",
"homepage": "https://github.com/sebastianbergmann/code-unit",
"support": {
"issues": "https://github.com/sebastianbergmann/code-unit/issues",
"source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-10-26T13:08:54+00:00"
"time": "2023-01-04T14:04:25+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -9276,16 +9164,16 @@
},
{
"name": "symfony/css-selector",
"version": "v6.0.17",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "3e526b732295b5d4c16c38d557b74ba8498a92b4"
"reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/3e526b732295b5d4c16c38d557b74ba8498a92b4",
"reference": "3e526b732295b5d4c16c38d557b74ba8498a92b4",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4",
"reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4",
"shasum": ""
},
"require": {
@ -9321,7 +9209,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/css-selector/tree/v6.0.17"
"source": "https://github.com/symfony/css-selector/tree/v5.4.17"
},
"funding": [
{
@ -9337,20 +9225,20 @@
"type": "tidelift"
}
],
"time": "2022-12-28T14:21:34+00:00"
"time": "2022-12-23T11:40:44+00:00"
},
{
"name": "symfony/dom-crawler",
"version": "v6.0.17",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "281d13dfd1a2ac4ca8be8c60b0af208ffdac95fe"
"reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/281d13dfd1a2ac4ca8be8c60b0af208ffdac95fe",
"reference": "281d13dfd1a2ac4ca8be8c60b0af208ffdac95fe",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32a07d910edc138a1dd5508c17c6b9bc1eb27a1b",
"reference": "32a07d910edc138a1dd5508c17c6b9bc1eb27a1b",
"shasum": ""
},
"require": {
@ -9394,7 +9282,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dom-crawler/tree/v6.0.17"
"source": "https://github.com/symfony/dom-crawler/tree/v5.4.17"
},
"funding": [
{
@ -9410,7 +9298,7 @@
"type": "tidelift"
}
],
"time": "2022-12-22T17:53:58+00:00"
"time": "2022-12-22T10:31:03+00:00"
},
{
"name": "theseer/tokenizer",