Merge pull request 'Traduction du modèle de rapport de bug' (#1 ) from mes-modifs into master

Reviewed-on: #1
Traduction du modèle de rapport de bug
2025-07-07 12:56:24 +00:00 · 2025-07-07 14:41:21 +02:00 · 2022-06-11 20:39:14 -05:00 · 2022-02-03 10:33:12 -06:00 · 2021-12-13 19:44:12 +00:00 · 2020-07-20 10:45:00 +02:00
15 changed files with 1860 additions and 1882 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,42 +1,41 @@
 ---
-name: Bug report
+name: Rapport de bug
-about: Create a report to help us improve
+about: Créez un rapport pour nous aider à nous améliorer
 title: ''
 labels: ''
 assignees: ''
 ---
-**Describe the bug**
+**Décrivez le bug**
-A clear and concise description of what the bug is.
+Une description claire et concise de ce qu'est le bug.
-**Affected module**
+**Module affecté**
-Which one is the module that is not working as expected, e.g. Nessus, Qualys WAS, Qualys VM, OpenVAS, ELK, Jira...). 
+Lequel des modules ne fonctionne pas comme prévu, par exemple, Nessus, Qualys WAS, Qualys VM, OpenVAS, ELK, Jira...
-**VulnWhisperer debug trail**
+**Trace de débogage de VulnWhisperer**
-If applicable, paste the VulnWhisperer debug trail of the execution for further detail (execute with '-d' flag).
+Si possible, veuillez joindre la trace de débogage de l'exécution pour une enquête plus approfondie (exécuter avec l'option `-d`).
-**To Reproduce**
+**Pour reproduire**
-Steps to reproduce the behavior:
+Étapes pour reproduire le comportement :
-1. Go to '...'
+1. Allez à '...'
-2. Click on '....'
+2. Cliquez sur '....'
-3. Scroll down to '....'
+3. Voir l'erreur
 4. See error
