resolving conflicts

2023-10-23 05:39:31 -03:00
parent c4d6a254cc 7474e836b6
commit 274c0bc692
19 changed files with 101 additions and 32 deletions
@@ -1,3 +1,3 @@
-WAZUH_VERSION=4.7.1
-WAZUH_IMAGE_VERSION=4.7.1
+WAZUH_VERSION=4.8.0
+WAZUH_IMAGE_VERSION=4.8.0
 WAZUH_TAG_REVISION=1
@@ -56,7 +56,7 @@ package:
  wazuh-manager:
    installed: true
    versions:
-    - 4.7.1-1
+    - 4.8.0-1
 port:
  tcp:1514:
    listening: true
@@ -31,12 +31,18 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
-        with: { ref: 4.4 }

      - name: Installing dependencies
        run: |
          sudo apt-get update
          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
      - name: Build Wazuh images
        run: build-docker-images/build-images.sh

@@ -31,12 +31,18 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
-        with: { ref: 4.4 }

      - name: Installing dependencies
        run: |
          sudo apt-get update
          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
      - name: Build Wazuh images
        run: build-docker-images/build-images.sh

@@ -31,12 +31,18 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
-        with: { ref: 4.4 }

      - name: Installing dependencies
        run: |
          sudo apt-get update
          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
      - name: Build Wazuh images
        run: build-docker-images/build-images.sh

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## Wazuh Docker v4.8.0
+### Added
+
+- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
+
 ## Wazuh Docker v4.7.1
 ### Added

@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0         ##

 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.8.0        |         |        |
 | v4.7.1        |         |        |
 | v4.7.0        |         |        |
 | v4.6.0        |         |        |
@@ -0,0 +1,45 @@
+# Wazuh Open Source Project Security Policy
+
+Version: 2023-06-12
+
+## Introduction
+This document outlines the Security Policy for Wazuh's open source projects. It emphasizes our commitment to maintain a secure environment for our users and contributors, and reflects our belief in the power of collaboration to identify and resolve security vulnerabilities.
+
+## Scope
+This policy applies to all open source projects developed, maintained, or hosted by Wazuh.
+
+## Reporting Security Vulnerabilities
+If you believe you've discovered a potential security vulnerability in one of our open source projects, we strongly encourage you to report it to us responsibly.
+
+Please submit your findings as security advisories under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [security@wazuh.com](mailto:security@wazuh.com).
+
+## Vulnerability Disclosure Policy
+Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps:
+
+- Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation.
+- Validation: We will validate the issue and work on reproducing it in our environment.
+- Remediation: We will work on a fix and thoroughly test it
+- Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party.
+- Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments.
+
+This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability.
+
+## Automatic Scanning
+We leverage GitHub Actions to perform automated scans of our supply chain. These scans assist us in identifying vulnerabilities and outdated dependencies in a proactive and timely manner.
+
+## Credit
+We believe in giving credit where credit is due. If you report a security vulnerability to us, and we determine that it is a valid vulnerability, we will publicly credit you for the discovery when we disclose the vulnerability. If you wish to remain anonymous, please indicate so in your initial report.
+
+We do appreciate and encourage feedback from our community, but currently we do not have a bounty program. We might start bounty programs in the future.
+
+## Compliance with this Policy
+We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications. 
+
+Furthermore, we will not take legal action against or suspend or terminate access to the site or services of those who discover and report security vulnerabilities in accordance with this policy because of the fact.
+
+We ask that all users and contributors respect this policy and the security of our community's users by disclosing vulnerabilities to us in accordance with this policy.
+
+## Changes to this Security Policy
+This policy may be revised from time to time. Each version of the policy will be identified at the top of the page by its effective date.
+
+If you have any questions about this Security Policy, please contact us at [security@wazuh.com](mailto:security@wazuh.com).
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.7.1"
-REVISION="40705"
+WAZUH-DOCKER_VERSION="4.8.0"
+REVISION="40800"
@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
 The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:

 ```
-$ build-docker-images/build-images.sh -v 4.5.2
+$ build-docker-images/build-images.sh -v 4.8.0
 ```

 To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.2.
    -r, --revision <rev>         [Optional] Package revision. By default 1
