From nobody Tue Feb 18 00:15:21 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yxg5k35bFz5nfb3; Tue, 18 Feb 2025 00:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yxg5k0MFBz3Zsj; Tue, 18 Feb 2025 00:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739837722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSLUgguvtAG1qpX0dU4XmLCBF/TSeNX8DGaao8Lo8cw=; b=yNoVhdwx52E2caL1wrItwgjEfS+t2PAEuHcOa9kUtG3uv6sI2ggPGGDb9MOKBqH9eWl+dd fYDxMgzoXkpGmMT3Fr8gnue57P0ycrJUx6nxKW1nmVerEpd1Dc0KV3mTyLhjcRQ5neWMsd SR1eJtTfwFld3o8bjeNrkz5TeaEPf3lPFCbRJzn/bGXiwDWVvdL6b0FZDSc1bVOxTrLJ0E xrQ8+/GdhA7sFFK2QDig0zcuJz4T4W4Gk42UqmaDjQcOgtH4WrWF521DIxbe57JSNXAu2x vZK/0UJs47J/TVjowmbWoOMTJl2xkzrCV1vvo5GF+OwolZri7+VwGZAPmw/M3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739837722; a=rsa-sha256; cv=none; b=vT4elibsCp9NIDh6wakciPaF6kHWQ/Cw3pxlNKmKeDAF8esXtbheRg8opNatBjYahwd8Gr hiZ/pEGZCzbgDUdH+N4l+u7xf+DrwVEKKa0xhvuPAkWx1gyFLnrG8gqvWJWF9cBOsXHa/6 PjtVdJXKjw3V5BIdRdL7XQISsr0YoSY8ieIqNg7H8ROL60zzSEo2DtUobSaP/MwNLi/OGq +MPG43IqPOsAza4K5pKPXtH8GYsN6havsRgc70mdjFfAqGgzaS2CMM15pcO2P2fOtGJNBv xDdXJXoQr3JXcsfniqLM8JVdnNjHySPs9TmOgbYkW6hqHDNuLNW/SWxxTbqgww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739837722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSLUgguvtAG1qpX0dU4XmLCBF/TSeNX8DGaao8Lo8cw=; b=iemIX6TXrD/BKhbiNppdnuhgfrVHkOq7W1sF42W8RCSCS9CoUw+FrURPvj8egZhdtoLs2a KoBVmZ2KcKvsiCOjQlyBpzIJ1CShIPWJCQkOolOF4rv92J87w67Lrc37ImfFUPJj3box5L k0uunLuSYkTzbQR8mRvJ5tOMIOJa1Sdcgs7PuPP5xt5ntlo1ATuxtcnARHsD0xBEfaDLje Lz3UI6OrkYURaPiPWQx8FOmlKwBjj/0M6GCE1eX5O4T+ixMOm97g73HNkLlMFUTYUOQwkI 97M/z5kGqBSZxbskpqryz+jFBRiufgXn+wKmRN5ZmgSS2RnIH6u8Y0GuwurxGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yxg5j6j6Mzw5l; Tue, 18 Feb 2025 00:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51I0FLQu050795; Tue, 18 Feb 2025 00:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51I0FLhR050792; Tue, 18 Feb 2025 00:15:21 GMT (envelope-from git) Date: Tue, 18 Feb 2025 00:15:21 GMT Message-Id: <202502180015.51I0FLhR050792@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: bc5b1b25e4d7 - main - security/wazuh-agent: Fix issue when protocol is equal to udp46 or tcp46 on FreBSD List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc5b1b25e4d7169567eec0c740130a3a14801add Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc5b1b25e4d7169567eec0c740130a3a14801add commit bc5b1b25e4d7169567eec0c740130a3a14801add Author: Jose Alonso Cardenas Marquez AuthorDate: 2025-02-18 00:10:51 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2025-02-18 00:15:12 +0000 security/wazuh-agent: Fix issue when protocol is equal to udp46 or tcp46 on FreBSD - Bump PORTREVISION Sponsored by: Entersekt --- security/wazuh-agent/Makefile | 1 + .../patch-src-data_provider-src_sysInfoFreeBSD.cpp | 35 +++++++++++++--------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index fde3d42815be..dc8e91f5eeb1 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -1,6 +1,7 @@ PORTNAME= wazuh DISTVERSION= 4.10.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://packages.wazuh.com/deps/35/libraries/sources/:wazuh_sources PKGNAMESUFFIX= -agent diff --git a/security/wazuh-agent/files/patch-src-data_provider-src_sysInfoFreeBSD.cpp b/security/wazuh-agent/files/patch-src-data_provider-src_sysInfoFreeBSD.cpp index 042232ae93e4..86f1fdf985af 100644 --- a/security/wazuh-agent/files/patch-src-data_provider-src_sysInfoFreeBSD.cpp +++ b/security/wazuh-agent/files/patch-src-data_provider-src_sysInfoFreeBSD.cpp @@ -1,5 +1,5 @@ ---- src/data_provider/src/sysInfoFreeBSD.cpp 2024-04-25 01:44:26.000000000 -0700 -+++ src/data_provider/src/sysInfoFreeBSD.cpp 2024-05-10 01:08:00.203056000 -0700 +--- src/data_provider/src/sysInfoFreeBSD.cpp 2025-01-15 06:26:54.000000000 -0800 ++++ src/data_provider/src/sysInfoFreeBSD.cpp 2025-02-17 14:38:11.834720000 -0800 @@ -11,6 +11,7 @@ #include "sysInfo.hpp" #include "cmdHelper.h" @@ -95,17 +95,18 @@ if (uname(&uts) >= 0) { ret["sysname"] = uts.sysname; -@@ -215,18 +234,137 @@ +@@ -215,18 +234,145 @@ nlohmann::json SysInfo::getPorts() const { - // Currently not supported for this OS. - return nlohmann::json {}; --} + const auto query{Utils::exec(R"(sockstat -46qs)")}; ++ ++ /* USER COMMAND PID FD PROTO LOCAL_ADDRESS FOREIGN_ADDRESS PATH_STATE CONN_STATE */ ++ + nlohmann::json ports {}; - --void SysInfo::getProcessesInfo(std::function /*callback*/) const ++ + if (!query.empty()) + { + const auto lines{Utils::split(Utils::trimToOneSpace(query), '\n')}; @@ -117,6 +118,7 @@ + std::string remoteip = ""; + std::string remoteport = ""; + std::string statedata = ""; ++ + const auto data{Utils::split(line, ' ')}; + auto localdata{Utils::split(data[5], ':')}; + auto remotedata{Utils::split(data[6], ':')}; @@ -126,7 +128,7 @@ + remoteip = remotedata[0]; + remoteport = remotedata[1]; + -+ if((data[4] != "udp4") && (data[4] != "udp6")) { ++ if((data[4] != "udp4") && (data[4] != "udp6") && (data[4] != "udp46")) { + statedata = Utils::toLowerCase(data[7]); + } + @@ -137,10 +139,12 @@ + if(localdata.size() == 4) { + localip = localdata[0] + ":"+ localdata[1] + ":" + localdata[2]; + localport = localdata[3]; -+ } else if(localip == "*") { ++ } ++ ++ if(localip == "*") { + if((data[4] == "tcp6") || (data[4] == "udp6")) { + localip = "0:0:0:0:0:0:0:0"; -+ } else { ++ } else if((data[4] == "tcp4") || (data[4] == "udp4")) { + localip = "0.0.0.0"; + } + } @@ -152,7 +156,9 @@ + if(remotedata.size() == 4) { + remoteip = remotedata[0] + ":"+ remotedata[1] + ":" + remotedata[2]; + remoteport = remotedata[3]; -+ } else if(remoteport == "*") { ++ } ++ ++ if(remoteport == "*") { + remoteip = ""; + remoteport = "0"; + } @@ -177,8 +183,9 @@ + } + + return ports; -+} -+ + } + +-void SysInfo::getProcessesInfo(std::function /*callback*/) const +void SysInfo::getProcessesInfo(std::function callback) const { - // Currently not supported for this OS. @@ -219,7 +226,7 @@ + jsProcessInfo["vm_size"] = process["virtual-size"].get(); + jsProcessInfo["resident"] = process["rss"].get(); + //jsProcessInfo["share"] = process["percent-memory"].get(); -+ jsProcessInfo["start_time"] = process["elapsed-times"].get(); ++ jsProcessInfo["start_time"] = process["elapsed-times"].get() == "-" ? "0" : process["elapsed-times"].get(); + jsProcessInfo["pgrp"] = process["process-group"].get(); + jsProcessInfo["session"] = process["sid"].get(); + jsProcessInfo["tgid"] = process["terminal-process-gid"].get(); @@ -239,7 +246,7 @@ if (!query.empty()) { -@@ -235,18 +373,22 @@ +@@ -235,18 +381,22 @@ for (const auto& line : lines) { const auto data{Utils::split(line, '|')};