Asset-based ISO 27005:2022 alignment

composer.json

@@ -46,8 +46,8 @@
         "ext-pdo": "*",
         "ext-bcmath": "*",
         "ext-openssl": "*",
-        "monarc/frontoffice": "^2.13.1",
-        "monarc/core": "^2.13.1",
+        "monarc/frontoffice": "dev-stage",
+        "monarc/core": "dev-stage as 2.13.5",
         "laminas/laminas-mvc": "^3.1",
         "laminas/laminas-di": "^3.1",
         "laminas/laminas-permissions-rbac": "^3.0",

config/autoload/languages.local.php.dist

@@ -1,43 +1,21 @@
 <?php
 
-return array(
+return [
+    'defaultLanguageIndex' => 1,
+
     'languages' => [
-        1 => 'Français',
-        2 => 'English',
-        3 => 'Deutsch',
-        4 => 'Nederlands',
-        5 => 'Spanish',
-        6 => 'Romanian',
-        7 => 'Italien',
-        8 => 'Japanese',
-        9 => 'Polish',
-        10 => 'Portuguese',
-        11 => 'Russian',
-        12 => 'Chinese',
+        'fr' => ['index' => 1, 'label' => 'Français'],
+        'en' => ['index' => 2, 'label' => 'English'],
+        'de' => ['index' => 3, 'label' => 'Deutsch'],
+        'nl' => ['index' => 4, 'label' => 'Dutch'],
+        'es' => ['index' => 5, 'label' => 'Español'],
+        'ro' => ['index' => 6, 'label' => 'Română'],
+        'it' => ['index' => 7, 'label' => 'Italiano'],
+        'ja' => ['index' => 8, 'label' => 'Japanese'],
+        'pl' => ['index' => 9, 'label' => 'Polski'],
+        'pt' => ['index' => 10, 'label' => 'Português'],
+        'zh' => ['index' => 11, 'label' => '中文'],
     ],
 
-    'defaultLanguageIndex' => 1,
-
-    /* Link with (ModuleCore)
-    config['languages'] = [
-        'fr' => array(
-            'index' => 1,
-            'label' => 'Français'
-        ),
-        'en' => array(
-            'index' => 2,
-            'label' => 'English'
-        ),
-        'de' => array(
-            'index' => 3,
-            'label' => 'Deutsch'
-        ),
-        'ne' => array(
-            'index' => 4,
-            'label' => 'Nederlands',
-        ),
-    ]
-    */
-
-    'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','zh'),
-);
+    'activeLanguages' => ['fr','en','de','nl','es','ro','it','ja','pl','pt','zh'],
+];

config/autoload/local.php.dist

@@ -71,7 +71,6 @@ return [
     ],
 
     'instanceName' => 'Development', // for example a short URL or client name from ansible
-    'twoFactorAuthEnforced' => false,
 
     'terms' => 'https://my.monarc.lu/terms.html',
 

docker-compose.dev.yml

@@ -118,6 +118,11 @@ services:
     volumes:
       # Mount the application code for live development
       - ./:/var/www/html/monarc
+      # Mount sibling repositories so Composer path symlinks and node_modules links resolve in-container
+      - ../zm-core:/var/www/html/zm-core
+      - ../zm-client:/var/www/html/zm-client
+      - ../ng-anr:/var/www/html/ng-anr
+      - ../ng-client:/var/www/html/ng-client
       # Preserve vendor directory in named volume for better performance
       - vendor_data:/var/www/html/monarc/vendor
       - node_modules_data:/var/www/html/monarc/node_modules

public/swagger.yaml

@@ -1369,6 +1369,227 @@ paths:
         '204':
           description: AMV deleted
 
