Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.7.0 into master #1031

Merged
merged 23 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4c14f98
Add Debian Bookworm VDT support
Aug 25, 2023
03b1c9c
Merge pull request #1011 from wazuh/18542-vdt-bookworm-support
teddytpc1 Aug 25, 2023
3bc97df
Bumo to 4.5.3
davidcr01 Aug 29, 2023
739ef46
Merge pull request #1014 from wazuh/bump-4.5.3
teddytpc1 Aug 29, 2023
86fb18a
Added SHA512 URL variables
davidcr01 Aug 31, 2023
06314eb
Added tasks to verify SHA512 checksum
davidcr01 Aug 31, 2023
4c62f30
Fixed checksum condition
davidcr01 Aug 31, 2023
b8e2fb6
Changed md5 by sha512 variable
davidcr01 Aug 31, 2023
f2ec140
Added task to delete checksum file
davidcr01 Aug 31, 2023
9198fad
Merge pull request #1015 from wazuh/1001-md5-check-replaced-by-sha512
teddytpc1 Aug 31, 2023
6bb6e71
Merge branch '4.6.0' into merge-4.5.3-into-4.6.0
teddytpc1 Aug 31, 2023
ed82a8b
Merge pull request #1017 from wazuh/merge-4.5.3-into-4.6.0
teddytpc1 Aug 31, 2023
e18970a
Bump revision to 40505
davidcr01 Sep 4, 2023
194aa38
Merge pull request #1020 from wazuh/bump-revision-40505
davidcr01 Sep 4, 2023
64d3bcc
MD5 for 4.5.2 updated
teddytpc1 Sep 6, 2023
53ccf75
Merge pull request #1022 from wazuh/4.5.2-md5
teddytpc1 Sep 6, 2023
12a59cd
Merge branch '4.5.2' into merge-4.5.2-into-4.5.3
davidcr01 Sep 7, 2023
ca67cc5
Merge pull request #1026 from wazuh/merge-4.5.2-into-4.5.3
teddytpc1 Sep 7, 2023
561bd9a
Merge branch '4.5.3' into merge-4.5.3-into-4.6.0
davidcr01 Sep 7, 2023
b728365
Merge pull request #1028 from wazuh/merge-4.5.3-into-4.6.0
teddytpc1 Sep 7, 2023
aeff17a
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0
davidcr01 Sep 7, 2023
ca4ce70
Merge pull request #1029 from wazuh/merge-4.6.0-into-4.7.0
teddytpc1 Sep 7, 2023
2c128f9
Merge branch '4.7.0' into merge-4.7.0-into-master
davidcr01 Sep 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ All notable changes to this project will be documented in this file.

- Update to [Wazuh v4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)

## [v4.5.3]

### Added

- Update to [Wazuh v4.5.3](https://github.com/wazuh/wazuh/blob/v4.5.3/CHANGELOG.md#v453)

## [v4.5.2]

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
| v4.8.0 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
| v4.5.0 | | |
Expand Down
3 changes: 1 addition & 2 deletions roles/wazuh/ansible-wazuh-agent/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ wazuh_winagent_config:
auth_path: C:\Program Files\ossec-agent\agent-auth.exe
# Adding quotes to auth_path_x86 since win_shell outputs error otherwise
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
check_md5: True
md5: 3823a34bb108b9ad4e9fb43cb8f0b4e3
check_sha512: True

wazuh_dir: "/var/ossec"

Expand Down
25 changes: 21 additions & 4 deletions roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,29 @@
when:
- not wazuh_package_downloaded.stat.exists

- name: Windows | Download SHA512 checksum file
win_get_url:
url: "{{ wazuh_winagent_sha512_url }}"
dest: "{{ wazuh_winagent_config.download_dir }}"
when:
- wazuh_winagent_config.check_sha512

- name: Extract checksum from SHA512 file
win_shell: Get-Content "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}.sha512" | ForEach-Object { $_.Split(' ')[0] }
register: extracted_checksum
when:
- wazuh_winagent_config.check_sha512

- name: Windows | Verify the Wazuh Agent installer
win_stat:
path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
get_checksum: true
checksum_algorithm: md5
checksum_algorithm: sha512
register: wazuh_agent_status
failed_when:
- wazuh_agent_status.stat.checksum != wazuh_winagent_config.md5
- wazuh_agent_status.stat.checksum != extracted_checksum.stdout_lines[0]
when:
- wazuh_winagent_config.check_md5

- wazuh_winagent_config.check_sha512

- name: Windows | Install Agent if not already installed
win_package:
Expand Down Expand Up @@ -95,3 +107,8 @@
win_file:
path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
state: absent

- name: Windows | Delete downloaded checksum file
win_file:
path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}.sha512"
state: absent
1 change: 1 addition & 0 deletions roles/wazuh/ansible-wazuh-manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ wazuh_manager_vulnerability_detector:
os:
- 'buster'
- 'bullseye'
- 'bookworm'
update_interval: '1h'
name: '"debian"'
- enabled: 'no'
Expand Down
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ wazuh_repo:
key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"

certs_gen_tool_version: 4.8

Expand Down
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo_pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ wazuh_repo:
key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
wazuh_winagent_sha512_url: "https://packages-dev.wazuh.com/pre-release/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"

certs_gen_tool_version: 4.8

Expand Down