diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 892de80..d488acb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,14 @@ Change Log This document records all notable changes to `nessus file analyzer by LimberDuck `_. This project adheres to `Semantic Versioning `_. + +0.3.1 (2019-09-02) +--------------------- + +Bug Fixes + - **Start button and menu option Start analysis** - will be set to disabled if you do not provide nessus files during the next selection (e.g. cancelling nessus files selection, cancelling source directory selection, selecting directory without nessus files, dropping files with extension different than .nessus, dropping directory without nessus files) + - **List of files to pars** - will be correctly cleared out if you do not provide nessus files during the next selection (e.g. cancelling nessus files selection, cancelling source directory selection, selecting directory without nessus files, dropping files with extension different than .nessus, dropping directory without nessus files) + 0.3.0 (2019-08-26) --------------------- diff --git a/README.rst b/README.rst index fcc3256..5b0d334 100644 --- a/README.rst +++ b/README.rst @@ -36,7 +36,7 @@ Main features Usage ===== 1. To open nessus files: - 1.1 Open *nessus file analyzer by LimberDuck*, go to Menu "File" and choose: + 1.1 Open nessus file analyzer by LimberDuck, go to Menu "File" and choose: - "Open file\\-s" if you want to open one or more nessus files at once. - "Open directory" if you want to open all nessus files from selected directory and its subdirectories. 1.2 On OS level select one or more nessus files: @@ -47,7 +47,6 @@ Usage - simple drag and drop selected directory or directories on *nessus file analyzer by LimberDuck* window. 2. Select one or more report type: - - "scan" - if you want to see sum-up from point of view of whole scan - "host" - if you want to see sum-up from point of view of particular host from given scan - "vulnerabilities" - if you want to see list of vulnerabilities reported in this scan for all scanned hosts diff --git a/nessus_file_analyzer/__about__.py b/nessus_file_analyzer/__about__.py index 396f228..60c52b1 100644 --- a/nessus_file_analyzer/__about__.py +++ b/nessus_file_analyzer/__about__.py @@ -33,8 +33,8 @@ "of scans performed by using Nessus by (C) Tenable, Inc. and exports parsed" \ "data to a Microsoft Excel Workbook for effortless analysis." __uri__ = "https://github.com/LimberDuck" -__version__ = "0.3.0" -__release_date__ = "2019.08.26" +__version__ = "0.3.1" +__release_date__ = "2019.09.02" __author__ = u"Damian Krawczyk" __email__ = "damian.krawczyk@limberduck.org" __license_name__ = "GNU GPLv3" diff --git a/nessus_file_analyzer/app.py b/nessus_file_analyzer/app.py index 410a83e..7f6cefb 100644 --- a/nessus_file_analyzer/app.py +++ b/nessus_file_analyzer/app.py @@ -811,8 +811,9 @@ def open_files(self): self.get_target_directory_from_file() - self.list_of_files_to_pars(files_only) + self.list_of_files_to_pars(files_only) + if len(files_only) > 0: if (self.__report_scan_enabled or self.__report_host_enabled or self.__report_vulnerabilities_enabled @@ -820,10 +821,8 @@ def open_files(self): self.pushButton_start.setEnabled(True) self.actionStart_analysis.setEnabled(True) else: - number_of_files = 0 - info = 'Selected {0} files.'.format(str(number_of_files)) - color = 'black' - self.print_log(info, color=color) + self.pushButton_start.setDisabled(True) + self.actionStart_analysis.setDisabled(True) @staticmethod def check_if_subdirectory_exist(main_directory): @@ -863,6 +862,7 @@ def open_directory(self): os_separator = os.path.sep target_directory = os.path.abspath(directories) + files =[] if directories: if self.checkBox_set_source_directory_as_target_directory.isChecked(): self.set_target_directory(target_directory) @@ -871,8 +871,10 @@ def open_directory(self): files = glob.glob(target_directory + os_separator + '**' + os_separator + extension, recursive=True) # print(files) - self.list_of_files_to_pars(files) + self.list_of_files_to_pars(files) + + if len(files) > 0: if (self.__report_scan_enabled or self.__report_host_enabled or self.__report_vulnerabilities_enabled @@ -880,10 +882,8 @@ def open_directory(self): self.pushButton_start.setEnabled(True) self.actionStart_analysis.setEnabled(True) else: - number_of_files = 0 - info = 'Selected {0} files.'.format(str(number_of_files)) - color = 'black' - self.print_log(info, color=color) + self.pushButton_start.setDisabled(True) + self.actionStart_analysis.setDisabled(True) def open_files_by_drag_and_drop(self, qurls): """ @@ -924,9 +924,20 @@ def open_files_by_drag_and_drop(self, qurls): for file in files: paths.append(file) - if len(paths) > 0: self.list_of_files_to_pars(paths) + if len(paths) > 0: + if (self.__report_scan_enabled + or self.__report_host_enabled + or self.__report_vulnerabilities_enabled + or self.__report_noncompliance_enabled): + self.pushButton_start.setEnabled(True) + self.actionStart_analysis.setEnabled(True) + + else: + self.pushButton_start.setDisabled(True) + self.actionStart_analysis.setDisabled(True) + def open_target_directory(self): """ Function open target directory taking into account Operating system: @@ -994,7 +1005,7 @@ def list_of_files_to_pars(self, files): suffix = '' else: suffix = 's' - info = 'Selected {0} file{1}.'.format(str(number_of_files), suffix) + info = 'Selected {0} nessus file{1}.'.format(str(number_of_files), suffix) color = 'blue' self.print_log(info, color=color) self.print_status_bar_info(info) diff --git a/version.rc b/version.rc index bc82fe9..6d73961 100644 --- a/version.rc +++ b/version.rc @@ -1,7 +1,7 @@ VSVersionInfo( ffi=FixedFileInfo( - filevers=(0, 3, 0, 0), - prodvers=(0, 3, 0, 0), + filevers=(0, 3, 1, 0), + prodvers=(0, 3, 1, 0), mask=0x3f, flags=0x0, OS=0x40004, @@ -16,12 +16,12 @@ VSVersionInfo( u'040904B0', [StringStruct(u'CompanyName', u'LimberDuck'), StringStruct(u'FileDescription', u'nessus file analyzer'), - StringStruct(u'FileVersion', u'0.3.0.0'), + StringStruct(u'FileVersion', u'0.3.1.0'), StringStruct(u'InternalName', u'nfa'), StringStruct(u'LegalCopyright', u'\xa9 Damian Krawczyk.'), StringStruct(u'OriginalFilename', u'nfa.exe'), StringStruct(u'ProductName', u'nessus file analyzer'), - StringStruct(u'ProductVersion', u'0.3.0.0')]) + StringStruct(u'ProductVersion', u'0.3.1.0')]) ]), VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) ]