CVEs alerts inventory for Vulnerability Detector: partial scan type #1428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add retry decorator to create_simulated_agent of vulnerability_detector module to allow two attempts when the simulated agent is added to the system Add ALERT_LOGS_PATH to the initialization module of the wazuh_testing.tools package #1425
mdengra
force-pushed
the
1425-cve-alerts-inventory-partial_scan
branch
from
30fd32f to
1639efa
Compare
BraulioV
suggested changes
Jun 9, 2021
Comment on lines
824
to
830
| for _ in range(VULN_DETECTOR_GLOBAL_TIMEOUT): | ||
| try: | ||
| make_query(CVE_DB_PATH, [query_string]) | ||
| return | ||
| except sqlite3.OperationalError: | ||
| sleep(1) | ||
| raise sqlite3.OperationalError |
There was a problem hiding this comment.
Suggested change
| for _ in range(VULN_DETECTOR_GLOBAL_TIMEOUT): | |
| try: | |
| make_query(CVE_DB_PATH, [query_string]) | |
| return | |
| except sqlite3.OperationalError: | |
| sleep(1) | |
| raise sqlite3.OperationalError | |
| for _ in range(VULN_DETECTOR_GLOBAL_TIMEOUT): | |
| try: | |
| make_query(CVE_DB_PATH, [query_string]) | |
| break | |
| except sqlite3.OperationalError: | |
| sleep(1) | |
| else: | |
| raise sqlite3.OperationalError |
Comment on lines
820
to
822
| Args: | ||
| timestamp (int): The new timestamp value to set. | ||
| """ |
Comment on lines
39
to
48
| parameters = [{ | ||
| 'BUSTER_FEED_PATH': buster_oval_feed_path, | ||
| 'DEBIAN_JSON_FEED_PATH': debian_json_feed_path, | ||
| 'NVD_JSON_FEED_PATH': nvd_json_feed_path | ||
| }] | ||
| metadata = [{ | ||
| 'BUSTER_FEED_PATH': buster_oval_feed_path, | ||
| 'DEBIAN_JSON_FEED_PATH': debian_json_feed_path, | ||
| 'NVD_JSON_FEED_PATH': nvd_json_feed_path | ||
| }] |
There was a problem hiding this comment.
Suggested change
| parameters = [{ | |
| 'BUSTER_FEED_PATH': buster_oval_feed_path, | |
| 'DEBIAN_JSON_FEED_PATH': debian_json_feed_path, | |
| 'NVD_JSON_FEED_PATH': nvd_json_feed_path | |
| }] | |
| metadata = [{ | |
| 'BUSTER_FEED_PATH': buster_oval_feed_path, | |
| 'DEBIAN_JSON_FEED_PATH': debian_json_feed_path, | |
| 'NVD_JSON_FEED_PATH': nvd_json_feed_path | |
| }] | |
| parameters = [{ | |
| 'BUSTER_FEED_PATH': buster_oval_feed_path, | |
| 'DEBIAN_JSON_FEED_PATH': debian_json_feed_path, | |
| 'NVD_JSON_FEED_PATH': nvd_json_feed_path | |
| }] | |
| metadata = parameters |
Comment on lines
69
to
70
| """Add a dummy agent, inserts in its database (sys_programs table) a test package, | ||
| and configures its database to appear to be up to date (sync_info table).""" |
There was a problem hiding this comment.
Change this docstring to look like the one in test_partial_scan_type. A single line explaining what it does, another one if you need further details and the args.
| test_feed_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'data', 'feeds') | ||
| configurations_path = os.path.join(test_data_path, 'wazuh_partial_scan_type.yaml') | ||
| wazuh_log_monitor = FileMonitor(LOG_FILE_PATH) | ||
| wazuh_alert_monitor = FileMonitor(ALERT_LOGS_PATH) |
There was a problem hiding this comment.
I prefer to monitor the alerts.json file rather than the plain log. The reason for this change is based on the fact that we can extract the alert using the FileMonitor and check the fields in it by import it with the json module.
Fix docstring in add_simulated_agent fixture #1425
BraulioV
approved these changes
Jun 9, 2021
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds a test to verify if the
PARTIAL_SCANtype of vulnerability detector works correctly as part of #1261.Test results
Manager
Tested on CentOS 8 (local)
Tested on CentOS 7 (Jenkins)
Documentation
Tests
pycodestyle --max-line-length=120 --show-source --show-pep8 file.py.provision_documentation.shgenerate the docs without errors.