wazuh · pro-akim · Apr 28, 2022 · Apr 28, 2022 · Apr 28, 2022 · Apr 28, 2022
diff --git a/.github/ISSUE_TEMPLATE/dev-testing-request.md b/.github/ISSUE_TEMPLATE/dev-testing-request.md
@@ -0,0 +1,38 @@
+---
+name: DEV testing request
+about: Request the QA team to perform some type of testing related with development and code closure, either manually or automatically.
+labels: status/not-tracked, team/qa, type/dev-testing
+assignees: ''
+
+---
+
+| Target version | Related issue | Related PR |
+|--------------------|--------------------|-----------------|
+|                        |                        |                    |
+
+<!-- Important: No section may be left blank. If not, delete it directly (in principle only Steps to reproduce could be left blank in case of not proceeding, although there are always exceptions). -->
+
+## Description
+<!-- Description that puts into context and shows the QA tester the changes that have been made by the developer and need to be tested. -->
+
+## Proposed checks
+<!-- Indicate through a list of checkboxes the suggested checks to be carried out by the QA tester -->
+
+- [ ] Proposed check 1
+- [ ] Proposed check 2
+...
+
+## Steps to reproduce
+<!--
+(DELETE SECTION IF NOT APPLICABLE) If the changes correspond to the fix of a bug or behavior, indicate the steps necessary to reproduce it before the fix
+-->
+
+## Expected results
+<!-- Indicate expected results such as behaviors, logs... -->
+
+## Configuration and considerations
+<!--
+Indicate considerations to take into account when performing the testing that may not be very intuitive.
+
+If any configuration has to be applied, it should be indicated as far as possible.
+-->
diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -0,0 +1,18 @@
+---
+name: Enhancement request
+about: 'Request to enhance a repository resource: framework, test, documentation ...'
+labels: status/not-tracked, team/qa, type/enhancement
+assignees: ''
+
+---
+
+<!-- Important: No section may be left blank. -->
+
+## Description
+<!-- Describe the module or behavior to be improved -->
+
+### Current behavior
+<!-- Describe current behavior -->
+
+### Expected behavior
+<!-- Describe the expected behavior after the proposed improvement-->
diff --git a/.github/ISSUE_TEMPLATE/release-testing-request.md b/.github/ISSUE_TEMPLATE/release-testing-request.md
@@ -0,0 +1,41 @@
+---
+name: Release testing request
+about: Request the QA team to perform some type of testing related with pre-release, either manually or automatically.
+labels: status/not-tracked, team/qa, type/release-testing
+assignees: ''
+
+---
+
+| Target version | Release candidate | Main release testing issue |
+|--------------------|--------------------|--------------------|
+|                    |                    |                    |
+
+<!-- Important: No section may be left blank. If not, delete it directly (in principle only Steps to reproduce could be left blank in case of not proceeding, although there are always exceptions). -->
+
+## Deployment configuration and installation options
+<!-- Indicate here the type of deployment you want to use for this testing and how the installation will be performed according to the documentation. For more information see the spreadsheet of E2E UX Tests -->
+
+## Description
+<!-- Description that puts into context and shows the QA tester the changes that have been made by the developer and need to be tested. -->
+
+## Proposed checks
+<!-- Indicate through a list of checkboxes the suggested checks to be carried out by the QA tester -->
+
+- [ ] Proposed check 1
+- [ ] Proposed check 2
+...
+
+## Steps to reproduce
+<!--
+(DELETE SECTION IF NOT APPLICABLE) If the changes correspond to the fix of a bug or behavior, indicate the steps necessary to reproduce it before the fix
+-->
+
+## Expected results
+<!-- Indicate expected results such as behaviors, logs... -->
+
+## Configuration and considerations
+<!--
+Indicate considerations to take into account when performing the testing that may not be very intuitive.
+
+If any configuration has to be applied, it should be indicated as far as possible.
+-->
diff --git a/.github/ISSUE_TEMPLATE/tests-development-request.md b/.github/ISSUE_TEMPLATE/tests-development-request.md
@@ -0,0 +1,30 @@
+---
+name: Tests development request
+about: Request the QA team to develop and automate new tests.
+labels: status/not-tracked, team/qa, type/tests-development
+assignees: ''
+
+---
+
+| Target version | Related issue | Related PR/dev branch |
+|--------------------|--------------------|-----------------|
+|                        |                        |                    |
+
+<!-- Important: No section may be left blank. If not, delete it directly (in principle only "Configurations" and "Considerations" could be left blank in case of not proceeding). -->
+
+## Description
+<!-- Description that puts into context and shows the QA tester the changes that have been implemented and have to be tested. -->
+
+## Configurations
+<!-- If any configuration has to be applied, it should be indicated as far as possible. -->
+
+## Proposed test cases
+<!-- Indicate the minimum test cases proposed by the developer. -->
+
+- [ ] Proposed test case 1
+- [ ] Proposed test case 2
+...
+
+## Considerations
+<!-- Indicate considerations to take into account when performing the testing that may not be very intuitive.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,41 +1,37 @@
 |Related issue|
-|---|
-||
+|-------------|
+|             |
 
-<!--
-This template reflects sections that must be included in new Pull requests.
-Contributions from the community are really appreciated. If this is the case, please add the
-"contribution" to properly track the Pull Request.
+## Description
 
-Please fill the table above. Feel free to extend it at your convenience.
--->
+<!-- Add a description of the context and content of all changes made in the pull request -->
 
-## Description
+<!-- Added functionalities or files. Remove if not applicable -->
+### Added
+
+- Item 1
+- Item n
 
-<!--
-Add a clear description of how the problem has been solved.
--->
+<!-- Changes made to existing functionality or files. Remove if not applicable -->
+### Updated
 
-## Configuration options
+- Item 1
+- Item n
 
-<!--
-When proceed, this section should include new configuration parameters.
--->
+<!-- Functionalities or files that have been deleted. Remove if not applicable -->
+### Deleted
 
-## Logs example
+- Item 1
+- Item n
 
-<!--
-Paste here related logs and alerts
--->
+---
 
-## Tests
+## Testing performed
 
-- [ ] Proven that tests **pass** when they have to pass.
-- [ ] Proven that tests **fail** when they have to fail.
-<!--
-Important: Don't remove these checks if your PR modifies Python code.
--->
-- [ ] Python codebase satisfies PEP-8 style style guide. `pycodestyle --max-line-length=120 --show-source --show-pep8 file.py`.
-- [ ] Python codebase is documented following the Google Style for Python docstrings.
-- [ ] The test is documented in wazuh-qa/docs.
-- [ ] `provision_documentation.sh` generate the docs without errors.
+<!-- At most there can only be this table. It must be updated if a new test has been performed. It is important to update the commit that has been tested! -->
+<!-- The developer only has to update his row. The same for the reviewer -->
+<!-- Reviewer has only to test in Jenkins -->
+| Tester             | Test path | Jenkins | Local  | OS | Commit | Notes                |
+|--------------------|-----------|---------|--------|-----|--------|----------------------|
+| @user (Developer)  |           | ⚫⚫⚫ | ⚫⚫⚫ |         |         | Nothing to highlight |
+| @user (Reviewer)   |           | ⚫⚫⚫ | :no_entry_sign: :no_entry_sign: :no_entry_sign:  |        |         | Nothing to highlight |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,58 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.6.0] - Development (unreleased)
+
+Wazuh commit: TBD \
+Release report: TBD
+
+### Changed
+- Update schema database version([#3879](https://github.com/wazuh/wazuh-qa/pull/3879)) \- (Tests)
+
+## [4.5.0] - Development (unreleased)
+
+Wazuh commit: TBD \
+Release report: TBD
+
+### Added
+
+- Add tests with new options to avoid FIM synchronization overlapping. ([#3318](https://github.com/wazuh/wazuh-qa/pull/3318)) \- (Framework + tests)
+- Add Logcollector millisecond granularity support test case ([#3910](https://github.com/wazuh/wazuh-qa/pull/3910)) \- (Tests)
+- Add Windows System folders FIM monitoring tests ([#3720](https://github.com/wazuh/wazuh-qa/pull/3720)) \- (Tests)
+- Add 'test_whodata_policy_changes' tests ([#3627](https://github.com/wazuh/wazuh-qa/pull/3627)) \- (Framework + Tests)
+- Add test to check if active-response netsh generates alerts when firewall is disabled. ([#3787](https://github.com/wazuh/wazuh-qa/pull/3787)) \- (Framework + Tests)
+- Add new tests for logcollector 'ignore' and 'restrict' options ([#3582](https://github.com/wazuh/wazuh-qa/pull/3582)) \- (Tests)
+- Add 'Force reconnect' feature to agent_simulator tool. ([#3111](https://github.com/wazuh/wazuh-qa/pull/3111)) \- (Tools)
+- Add new module to support migration tool. ([#3837](https://github.com/wazuh/wazuh-qa/pull/3837))
+
+### Changed
+
+- Update FIM `test_audit` tests to new framework ([#3939](https://github.com/wazuh/wazuh-qa/pull/3939)) \- (Framework + Tests)
+- Update FIM test to new FIM DBSync process  ([#2728](https://github.com/wazuh/wazuh-qa/pull/2728)) \- (Framework + Tests)
+- Update file_limit and registry_limit tests ([#3280](https://github.com/wazuh/wazuh-qa/pull/3280)) \- (Tests)
+- Change expected timestamp for proftpd analysisd test predecoder test case ([#3900](https://github.com/wazuh/wazuh-qa/pull/3900)) \- (Tests)
+- Skip test_large_changes test module ([#3783](https://github.com/wazuh/wazuh-qa/pull/3783)) \- (Tests)
+- Update report_changes tests ([#3405](https://github.com/wazuh/wazuh-qa/pull/3405)) \- (Tests)
+- Update Authd force_insert tests ([#3379](https://github.com/wazuh/wazuh-qa/pull/3379)) \- (Tests)
+- Update cluster logs in reliability tests ([#2772](https://github.com/wazuh/wazuh-qa/pull/2772)) \- (Tests)
+- Use correct version format in agent_simulator tool ([#3198](https://github.com/wazuh/wazuh-qa/pull/3198)) \- (Tools)
+
+### Fixed
+
+- Fix imports and add windows support for test_report_changes_and_diff IT ([#3548](https://github.com/wazuh/wazuh-qa/issues/3548)) \- (Framework + Tests)
+- Fix a regex error in the FIM integration tests ([#3061](https://github.com/wazuh/wazuh-qa/issues/3061)) \- (Framework + Tests)
+- Fix an error in the cluster performance tests related to CSV parser ([#2999](https://github.com/wazuh/wazuh-qa/pull/2999)) \- (Framework + Tests)
+
+
 ## [4.4.0] - Development (unreleased)
 
 Wazuh commit: TBD \
 Release report: TBD
 
 ### Added
 
+- Add new integration test for `authd` to validate error when `authd.pass` is empty ([#3721](https://github.com/wazuh/wazuh-qa/pull/3721)) \- (Framework + Tests)
+- Add new test to check missing fields in `cpe_helper.json` file ([#3766](https://github.com/wazuh/wazuh-qa/pull/3766)) \- (Framework + Tests)
 - Add multigroups tests cases for `test_assign_groups_guess` ([#3979](https://github.com/wazuh/wazuh-qa/pull/3979)) \- (Tests)
 - Fix test_agent_groups system test ([#3955](https://github.com/wazuh/wazuh-qa/pull/3964)) \- (Tests)
 - Add new group_hash case and update the `without condition` case output in `wazuh_db/sync_agent_groups_get` ([#3959](https://github.com/wazuh/wazuh-qa/pull/3959)) \- (Tests)
@@ -64,6 +109,7 @@ Release report: TBD
 - Add `monitord.rotate_log` to `local_internal_options` file for `test_macos_format_query` ([#3602](https://github.com/wazuh/wazuh-qa/pull/3602)) \- (Tests)
 - Adapt analysisd integration tests for EPS ([#3559](https://github.com/wazuh/wazuh-qa/issues/3559)) \- (Tests)
 - Improve `test_remove_audit` FIM test to retry install and remove command ([#3562](https://github.com/wazuh/wazuh-qa/pull/3562)) \- (Tests)
+- Update pattern and expected condition for multi_groups tests ([#3565](https://github.com/wazuh/wazuh-qa/pull/3565)) \- (Tests)
 - Skip unstable integration tests for gcloud ([#3531](https://github.com/wazuh/wazuh-qa/pull/3531)) \- (Tests)
 - Skip unstable integration test for agentd ([#3538](https://github.com/wazuh/wazuh-qa/pull/3538))
 - Update wazuhdb_getconfig and EPS limit integration tests ([#3146](https://github.com/wazuh/wazuh-qa/pull/3146)) \- (Tests)

diff --git a/deps/wazuh_testing/setup.py b/deps/wazuh_testing/setup.py
@@ -28,7 +28,9 @@
     'qa_ctl/deployment/vagrantfile_template.txt',
     'qa_ctl/provisioning/wazuh_deployment/templates/preloaded_vars.conf.j2',
     'data/qactl_conf_validator_schema.json',
-    'data/all_disabled_ossec.conf'
+    'data/all_disabled_ossec.conf',
+    'tools/migration_tool/delta_schema.json',
+    'tools/migration_tool/CVE_JSON_5.0_bundled.json'
 ]
 
 scripts_list = [
@@ -60,7 +62,7 @@ def get_files_from_directory(directory):
 
 setup(
     name='wazuh_testing',
-    version='4.4.0',
+    version='4.6.0',
     description='Wazuh testing utilities to help programmers automate tests',
     url='https://github.com/wazuh',
     author='Wazuh',

diff --git a/deps/wazuh_testing/wazuh_testing/__init__.py b/deps/wazuh_testing/wazuh_testing/__init__.py
@@ -24,7 +24,6 @@
 WAZUH_CONF_PATH = os.path.join(WAZUH_PATH, 'etc', 'ossec.conf')
 WAZUH_LOGS_PATH = os.path.join(WAZUH_PATH, 'logs')
 CLIENT_KEYS_PATH = os.path.join(WAZUH_PATH, 'etc' if platform.system() == 'Linux' else '', 'client.keys')
-DB_PATH = os.path.join(WAZUH_PATH, 'queue', 'db')
 QUEUE_DB_PATH = os.path.join(WAZUH_PATH, 'queue', 'db')
 QUEUE_SOCKETS_PATH = os.path.join(WAZUH_PATH, 'queue', 'sockets')
 WAZUH_DB_SOCKET_PATH = os.path.join(QUEUE_DB_PATH, 'wdb')
@@ -39,6 +38,9 @@
 API_JSON_LOG_FILE_PATH = os.path.join(WAZUH_PATH, 'logs', 'api.json')
 API_LOG_FOLDER = os.path.join(WAZUH_PATH, 'logs', 'api')
 WAZUH_TESTING_PATH = os.path.dirname(os.path.abspath(__file__))
+WAZUH_TESTING_DATA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data')
+DEFAULT_AUTHD_PASS_PATH = os.path.join(WAZUH_PATH, 'etc', 'authd.pass')
+
 
 # Daemons
 LOGCOLLECTOR_DAEMON = 'wazuh-logcollector'
@@ -71,6 +73,28 @@
 T_60 = 60
 
 
+# Local internal options
+WINDOWS_DEBUG = 'windows.debug'
+SYSCHECK_DEBUG = 'syscheck.debug'
+VERBOSE_DEBUG_OUTPUT = 2
+
+# Wazuh Service commands
+WAZUH_SERVICES_STOP = 'stop'
+WAZUH_SERVICES_START = 'start'
+
+
+# Configurations
+DATA = 'data'
+WAZUH_LOG_MONITOR = 'wazuh_log_monitor'
+
+
+# File Types
+FIFO = 'fifo'
+SYMLINK = 'sym_link'
+HARDLINK = 'hard_link'
+SOCKET = 'socket'
+REGULAR = 'regular'
+
 # Protocols
 UDP = 'UDP'
 TCP = 'TCP'