From 6abd403379209285010fd9f6d7a857639ed4aab8 Mon Sep 17 00:00:00 2001 From: MiguelazoDS Cazajous-Miguel Date: Tue, 5 Mar 2024 15:20:08 -0300 Subject: [PATCH 1/5] Compress HPUX package to reduce size without any extra dependencies --- hp-ux/generate_wazuh_packages.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hp-ux/generate_wazuh_packages.sh b/hp-ux/generate_wazuh_packages.sh index 0382cee035..6bbc5d211c 100755 --- a/hp-ux/generate_wazuh_packages.sh +++ b/hp-ux/generate_wazuh_packages.sh @@ -162,8 +162,10 @@ create_package() { VERSION=`cat /tmp/VERSION` rm ${install_path}/wodles/oscap/content/*.xml wazuh_version=`echo "${wazuh_version}" | cut -d v -f 2` - pkg_name="wazuh-agent-${wazuh_version}-${wazuh_revision}-hpux-11v3-ia64.tar" - tar cvpf ${target_dir}/${pkg_name} ${install_path} /sbin/init.d/wazuh-agent /sbin/rc2.d/S97wazuh-agent /sbin/rc3.d/S97wazuh-agent + pkg_tar_file="wazuh-agent-${wazuh_version}-${wazuh_revision}-hpux-11v3-ia64.tar" + tar cvpf ${target_dir}/${pkg_tar_file} ${install_path} /sbin/init.d/wazuh-agent /sbin/rc2.d/S97wazuh-agent /sbin/rc3.d/S97wazuh-agent + pkg_name="${pkg_tar_file}.gz" + gzip ${target_dir}/${pkg_tar_file} if [ "${compute_checksums}" = "yes" ]; then cd ${target_dir} @@ -210,11 +212,11 @@ show_help() { echo echo "Usage: $0 [OPTIONS]" echo - echo " -e Install all the packages necessaries to build the TAR package" + echo " -e Install all the packages necessaries to build the package" echo " -b Select Git branch. Example v3.5.0" - echo " -s Directory to store the resulting tar package. By default, an output folder will be created." - echo " -p Installation path for the package. By default: /var" - echo " -c, --checksum Compute the SHA512 checksum of the TAR package." + echo " -s Directory to store the resulting package. By default, an output folder will be created." + echo " -p Installation path for the package. By default: /var" + echo " -c, --checksum Compute the SHA512 checksum of the package." echo " -d , --depot Change the path to depothelper package (by default current path)." echo " -h Shows this help" echo From 8be27eb87f5706f4fa2d619f3b61ae2e47294c80 Mon Sep 17 00:00:00 2001 From: Federico Rodriguez Date: Thu, 7 Mar 2024 15:44:35 +0100 Subject: [PATCH 2/5] Change dashboard-management menu order --- stack/dashboard/base/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 07b9fa1b0c..836406a955 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -184,7 +184,7 @@ sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/t # Define categories category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' category_indexer_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}' -category_dashboard_management='{id:"wz-category-dashboard-management",label:"Dashboard management",order:700,euiIconType:"dashboardApp"}' +category_dashboard_management='{id:"wz-category-dashboard-management",label:"Dashboard management",order:6e3,euiIconType:"dashboardApp"}' # Add custom categories (explore) to the built-in sed -i -e "s|DEFAULT_APP_CATEGORIES=Object.freeze({|DEFAULT_APP_CATEGORIES=Object.freeze({explore:${category_explore},|" ./src/core/target/public/core.entry.js @@ -239,7 +239,7 @@ app_order_dev_tools=9050 sed -i -e "s|order:9070|order:${app_order_dev_tools}|g" ./src/plugins/dev_tools/target/public/devTools.plugin.js # Replace app order to Dashboard management app -app_order_dashboard_management=701 +app_order_dashboard_management=10001 sed -i -e "s|order:9030|order:${app_order_dashboard_management}|g" ./src/plugins/management/target/public/management.plugin.js # Replace app order to Security app From c93e46939e95e216e10c817a789a25df7917d46b Mon Sep 17 00:00:00 2001 From: sebasfalcone Date: Tue, 26 Mar 2024 16:56:59 +0100 Subject: [PATCH 3/5] CL: - Updated permissions for: - /var/ossec/templates - /var/ossec/queue/vd - /var/ossec/queue/indexer --- rpms/SPECS/wazuh-manager.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 35c65dafd9..c9d63743c1 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -695,7 +695,7 @@ rm -fr %{buildroot} %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 -%dir %attr(750, wazuh, wazuh) %{_localstatedir}/templates +%dir %attr(440, root, wazuh) %{_localstatedir}/templates %attr(0440, root, wazuh) %{_localstatedir}/templates/vd_states_template.json %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/api %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/archives @@ -737,8 +737,8 @@ 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(770, wazuh, wazuh) %{_localstatedir}/queue/vd -%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/indexer +%dir %attr(660, root, wazuh) %{_localstatedir}/queue/vd +%dir %attr(660, root, wazuh) %{_localstatedir}/queue/indexer %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/router %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/logcollector %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/keystore From a2e3825401d7933f0432a6393933021307878e99 Mon Sep 17 00:00:00 2001 From: Marcel Kemp Date: Wed, 27 Mar 2024 11:04:32 +0100 Subject: [PATCH 4/5] Skip certificate validation for CentOS 5 --- rpms/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpms/build.sh b/rpms/build.sh index 05d1224fda..d05da93dcb 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -58,6 +58,7 @@ src_file="${file_name}.src.rpm" pkg_path="${rpm_build_dir}/RPMS/${architecture_target}" src_path="${rpm_build_dir}/SRPMS" extract_path="${pkg_path}" +ssl_flag="" mkdir -p ${rpm_build_dir}/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} # Prepare the sources directory to build the source tar.gz @@ -68,7 +69,10 @@ cp -R wazuh-* ${build_dir}/${package_name} if [ "${use_local_specs}" = "no" ]; then specs_path="/downloaded_tmp_specs" mkdir -p "${specs_path}" - curl -L "https://raw.githubusercontent.com/wazuh/wazuh-packages/${wazuh_packages_branch}/rpms/SPECS/wazuh-${build_target}.spec" -o "${specs_path}/wazuh-${build_target}.spec" + if [ "${legacy}" = "yes" ]; then + ssl_flag+="-k" + fi + curl -L "https://raw.githubusercontent.com/wazuh/wazuh-packages/${wazuh_packages_branch}/rpms/SPECS/wazuh-${build_target}.spec" -o "${specs_path}/wazuh-${build_target}.spec" ${ssl_flag} else specs_path="/specs" fi From c80b6850431a1ff89888267444073261de49a977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 27 Mar 2024 14:48:18 -0300 Subject: [PATCH 5/5] Port variable name fixed --- unattended_installer/install_functions/dashboard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/dashboard.sh b/unattended_installer/install_functions/dashboard.sh index cf25db1b53..d57fe29fa9 100644 --- a/unattended_installer/install_functions/dashboard.sh +++ b/unattended_installer/install_functions/dashboard.sh @@ -10,7 +10,7 @@ function dashboard_changePort() { chosen_port="$1" http_port="${chosen_port}" - wazuh_dashboard_ports=( "${http_port}" ) + wazuh_dashboard_port=( "${http_port}" ) wazuh_aio_ports=(9200 9300 1514 1515 1516 55000 "${http_port}") sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' "$0"