+  # Risk Sources
+  /api/risk-sources:
+    get:
+      summary: Get risk sources
+      tags:
+        - Risk Sources
+      parameters:
+        - in: query
+          name: filter
+          schema:
+            type: string
+          description: Filter risk sources by label
+        - in: query
+          name: status
+          schema:
+            type: string
+            enum: [all, "0", "1"]
+          description: Return all, inactive only, or active only
+      responses:
+        '200':
+          description: List of risk sources
+    post:
+      summary: Create risk source
+      tags:
+        - Risk Sources
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - label
+              properties:
+                label:
+                  type: string
+      responses:
+        '200':
+          description: Risk source created
+
+  /api/risk-sources/{id}:
+    get:
+      summary: Get risk source by ID
+      tags:
+        - Risk Sources
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Risk source details
+    put:
+      summary: Update risk source
+      tags:
+        - Risk Sources
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                label:
+                  type: string
+                is_active:
+                  type: boolean
+      responses:
+        '200':
+          description: Risk source updated
+    delete:
+      summary: Deactivate risk source
+      tags:
+        - Risk Sources
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Risk source deactivated
+
+  # ANR Child Routes - Reassessment Triggers
+  /api/client-anr/{anrid}/reassessment-triggers:
+    get:
+      summary: Get reassessment triggers for an ANR
+      tags:
+        - ANR - Reassessment Triggers
+      parameters:
+        - in: path
+          name: anrid
+          required: true
+          schema:
+            type: integer
+        - in: query
+          name: filter
+          schema:
+            type: string
+          description: Filter reassessment triggers by trigger type or description
+        - in: query
+          name: status
+          schema:
+            type: string
+            enum: [all, "0", "1"]
+          description: Return all, inactive only, or active only
+      responses:
+        '200':
+          description: List of reassessment triggers and available default trigger choices
+    post:
+      summary: Create reassessment trigger in ANR
+      tags:
+        - ANR - Reassessment Triggers
+      parameters:
+        - in: path
+          name: anrid
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - triggerType
+                - description
+              properties:
+                triggerType:
+                  type: string
+                description:
+                  type: string
+                isActive:
+                  type: boolean
+                position:
+                  type: integer
+      responses:
+        '200':
+          description: Reassessment trigger created
+
+  /api/client-anr/{anrid}/reassessment-triggers/{id}:
+    get:
+      summary: Get reassessment trigger by ID for an ANR
+      tags:
+        - ANR - Reassessment Triggers
+      parameters:
+        - in: path
+          name: anrid
+          required: true
+          schema:
+            type: integer
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Reassessment trigger details
+    put:
+      summary: Update reassessment trigger in ANR
+      tags:
+        - ANR - Reassessment Triggers
+      parameters:
+        - in: path
+          name: anrid
+          required: true
+          schema:
+            type: integer
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                triggerType:
+                  type: string
+                description:
+                  type: string
+                isActive:
+                  type: boolean
+                position:
+                  type: integer
+      responses:
+        '200':
+          description: Reassessment trigger updated
+    delete:
+      summary: Delete reassessment trigger from ANR
+      tags:
+        - ANR - Reassessment Triggers
+      parameters:
+        - in: path
+          name: anrid
+          required: true
+          schema:
+            type: integer
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Reassessment trigger deleted
+
   # ANR Child Routes - Threats
   /api/client-anr/{anrid}/threats:
     get:

scripts/compile_translations.sh

@@ -1,12 +1,32 @@
 #!/bin/bash
 
-pushd node_modules/ng_client
-grunt compile_translations
-grunt concat
+set -e
+
+APP_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+export MONARC_PUBLIC_JS_DIR="$APP_ROOT/public/js"
+export MONARC_PUBLIC_CSS_DIR="$APP_ROOT/public/css"
+
+pushd "$APP_ROOT/node_modules/ng_client" >/dev/null
+
+GRUNT_BIN="./node_modules/.bin/grunt"
+if [ ! -x "$GRUNT_BIN" ]; then
+    GRUNT_BIN="$(command -v grunt)"
+fi
+
+if [ -z "$GRUNT_BIN" ]; then
+    echo "grunt is not available. Install project dependencies or provide a local grunt binary." >&2
+    exit 1
+fi
+
+"$GRUNT_BIN" compile_translations
+"$GRUNT_BIN" concat
 
 if [ -d po ]; then
-  for i in $(ls po/*\.po); do
-    l=$(basename $i .po)
-    msgfmt -o ./po/$l.mo -v ./po/$l.po
-  done;
+  for i in po/*.po; do
+    [ -e "$i" ] || continue
+    l=$(basename "$i" .po)
+    msgfmt -o "./po/$l.mo" -v "$i"
+  done
 fi
+
+popd >/dev/null