Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/remove-db-a…
Browse files Browse the repository at this point in the history
…bstract

* origin/master: (153 commits)
  Update the client version with the operational risks fix.
  Added the new version 2.12.7
  Added the data path global const to use it in all the places.
  Update issue templates
  Update bug_report.md
  Updated the frontoffice dependency with the fix of snapshots creation.
  Added setting up the project the PROJECT_ROOT const, update the core dependency where the const is used.
  Updated the client dependency with a deliverable generation fix.
  Update the client dependency with the profile removal fix.
  Changing the script permissions.
  Updated the import anrs script permission and the clients db upgrade parameter.
  [WSL]Updated FO install
  [WSL]Updated Full install
  [WSL]Updated README
  [WSL] Typo
  [WSL]Fixed stats-service install
  [WSL]Updated stats-service install
  [WSL]Added missing npm install
  [WSL]Updated WSL Full install
  [WSL]Updated WSL Full install
  ...

# Conflicts:
#	composer.json
#	composer.lock
  • Loading branch information
Ruslan Baidan committed Nov 17, 2023
2 parents 51922f7 + bcbc8c6 commit 4d2dabf
Show file tree
Hide file tree
Showing 60 changed files with 3,161 additions and 7,521 deletions.
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
name: Bug report
name: Issue or bug report
about: Create a report to help us improve
labels: bug, potential-bug, needs triage
projects: MONARC Development Overview
title: ''
labels: bug, needs triage, potential-bug
assignees: ''

---

Expand Down
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
extensions: imagick, intl, xml, mysql, bcmath #optional, setup extensions
ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
coverage: xdebug #optional, setup coverage driver
Expand All @@ -44,7 +44,7 @@ jobs:
run: composer validate

- name: Install PHP dependencies
run: composer install --prefer-dist --no-progress --no-suggest
run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-req=php

- name: Create synlinks for MONARC PHP modules
run: |
Expand Down
108 changes: 108 additions & 0 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: MonarcAppFO releases

on:
push:
branches: [ 'master' ]
tags: [ 'v*.*', 'v*.*.*', 'v*.*.*-*' ]
pull_request:
branches: [ 'master' ]

jobs:
build:
runs-on: ubuntu-20.04

strategy:
matrix:
node-version: [ "16.x" ]
php-version: [ "8.1" ]

steps:
- uses: actions/checkout@v2

- name: install deps
run: sudo apt-get update && sudo apt install -y gettext

# PHP
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2.3
extensions: bcmath

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install PHP dependencies
run: composer install --prefer-dist --no-progress --no-suggest --no-dev --ignore-platform-req=php

- name: Symlink Monarc modules
run: |
mkdir -p module/Monarc
ln -s ../../vendor/monarc/core module/Monarc/Core
ln -s ../../vendor/monarc/frontoffice module/Monarc/FrontOffice
# javascript
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- uses: oprypin/find-latest-tag@v1
with:
repository: monarc-project/ng-anr
releases-only: true
id: ng_anr_lasttag

- run: echo "ng-anr is at version ${{ steps.ng_anr_lasttag.outputs.tag }}"

- name: Install ng-anr
uses: actions/checkout@v3
with:
repository: monarc-project/ng-anr
ref: ${{ steps.ng_anr_lasttag.outputs.tag }}
path: './node_modules/ng_anr'


- uses: oprypin/find-latest-tag@v1
with:
repository: monarc-project/ng-client
releases-only: true
id: ng_client_lasttag

- run: echo "ng-client is at version ${{ steps.ng_client_lasttag.outputs.tag }}"

- name: Install ng-client
uses: actions/checkout@v3
with:
repository: monarc-project/ng-client
ref: ${{ steps.ng_client_lasttag.outputs.tag }}
path: './node_modules/ng_client'

- name: Install ng-client dependencies
run: |
cd node_modules/ng_client
npm ci
# final "cleanup"
- name: post job
run: |
bash -ex ./scripts/link_modules_resources.sh
bash -ex ./scripts/compile_translations.sh
# prepare release
- name: Get repository name
id: repository
run: echo "::set-output name=pathref::$(echo '${{ github.repository }}' | cut -d'/' -f2)-$(echo '${{ github.ref_name }}' | sed 's/[^[:alnum:]\.-]/_/g')"

