Merge pull request #100 from dbarzin/dev

Dev

README.fr.md

@@ -1,29 +1,18 @@
 # Mercator
 
-Mercator est une application Web permettant de gérer la cartographie d’un système d’information 
-comme décrit dans le [Guide pour la cartographie du Système d’information](https://www.ssi.gouv.fr/guide/cartographie-du-systeme-dinformation/) de l’[ANSSI](https://www.ssi.gouv.fr/). La [documentation](https://dbarzin.github.io/mercator/) et les [sources de l'application](https://dbarzin.github.io/mercator/) sont publiées sur GitHub.
+Mercator est une application Web permettant de gérer la cartographie d’un système d’information comme décrit dans le [Guide pour la cartographie du Système d’information](https://www.ssi.gouv.fr/guide/cartographie-du-systeme-dinformation/) de l’[ANSSI](https://www.ssi.gouv.fr/). La [documentation](https://dbarzin.github.io/mercator/) et les [sources de l'application](https://dbarzin.github.io/mercator/) sont publiées sur GitHub.
 
-[![Latest Release](https://img.shields.io/github/release/dbarzin/mercator.svg?style=flat-square)](https://github.com/dbarzin/mercator/releases/latest)
-![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square)
-![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square)
-![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square)
+[![Latest Release](https://img.shields.io/github/release/dbarzin/mercator.svg?style=flat-square)](https://github.com/dbarzin/mercator/releases/latest) ![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square) ![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square) ![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square)
 
 Read this in other languages: [English](README.md)
 
 ## Introduction
 
-Les attaques informatiques interviennent dans un environnement en constante évolution. 
-Pour répondre à ces enjeux, il est nécessaire de mettre en place une approche globale de 
-gestion des risques au sein de son organisation. 
+Les attaques informatiques interviennent dans un environnement en constante évolution. Pour répondre à ces enjeux, il est nécessaire de mettre en place une approche globale de gestion des risques au sein de son organisation. 
 
-La cartographie du Système d’Information permet d’avoir une vue globale de l’ensemble 
-des éléments qui constituent le système d’information pour d’obtenir une meilleure lisibilité, 
-et donc un meilleur contrôle. 
+La cartographie du Système d’Information permet d’avoir une vue globale de l’ensemble des éléments qui constituent le système d’information pour d’obtenir une meilleure lisibilité, et donc un meilleur contrôle. 
 
-L’élaboration d’une cartographie participe à la protection, à la défense et à la résilience 
-du système d’information. C’est un outil indispensable à la maitrise de son système d’information 
-(SI) et est une obligation pour les Opérateurs d’importance vitale (OIV) et qui s’intègre dans une 
-démarche globale de gestion des risques.
+L’élaboration d’une cartographie participe à la protection, à la défense et à la résilience du système d’information. C’est un outil indispensable à la maitrise de son système d’information (SI) et est une obligation pour les Opérateurs d’importance vitale (OIV) et qui s’intègre dans une démarche globale de gestion des risques.
 
 ## Fonctions majeures
 - Gestion des vues (écosystème, système d’information, administration, logique, applications, et physique)
@@ -40,22 +29,19 @@ démarche globale de gestion des risques.
 
 Page principale
 
-[<img src="public/screenshots/mercator1.png" width="400" height="300">](public/screenshots/mercator1.fr.png)
-[<img src="public/screenshots/mercator2.png" width="400" height="300">](public/screenshots/mercator2.fr.png)
+[<img src="public/screenshots/mercator1.png" width="400" height="300">](public/screenshots/mercator1.fr.png) [<img src="public/screenshots/mercator2.png" width="400" height="300">](public/screenshots/mercator2.fr.png)
 
 Niveaux de conformité
 
 [<img src="public/screenshots/mercator3.png" width="400">](public/screenshots/mercator3.fr.png)
 
 Ecran de saisie
 
-[<img src="public/screenshots/mercator4.png" width="400" height="200">](public/screenshots/mercator4.fr.png)
-[<img src="public/screenshots/mercator5.png" width="400" height="200">](public/screenshots/mercator5.fr.png)
+[<img src="public/screenshots/mercator4.png" width="400" height="200">](public/screenshots/mercator4.fr.png) [<img src="public/screenshots/mercator5.png" width="400" height="200">](public/screenshots/mercator5.fr.png)
 
 Dessin de la cartographie
 
-[<img src="public/screenshots/mercator6.png" width="400" height="300">](public/screenshots/mercator6.fr.png)
-[<img src="public/screenshots/mercator7.png" width="400" height="300">](public/screenshots/mercator7.fr.png)
+[<img src="public/screenshots/mercator6.png" width="400" height="300">](public/screenshots/mercator6.fr.png) [<img src="public/screenshots/mercator7.png" width="400" height="300">](public/screenshots/mercator7.fr.png)
 
 Modèle de données
 

README.md

@@ -1,8 +1,6 @@
 # Mercator
 
-Mercator is a web application allowing to manage the mapping of an information system as described in the 
-[Mapping The Information System Guide](https://www.ssi.gouv.fr/en/guide/mapping-the-information-system/) 
-of the [ANSSI](https://www.ssi.gouv.fr/en/). 
+Mercator is a web application allowing to manage the mapping of an information system as described in the [Mapping The Information System Guide](https://www.ssi.gouv.fr/en/guide/mapping-the-information-system/) of the [ANSSI](https://www.ssi.gouv.fr/en/). 
 
 [![Latest Release](https://img.shields.io/github/release/dbarzin/mercator.svg?style=flat-square)](https://github.com/dbarzin/mercator/releases/latest)
 ![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square)
@@ -13,15 +11,11 @@ Read this in other languages: [French](README.fr.md)
 
 ## Introduction
 
-Computer attacks occur in a constantly changing environment. 
-To meet these challenges, it is necessary to implement a global approach to risk management within the organization. 
+Computer attacks occur in a constantly changing environment. To meet these challenges, it is necessary to implement a global approach to risk management within the organization. 
 
-The mapping of the Information System allows to have a global view of all the elements which compose the information 
-system to obtain a better readability, and thus a better control. 
+The mapping of the Information System allows to have a global view of all the elements which compose the information system to obtain a better readability, and thus a better control. 
 
-The elaboration of a cartography participates in the protection, the defense and the resilience of the information system. 
-It is an essential tool for the control of its information system (IS) and is an obligation for Operators of Vital Importance (OVI) 
-and is part of a global risk management and a global risk management approach.
+The elaboration of a cartography participates in the protection, the defense and the resilience of the information system. It is an essential tool for the control of its information system (IS) and is an obligation for Operators of Vital Importance (OVI) and is part of a global risk management and a global risk management approach.
 
 ## Major functions
 - Graphical views of the ecosystem, information system, administration, logical, applications, and physical infrastructure
@@ -37,22 +31,19 @@ and is part of a global risk management and a global risk management approach.
 
 Main page
 
-[<img src="public/screenshots/mercator1.png" width="400" height="300">](public/screenshots/mercator1.png)
-[<img src="public/screenshots/mercator2.png" width="400" height="300">](public/screenshots/mercator2.png)
+[<img src="public/screenshots/mercator1.png" width="400" height="300">](public/screenshots/mercator1.png) [<img src="public/screenshots/mercator2.png" width="400" height="300">](public/screenshots/mercator2.png)
 
 Compliance Levels
 
 [<img src="public/screenshots/mercator3.png" width="400">](public/screenshots/mercator3.png)
 
 Input screen
 
-[<img src="public/screenshots/mercator4.png" width="400" height="200">](public/screenshots/mercator4.png)
-[<img src="public/screenshots/mercator5.png" width="400" height="200">](public/screenshots/mercator5.png)
+[<img src="public/screenshots/mercator4.png" width="400" height="200">](public/screenshots/mercator4.png) [<img src="public/screenshots/mercator5.png" width="400" height="200">](public/screenshots/mercator5.png)
 
 Drawing of the cartography
 
-[<img src="public/screenshots/mercator6.png" width="400" height="300">](public/screenshots/mercator6.png)
-[<img src="public/screenshots/mercator7.png" width="400" height="300">](public/screenshots/mercator7.png)
+[<img src="public/screenshots/mercator6.png" width="400" height="300">](public/screenshots/mercator6.png) [<img src="public/screenshots/mercator7.png" width="400" height="300">](public/screenshots/mercator7.png)
 
 Data model
 

ROADMAP.md

@@ -29,3 +29,10 @@ Ce document reprend les évolutions prévues sur Mercator sur l'année 2022.
 - [ ] Publier une VM Docker sur [dockerHub](https://hub.docker.com/)
 - [ ] Documenter une procédure de déploiement sous Debian
 - [ ] Dark Theme
+
+## Evolution 2023
+
+- [ ] Généraliser la notion de cartographe à d'atres objets
+- [ ] Générer les cartographes dans la gestion des utilisateurs
+- [ ] Ajouter des fonctions de manipulation des graphes d'objet
+

app/Http/Controllers/Admin/CartographyController.php

@@ -683,9 +683,10 @@ public function cartography(Request $request)
  foreach ($applications as $application) {
  $section->addBookmark('APPLICATION'.$application->id);
  $table = $this->addTable($section, $application->name);
- $this->addHTMLRow($table, trans('cruds.application.fields.description'), $application->description);
  $this->addTextRow($table, trans('cruds.application.fields.version'), $application->version);
 
+ $this->addHTMLRow($table, trans('cruds.application.fields.description'), $application->description);
+
  $textRun = $this->addTextRunRow($table, trans('cruds.application.fields.entities'));
  foreach ($application->entities as $entity) {
  $textRun->addLink('ENTITY'.$entity->id, $entity->name, CartographyController::FANCYLINKSTYLE, null, true);
@@ -701,6 +702,7 @@ public function cartography(Request $request)
  $this->addTextRow($table, trans('cruds.application.fields.technology'), $application->technology);
  $this->addTextRow($table, trans('cruds.application.fields.type'), $application->type);
  $this->addTextRow($table, trans('cruds.application.fields.users'), $application->users);
+
  $this->addTextRow($table, trans('cruds.application.fields.documentation'), $application->documentation);
 
  $textRun = $this->addTextRunRow($table, trans('cruds.application.fields.flux'));
@@ -719,6 +721,9 @@ public function cartography(Request $request)
  $textRun->addText(', ');
  }
  }
+
+ $this->addTextRow($table, trans('cruds.application.fields.install_date'), $application->install_date);
+ $this->addTextRow($table, trans('cruds.application.fields.update_date'), $application->update_date);
 
  // Security Needs
  $textRun = $this->addHTMLRow(
@@ -1472,10 +1477,13 @@ public function cartography(Request $request)
  $this->addHTMLRow($table, trans('cruds.logicalServer.fields.description'), $logicalServer->description);
 
  $this->addTextRow($table, trans('cruds.logicalServer.fields.operating_system'), $logicalServer->operating_system);
- $this->addTextRow($table, trans('cruds.logicalServer.fields.address_ip'), $logicalServer->address_ip);
+ $this->addTextRow($table, trans('cruds.logicalServer.fields.install_date'), $logicalServer->install_date);
+ $this->addTextRow($table, trans('cruds.logicalServer.fields.update_date'), $logicalServer->update_date);
  $this->addTextRow($table, trans('cruds.logicalServer.fields.cpu'), $logicalServer->cpu);
  $this->addTextRow($table, trans('cruds.logicalServer.fields.memory'), $logicalServer->memory);
  $this->addTextRow($table, trans('cruds.logicalServer.fields.disk'), strval($logicalServer->disk));
+ $this->addTextRow($table, trans('cruds.logicalServer.fields.address_ip'), $logicalServer->address_ip);
+ $this->addTextRow($table, trans('cruds.logicalServer.fields.environment'), $logicalServer->environment);
  $this->addTextRow($table, trans('cruds.logicalServer.fields.net_services'), $logicalServer->net_services);
 
  $this->addHTMLRow($table, trans('cruds.logicalServer.fields.configuration'), $logicalServer->configuration);

resources/lang/fr/cruds.php

@@ -106,7 +106,7 @@
  "install_date" => "Date d'installation",
  "install_date_helper" => "Date d'installation de l'application",
  "update_date" => "Date de mise à jour",
- "update_date_helper" => "Date de dernière de dernière mise à jour",
+ "update_date_helper" => "Date de dernière mise à jour",
  ],
  'title' => 'Applications',
  'title_short' => 'Applications',
@@ -498,17 +498,17 @@
  'disk' => 'Disque',
  'disk_helper' => 'Espace disque alloué (GB)',
  'environment' => 'Environnement',
- 'environment_helper' => 'Prod, Préprod, Test, Dev, Integration, ...',
+ 'environment_helper' => 'Ex: Prod, Préprod, Intégration, Test, Dev, ...',
  'memory' => 'Mémoire',
  'memory_helper' => 'Quantité de mémoire allouée (GB)',
  'name' => 'Nom',
  'name_helper' => '',
- 'net_services' => 'Services réseau actifs',
- 'net_services_helper' => '',
+ 'net_services' => 'Services réseau',
+ 'net_services_helper' => 'Liste des services réseaux actifs',
  'operating_system' => 'Système d\'exploitation',
  'operating_system_helper' => "Nom et version de l'OS",
  'servers' => 'Serveurs physiques',
- 'servers_helper' => 'Serveur physique de support',
+ 'servers_helper' => 'Serveurs physiques de support',
  "install_date" => "Date d'installation",
  "install_date_helper" => "Date d'installation du système d'exploitation",
  "update_date" => "Date de mise à jour",

resources/views/admin/applications/show.blade.php

@@ -149,15 +149,17 @@
  <th colspan="1">
  {{ trans('cruds.application.fields.install_date') }}
  </th>
- <td colspan="5">
+ <td colspan="3">
  {{ $application->install_date }}
  </td>
  <th colspan="1">
  {{ trans('cruds.application.fields.update_date') }}
  </th>
- <td colspan="5">
+ <td colspan="3">
  {{ $application->update_date }}
  </td>
+ <td colspan="4">
+ </td>
  </tr>
  <tr>
  <th>

resources/views/admin/logicalServers/show.blade.php

@@ -73,10 +73,10 @@
  </tr>
  <tr>
  <th colspan="1">
- {{ trans('cruds.logicalServer.fields.address_ip') }}
+ {{ trans('cruds.logicalServer.fields.install_date') }}
  </th>
  <td colspan="3">
- {!! $logicalServer->address_ip !!}
+ {!! $logicalServer->install_date !!}
  </td>
  <th colspan="1">
  {{ trans('cruds.logicalServer.fields.memory') }}
@@ -85,20 +85,31 @@
  {!! $logicalServer->memory !!}
  </td>
  <th colspan="1">
- {{ trans('cruds.logicalServer.fields.net_services') }}
+ {{ trans('cruds.logicalServer.fields.address_ip') }}
  </th>
  <td colspan="3">
- {{ $logicalServer->net_services }}
+ {!! $logicalServer->address_ip !!}
  </td>
  </tr>
  <tr>
- <td colspan="4"></td>
+ <th colspan="1">
+ {{ trans('cruds.logicalServer.fields.update_date') }}
+ </th>
+ <td colspan="3">
+ {!! $logicalServer->update_date !!}
+ </td>
  <th colspan="1">
  {{ trans('cruds.logicalServer.fields.disk') }}
  </th>
  <td colspan="3">
  {!! $logicalServer->disk !!}
  </td>
+ <th colspan="1">
+ {{ trans('cruds.logicalServer.fields.net_services') }}
+ </th>
+ <td colspan="3">
+ {{ $logicalServer->net_services }}
+ </td>
  </tr>
  <tr>
  <th>