fix: corrections applied. #3085

wazuh · Jul 26, 2022 · 97856db · 97856db
1 parent 8065c8d
commit 97856db
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/tests/end_to_end/test_yara_integration/data/configuration/malware_downloader.sh b/tests/end_to_end/test_yara_integration/data/configuration/malware_downloader.sh
diff --git a/tests/end_to_end/test_yara_integration/data/playbooks/configuration.yaml b/tests/end_to_end/test_yara_integration/data/playbooks/configuration.yaml
@@ -104,7 +104,7 @@
         name:
           - epel-release
         state: present
-      when: ( ansible_facts['distribution'] == "CentOS" and "epel" not in check_epel_release.stdout)
+      when: '"epel" not in check_epel_release.stdout'
 
     - name: Check if yara is installed
       shell: rpm -qa yara
@@ -115,7 +115,7 @@
         name:
           - yara
         state: present
-      when: ( ansible_facts['distribution'] == "CentOS" and "yara" not in check_yara.stdout)
+      when: '"yara" not in check_yara.stdout'
 
     - name: Create a directory to store malware
       file:
@@ -139,4 +139,4 @@
         name:
           - jq
         state: present
-      when: ( ansible_facts['distribution'] == "CentOS" and "jq" not in check_jq.stdout)
+      when: '"jq" not in check_jq.stdout'
diff --git a/tests/end_to_end/test_yara_integration/data/playbooks/generate_events.yaml b/tests/end_to_end/test_yara_integration/data/playbooks/generate_events.yaml
@@ -8,8 +8,12 @@
     - name: Truncate alerts file
       shell: echo "" > {{ alerts_path }}
 
+    - name: Wait until the server is ready
+      wait_for:
+        timeout: 5
+
     - name: Download malware
-      script: "{{ MALWARE_DOWNLOADER_SCRIPT }}"
+      shell: curl -s -XGET {{ url }} -o "/tmp/yara/malware/mirai"
 
     - name: Wait for alerts to be generated
       wait_for:

diff --git a/tests/end_to_end/test_yara_integration/data/test_cases/cases_yara_integration.yaml b/tests/end_to_end/test_yara_integration/data/test_cases/cases_yara_integration.yaml
@@ -3,7 +3,7 @@
   configuration_parameters: null
   metadata:
     extra_vars:
-      MALWARE_DOWNLOADER_SCRIPT: CUSTOM_MALWARE_SCRIPT_PATH
+      url: https://wazuh-demo.s3-us-west-1.amazonaws.com/mirai
     rule.id: 108001
     rule.level: 12
     rule.description: 'File \\"/tmp/yara/malware/mirai\\" is a positive match. Yara rule: Mirai_Botnet_Malware_RID2EF6'

diff --git a/tests/end_to_end/test_yara_integration/test_yara_integration.py b/tests/end_to_end/test_yara_integration/test_yara_integration.py
@@ -24,11 +24,6 @@
 
 # Custom paths
 yara_script = os.path.join(test_data_path, 'configuration', 'yara.sh')
-malware_downloader_script = os.path.join(test_data_path, 'configuration', 'malware_downloader.sh')
-
-# Update configuration with custom paths
-configuration_metadata = config.update_configuration_template(configuration_metadata, ['CUSTOM_MALWARE_SCRIPT_PATH'],
-                                                              [malware_downloader_script])
 configuration_extra_vars = {'yara_script': yara_script}
 
 
@@ -50,7 +45,7 @@ def test_yara_integration(configure_environment, metadata, get_dashboard_credent
 
     # Check that alert has been raised and save timestamp
     raised_alert = evm.check_event(callback=expected_alert_json, file_to_monitor=alerts_json,
-                                   error_message='The alert has not occurred').result()
+                                   timeout=1, error_message='The alert has not occurred').result()
     raised_alert_timestamp = raised_alert.group(1)
 
     query = e2e.make_query([