-**Expected behavior**
+**Comportement attendu**
-A clear and concise description of what you expected to happen.
+Une description claire et concise de ce à quoi vous vous attendiez.
-**Screenshots**
+**Captures d'écran**
-If applicable, add screenshots to help explain your problem.
+Si applicable, ajoutez des captures d'écran pour aider à expliquer votre problème.
-**System in which VulnWhisperer runs (please complete the following information):**
+**Système sur lequel VulnWhisperer s'exécute (veuillez compléter les informations suivantes) :**
- - OS: [e.g. Ubuntu Server]
+ - OS : [ex. Ubuntu Server]
- - Version: [e.g. 18.04.2 LTS]
+ - Version : [ex. 18.04.2 LTS]
- - VulnWhisperer Version: [e.g. 1.7.1]
+ - Version de VulnWhisperer : [ex. 1.7.1]
-**Additional context**
+**Contexte additionnel**
-Add any other context about the problem here.
+Ajoutez tout autre contexte sur le problème ici.
-## Important Note
+**Note importante**
-As VulnWhisperer relies on ELK for the data aggregation, it is expected that you already have an ELK instance or the knowledge to deploy one. 
+Comme VulnWhisperer s'appuie sur ELK pour l'agrégation de données, il est attendu que vous ayez déjà une instance ELK ou les connaissances pour en déployer une.
-In order to speed up deployment, we provide an updated and tested docker-compose file which deploys all the needed infrastructure and we will support its deployment, but we will not be giving support to ELK instances.
+Pour accélérer le déploiement, nous fournissons un fichier docker-compose à jour et testé qui déploie toute l'infrastructure nécessaire et nous supporterons son déploiement, mais nous ne donnerons pas de support pour les instances ELK.
--- a/README.md
+++ b/README.md
@ -1,19 +1,15 @@
-<p align="center"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/vuln_whisperer_logo_s.png" width="400px"></p>
+<p align="center"><img src="https://git.gudita.com/Cyberdefense/VulnWhisperer/raw/branch/master/docs/source/vuln_whisperer_logo_s.png" width="400px"></p>
-<p align="center"> <i>Create <u><b>actionable data</b></u> from your vulnerability scans </i> </p> 
+<p align="center"> <i>Créez des <u><b>données exploitables</b></u> à partir de vos scans de vulnérabilités</i> </p> 
-<p align="center" style="width:400px"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/vulnWhispererWebApplications.png" style="width:400px"></p>
+<p align="center" style="width:400px"><img src="https://git.gudita.com/Cyberdefense/VulnWhisperer/raw/branch/master/docs/source/vulnWhispererWebApplications.png" style="width:400px"></p>
-VulnWhisperer is a vulnerability management tool and report aggregator. VulnWhisperer will pull all the reports from the different Vulnerability scanners and create a file with a unique filename for each one, using that data later to sync with Jira and feed Logstash. Jira does a closed cycle full Sync with the data provided by the Scanners, while Logstash indexes and tags all of the information inside the report (see logstash files at /resources/elk6/pipeline/). Data is then shipped to ElasticSearch to be indexed, and ends up in a visual and searchable format in Kibana with already defined dashboards.
+VulnWhisperer est un outil de gestion des vulnérabilités et un agrégateur de rapports. VulnWhisperer récupère tous les rapports des différents scanners de vulnérabilités et crée un fichier avec un nom unique pour chacun, utilisant ensuite ces données pour se synchroniser avec Jira et alimenter Logstash. Jira effectue une synchronisation complète en cycle fermé avec les données fournies par les scanners, tandis que Logstash indexe et étiquette toutes les informations contenues dans le rapport (voir les fichiers logstash dans `/resources/elk6/pipeline/`). Les données sont ensuite envoyées à ElasticSearch pour être indexées, et finissent dans un format visuel et consultable dans Kibana avec des tableaux de bord déjà définis.
-[![Build Status](https://travis-ci.org/HASecuritySolutions/VulnWhisperer.svg?branch=master)](https://travis-ci.org/HASecuritySolutions/VulnWhisperer)
+VulnWhisperer est un projet open-source financé par la communauté. VulnWhisperer est actuellement fonctionnel mais nécessite une refonte de la documentation et une revue de code. Si vous souhaitez de l'aide, si vous êtes intéressé par de nouvelles fonctionnalités, ou si vous recherchez un support payant, veuillez nous contacter à **info@sahelcyber.com**.
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](http://choosealicense.com/licenses/mit/)
 [![Twitter](https://img.shields.io/twitter/follow/VulnWhisperer.svg?style=social&label=Follow)](https://twitter.com/VulnWhisperer)
 Currently Supports
 -----------------
-### Vulnerability Frameworks
+### Scanners de Vulnérabilités Supportés
 - [X] [Nessus (**v6**/**v7**/**v8**)](https://www.tenable.com/products/nessus/nessus-professional)
 - [X] [Qualys Web Applications](https://www.qualys.com/apps/web-app-scanning/)
@ -26,143 +22,117 @@ Currently Supports
 - [ ] [NMAP](https://nmap.org/)
 - [ ] [Burp Suite](https://portswigger.net/burp)
 - [ ] [OWASP ZAP](https://www.zaproxy.org/)
- [ ] More to come
+- [ ] Et d'autres à venir
-### Reporting Frameworks
+### Plateformes de Reporting Supportées
- [X] [ELK (**v6**/**v7**)](https://www.elastic.co/elk-stack)
+- [X] [Elastic Stack (**v6**/**v7**)](https://www.elastic.co/elk-stack)
 - [ ] [OpenSearch - Envisagé pour la prochaine mise à jour](https://opensearch.org/)
 - [X] [Jira](https://www.atlassian.com/software/jira)
 - [ ] [Splunk](https://www.splunk.com/)
-Getting Started
+## Démarrage
 ===============
-1) Follow the [install requirements](#installreq)
+1) Suivez les [prérequis d'installation](#installreq)
-2) Fill out the section you want to process in <a href="https://github.com/HASecuritySolutions/VulnWhisperer/blob/master/configs/frameworks_example.ini">frameworks_example.ini file</a>
+2) Remplissez la section que vous souhaitez traiter dans le fichier <a href="https://git.gudita.com/Cyberdefense/VulnWhisperer/src/branch/master/configs/frameworks_example.ini">frameworks_example.ini</a>
-3) [JIRA] If using Jira, fill Jira config in the config file mentioned above.
+3) [JIRA] Si vous utilisez Jira, remplissez la configuration Jira dans le fichier de configuration mentionné ci-dessus.
-3) [ELK] Modify the IP settings in the <a href="https://github.com/HASecuritySolutions/VulnWhisperer/tree/master/resources/elk6/pipeline">Logstash files to accommodate your environment</a> and import them to your logstash conf directory (default is /etc/logstash/conf.d/)
+3) [ELK] Modifiez les paramètres IP dans les <a href="https://git.gudita.com/Cyberdefense/VulnWhisperer/src/branch/master/resources/elk6/pipeline">fichiers Logstash pour correspondre à votre environnement</a> et importez-les dans votre répertoire de configuration logstash (par défaut `/etc/logstash/conf.d/`)
-4) [ELK] Import the <a href="https://github.com/HASecuritySolutions/VulnWhisperer/blob/master/resources/elk6/kibana.json">Kibana visualizations</a>
+4) [ELK] Importez les <a href="https://git.gudita.com/Cyberdefense/VulnWhisperer/src/branch/master/resources/elk6/kibana.json">visualisations Kibana</a>
-5) [Run Vulnwhisperer](#run)
+5) [Exécutez Vulnwhisperer](#run)
-Need assistance or just want to chat? Join our [slack channel](https://join.slack.com/t/vulnwhisperer/shared_invite/enQtNDQ5MzE4OTIyODU0LWQxZTcxYTY0MWUwYzA4MTlmMWZlYWY2Y2ZmM2EzNDFmNWVlOTM4MzNjYzI0YzdkMDA0YmQyYWRhZGI2NGUxNGI)
+> **Note importante concernant les liens du Wiki :** La migration de Gitea ne transfère pas toujours le Wiki d'un projet GitHub (qui est techniquement un dépôt séparé). Si les liens vers le Wiki (comme le guide de déploiement ELK) ne fonctionnent pas, vous devrez peut-être recréer ces pages manuellement dans l'onglet "Wiki" de votre dépôt sur Gitea.
-Requirements
+Besoin d'aide ou juste envie de discuter ? Rejoignez notre [canal Slack](https://join.slack.com/t/vulnwhisperer/shared_invite/enQtNDQ5MzE4OTIyODU0LWQxZTcxYTY0MWUwYzA4MTlmMWZlYWY2Y2ZmM2EzNDFmNWVlOTM4MzNjYzI0YzdkMDA0YmQyYWRhZGI2NGUxNGI)
 -------------
 ####
 *   Python 2.7
 *   Vulnerability Scanner
 *   Reporting System: Jira / ElasticStack 6.6
-<a id="installreq">Install Requirements-VulnWhisperer(may require sudo)</a>
+## Prérequis
--------------------
+* Python 2.7
-**Install OS packages requirement dependencies** (Debian-based distros, CentOS don't need it)
+* Un Scanner de Vulnérabilités
 * Un Système de Reporting : Jira / ElasticStack 6.6
 <a id="installreq"></a>
 ## Prérequis d'Installation - VulnWhisperer (peut nécessiter sudo)
 **Installez les dépendances des paquets du système d'exploitation** (pour les distributions basées sur Debian, CentOS n'en a pas besoin)
 ```shell
 sudo apt-get install zlib1g-dev libxml2-dev libxslt1-dev
-sudo apt-get install  zlib1g-dev libxml2-dev libxslt1-dev 
+(Optionnel) Utilisez un environnement virtuel python pour ne pas perturber les bibliothèques python de l'hôte
 ```
-**(Optional) Use a python virtualenv to not mess with host python libraries**
+virtualenv venv # créera l'environnement virtuel python 2.7
 ```shell
 virtualenv venv (will create the python 2.7 virtualenv)
 source venv/bin/activate (start the virtualenv, now pip will run there and should install libraries without sudo)
-deactivate (for quitting the virtualenv once you are done)
+source venv/bin/activate # démarre l'environnement, pip s'exécutera ici et devrait installer les bibliothèques sans sudo
 ```
-**Install python libraries requirements**
+deactivate # pour quitter l'environnement virtuel une fois que vous avez terminé
-```python
+Installez les dépendances des bibliothèques python
-pip install -r /path/to/VulnWhisperer/requirements.txt
+
-cd /path/to/VulnWhisperer
+pip install -r /chemin/vers/VulnWhisperer/requirements.txt
 cd /chemin/vers/VulnWhisperer
 python setup.py install
 ```
-**(Optional) If using a proxy, add proxy URL as environment variable to PATH**
+(Optionnel) Si vous utilisez un proxy, ajoutez l'URL du proxy comme variable d'environnement au PATH
 ```shell
 export HTTP_PROXY=http://example.com:8080
 export HTTPS_PROXY=http://example.com:8080
 ```
-Now you're ready to pull down scans. (see <a href="#run">run section</a>)
+export HTTP_PROXY=[http://exemple.com:8080](http://exemple.com:8080)
 export HTTPS_PROXY=[http://exemple.com:8080](http://exemple.com:8080)
 Vous êtes maintenant prêt à télécharger les scans.
 Configuration
-----
+Il y a quelques étapes de configuration pour mettre en place VulnWhisperer :
-There are a few configuration steps to setting up VulnWhisperer:
+Configurer le fichier Ini
 *   Configure Ini file
 *   Setup Logstash File
 *   Import ElasticSearch Templates
 *   Import Kibana Dashboards
-<a href="https://github.com/austin-taylor/VulnWhisperer/blob/master/configs/frameworks_example.ini">frameworks_example.ini file</a>
+Configurer le fichier Logstash
 <p align="left" style="width:200px"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/config_example.png" style="width:200px"></p>
 Importer les modèles ElasticSearch
-<a id="run">Run</a>
+Importer les tableaux de bord Kibana
-----
+
-To run, fill out the configuration file with your vulnerability scanner settings. Then you can execute from the command line.
+Exécution
-```python
+Pour exécuter, remplissez le fichier de configuration avec les paramètres de votre scanner de vulnérabilités. Ensuite, vous pouvez l'exécuter depuis la ligne de commande.
-(optional flag: -F -> provides "Fancy" log colouring, good for comprehension when manually executing VulnWhisperer)
+
 # (optionnel : -F -> fournit une coloration "Fantaisie" des logs, utile pour la compréhension lors de l'exécution manuelle de VulnWhisperer)
 vuln_whisperer -c configs/frameworks_example.ini -s nessus 
-or
+# ou
 vuln_whisperer -c configs/frameworks_example.ini -s qualys
-```
+Si aucune section n'est spécifiée (ex. -s nessus), vulnwhisperer vérifiera dans le fichier de configuration les modules ayant la propriété enabled=true et les exécutera séquentiellement.
 If no section is specified (e.g. -s nessus), vulnwhisperer will check on the config file for the modules that have the property `enabled=true` and run them sequentially.
 <p align="center" style="width:300px"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/running_vuln_whisperer.png" style="width:400px"></p>
 Next you'll need to import the visualizations into Kibana and setup your logstash config. You can either follow the sample setup instructions [here](https://github.com/HASecuritySolutions/VulnWhisperer/wiki/Sample-Guide-ELK-Deployment) or go for the `docker-compose` solution we offer.
 Docker-compose
-----
+ELK est un monde en soi, et pour les nouveaux venus sur la plateforme, cela nécessite des compétences de base sous Linux et généralement un peu de dépannage jusqu'à ce qu'il soit déployé et fonctionne comme prévu. Comme nous ne sommes pas en mesure de fournir un support pour les problèmes ELK de chaque utilisateur, nous avons mis en place un docker-compose qui inclut :
 ELK is a whole world by itself, and for newcomers to the platform, it requires basic Linux skills and usually a bit of troubleshooting until it is deployed and working as expected. As we are not able to provide support for each users ELK problems, we put together a docker-compose which includes:
- VulnWhisperer
+VulnWhisperer
 - Logstash 6.6
 - ElasticSearch 6.6
 - Kibana 6.6
-The docker-compose just requires specifying the paths where the VulnWhisperer data will be saved, and where the config files reside. If ran directly after `git clone`, with just adding the Scanner config to the VulnWhisperer config file ([/resources/elk6/vulnwhisperer.ini](https://github.com/HASecuritySolutions/VulnWhisperer/blob/master/resources/elk6/vulnwhisperer.ini)), it will work out of the box.
+Logstash 6.6
-It also takes care to load the Kibana Dashboards and Visualizations automatically through the API, which needs to be done manually otherwise at Kibana's startup.
+ElasticSearch 6.6
-For more info about the docker-compose, check on the [docker-compose wiki](https://github.com/HASecuritySolutions/VulnWhisperer/wiki/docker-compose-Instructions) or the [FAQ](https://github.com/HASecuritySolutions/VulnWhisperer/wiki).
+Kibana 6.6
-Getting Started
+Le docker-compose nécessite simplement de spécifier les chemins où les données de VulnWhisperer seront sauvegardées, et où se trouvent les fichiers de configuration. S'il est exécuté directement après un git clone, en ajoutant simplement la configuration du scanner au fichier de configuration de VulnWhisperer (/resources/elk6/vulnwhisperer.ini), il fonctionnera immédiatement.
 ===============
-Our current Roadmap is as follows:
+Il se charge également de charger automatiquement les tableaux de bord et les visualisations Kibana via l'API, ce qui doit être fait manuellement autrement au démarrage de Kibana.
 - [ ] Create a Vulnerability Standard
 - [ ] Map every scanner results to the standard 
 - [ ] Create Scanner module guidelines for easy integration of new scanners (consistency will allow #14)
 - [ ] Refactor the code to reuse functions and enable full compatibility among modules
 - [ ] Change Nessus CSV to JSON (Consistency and Fix #82)
 - [ ] Adapt single Logstash to standard and Kibana Dashboards
 - [ ] Implement Detectify Scanner
 - [ ] Implement Splunk Reporting/Dashboards
-On top of this, we try to focus on fixing bugs as soon as possible, which might delay the development. We also very welcome PR's, and once we have the new standard implemented, it will be very easy to add compatibility with new scanners. 
+Pour plus d'informations sur le docker-compose, consultez le wiki docker-compose ou la FAQ.
-The Vulnerability Standard will initially be a new simple one level JSON with all the information that matches from the different scanners having standardized variable names, while maintaining the rest of the variables as they are. In the future, once everything is implemented, we will evaluate moving to an existing standard like ECS or AWS Vulnerability Schema; we prioritize functionality over perfection.
+Feuille de route
 Notre feuille de route actuelle est la suivante :
-Video Walkthrough -- Featured on ElasticWebinar
+[ ] Créer un standard de vulnérabilité
 ----------------------------------------------
 <a href="http://www.youtube.com/watch?feature=player_embedded&v=zrEuTtRUfNw?start=30
 " target="_blank"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/elastic_webinar.png" 
 alt="Elastic presentation on VulnWhisperer" border="10" /></a>
-Authors
+[ ] Mapper les résultats de chaque scanner au standard
 ------
   - [Austin Taylor (@HuntOperator)](https://github.com/austin-taylor)
   - [Justin Henderson (@smapper)](https://github.com/SMAPPER)
 Contributors
 ------------
   - [Quim Montal (@qmontal)](https://github.com/qmontal)
   - [@pemontto](https://github.com/pemontto)
   - [@cybergoof](https://github.com/cybergoof)
-AS SEEN ON TV
+[ ] Créer des directives de module de scanner pour une intégration facile de nouveaux scanners
-------------
+
-<p align="center" style="width:400px"><a href="https://twitter.com/MalwareJake/status/935654519471353856"><img src="https://github.com/austin-taylor/vulnwhisperer/blob/master/docs/source/as_seen_on_tv.png" style="width:400px"></a></p>
+[ ] Refactoriser le code pour réutiliser les fonctions et permettre une compatibilité totale entre les modules
 [ ] Changer Nessus CSV en JSON
 [ ] Adapter le Logstash unique au standard et aux tableaux de bord Kibana
 [ ] Implémenter le scanner Detectify
 [ ] Implémenter le reporting/tableaux de bord Splunk
 En plus de cela, nous essayons de nous concentrer sur la correction des bugs dès que possible, ce qui peut retarder le développement. Nous accueillons également très volontiers les PR (Pull Requests), et une fois que nous aurons implémenté le nouveau standard, il sera très facile d'ajouter la compatibilité avec de nouveaux scanners.
 Le standard de vulnérabilité sera initialement un nouveau JSON simple à un niveau avec toutes les informations correspondantes des différents scanners ayant des noms de variables standardisés, tout en conservant le reste des variables telles quelles.
--- a/bin/vuln_whisperer
+++ b/bin/vuln_whisperer
@ -93,7 +93,7 @@ def main():
                                       scanname=args.scanname)
                    exit_code += vw.whisper_vulnerabilities()
                except Exception as e:
-                    logger.error("VulnWhisperer was unable to perform the processing on '{}'".format(section))
+                    logger.error("VulnWhisperer was unable to perform the processing on '{}'".format(args.source))
        else:
            logger.info('Running vulnwhisperer for section {}'.format(args.section))
            vw = vulnWhisperer(config=args.config,
--- a/configs/test.ini
+++ b/configs/test.ini
@ -6,8 +6,8 @@ access_key=
 secret_key=
 username=nessus_username
 password=nessus_password
-write_path=/tmp/VulnWhisperer/data/nessus/
+write_path=/opt/VulnWhisperer/data/nessus/
-db_path=/tmp/VulnWhisperer/data/database
+db_path=/opt/VulnWhisperer/data/database
 trash=false
 verbose=true
@ -19,8 +19,8 @@ access_key=
 secret_key=
 username=tenable.io_username
 password=tenable.io_password
-write_path=/tmp/VulnWhisperer/data/tenable/
+write_path=/opt/VulnWhisperer/data/tenable/
-db_path=/tmp/VulnWhisperer/data/database
+db_path=/opt/VulnWhisperer/data/database
 trash=false
 verbose=true
@ -30,8 +30,8 @@ enabled = false
 hostname = qualys_web
 username = exampleuser
 password = examplepass
-write_path=/tmp/VulnWhisperer/data/qualys_web/
+write_path=/opt/VulnWhisperer/data/qualys_web/
-db_path=/tmp/VulnWhisperer/data/database
+db_path=/opt/VulnWhisperer/data/database
 verbose=true
 # Set the maximum number of retries each connection should attempt.
@ -46,8 +46,8 @@ enabled = true
 hostname = qualys_vuln
 username = exampleuser
 password = examplepass
-write_path=/tmp/VulnWhisperer/data/qualys_vuln/
+write_path=/opt/VulnWhisperer/data/qualys_vuln/
-db_path=/tmp/VulnWhisperer/data/database
+db_path=/opt/VulnWhisperer/data/database
 verbose=true
 [detectify]
@ -58,8 +58,8 @@ hostname = detectify
 username = exampleuser
 #password variable used as secretKey
 password = examplepass
-write_path =/tmp/VulnWhisperer/data/detectify/
+write_path =/opt/VulnWhisperer/data/detectify/
-db_path = /tmp/VulnWhisperer/data/database
+db_path = /opt/VulnWhisperer/data/database
 verbose = true
 [openvas]
@ -68,8 +68,8 @@ hostname = openvas
 port = 4000
 username = exampleuser
 password = examplepass
-write_path=/tmp/VulnWhisperer/data/openvas/
+write_path=/opt/VulnWhisperer/data/openvas/
-db_path=/tmp/VulnWhisperer/data/database
+db_path=/opt/VulnWhisperer/data/database
 verbose=true
 [jira]
@ -77,8 +77,8 @@ enabled = false
 hostname = jira-host
 username = username
 password = password
-write_path = /tmp/VulnWhisperer/data/jira/
+write_path = /opt/VulnWhisperer/data/jira/
-db_path = /tmp/VulnWhisperer/data/database
+db_path = /opt/VulnWhisperer/data/database
 verbose = true
 dns_resolv = False
--- a/requirements.txt
+++ b/requirements.txt
@ -2,7 +2,7 @@ pandas==0.20.3
 setuptools==40.4.3
 pytz==2017.2
 Requests==2.20.0
-lxml==4.1.1
+lxml==4.6.5
 future-fstrings
 bs4
 jira
--- a/resources/elk5-old_compatibility/docker/3000_openvas.conf
+++ b/resources/elk5-old_compatibility/docker/3000_openvas.conf
@ -2,7 +2,7 @@
 # Email: austin@hasecuritysolutions.com
 # Last Update: 03/04/2018
 # Version 0.3
-# Description: Take in qualys web scan reports from vulnWhisperer and pumps into logstash
+# Description: Take in Openvas web scan reports from vulnWhisperer and pumps into logstash
 input {
  file {
--- a/setup.py
+++ b/setup.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 from __future__ import absolute_import
 from setuptools import setup, find_packages
 setup(
--- a/vulnwhisp/base/config.py
+++ b/vulnwhisp/base/config.py
@ -1,4 +1,3 @@
 from __future__ import absolute_import
 import sys
 import logging
@ -6,7 +5,7 @@ import logging
 if sys.version_info > (3, 0):
    import configparser as cp
 else:
-    import six.moves.configparser as cp
+    import ConfigParser as cp
 class vwConfig(object):
--- a/vulnwhisp/frameworks/nessus.py
+++ b/vulnwhisp/frameworks/nessus.py
@ -1,4 +1,3 @@
 from __future__ import absolute_import
 import json
 import logging
 import sys
--- a/vulnwhisp/frameworks/openvas.py
+++ b/vulnwhisp/frameworks/openvas.py
@ -1,6 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 __author__ = 'Austin Taylor'
 import datetime as dt
--- a/vulnwhisp/frameworks/qualys_vuln.py
+++ b/vulnwhisp/frameworks/qualys_vuln.py
@ -1,6 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 __author__ = 'Nathan Young'
 import logging
@ -19,9 +18,9 @@ class qualysWhisperAPI(object):
        self.logger = logging.getLogger('qualysWhisperAPI')
        self.config = config
        try:
-            self.qgc = qualysapi.connect(config_file=config, section='qualys_vuln')
+            self.qgc = qualysapi.connect(config, 'qualys_vuln')
            # Fail early if we can't make a request or auth is incorrect
-            # self.qgc.request('about.php')
+            self.qgc.request('about.php')
            self.logger.info('Connected to Qualys at {}'.format(self.qgc.server))
        except Exception as e:
            self.logger.error('Could not connect to Qualys: {}'.format(str(e)))
--- a/vulnwhisp/frameworks/qualys_web.py
+++ b/vulnwhisp/frameworks/qualys_web.py
@ -1,8 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from six.moves import range
 from functools import reduce
 __author__ = 'Austin Taylor'
 from lxml import objectify
@ -17,16 +14,24 @@ import os
 import csv
 import logging
 import dateutil.parser as dp
 csv.field_size_limit(sys.maxsize)
 class qualysWhisperAPI(object):
    COUNT_WEBAPP = '/count/was/webapp'
    COUNT_WASSCAN = '/count/was/wasscan'
    DELETE_REPORT = '/delete/was/report/{report_id}'
    GET_WEBAPP_DETAILS = '/get/was/webapp/{was_id}'
    QPS_REST_3 = '/qps/rest/3.0'
    REPORT_DETAILS = '/get/was/report/{report_id}'
    REPORT_STATUS = '/status/was/report/{report_id}'
    REPORT_CREATE = '/create/was/report'
    REPORT_DOWNLOAD = '/download/was/report/{report_id}'
    SCAN_DETAILS = '/get/was/wasscan/{scan_id}'
    SCAN_DOWNLOAD = '/download/was/wasscan/{scan_id}'
    SEARCH_REPORTS = '/search/was/report'
    SEARCH_WEB_APPS = '/search/was/webapp'
    SEARCH_WAS_SCAN = '/search/was/wasscan'
    VERSION = '/qps/rest/portal/version'
    def __init__(self, config=None):
        self.logger = logging.getLogger('qualysWhisperAPI')
@ -36,6 +41,10 @@ class qualysWhisperAPI(object):
            self.logger.info('Connected to Qualys at {}'.format(self.qgc.server))
        except Exception as e:
            self.logger.error('Could not connect to Qualys: {}'.format(str(e)))
        self.headers = {
            #"content-type": "text/xml"}
            "Accept" : "application/json",
            "Content-Type": "application/json"}
        self.config_parse = qcconf.QualysConnectConfig(config, 'qualys_web')
        try:
            self.template_id = self.config_parse.get_template_id()
@ -60,8 +69,14 @@ class qualysWhisperAPI(object):
    def generate_scan_result_XML(self, limit=1000, offset=1, status='FINISHED'):
        report_xml = E.ServiceRequest(
-            E.filters(E.Criteria({'field': 'status', 'operator': 'EQUALS'}, status)),
+            E.filters(
-            E.preferences(E.startFromOffset(str(offset)), E.limitResults(str(limit))),
+                E.Criteria({'field': 'status', 'operator': 'EQUALS'}, status
                           ),
            ),
            E.preferences(
                E.startFromOffset(str(offset)),
                E.limitResults(str(limit))
            ),
        )
        return report_xml
@ -100,10 +115,8 @@ class qualysWhisperAPI(object):
                if i % limit == 0:
                    if (total - i) < limit:
                        qualys_api_limit = total - i
-                    self.logger.info('Making a request with a limit of {} at offset {}'
+                    self.logger.info('Making a request with a limit of {} at offset {}'.format((str(qualys_api_limit)), str(i + 1)))
-                            .format((str(qualys_api_limit)), str(i + 1)))
+                    scan_info = self.get_scan_info(limit=qualys_api_limit, offset=i + 1, status=status)
                    scan_info = self.get_scan_info(
                            limit=qualys_api_limit, offset=i + 1, status=status)
                    _records.append(scan_info)
            self.logger.debug('Converting XML to DataFrame')
            dataframes = [self.xml_parser(xml) for xml in _records]
@ -120,8 +133,7 @@ class qualysWhisperAPI(object):
        return self.qgc.request(self.REPORT_STATUS.format(report_id=report_id))
    def download_report(self, report_id):
-        return self.qgc.request(
+        return self.qgc.request(self.REPORT_DOWNLOAD.format(report_id=report_id))
                self.REPORT_DOWNLOAD.format(report_id=report_id), http_method='get')
    def generate_scan_report_XML(self, scan_id):
        """Generates a CSV report for an asset based on template defined in .ini file"""
@ -133,8 +145,20 @@ class qualysWhisperAPI(object):
                    E.format('CSV'),
                    #type is not needed, as the template already has it
                    E.type('WAS_SCAN_REPORT'),
-                    E.template(E.id(self.template_id)),
+                    E.template(
-                    E.config(E.scanReport(E.target(E.scans(E.WasScan(E.id(scan_id))))))
+                        E.id(self.template_id)
                    ),
                    E.config(
                        E.scanReport(
                            E.target(
                                E.scans(
                                    E.WasScan(
                                        E.id(scan_id)
                                    )
                                ),
                            ),
                        ),
                    )
                )
            )
        )
@ -151,14 +175,95 @@ class qualysWhisperAPI(object):
    def delete_report(self, report_id):
        return self.qgc.request(self.DELETE_REPORT.format(report_id=report_id))
 class qualysReportFields:
    CATEGORIES = ['VULNERABILITY',
                  'SENSITIVECONTENT',
                  'INFORMATION_GATHERED']
    # URL Vulnerability Information
    VULN_BLOCK = [
        CATEGORIES[0],
        'ID',
        'QID',
        'Url',
        'Param',
        'Function',
        'Form Entry Point',
        'Access Path',
        'Authentication',
        'Ajax Request',
        'Ajax Request ID',
        'Ignored',
        'Ignore Reason',
        'Ignore Date',
        'Ignore User',
        'Ignore Comments',
        'First Time Detected',
        'Last Time Detected',
        'Last Time Tested',
        'Times Detected',
        'Payload #1',
        'Request Method #1',
        'Request URL #1',
        'Request Headers #1',
        'Response #1',
        'Evidence #1',
    ]
    INFO_HEADER = [
        'Vulnerability Category',
        'ID',
        'QID',
        'Response #1',
        'Last Time Detected',
    ]
    INFO_BLOCK = [
        CATEGORIES[2],
        'ID',
        'QID',
        'Results',
        'Detection Date',
    ]
    QID_HEADER = [
        'QID',
        'Id',
        'Title',
        'Category',
        'Severity Level',
        'Groups',
        'OWASP',
        'WASC',
        'CWE',
        'CVSS Base',
        'CVSS Temporal',
        'Description',
        'Impact',
        'Solution',
    ]
    GROUP_HEADER = ['GROUP', 'Name', 'Category']
    OWASP_HEADER = ['OWASP', 'Code', 'Name']
    WASC_HEADER = ['WASC', 'Code', 'Name']
    SCAN_META = ['Web Application Name', 'URL', 'Owner', 'Scope', 'Operating System']
    CATEGORY_HEADER = ['Category', 'Severity', 'Level', 'Description']
 class qualysUtils:
    def __init__(self):
        self.logger = logging.getLogger('qualysUtils')
-    def grab_section(self, report, section, end=[], pop_last=False):
+    def grab_section(
            self,
            report,
            section,
            end=[],
            pop_last=False,
    ):
        temp_list = []
        max_col_count = 0
-        with open(report, 'rt') as csvfile:
+        with open(report, 'rb') as csvfile:
            q_report = csv.reader(csvfile, delimiter=',', quotechar='"')
            for line in q_report:
                if set(line) == set(section):
@ -184,53 +289,44 @@ class qualysUtils:
        return _data
 class qualysScanReport:
-    CATEGORIES = ['VULNERABILITY', 'SENSITIVECONTENT', 'INFORMATION_GATHERED']
+    # URL Vulnerability Information
    WEB_SCAN_VULN_BLOCK = list(qualysReportFields.VULN_BLOCK)
    WEB_SCAN_VULN_BLOCK.insert(WEB_SCAN_VULN_BLOCK.index('QID'), 'Detection ID')
-    WEB_SCAN_BLOCK = [
+    WEB_SCAN_VULN_HEADER = list(WEB_SCAN_VULN_BLOCK)
-        "ID", "Detection ID", "QID", "Url", "Param/Cookie", "Function",
+    WEB_SCAN_VULN_HEADER[WEB_SCAN_VULN_BLOCK.index(qualysReportFields.CATEGORIES[0])] = \
-        "Form Entry Point", "Access Path", "Authentication", "Ajax Request",
+        'Vulnerability Category'
        "Ajax Request ID", "Ignored", "Ignore Reason", "Ignore Date", "Ignore User",
        "Ignore Comments", "Detection Date", "Payload #1", "Request Method #1",
        "Request URL #1", "Request Headers #1", "Response #1", "Evidence #1",
        "Unique ID", "Flags", "Protocol", "Virtual Host", "IP", "Port", "Result",
        "Info#1", "CVSS V3 Base", "CVSS V3 Temporal", "CVSS V3 Attack Vector",
        "Request Body #1"
    ]
    WEB_SCAN_VULN_BLOCK = [CATEGORIES[0]] + WEB_SCAN_BLOCK
    WEB_SCAN_SENSITIVE_BLOCK = [CATEGORIES[1]] + WEB_SCAN_BLOCK
-    WEB_SCAN_HEADER = ["Vulnerability Category"] + WEB_SCAN_BLOCK
+    WEB_SCAN_SENSITIVE_HEADER = list(WEB_SCAN_VULN_HEADER)
-    WEB_SCAN_HEADER[WEB_SCAN_HEADER.index("Detection Date")] = "Last Time Detected"
+    WEB_SCAN_SENSITIVE_HEADER.insert(WEB_SCAN_SENSITIVE_HEADER.index('Url'
                                                                     ), 'Content')
    WEB_SCAN_SENSITIVE_BLOCK = list(WEB_SCAN_SENSITIVE_HEADER)
    WEB_SCAN_SENSITIVE_BLOCK.insert(WEB_SCAN_SENSITIVE_BLOCK.index('QID'), 'Detection ID')
    WEB_SCAN_SENSITIVE_BLOCK[WEB_SCAN_SENSITIVE_BLOCK.index('Vulnerability Category'
                                                            )] = qualysReportFields.CATEGORIES[1]
-    WEB_SCAN_INFO_BLOCK = [
+    WEB_SCAN_INFO_HEADER = list(qualysReportFields.INFO_HEADER)
-        "INFORMATION_GATHERED", "ID", "Detection ID", "QID", "Results", "Detection Date",
+    WEB_SCAN_INFO_HEADER.insert(WEB_SCAN_INFO_HEADER.index('QID'), 'Detection ID')
        "Unique ID", "Flags", "Protocol", "Virtual Host", "IP", "Port", "Result",
        "Info#1"
    ]
-    WEB_SCAN_INFO_HEADER = [
+    WEB_SCAN_INFO_BLOCK = list(qualysReportFields.INFO_BLOCK)
-        "Vulnerability Category", "ID", "Detection ID", "QID", "Results", "Last Time Detected",
+    WEB_SCAN_INFO_BLOCK.insert(WEB_SCAN_INFO_BLOCK.index('QID'), 'Detection ID')
        "Unique ID", "Flags", "Protocol", "Virtual Host", "IP", "Port", "Result",
        "Info#1"
    ]
-    QID_HEADER = [
+    QID_HEADER = list(qualysReportFields.QID_HEADER)
-        "QID", "Id", "Title", "Category", "Severity Level", "Groups", "OWASP", "WASC",
+    GROUP_HEADER = list(qualysReportFields.GROUP_HEADER)
-        "CWE", "CVSS Base", "CVSS Temporal", "Description", "Impact", "Solution",
+    OWASP_HEADER = list(qualysReportFields.OWASP_HEADER)
-        "CVSS V3 Base", "CVSS V3 Temporal", "CVSS V3 Attack Vector"
+    WASC_HEADER = list(qualysReportFields.WASC_HEADER)
-    ]
+    SCAN_META = list(qualysReportFields.SCAN_META)
-    GROUP_HEADER = ['GROUP', 'Name', 'Category']
+    CATEGORY_HEADER = list(qualysReportFields.CATEGORY_HEADER)
    OWASP_HEADER = ['OWASP', 'Code', 'Name']
    WASC_HEADER = ['WASC', 'Code', 'Name']
    SCAN_META = [
        "Web Application Name", "URL", "Owner", "Scope", "ID", "Tags",
        "Custom Attributes"
    ]
    CATEGORY_HEADER = ['Category', 'Severity', 'Level', 'Description']
-    def __init__(self, config=None, file_in=None, 
+    def __init__(
-            file_stream=False, delimiter=',', quotechar='"'):
+            self,
            config=None,
            file_in=None,
            file_stream=False,
            delimiter=',',
            quotechar='"',
    ):
        self.logger = logging.getLogger('qualysScanReport')
        self.file_in = file_in
        self.file_stream = file_stream
@ -241,79 +337,71 @@ class qualysScanReport:
            try:
                self.qw = qualysWhisperAPI(config=config)
            except Exception as e:
-                self.logger.error(
+                self.logger.error('Could not load config! Please check settings. Error: {}'.format(str(e)))
                        'Could not load config! Please check settings. Error: {}'.format(
                            str(e)))
        if file_stream:
            self.open_file = file_in.splitlines()
        elif file_in:
            self.open_file = open(file_in, 'rb')
        self.downloaded_file = None
    def grab_sections(self, report):
-        return {
+        all_dataframes = []
-            'WEB_SCAN_VULN_BLOCK': pd.DataFrame(
+        dict_tracker = {}
-                self.utils.grab_section(
+        with open(report, 'rb') as csvfile:
-                    report,
+            dict_tracker['WEB_SCAN_VULN_BLOCK'] = pd.DataFrame(self.utils.grab_section(report,
-                    self.WEB_SCAN_VULN_BLOCK,
+                                                                                       self.WEB_SCAN_VULN_BLOCK,
-                    end=[self.WEB_SCAN_SENSITIVE_BLOCK, self.WEB_SCAN_INFO_BLOCK],
+                                                                                       end=[
-                    pop_last=True),
+                                                                                           self.WEB_SCAN_SENSITIVE_BLOCK,
-                columns=self.WEB_SCAN_HEADER),
+                                                                                           self.WEB_SCAN_INFO_BLOCK],
-            'WEB_SCAN_SENSITIVE_BLOCK': pd.DataFrame(
+                                                                                       pop_last=True),
-                self.utils.grab_section(report,
+                                                               columns=self.WEB_SCAN_VULN_HEADER)
-                    self.WEB_SCAN_SENSITIVE_BLOCK,
+            dict_tracker['WEB_SCAN_SENSITIVE_BLOCK'] = pd.DataFrame(self.utils.grab_section(report,
-                    end=[self.WEB_SCAN_INFO_BLOCK, self.WEB_SCAN_SENSITIVE_BLOCK],
+                                                                                            self.WEB_SCAN_SENSITIVE_BLOCK,
-                    pop_last=True),
+                                                                                            end=[
-                columns=self.WEB_SCAN_HEADER),
+                                                                                                self.WEB_SCAN_INFO_BLOCK,
-            'WEB_SCAN_INFO_BLOCK': pd.DataFrame(
+                                                                                                self.WEB_SCAN_SENSITIVE_BLOCK],
-                self.utils.grab_section(
+                                                                                            pop_last=True),
-                    report,
+                                                                columns=self.WEB_SCAN_SENSITIVE_HEADER)
-                    self.WEB_SCAN_INFO_BLOCK,
+            dict_tracker['WEB_SCAN_INFO_BLOCK'] = pd.DataFrame(self.utils.grab_section(report,
-                    end=[self.QID_HEADER],
+                                                                                       self.WEB_SCAN_INFO_BLOCK,
-                    pop_last=True),
+                                                                                       end=[self.QID_HEADER],
-                columns=self.WEB_SCAN_INFO_HEADER),
+                                                                                       pop_last=True),
                                                                columns=self.WEB_SCAN_INFO_HEADER)
            dict_tracker['QID_HEADER'] = pd.DataFrame(self.utils.grab_section(report,
                                                                              self.QID_HEADER,
                                                                              end=[self.GROUP_HEADER],
                                                                              pop_last=True),
                                                                columns=self.QID_HEADER)
            dict_tracker['GROUP_HEADER'] = pd.DataFrame(self.utils.grab_section(report,
                                                                                self.GROUP_HEADER,
                                                                                end=[self.OWASP_HEADER],
                                                                                pop_last=True),
                                                                columns=self.GROUP_HEADER)
            dict_tracker['OWASP_HEADER'] = pd.DataFrame(self.utils.grab_section(report,
                                                                                self.OWASP_HEADER,
                                                                                end=[self.WASC_HEADER],
                                                                                pop_last=True),
                                                                columns=self.OWASP_HEADER)
            dict_tracker['WASC_HEADER'] = pd.DataFrame(self.utils.grab_section(report,
                                                                               self.WASC_HEADER, end=[['APPENDIX']],
                                                                               pop_last=True),
                                                                columns=self.WASC_HEADER)
-            'QID_HEADER': pd.DataFrame(
+            dict_tracker['SCAN_META'] = pd.DataFrame(self.utils.grab_section(report,
-                self.utils.grab_section(
+                                                                             self.SCAN_META,
-                    report,
+                                                                             end=[self.CATEGORY_HEADER],
-                    self.QID_HEADER,
+                                                                             pop_last=True),
-                    end=[self.GROUP_HEADER],
+                                                                columns=self.SCAN_META)
-                    pop_last=True),
+
-                columns=self.QID_HEADER),
+            dict_tracker['CATEGORY_HEADER'] = pd.DataFrame(self.utils.grab_section(report,
-            'GROUP_HEADER': pd.DataFrame(
+                                                                                   self.CATEGORY_HEADER),
-                self.utils.grab_section(
+                                                                columns=self.CATEGORY_HEADER)
-                    report,
+            all_dataframes.append(dict_tracker)
-                    self.GROUP_HEADER,
+
-                    end=[self.OWASP_HEADER],
+        return all_dataframes
                    pop_last=True),
                columns=self.GROUP_HEADER),
            'OWASP_HEADER': pd.DataFrame(
                self.utils.grab_section(
                    report,
                    self.OWASP_HEADER,
                    end=[self.WASC_HEADER],
                    pop_last=True),
                columns=self.OWASP_HEADER),
            'WASC_HEADER': pd.DataFrame(
                self.utils.grab_section(
                    report,
                    self.WASC_HEADER,
                    end=[['APPENDIX']],
                    pop_last=True),
                columns=self.WASC_HEADER),
            'SCAN_META': pd.DataFrame(
                self.utils.grab_section(report,
                    self.SCAN_META,
                    end=[self.CATEGORY_HEADER],
                    pop_last=True),
                columns=self.SCAN_META),
            'CATEGORY_HEADER': pd.DataFrame(
                self.utils.grab_section(report,
                    self.CATEGORY_HEADER),
                columns=self.CATEGORY_HEADER)
        }
    def data_normalizer(self, dataframes):
        """
@ -321,21 +409,12 @@ class qualysScanReport:
        :param dataframes:
        :return:
        """
-        df_dict = dataframes
+        df_dict = dataframes[0]
-        merged_df = pd.concat([
+        merged_df = pd.concat([df_dict['WEB_SCAN_VULN_BLOCK'], df_dict['WEB_SCAN_SENSITIVE_BLOCK'],
-            df_dict['WEB_SCAN_VULN_BLOCK'],
+                               df_dict['WEB_SCAN_INFO_BLOCK']], axis=0,
-            df_dict['WEB_SCAN_SENSITIVE_BLOCK'],
+                              ignore_index=False)
-            df_dict['WEB_SCAN_INFO_BLOCK']
+        merged_df = pd.merge(merged_df, df_dict['QID_HEADER'], left_on='QID',
-        ], axis=0, ignore_index=False)
+                             right_on='Id')
        merged_df = pd.merge(
                merged_df,
                df_dict['QID_HEADER'].drop(
                    #these columns always seem to be the same as what we're merging into
                    ['CVSS V3 Attack Vector', 'CVSS V3 Base', 'CVSS V3 Temporal'],
                    axis=1),
                left_on='QID', right_on='Id'
        )
        if 'Content' not in merged_df:
            merged_df['Content'] = ''
@ -352,11 +431,8 @@ class qualysScanReport:
        merged_df = merged_df.assign(**df_dict['SCAN_META'].to_dict(orient='records')[0])
-        merged_df = pd.merge(
+        merged_df = pd.merge(merged_df, df_dict['CATEGORY_HEADER'], how='left', left_on=['Category', 'Severity Level'],
-                merged_df, df_dict['CATEGORY_HEADER'],
+                             right_on=['Category', 'Severity'], suffixes=('Severity', 'CatSev'))
                how='left', left_on=['Category', 'Severity Level'],
                right_on=['Category', 'Severity'], suffixes=('Severity', 'CatSev')
        )
        merged_df = merged_df.replace('N/A', '').fillna('')
--- a/vulnwhisp/reporting/jira_api.py
+++ b/vulnwhisp/reporting/jira_api.py
@ -1,18 +1,15 @@
 from __future__ import absolute_import
 import json
 import os
-from datetime import datetime, date
+from datetime import datetime, date, timedelta
 from jira import JIRA
 import requests
 import logging
 from bottle import template
 import re
 from six.moves import range
 class JiraAPI(object):
-    def __init__(self, hostname=None, username=None, password=None, path="", debug=False, clean_obsolete=True,
+    def __init__(self, hostname=None, username=None, password=None, path="", debug=False, clean_obsolete=True, max_time_window=12, decommission_time_window=3):
                 max_time_window=12, decommission_time_window=3):
        self.logger = logging.getLogger('JiraAPI')
        if debug:
            self.logger.setLevel(logging.DEBUG)
@ -32,31 +29,26 @@ class JiraAPI(object):
        self.template_path = 'vulnwhisp/reporting/resources/ticket.tpl'
        self.max_ips_ticket = 30
        self.attachment_filename = "vulnerable_assets.txt"
-        self.max_time_tracking = max_time_window  # in months
+        self.max_time_tracking = max_time_window #in months
        if path:
            self.download_tickets(path)
        else:
            self.logger.warn("No local path specified, skipping Jira ticket download.")
-        self.max_decommission_time = decommission_time_window  # in months
+        self.max_decommission_time = decommission_time_window #in months
        # [HIGIENE] close tickets older than 12 months as obsolete (max_time_window defined)
        if clean_obsolete:
            self.close_obsolete_tickets()
        # deletes the tag "server_decommission" from those tickets closed <=3 months ago
        self.decommission_cleanup()
-
+        
-        self.jira_still_vulnerable_comment = '''This ticket has been reopened due to the vulnerability not having been \
+        self.jira_still_vulnerable_comment = '''This ticket has been reopened due to the vulnerability not having been fixed (if multiple assets are affected, all need to be fixed; if the server is down, lastest known vulnerability might be the one reported).
-        fixed (if multiple assets are affected, all need to be fixed; if the server is down, lastest known \
+        - In the case of the team accepting the risk and wanting to close the ticket, please add the label "*risk_accepted*" to the ticket before closing it.
-        vulnerability might be the one reported).
+        - If server has been decommissioned, please add the label "*server_decommission*" to the ticket before closing it.
-        - In the case of the team accepting the risk and wanting to close the ticket, please add the label \
+        - If when checking the vulnerability it looks like a false positive, _+please elaborate in a comment+_ and add the label "*false_positive*" before closing it; we will review it and report it to the vendor.
        "*risk_accepted*" to the ticket before closing it.
        - If server has been decommissioned, please add the label "*server_decommission*" to the ticket before closing \
        it.
        - If when checking the vulnerability it looks like a false positive, _+please elaborate in a comment+_ and add \
         the label "*false_positive*" before closing it; we will review it and report it to the vendor.
        If you have further doubts, please contact the Security Team.'''
-    def create_ticket(self, title, desc, project="IS", components=[], tags=[], attachment_contents=[]):
+    def create_ticket(self, title, desc, project="IS", components=[], tags=[], attachment_contents = []):
        labels = ['vulnerability_management']
        for tag in tags:
            labels.append(str(tag))
@ -70,56 +62,58 @@ class JiraAPI(object):
            for c in project_obj.components:
                if component == c.name:
                    self.logger.debug("resolved component name {} to id {}".format(c.name, c.id))
-                    components_ticket.append({"id": c.id})
+                    components_ticket.append({ "id": c.id })
-                    exists = True
+                    exists=True
            if not exists:
                self.logger.error("Error creating Ticket: component {} not found".format(component))
                return 0
-
+        
-        new_issue = self.jira.create_issue(project=project,
+        try:
-                                           summary=title,
+            new_issue = self.jira.create_issue(project=project,
-                                           description=desc,
+                                               summary=title,
-                                           issuetype={'name': 'Bug'},
+                                               description=desc,
-                                           labels=labels,
+                                               issuetype={'name': 'Bug'},
-                                           components=components_ticket)
+                                               labels=labels,
-
+                                               components=components_ticket)
-        self.logger.info("Ticket {} created successfully".format(new_issue))
+            
-
+            self.logger.info("Ticket {} created successfully".format(new_issue))
-        if attachment_contents:
+            
-            self.add_content_as_attachment(new_issue, attachment_contents)
+            if attachment_contents:
-
+                self.add_content_as_attachment(new_issue, attachment_contents)
        except Exception as e:
            self.logger.error("Failed to create ticket on Jira Project '{}'. Error: {}".format(project, e))
            new_issue = False
        return new_issue
-
+    
-    # Basic JIRA Metrics
+    #Basic JIRA Metrics
    def metrics_open_tickets(self, project=None):
-        jql = "labels= vulnerability_management and resolution = Unresolved"
+        jql = "labels= vulnerability_management and resolution = Unresolved" 
        if project:
            jql += " and (project='{}')".format(project)
-        self.logger.debug('Executing: {}'.format(jql))
+        self.logger.debug('Executing: {}'.format(jql)) 
        return len(self.jira.search_issues(jql, maxResults=0))
    def metrics_closed_tickets(self, project=None):
-        jql = "labels= vulnerability_management and NOT resolution = Unresolved AND created >=startOfMonth(-{})".format(
+        jql = "labels= vulnerability_management and NOT resolution = Unresolved AND created >=startOfMonth(-{})".format(self.max_time_tracking) 
            self.max_time_tracking)
        if project:
            jql += " and (project='{}')".format(project)
        return len(self.jira.search_issues(jql, maxResults=0))
    def sync(self, vulnerabilities, project, components=[]):
-        # JIRA structure of each vulnerability: [source, scan_name, title, diagnosis, consequence, solution,
+        #JIRA structure of each vulnerability: [source, scan_name, title, diagnosis, consequence, solution, ips, risk, references]
        # ips, risk, references]
        self.logger.info("JIRA Sync started")
        for vuln in vulnerabilities:
            # JIRA doesn't allow labels with spaces, so making sure that the scan_name doesn't have spaces
            # if it has, they will be replaced by "_"
-            if " " in vuln['scan_name']:
+            if " " in  vuln['scan_name']:
                vuln['scan_name'] = "_".join(vuln['scan_name'].split(" "))
-
+            
-            # we exclude from the vulnerabilities to report those assets that already exist
+            # we exclude from the vulnerabilities to report those assets that already exist with *risk_accepted*/*server_decommission*
            # with *risk_accepted*/*server_decommission*
            vuln = self.exclude_accepted_assets(vuln)
-
+            
            # make sure after exclusion of risk_accepted assets there are still assets
            if vuln['ips']:
                exists = False
@ -142,65 +136,56 @@ class JiraAPI(object):
                # create local text file with assets, attach it to ticket
                if len(vuln['ips']) > self.max_ips_ticket:
                    attachment_contents = vuln['ips']
-                    vuln['ips'] = [
+                    vuln['ips'] = ["Affected hosts ({assets}) exceed Jira's allowed character limit, added as an attachment.".format(assets = len(attachment_contents))]
                        "Affected hosts ({assets}) exceed Jira's allowed character limit, added as an attachment.".format(
                            assets=len(attachment_contents))]
                try:
                    tpl = template(self.template_path, vuln)
                except Exception as e:
                    self.logger.error('Exception templating: {}'.format(str(e)))
                    return 0
-                self.create_ticket(title=vuln['title'], desc=tpl, project=project, components=components,
+                self.create_ticket(title=vuln['title'], desc=tpl, project=project, components=components, tags=[vuln['source'], vuln['scan_name'], 'vulnerability', vuln['risk']], attachment_contents = attachment_contents)
                                   tags=[vuln['source'], vuln['scan_name'], 'vulnerability', vuln['risk']],
                                   attachment_contents=attachment_contents)
            else:
                self.logger.info("Ignoring vulnerability as all assets are already reported in a risk_accepted ticket")
-
+        
        self.close_fixed_tickets(vulnerabilities)
        # we reinitialize so the next sync redoes the query with their specific variables
        self.all_tickets = []
        self.excluded_tickets = []
        return True
-
+    
    def exclude_accepted_assets(self, vuln):
        # we want to check JIRA tickets with risk_accepted/server_decommission or false_positive labels sharing the same source
        # will exclude tickets older than 12 months, old tickets will get closed for higiene and recreated if still vulnerable
-        labels = [vuln['source'], vuln['scan_name'], 'vulnerability_management', 'vulnerability']
+        labels = [vuln['source'], vuln['scan_name'], 'vulnerability_management', 'vulnerability'] 
-
+        
        if not self.excluded_tickets:
-            jql = "{} AND labels in (risk_accepted,server_decommission, false_positive) AND NOT labels=advisory AND created >=startOfMonth(-{})".format(
+            jql = "{} AND labels in (risk_accepted,server_decommission, false_positive) AND NOT labels=advisory AND created >=startOfMonth(-{})".format(" AND ".join(["labels={}".format(label) for label in labels]), self.max_time_tracking)
                " AND ".join(["labels={}".format(label) for label in labels]), self.max_time_tracking)
            self.excluded_tickets = self.jira.search_issues(jql, maxResults=0)
        title = vuln['title']
-        # WARNING: function IGNORES DUPLICATES, after finding a "duplicate" will just return it exists
+        #WARNING: function IGNORES DUPLICATES, after finding a "duplicate" will just return it exists
-        # it wont iterate over the rest of tickets looking for other possible duplicates/similar issues
+        #it wont iterate over the rest of tickets looking for other possible duplicates/similar issues
        self.logger.info("Comparing vulnerability to risk_accepted tickets")
        assets_to_exclude = []
        tickets_excluded_assets = []
        for index in range(len(self.excluded_tickets)):
-            checking_ticketid, checking_title, checking_assets = self.ticket_get_unique_fields(
+            checking_ticketid, checking_title, checking_assets = self.ticket_get_unique_fields(self.excluded_tickets[index])
                self.excluded_tickets[index])
            if title.encode('ascii') == checking_title.encode('ascii'):
                if checking_assets:
-                    # checking_assets is a list, we add to our full list for later delete all assets
+                    #checking_assets is a list, we add to our full list for later delete all assets
-                    assets_to_exclude += checking_assets
+                    assets_to_exclude+=checking_assets
                    tickets_excluded_assets.append(checking_ticketid)
-
+       
        if assets_to_exclude:
            assets_to_remove = []
-            self.logger.warn("Vulnerable Assets seen on an already existing risk_accepted Jira ticket: {}".format(
+            self.logger.warn("Vulnerable Assets seen on an already existing risk_accepted Jira ticket: {}".format(', '.join(tickets_excluded_assets)))
                ', '.join(tickets_excluded_assets)))
            self.logger.debug("Original assets: {}".format(vuln['ips']))
-            # assets in vulnerability have the structure "ip - hostname - port", so we need to match by partial
+            #assets in vulnerability have the structure "ip - hostname - port", so we need to match by partial 
            for exclusion in assets_to_exclude:
                # for efficiency, we walk the backwards the array of ips from the scanners, as we will be popping out the matches 
                # and we don't want it to affect the rest of the processing (otherwise, it would miss the asset right after the removed one)
                for index in range(len(vuln['ips']))[::-1]:
                    if exclusion == vuln['ips'][index].split(" - ")[0]:
-                        self.logger.debug(
+                        self.logger.debug("Deleting asset {} from vulnerability {}, seen in risk_accepted.".format(vuln['ips'][index], title))
                            "Deleting asset {} from vulnerability {}, seen in risk_accepted.".format(vuln['ips'][index],
                                                                                                     title))
                        vuln['ips'].pop(index)
            self.logger.debug("Modified assets: {}".format(vuln['ips']))
@ -212,37 +197,35 @@ class JiraAPI(object):
        Returns [exists (bool), is equal (bool), ticketid (str), assets (array)]
        '''
        # we need to return if the vulnerability has already been reported and the ID of the ticket for further processing
-        # function returns array [duplicated(bool), update(bool), ticketid, ticket_assets]
+        #function returns array [duplicated(bool), update(bool), ticketid, ticket_assets]
        title = vuln['title']
-        labels = [vuln['source'], vuln['scan_name'], 'vulnerability_management', 'vulnerability']
+        labels = [vuln['source'], vuln['scan_name'], 'vulnerability_management', 'vulnerability'] 
-        # list(set()) to remove duplicates
+        #list(set()) to remove duplicates
        assets = list(set(re.findall(r"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b", ",".join(vuln['ips']))))
-
+        
        if not self.all_tickets:
            self.logger.info("Retrieving all JIRA tickets with the following tags {}".format(labels))
            # we want to check all JIRA tickets, to include tickets moved to other queues
            # will exclude tickets older than 12 months, old tickets will get closed for higiene and recreated if still vulnerable
-            jql = "{} AND NOT labels=advisory AND created >=startOfMonth(-{})".format(
+            jql = "{} AND NOT labels=advisory AND created >=startOfMonth(-{})".format(" AND ".join(["labels={}".format(label) for label in labels]), self.max_time_tracking)
-                " AND ".join(["labels={}".format(label) for label in labels]), self.max_time_tracking)
+            
            self.all_tickets = self.jira.search_issues(jql, maxResults=0)
-
+        
-        # WARNING: function IGNORES DUPLICATES, after finding a "duplicate" will just return it exists
+        #WARNING: function IGNORES DUPLICATES, after finding a "duplicate" will just return it exists
-        # it wont iterate over the rest of tickets looking for other possible duplicates/similar issues
+        #it wont iterate over the rest of tickets looking for other possible duplicates/similar issues
        self.logger.info("Comparing Vulnerabilities to created tickets")
        for index in range(len(self.all_tickets)):
            checking_ticketid, checking_title, checking_assets = self.ticket_get_unique_fields(self.all_tickets[index])
            # added "not risk_accepted", as if it is risk_accepted, we will create a new ticket excluding the accepted assets
-            if title.encode('ascii') == checking_title.encode('ascii') and not self.is_risk_accepted(
+            if title.encode('ascii') == checking_title.encode('ascii') and not self.is_risk_accepted(self.jira.issue(checking_ticketid)): 
                    self.jira.issue(checking_ticketid)):
                difference = list(set(assets).symmetric_difference(checking_assets))
-                # to check intersection - set(assets) & set(checking_assets)
+                #to check intersection - set(assets) & set(checking_assets)
-                if difference:
+                if difference: 
                    self.logger.info("Asset mismatch, ticket to update. Ticket ID: {}".format(checking_ticketid))
-                    return False, True, checking_ticketid, checking_assets  # this will automatically validate
+                    return False, True, checking_ticketid, checking_assets #this will automatically validate
                else:
                    self.logger.info("Confirmed duplicated. TickedID: {}".format(checking_ticketid))
-                    return True, False, checking_ticketid, []  # this will automatically validate
+                    return True, False, checking_ticketid, [] #this will automatically validate
        return False, False, "", []
    def ticket_get_unique_fields(self, ticket):
@ -251,22 +234,19 @@ class JiraAPI(object):
        assets = self.get_assets_from_description(ticket)
        if not assets:
-            # check if attachment, if so, get assets from attachment
+            #check if attachment, if so, get assets from attachment
            assets = self.get_assets_from_attachment(ticket)
-
+                
        return ticketid, title, assets
-    def get_assets_from_description(self, ticket, _raw=False):
+    def get_assets_from_description(self, ticket, _raw = False):
        # Get the assets as a string "host - protocol/port - hostname" separated by "\n"
        # structure the text to have the same structure as the assets from the attachment
        affected_assets = ""
        try:
-            affected_assets = \
+            affected_assets = ticket.raw.get('fields', {}).get('description').encode("ascii").split("{panel:title=Affected Assets}")[1].split("{panel}")[0].replace('\n','').replace(' * ','\n').replace('\n', '', 1)
            ticket.raw.get('fields', {}).get('description').encode("ascii").split("{panel:title=Affected Assets}")[
                1].split("{panel}")[0].replace('\n', '').replace(' * ', '\n').replace('\n', '', 1)
        except Exception as e:
-            self.logger.error(
+            self.logger.error("Unable to process the Ticket's 'Affected Assets'. Ticket ID: {}. Reason: {}".format(ticket, e))
                "Unable to process the Ticket's 'Affected Assets'. Ticket ID: {}. Reason: {}".format(ticket, e))
        if affected_assets:
            if _raw:
@ -282,14 +262,14 @@ class JiraAPI(object):
                self.logger.error("Ticket IPs regex failed. Ticket ID: {}. Reason: {}".format(ticket, e))
        return False
-    def get_assets_from_attachment(self, ticket, _raw=False):
+    def get_assets_from_attachment(self, ticket, _raw = False):
        # Get the assets as a string "host - protocol/port - hostname" separated by "\n"
        affected_assets = []
        try:
            fields = self.jira.issue(ticket.key).raw.get('fields', {})
            attachments = fields.get('attachment', {})
            affected_assets = ""
-            # we will make sure we get the latest version of the file
+            #we will make sure we get the latest version of the file
            latest = ''
            attachment_id = ''
            if attachments:
@ -297,16 +277,15 @@ class JiraAPI(object):
                    if item.get('filename') == self.attachment_filename:
                        if not latest:
                            latest = item.get('created')
-                            attachment_id = item.get('id')
+                            attachment_id = item.get('id') 
                        else:
                            if latest < item.get('created'):
-                                latest = item.get('created')
+                                latest = item.get('created')         
-                                attachment_id = item.get('id')
+                                attachment_id = item.get('id') 
            affected_assets = self.jira.attachment(attachment_id).get()
        except Exception as e:
-            self.logger.error(
+            self.logger.error("Failed to get assets from ticket attachment. Ticket ID: {}. Reason: {}".format(ticket, e))
                "Failed to get assets from ticket attachment. Ticket ID: {}. Reason: {}".format(ticket, e))
        if affected_assets:
            if _raw:
@ -352,15 +331,15 @@ class JiraAPI(object):
    def add_content_as_attachment(self, issue, contents):
        try:
-            # Create the file locally with the data
+            #Create the file locally with the data
            attachment_file = open(self.attachment_filename, "w")
            attachment_file.write("\n".join(contents))
            attachment_file.close()
-            # Push the created file to the ticket
+            #Push the created file to the ticket
            attachment_file = open(self.attachment_filename, "rb")
            self.jira.add_attachment(issue, attachment_file, self.attachment_filename)
            attachment_file.close()
-            # remove the temp file
+            #remove the temp file
            os.remove(self.attachment_filename)
            self.logger.info("Added attachment successfully.")
        except:
@ -370,23 +349,21 @@ class JiraAPI(object):
        return True
    def get_ticket_reported_assets(self, ticket):
-        # [METRICS] return a list with all the affected assets for that vulnerability (including already resolved ones)
+        #[METRICS] return a list with all the affected assets for that vulnerability (including already resolved ones) 
-        return list(set(re.findall(r"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b", str(self.jira.issue(ticket).raw))))
+        return list(set(re.findall(r"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b",str(self.jira.issue(ticket).raw))))
    def get_resolution_time(self, ticket):
-        # get time a ticket took to be resolved
+        #get time a ticket took to be resolved
        ticket_obj = self.jira.issue(ticket)
        if self.is_ticket_resolved(ticket_obj):
            ticket_data = ticket_obj.raw.get('fields')
-            # dates follow format '2018-11-06T10:36:13.849+0100'
+            #dates follow format '2018-11-06T10:36:13.849+0100'
-            created = [int(x) for x in
+            created = [int(x) for x in ticket_data['created'].split('.')[0].replace('T', '-').replace(':','-').split('-')]
-                       ticket_data['created'].split('.')[0].replace('T', '-').replace(':', '-').split('-')]
+            resolved =[int(x) for x in ticket_data['resolutiondate'].split('.')[0].replace('T', '-').replace(':','-').split('-')]
-            resolved = [int(x) for x in
+            
-                        ticket_data['resolutiondate'].split('.')[0].replace('T', '-').replace(':', '-').split('-')]
+            start = datetime(created[0],created[1],created[2],created[3],created[4],created[5])
-
+            end = datetime(resolved[0],resolved[1],resolved[2],resolved[3],resolved[4],resolved[5])
-            start = datetime(created[0], created[1], created[2], created[3], created[4], created[5])
+            return (end-start).days
            end = datetime(resolved[0], resolved[1], resolved[2], resolved[3], resolved[4], resolved[5])
            return (end - start).days
        else:
            self.logger.error("Ticket {ticket} is not resolved, can't calculate resolution time".format(ticket=ticket))
@ -395,28 +372,28 @@ class JiraAPI(object):
    def ticket_update_assets(self, vuln, ticketid, ticket_assets):
        # correct description will always be in the vulnerability to report, only needed to update description to new one
        self.logger.info("Ticket {} exists, UPDATE requested".format(ticketid))
        #for now, if a vulnerability has been accepted ('accepted_risk'), ticket is completely ignored and not updated (no new assets)
-        # for now, if a vulnerability has been accepted ('accepted_risk'), ticket is completely ignored and not updated (no new assets)
+        #TODO when vulnerability accepted, create a new ticket with only the non-accepted vulnerable assets
-
+        #this would require go through the downloaded tickets, check duplicates/accepted ones, and if so,
-        # TODO when vulnerability accepted, create a new ticket with only the non-accepted vulnerable assets
+        #check on their assets to exclude them from the new ticket
        # this would require go through the downloaded tickets, check duplicates/accepted ones, and if so,
        # check on their assets to exclude them from the new ticket
        risk_accepted = False
        ticket_obj = self.jira.issue(ticketid)
        if self.is_ticket_resolved(ticket_obj):
            if self.is_risk_accepted(ticket_obj):
                return 0
            self.reopen_ticket(ticketid=ticketid, comment=self.jira_still_vulnerable_comment)
-
+        
-        # First will do the comparison of assets
+        #First will do the comparison of assets
        ticket_obj.update()
        assets = list(set(re.findall(r"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b", ",".join(vuln['ips']))))
        difference = list(set(assets).symmetric_difference(ticket_assets))
-
+        
        comment = ''
        added = ''
        removed = ''
-        # put a comment with the assets that have been added/removed
+        #put a comment with the assets that have been added/removed
        for asset in difference:
            if asset in assets:
                if not added:
@ -424,71 +401,66 @@ class JiraAPI(object):
                added += '* {}\n'.format(asset)
            elif asset in ticket_assets:
                if not removed:
-                    removed = '\nThe following assets *have been resolved*:\n'
+                    removed= '\nThe following assets *have been resolved*:\n'
                removed += '* {}\n'.format(asset)
        comment = added + removed
-
+        
-        # then will check if assets are too many that need to be added as an attachment
+        #then will check if assets are too many that need to be added as an attachment
        attachment_contents = []
        if len(vuln['ips']) > self.max_ips_ticket:
            attachment_contents = vuln['ips']
-            vuln['ips'] = [
+            vuln['ips'] = ["Affected hosts ({assets}) exceed Jira's allowed character limit, added as an attachment.".format(assets = len(attachment_contents))]
-                "Affected hosts ({assets}) exceed Jira's allowed character limit, added as an attachment.".format(
+        
-                    assets=len(attachment_contents))]
+        #fill the ticket description template
        # fill the ticket description template
        try:
            tpl = template(self.template_path, vuln)
        except Exception as e:
            self.logger.error('Exception updating assets: {}'.format(str(e)))
            return 0
-        # proceed checking if it requires adding as an attachment
+        #proceed checking if it requires adding as an attachment
        try:
-            # update attachment with hosts and delete the old versions
+            #update attachment with hosts and delete the old versions
            if attachment_contents:
                self.clean_old_attachments(ticket_obj)
                self.add_content_as_attachment(ticket_obj, attachment_contents)
-
+                
-            ticket_obj.update(description=tpl, comment=comment, fields={"labels": ticket_obj.fields.labels})
+            ticket_obj.update(description=tpl, comment=comment, fields={"labels":ticket_obj.fields.labels})
            self.logger.info("Ticket {} updated successfully".format(ticketid))
            self.add_label(ticketid, 'updated')
        except Exception as e:
-            self.logger.error(
+            self.logger.error("Error while trying up update ticket {ticketid}.\nReason: {e}".format(ticketid = ticketid, e=e))
                "Error while trying up update ticket {ticketid}.\nReason: {e}".format(ticketid=ticketid, e=e))
        return 0
    def add_label(self, ticketid, label):
        ticket_obj = self.jira.issue(ticketid)
-
+        
        if label not in [x.encode('utf8') for x in ticket_obj.fields.labels]:
            ticket_obj.fields.labels.append(label)
-
+        
            try:
-                ticket_obj.update(fields={"labels": ticket_obj.fields.labels})
+                ticket_obj.update(fields={"labels":ticket_obj.fields.labels})
                self.logger.info("Added label {label} to ticket {ticket}".format(label=label, ticket=ticketid))
-            except Exception as e:
+            except:
-                self.logger.error(
+                self.logger.error("Error while trying to add label {label} to ticket {ticket}".format(label=label, ticket=ticketid))
-                    "Error while trying to add label {label} to ticket {ticket}".format(label=label, ticket=ticketid))
+        
        return 0
    def remove_label(self, ticketid, label):
        ticket_obj = self.jira.issue(ticketid)
-
+        
        if label in [x.encode('utf8') for x in ticket_obj.fields.labels]:
            ticket_obj.fields.labels.remove(label)
-
+        
            try:
-                ticket_obj.update(fields={"labels": ticket_obj.fields.labels})
+                ticket_obj.update(fields={"labels":ticket_obj.fields.labels})
                self.logger.info("Removed label {label} from ticket {ticket}".format(label=label, ticket=ticketid))
-            except Exception as e:
+            except:
-                self.logger.error("Error while trying to remove label {label} to ticket {ticket}".format(label=label,
+                self.logger.error("Error while trying to remove label {label} to ticket {ticket}".format(label=label, ticket=ticketid))
                                                                                                         ticket=ticketid))
        else:
            self.logger.error("Error: label {label} not in ticket {ticket}".format(label=label, ticket=ticketid))
-
+        
        return 0
    def close_fixed_tickets(self, vulnerabilities):
@ -508,16 +480,17 @@ class JiraAPI(object):
                self.logger.info("Ticket {} is still vulnerable".format(ticket))
                continue
            self.logger.info("Ticket {} is no longer vulnerable".format(ticket))
-            self.close_ticket(ticket, self.JIRA_RESOLUTION_FIXED, comment)
+            self.close_ticket(ticket, self.JIRA_RESOLUTION_FIXED, comment) 
        return 0
    def is_ticket_reopenable(self, ticket_obj):
        transitions = self.jira.transitions(ticket_obj)
        for transition in transitions:
            if transition.get('name') == self.JIRA_REOPEN_ISSUE:
                self.logger.debug("Ticket is reopenable")
                return True
-        self.logger.warn("Ticket can't be opened. Check Jira transitions.")
+        self.logger.error("Ticket {} can't be opened. Check Jira transitions.".format(ticket_obj))
        return False
    def is_ticket_closeable(self, ticket_obj):
@ -525,11 +498,11 @@ class JiraAPI(object):
        for transition in transitions:
            if transition.get('name') == self.JIRA_CLOSE_ISSUE:
                return True
-        self.logger.warn("Ticket can't closed. Check Jira transitions.")
+        self.logger.error("Ticket {} can't closed. Check Jira transitions.".format(ticket_obj))
        return False
    def is_ticket_resolved(self, ticket_obj):
-        # Checks if a ticket is resolved or not
+        #Checks if a ticket is resolved or not
        if ticket_obj is not None:
            if ticket_obj.raw['fields'].get('resolution') is not None:
                if ticket_obj.raw['fields'].get('resolution').get('name') != 'Unresolved':
@ -539,6 +512,7 @@ class JiraAPI(object):
        self.logger.debug("Checked ticket {} is already open".format(ticket_obj))
        return False
    def is_risk_accepted(self, ticket_obj):
        if ticket_obj is not None:
            if ticket_obj.raw['fields'].get('labels') is not None:
@ -559,13 +533,12 @@ class JiraAPI(object):
        self.logger.debug("Ticket {} exists, REOPEN requested".format(ticketid))
        # this will reopen a ticket by ticketid
        ticket_obj = self.jira.issue(ticketid)
-
+        
        if self.is_ticket_resolved(ticket_obj):
            if (not self.is_risk_accepted(ticket_obj) or ignore_labels):
                try:
                    if self.is_ticket_reopenable(ticket_obj):
-                        error = self.jira.transition_issue(issue=ticketid, transition=self.JIRA_REOPEN_ISSUE,
+                        error = self.jira.transition_issue(issue=ticketid, transition=self.JIRA_REOPEN_ISSUE, comment = comment)
                                                           comment=comment)
                        self.logger.info("Ticket {} reopened successfully".format(ticketid))
                        if not ignore_labels:
                            self.add_label(ticketid, 'reopened')
@ -583,32 +556,30 @@ class JiraAPI(object):
        if not self.is_ticket_resolved(ticket_obj):
            try:
                if self.is_ticket_closeable(ticket_obj):
-                    # need to add the label before closing the ticket
+                    #need to add the label before closing the ticket
                    self.add_label(ticketid, 'closed')
-                    error = self.jira.transition_issue(issue=ticketid, transition=self.JIRA_CLOSE_ISSUE,
+                    error = self.jira.transition_issue(issue=ticketid, transition=self.JIRA_CLOSE_ISSUE, comment = comment, resolution = {"name": resolution })
                                                       comment=comment, resolution={"name": resolution})
                    self.logger.info("Ticket {} closed successfully".format(ticketid))
                    return 1
            except Exception as e:
                # continue with ticket data so that a new ticket is created in place of the "lost" one
                self.logger.error("error closing ticket {}: {}".format(ticketid, e))
                return 0
-
+                
        return 0
    def close_obsolete_tickets(self):
        # Close tickets older than 12 months, vulnerabilities not solved will get created a new ticket 
        self.logger.info("Closing obsolete tickets older than {} months".format(self.max_time_tracking))
-        jql = "labels=vulnerability_management AND NOT labels=advisory AND created <startOfMonth(-{}) and resolution=Unresolved".format(
+        jql = "labels=vulnerability_management AND NOT labels=advisory AND created <startOfMonth(-{}) and resolution=Unresolved".format(self.max_time_tracking)
            self.max_time_tracking)
        tickets_to_close = self.jira.search_issues(jql, maxResults=0)
-
+        
        comment = '''This ticket is being closed for hygiene, as it is more than {} months old.
        If the vulnerability still exists, a new ticket will be opened.'''.format(self.max_time_tracking)
-
+        
        for ticket in tickets_to_close:
-            self.close_ticket(ticket, self.JIRA_RESOLUTION_OBSOLETE, comment)
+                self.close_ticket(ticket, self.JIRA_RESOLUTION_OBSOLETE, comment)
-
+        
        return 0
    def project_exists(self, project):
@ -623,19 +594,18 @@ class JiraAPI(object):
        '''
        saves all tickets locally, local snapshot of vulnerability_management ticktes
        '''
-        # check if file already exists
+        #check if file already exists
        check_date = str(date.today())
-        fname = '{}jira_{}.json'.format(path, check_date)
+        fname = '{}jira_{}.json'.format(path, check_date) 
        if os.path.isfile(fname):
            self.logger.info("File {} already exists, skipping ticket download".format(fname))
            return True
        try:
            self.logger.info("Saving locally tickets from the last {} months".format(self.max_time_tracking))
-            jql = "labels=vulnerability_management AND NOT labels=advisory AND created >=startOfMonth(-{})".format(
+            jql = "labels=vulnerability_management AND NOT labels=advisory AND created >=startOfMonth(-{})".format(self.max_time_tracking)
                self.max_time_tracking)
            tickets_data = self.jira.search_issues(jql, maxResults=0)
-            # TODO process tickets, creating a new field called "_metadata" with all the affected assets well structured
+            #TODO process tickets, creating a new field called "_metadata" with all the affected assets well structured
            # for future processing in ELK/Splunk; this includes downloading attachments with assets and processing them
            processed_tickets = []
@ -656,23 +626,24 @@ class JiraAPI(object):
                        assets_json = self.parse_asset_to_json(assets)
                        _metadata["affected_hosts"].append(assets_json)
                temp_ticket = ticket.raw.get('fields')
                temp_ticket['_metadata'] = _metadata
                processed_tickets.append(temp_ticket)
-
+            
-            # end of line needed, as writelines() doesn't add it automatically, otherwise one big line
+            #end of line needed, as writelines() doesn't add it automatically, otherwise one big line
-            to_save = [json.dumps(ticket.raw.get('fields')) + "\n" for ticket in tickets_data]
+            to_save = [json.dumps(ticket.raw.get('fields'))+"\n" for ticket in tickets_data]
            with open(fname, 'w') as outfile:
                outfile.writelines(to_save)
                self.logger.info("Tickets saved succesfully.")
-
+            
            return True
        except Exception as e:
            self.logger.error("Tickets could not be saved locally: {}.".format(e))
-        return False
+        return False 
    def decommission_cleanup(self):
        '''
@ -680,22 +651,19 @@ class JiraAPI(object):
        closed already for more than x months (default is 3 months) in order to clean solved issues
        for statistics purposes
        '''
-        self.logger.info("Deleting 'server_decommission' tag from tickets closed more than {} months ago".format(
+        self.logger.info("Deleting 'server_decommission' tag from tickets closed more than {} months ago".format(self.max_decommission_time))
            self.max_decommission_time))
-        jql = "labels=vulnerability_management AND labels=server_decommission and resolutiondate <=startOfMonth(-{})".format(
+        jql = "labels=vulnerability_management AND labels=server_decommission and resolutiondate <=startOfMonth(-{})".format(self.max_decommission_time)
            self.max_decommission_time)
        decommissioned_tickets = self.jira.search_issues(jql, maxResults=0)
-
+        
        comment = '''This ticket is having deleted the *server_decommission* tag, as it is more than {} months old and is expected to already have been decommissioned.
-        If that is not the case and the vulnerability still exists, the vulnerability will be opened again.'''.format(
+        If that is not the case and the vulnerability still exists, the vulnerability will be opened again.'''.format(self.max_decommission_time)
-            self.max_decommission_time)
+        
        for ticket in decommissioned_tickets:
-            # we open first the ticket, as we want to make sure the process is not blocked due to
+            #we open first the ticket, as we want to make sure the process is not blocked due to 
-            # an unexisting jira workflow or unallowed edit from closed tickets
+            #an unexisting jira workflow or unallowed edit from closed tickets
            self.reopen_ticket(ticketid=ticket, ignore_labels=True)
            self.remove_label(ticket, 'server_decommission')
            self.close_ticket(ticket, self.JIRA_RESOLUTION_FIXED, comment)
-
+        
        return 0
--- a/vulnwhisp/test/mock.py
+++ b/vulnwhisp/test/mock.py
@ -1,4 +1,3 @@
 from __future__ import absolute_import
 import os
 import logging
 import httpretty
@ -21,12 +20,10 @@ class mockAPI(object):
    def get_directories(self, path):
        dir, subdirs, files = next(os.walk(path))
        self.logger.debug('Subdirectories found: {}'.format(subdirs))
        return subdirs
    def get_files(self, path):
        dir, subdirs, files = next(os.walk(path))
        self.logger.debug('Files found: {}'.format(files))
        return files
    def qualys_vuln_callback(self, request, uri, response_headers):
--- a/vulnwhisp/vulnwhisp.py
+++ b/vulnwhisp/vulnwhisp.py
Author	SHA1	Message	Date
Mouktar KimBA	a9289d8e47	Merge pull request 'Traduction du modèle de rapport de bug' (#1 ) from mes-modifs into master Reviewed-on: #1	2025-07-07 12:56:24 +00:00
moxi	67ec8af3ae	Traduction du modèle de rapport de bug	2025-07-07 14:41:21 +02:00
Justin Henderson	691f45a1dc	Merge pull request #232 from HASecuritySolutions/dependabot/pip/lxml-4.6.5 Bump lxml from 4.1.1 to 4.6.5	2022-06-11 20:39:14 -05:00
Justin Henderson	80197454a3	Update README.md	2022-02-03 10:33:12 -06:00
dependabot[bot]	841cd09f2d	Bump lxml from 4.1.1 to 4.6.5 Bumps [lxml](https://github.com/lxml/lxml) from 4.1.1 to 4.6.5. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.1.1...lxml-4.6.5) --- updated-dependencies: - dependency-name: lxml dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-13 19:44:12 +00:00
Quim Montal	e7183864d0	Merge pull request #216 from Yashvendra/patch-1 Updated 3000_openvas.conf	2020-07-20 10:45:00 +02:00
Quim Montal	12ac3dbf62	Merge pull request #217 from andrew-bailey/patch-1 Update README.md	2020-07-20 10:43:09 +02:00
andrew-bailey	e41ec93058	Update README.md Fix license badge from MIT to Apache 2.0 which is the current license applied in Github	2020-07-20 11:57:36 +09:30
y_k_007	8a86e3142a	Update 3000_openvas.conf Fixed Description	2020-07-19 14:41:21 +05:30
Quim	9d003d12b4	improved error logging and excepcions	2020-04-08 12:01:47 +02:00
Quim Montal	63c638751b	Merge pull request #207 from spasaintk/patch-1 Update vulnwhisp.py	2020-02-29 20:05:51 +01:00
spasaintk	a3e85b7207	Update vulnwhisp.py Code triggers a crash: ERROR:root:main:local variable 'vw' referenced before assignment ERROR: local variable 'vw' referenced before assignment Proposed fix deals with the issue. After fix: INFO:vulnWhispererOpenVAS:process_openvas_scans:Processing complete	2020-02-28 00:33:38 +01:00