-    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.7.1.
+    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.8.0.
    -h, --help                   Show this help.

 ```
@@ -1,4 +1,4 @@
-WAZUH_IMAGE_VERSION=4.7.1
+WAZUH_IMAGE_VERSION=4.8.0
 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 WAZUH_TAG_REVISION=1
 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 # License (version 2) as published by the FSF - Free Software
 # Foundation.

-WAZUH_IMAGE_VERSION="4.7.1"
+WAZUH_IMAGE_VERSION="4.8.0"
 WAZUH_TAG_REVISION="1"
 WAZUH_DEV_STAGE=""
 FILEBEAT_MODULE_VERSION="0.2"
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-FROM ubuntu:focal AS builder
+FROM ubuntu:jammy AS builder

 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
@@ -42,7 +42,7 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chown -R 101:101 $INSTALL_DIR/data/
 # Add entrypoint
 # Add wazuh_app_config
 ################################################################################
-FROM ubuntu:focal
+FROM ubuntu:jammy

 # Set environment variables
 ENV USER="wazuh-dashboard" \
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config

 ## Variables
 CERT_TOOL=wazuh-certs-tool.sh
-PACKAGES_URL=https://packages.wazuh.com/4.7/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
+PACKAGES_URL=https://packages.wazuh.com/4.8/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/

 ## Check if the cert tool exists in S3 buckets
 CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-FROM ubuntu:focal AS builder
+FROM ubuntu:jammy AS builder

 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
@@ -26,7 +26,7 @@ RUN bash config.sh
 # Copy wazuh-indexer from stage 0
 # Add entrypoint
 ################################################################################
-FROM ubuntu:focal
+FROM ubuntu:jammy

 ENV USER="wazuh-indexer" \
    GROUP="wazuh-indexer" \
@@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE}
 ## Variables
 CERT_TOOL=wazuh-certs-tool.sh
 PASSWORD_TOOL=wazuh-passwords-tool.sh
-PACKAGES_URL=https://packages.wazuh.com/4.7/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
+PACKAGES_URL=https://packages.wazuh.com/4.8/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/

 ## Check if the cert tool exists in S3 buckets
 CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-FROM ubuntu:focal
+FROM ubuntu:jammy

 RUN rm /bin/sh && ln -s /bin/bash /bin/sh

@@ -8,8 +8,8 @@
 ## Variables
 CERT_TOOL=wazuh-certs-tool.sh
 PASSWORD_TOOL=wazuh-passwords-tool.sh
-PACKAGES_URL=https://packages.wazuh.com/4.7/
-PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.7/
+PACKAGES_URL=https://packages.wazuh.com/4.8/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.8/

 ## Check if the cert tool exists in S3 buckets
 CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.master:
-    image: wazuh/wazuh-manager:4.7.1
+    image: wazuh/wazuh-manager:4.8.0
    hostname: wazuh.master
    restart: always
    ulimits:
@@ -45,7 +45,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.worker:
-    image: wazuh/wazuh-manager:4.7.1
+    image: wazuh/wazuh-manager:4.8.0
    hostname: wazuh.worker
    restart: always
    ulimits:
@@ -81,7 +81,7 @@ services:
      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.7.1
+    image: wazuh/wazuh-indexer:4.8.0
    hostname: wazuh1.indexer
    restart: always
    ports:
@@ -107,7 +107,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.7.1
+    image: wazuh/wazuh-indexer:4.8.0
    hostname: wazuh2.indexer
    restart: always
    environment:
@@ -129,7 +129,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.7.1
+    image: wazuh/wazuh-indexer:4.8.0
    hostname: wazuh3.indexer
    restart: always
    environment:
@@ -151,7 +151,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.7.1
+    image: wazuh/wazuh-dashboard:4.8.0
    hostname: wazuh.dashboard
    restart: always
    ports:
@@ -3,7 +3,7 @@ version: '3.7'

 services:
  wazuh.manager:
-    image: wazuh/wazuh-manager:4.7.1
+    image: wazuh/wazuh-manager:4.8.0
    hostname: wazuh.manager
    restart: always
    ulimits:
@@ -46,7 +46,7 @@ services:
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

  wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.7.1
+    image: wazuh/wazuh-indexer:4.8.0
    hostname: wazuh.indexer
    restart: always
    ports:
@@ -71,7 +71,7 @@ services:
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml

  wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.7.1
+    image: wazuh/wazuh-dashboard:4.8.0
    hostname: wazuh.dashboard
    restart: always
    ports: