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.

Sign up for GitHub

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.8.0 into 4.8.1 #2759

Merged
merged 40 commits into from
Jan 11, 2024
Merged

Merge 4.8.0 into 4.8.1 #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b855574
Add new libraries to the manager spec file.
Dwordcito Aug 2, 2023
aa9a9e4
Adding flatccrt library to rpm SPECS
MiguelazoDS Oct 9, 2023
ef65612
Remove cpe helper installation
Dwordcito Nov 23, 2023
6c8bd2b
Remove libflatcc from specs files.
Dwordcito Dec 7, 2023
be4f235
Add indexer config to ossec.conf if missing
jftuduri Dec 20, 2023
7f9a95c
Revert "Add indexer config to ossec.conf if missing"
jftuduri Dec 20, 2023
dc4219e
Merge branch '4.8.0' into dev-14153-vulndet-refactor
Dwordcito Dec 21, 2023
9ceb882
Add indexer config to ossec.conf if missing, on upgrade
jftuduri Dec 20, 2023
dded7ee
Update old VD config when installing Wazuh manager
tsarquis88 Dec 12, 2023
d370b7b
Improve script by doing it more general
tsarquis88 Dec 12, 2023
220b931
Revert "Improve script by doing it more general"
tsarquis88 Dec 13, 2023
a35d415
Rename variables to shorter names
tsarquis88 Dec 13, 2023
9b5dc85
Reuse script
tsarquis88 Dec 18, 2023
e01f47d
Fix path
tsarquis88 Dec 18, 2023
40548b1
Add indexer config to ossec.conf if missing, on upgrade
jftuduri Dec 20, 2023
7d4e737
Merge pull request #2684 from wazuh/dev-2683-fix-upgrade-config-failure
Damian-Mangold Dec 22, 2023
8317813
Merge pull request #2711 from wazuh/dev-2706-fix-rpm-upgrade-config-f…
Damian-Mangold Dec 23, 2023
1622614
Add flag --download-content to generate_debian_package.sh
diegodfrf Dec 18, 2023
838881e
Add var download_content to build.sh
diegodfrf Dec 18, 2023
c55ec47
Add var DOWNLOAD_CONTENT_ENABLED to rules
diegodfrf Dec 18, 2023
34c902d
Add decompress to postinst
diegodfrf Dec 18, 2023
6339a60
Fix var DOWNLOAD_CONTENT
diegodfrf Dec 18, 2023
63993b4
Change owner queue/vd
diegodfrf Dec 18, 2023
586ce07
Add --download-content option to generate_rpm_package.sh
diegodfrf Dec 19, 2023
5ac6297
Add --define _download_content_enabled in build.sh
diegodfrf Dec 19, 2023
f27da25
Add download content in install.sh call
diegodfrf Dec 19, 2023
1adb361
Rename vd.tar.xz to vd_1.0.0_vd_4.8.0.tar.xz
diegodfrf Dec 21, 2023
e152a5e
Update folder name vd_updater
diegodfrf Dec 27, 2023
b05c2a4
Update _vdfilename
diegodfrf Dec 28, 2023
b4069cf
Fix rm command
diegodfrf Dec 28, 2023
e5af547
Merge pull request #2695 from wazuh/20747-add-content-databases
Dwordcito Dec 31, 2023
3ee5b41
Add xz dependency in RPM
diegodfrf Jan 4, 2024
51ade35
Add xz dependency in DEB
diegodfrf Jan 4, 2024
401a0a9
Remove flag --download-content
diegodfrf Jan 5, 2024
9b36ddc
Merge pull request #2748 from wazuh/2747-remove-download-content-flag
Dwordcito Jan 5, 2024
3d2371a
Merge pull request #2742 from wazuh/dev-14153-vulndet-refactor
Dwordcito Jan 9, 2024
e5be556
Update release date for 4.8.0
MarcelKemp Jan 9, 2024
4f57ad1
Merge pull request #2755 from wazuh/change/4.8.0-release-date
MarcelKemp Jan 9, 2024
40e6361
Merge pull request #2738 from wazuh/2731-add-xz-utils-as-requirement
Dwordcito Jan 9, 2024
3ceafce
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
pereyra-m Jan 11, 2024
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
4 changes: 2 additions & 2 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/*

%changelog
* Tue Feb 13 2024 support <[email protected]> - 4.8.1
* Wed Feb 28 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jan 31 2024 support <[email protected]> - 4.8.0
* Wed Feb 21 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Tue Jan 09 2024 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 21 Feb 2024 00:00:00 +0000

wazuh-agent (4.7.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Tue, 13 Feb 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 28 Feb 2024 00:00:00 +0000

It was downloaded from:

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 21 Feb 2024 00:00:00 +0000

wazuh-manager (4.7.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Homepage: http://www.wazuh.com

Package: wazuh-manager
Architecture: any
Depends: ${shlibs:Depends}, libc6 (>= 2.7), lsb-release, debconf, adduser
Depends: ${shlibs:Depends}, libc6 (>= 2.7), lsb-release, debconf, adduser, xz-utils
Suggests: expect
Conflicts: ossec-hids-agent, wazuh-agent, ossec-hids, wazuh-api
Replaces: wazuh-api
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Tue, 13 Feb 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 28 Feb 2024 00:00:00 +0000

It was downloaded from:

Expand Down
13 changes: 13 additions & 0 deletions debs/SPECS/wazuh-manager/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ case "$1" in
OSMYSHELL="/sbin/nologin"
SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts"
SCA_BASE_DIR="${SCRIPTS_DIR}/sca"
VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz'

if [ -d /run/systemd/system ]; then
rm -f /etc/init.d/wazuh-manager
Expand Down Expand Up @@ -71,6 +72,13 @@ case "$1" in
chown ${USER}:${GROUP} ${DIR}/queue/db/global.db*
fi

if [ -f "${DIR}/${VD_FILENAME}" ]; then
tar -xf ${DIR}/${VD_FILENAME} -C ${DIR}
chown ${USER}:${GROUP} ${DIR}/queue/vd
chown ${USER}:${GROUP} ${DIR}/queue/vd_updater
rm -rf ${DIR}/${VD_FILENAME}
fi

# Delete uncompatible DBs versions
if [ ! -z $2 ]; then

Expand Down Expand Up @@ -234,6 +242,11 @@ case "$1" in

fi

# Ensure that the 'Indexer' is configured
CONFIG_INDEXER_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template"
. ${SCRIPTS_DIR}/src/init/update-indexer.sh
updateIndexerTemplate "${DIR}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE

# Restoring file permissions
${SCRIPTS_DIR}/restore-permissions.sh > /dev/null 2>&1 || true

Expand Down
1 change: 1 addition & 0 deletions debs/SPECS/wazuh-manager/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ override_dh_install:
USER_GENERATE_AUTHD_CERT="y" \
USER_AUTO_START="n" \
USER_CREATE_SSL_CERT="n" \
DOWNLOAD_CONTENT="yes" \
./install.sh

# Copying init.d script
Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,9 +625,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Tue Feb 13 2024 support <[email protected]> - 4.8.1
* Wed Feb 28 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jan 31 2024 support <[email protected]> - 4.8.0
* Wed Feb 21 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Tue Jan 09 2024 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
Expand Down
39 changes: 29 additions & 10 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Conflicts: ossec-hids ossec-hids-agent wazuh-agent wazuh-local
Obsoletes: wazuh-api < 4.0.0
AutoReqProv: no

Requires: coreutils
Requires: coreutils xz
BuildRequires: coreutils glibc-devel automake autoconf libtool policycoreutils-python curl perl

ExclusiveOS: linux
Expand Down Expand Up @@ -78,6 +78,7 @@ echo 'USER_CA_STORE="/path/to/my_cert.pem"' >> ./etc/preloaded-vars.conf
echo 'USER_GENERATE_AUTHD_CERT="y"' >> ./etc/preloaded-vars.conf
echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf
echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf
echo 'DOWNLOAD_CONTENT="yes"' >> ./etc/preloaded-vars.conf
./install.sh

# Create directories
Expand All @@ -95,9 +96,6 @@ install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/l
# Clean the preinstalled configuration assesment files
rm -f ${RPM_BUILD_ROOT}%{_localstatedir}/ruleset/sca/*

# Install Vulnerability Detector files
install -m 0440 src/wazuh_modules/vulnerability_detector/*.json ${RPM_BUILD_ROOT}%{_localstatedir}/queue/vulnerabilities/dictionaries

# Add configuration scripts
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/
cp gen_ossec.sh ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/
Expand Down Expand Up @@ -289,6 +287,8 @@ fi
%post

echo "VERSION=\"$(%{_localstatedir}/bin/wazuh-control info -v)\"" > /etc/ossec-init.conf

# Upgrade install code block
if [ $1 = 2 ]; then
if [ -d %{_localstatedir}/logs/ossec ]; then
rm -rf %{_localstatedir}/logs/wazuh
Expand All @@ -299,6 +299,19 @@ if [ $1 = 2 ]; then
rm -rf %{_localstatedir}/queue/sockets
cp -rp %{_localstatedir}/queue/ossec %{_localstatedir}/queue/sockets
fi

# Ensure that the 'Indexer' is configured
CONFIG_INDEXER_TEMPLATE="%{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/generic/wodle-indexer.manager.template"
. %{_localstatedir}/packages_files/manager_installation_scripts/src/init/update-indexer.sh
updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE
fi

%define _vdfilename vd_1.0.0_vd_4.8.0.tar.xz
if [ -f "%{_localstatedir}/%{_vdfilename}" ]; then
tar -xf %{_localstatedir}/%{_vdfilename} -C %{_localstatedir}
chown wazuh:wazuh %{_localstatedir}/queue/vd
chown wazuh:wazuh %{_localstatedir}/queue/vd_updater
rm -rf %{_localstatedir}/%{_vdfilename}
fi

# Fresh install code block
Expand Down Expand Up @@ -685,13 +698,19 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6
%attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1
%attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so
%attr(750, root, wazuh) %{_localstatedir}/lib/libcontent_manager.so
%attr(750, root, wazuh) %{_localstatedir}/lib/libindexer_connector.so
%attr(750, root, wazuh) %{_localstatedir}/lib/librocksdb.so.8
%attr(750, root, wazuh) %{_localstatedir}/lib/librouter.so
%attr(750, root, wazuh) %{_localstatedir}/lib/libvulnerability_scanner.so
%{_localstatedir}/lib/libpython3.10.so.1.0
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/api.log
%attr(640, wazuh, wazuh) %ghost %{_localstatedir}/logs/integrations.log
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.log
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.json
%attr(0440, root, wazuh) %{_localstatedir}/queue/indexer/vd_states_template.json
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/api
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/archives
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/alerts
Expand All @@ -715,6 +734,7 @@ rm -fr %{buildroot}
%attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/centos/*
%dir %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel
%attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel/*
%attr(750, wazuh, wazuh) %{_localstatedir}/%{_vdfilename}
%dir %attr(750, root, wazuh) %{_localstatedir}/queue
%attr(600, root, wazuh) %ghost %{_localstatedir}/queue/agents-timestamp
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/agentless
Expand All @@ -731,11 +751,10 @@ rm -fr %{buildroot}
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/rids
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/tasks
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/sockets
%dir %attr(660, root, wazuh) %{_localstatedir}/queue/vulnerabilities
%dir %attr(440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/vd
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/indexer
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/router
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/logcollector
%attr(0440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries/cpe_helper.json
%attr(0440, root, wazuh) %ghost %{_localstatedir}/queue/vulnerabilities/dictionaries/msu.json.gz
%dir %attr(750, root, wazuh) %{_localstatedir}/ruleset
%dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/sca
%dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/decoders
Expand Down Expand Up @@ -853,9 +872,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Tue Feb 13 2024 support <[email protected]> - 4.8.1
* Wed Feb 28 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jan 31 2024 support <[email protected]> - 4.8.0
* Wed Feb 21 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Tue Jan 09 2024 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
Expand Down
2 changes: 1 addition & 1 deletion solaris/solaris10/pkginfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH="i386"
CLASSES="none"
CATEGORY="system"
VENDOR="Wazuh, Inc <[email protected]>"
PSTAMP="13Feb2024"
PSTAMP="28Feb2024"
EMAIL="[email protected]"
ISTATES="S s 1 2 3"
RSTATES="S s 1 2 3"
Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 21 Feb 2024 00:00:00 +0000

wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Tue, 13 Feb 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 28 Feb 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ rm -fr %{buildroot}
%config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"

%changelog
* Tue Feb 13 2024 support <[email protected]> - 4.8.1
* Wed Feb 28 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jan 31 2024 support <[email protected]> - 4.8.0
* Wed Feb 21 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Tue Jan 09 2024 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 21 Feb 2024 00:00:00 +0000

wazuh-indexer (4.7.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Tue, 13 Feb 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 28 Feb 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/rpm/wazuh-indexer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,9 @@ rm -fr %{buildroot}


%changelog
* Tue Feb 13 2024 support <[email protected]> - 4.8.1
* Wed Feb 28 2024 support <[email protected]> - 4.8.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Wed Jan 31 2024 support <[email protected]> - 4.8.0
* Wed Feb 21 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Tue Jan 09 2024 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
Expand Down
Loading