- name: create artifact archive
run: |
tar --exclude .git --exclude .github -zcf '../${{ steps.repository.outputs.pathref }}.tar.gz' .
- name: release
uses: softprops/action-gh-release@v1
with:
files: |
../${{ steps.repository.outputs.pathref }}.tar.gz
fail_on_unmatched_files: true
if: startsWith(github.ref, 'refs/tags/')
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
nbproject
._*
.buildpath
.DS_Store
Expand All @@ -8,7 +7,6 @@ nbproject
*.cache
migrations
!tests/migrations
*.sublime-*
vagrant/.vagrant/
vagrant/*.log
vendor/
Expand All @@ -23,3 +21,4 @@ npm-debug.log
node_modules/
bin/
data/*
.docker/mariaDb/data/*
10 changes: 5 additions & 5 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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
97 changes: 97 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,103 @@
MONARC Changelog
================


## 2.12.7 (2023-10-25)

### Enhancement

- [Alternative to 2FA QR code](https://github.com/monarc-project/MonarcAppFO/issues/505)
- [Add context info to the list of analysis panel](https://github.com/monarc-project/MonarcAppFO/issues/506)

### Fix

- [Global dashboard max calculation error](https://github.com/monarc-project/MonarcAppFO/issues/507)
- [[FrontOffice] Fixed the operational risks import from CSV](https://github.com/monarc-project/MonarcAppFO/issues/484)


## 2.12.6 (2023-03-24)

### Enhancement

- Analysis background import.
- Support of PHP8.
- Specific error message on a wrong password input of analysis import.

### Fix
- Recommendations modification from the Knowledge Base when due date is set.
- Recommendations modification fix of loading the linked recommendation set.


## 2.12.5 (2022-12-21)

### Enhancement

- Rebranding of Monarc app (logos, titles) according to the "Cases" -> "NC3" move.
- Improved the analyses import speed.

### Fix

- Fixed the autocomplete for passwords. Password filling for Import brakes the execution.
- Record of processing activities processor creation JS error.
- Fixed the long names displaying for assets (responsive view).
- Dashboard fixes.
- Added the possibility to modify the threat's theme.
- Updated and added missing translations.


## 2.12.4 (2022-11-11)

### Enhancement

- Implemented new dashboard chart views and a curve line that represents the average number tendency.
- Added a possibility to enforce all the instance's users to enable 2-Factor Authentication.


## 2.12.3 (2022-10-06)

### Enhancement

- Link multiple specific models per client.
- Added a possibility to import assets in the library from CSV files.

### Fix

- Error when adding a tag to instantiate an object.
([#459](https://github.com/monarc-project/MonarcAppFO/issues/459)).


## 2.12.2 (2022-06-29)

### Fix

- Error when exporting analysis with Statement of Applicability
([#445](https://github.com/monarc-project/MonarcAppFO/issues/445)).


## 2.12.1 (2022-06-22)

### Enhancement

- [Added new QRCode backend endroid/qr-code](https://github.com/monarc-project/zm-client/commit/406471458a9c729d2d4a9b677cc7a8518d640ab1)
NTP access to time.google.com:123 (NTP check removed) and api.qrserver.com is
no more needed: QRCode generation is local.


## 2.12.0 (2022-06-20)

### New

- [compliance scale](https://github.com/monarc-project/MonarcAppFO/discussions/439);
- [metadata assets](https://github.com/monarc-project/MonarcAppFO/discussions/437);
- [two-factor authentication](https://github.com/monarc-project/MonarcAppFO/discussions/442).

### Fix

- [Stats provider] removed the leading slash in the URI
([e7dfba1](https://github.com/monarc-project/zm-client/commit/e7dfba1cf64322bc3e83630df6729b525d7d5c8d))



## 2.11.1 (2021-10-28)

### New
Expand Down
10 changes: 9 additions & 1 deletion INSTALL/INSTALL.debian10.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,18 @@ Especially by setting a strong root password.
</VirtualHost>


## 1.4. Install PHP and dependencies
## 1.4. Install PHP and dependencies (It's recommended to install php8 or php8.1 and all the modules of the version).

# apt-get install php7.3 libapache2-mod-php7.3 php7.3-curl php7.3-gd php7.3-mysql php-apcu php7.3-xml php7.3-mbstring php7.3-intl php-imagick php7.3-zip

$ curl -sS https://getcomposer.org/installer -o composer-setup.php
# php composer-setup.php --install-dir=/usr/bin --filename=composer


## Apply PHP configuration settings in your php.ini

https://github.com/monarc-project/MonarcAppFO/blob/master/vagrant/bootstrap.sh#L22-L26


## 1.5 Apply all changes

Expand All @@ -75,7 +81,9 @@ Especially by setting a strong root password.
$ git clone https://github.com/monarc-project/MonarcAppFO.git /var/lib/monarc/fo
$ cd /var/lib/monarc/fo
$ mkdir -p data/cache
$ mkdir -p data/DoctrineORMModule/Proxy
$ mkdir -p data/LazyServices/Proxy
$ mkdir -p data/import/files
$ composer install -o
# chown -R www-data:www-data data/
# chmod -R 700 data/
Expand Down
Loading

0 comments on commit 4d2dabf

Please sign in to comment.