From nobody Mon Dec 23 21:05:03 2024 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 4YH9Wz61hNz5hQN8; Mon, 23 Dec 2024 21:05:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH9Wz43wKz4DMq; Mon, 23 Dec 2024 21:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734987903; 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=aLXG8fIQFuuoH5FHtLdKK4tCYrNY8zfN3Tgy9AekGUc=; b=tG6pA91lY486GI//B6ewil3NfamMLDDEjve//6BWGnWbj+Z9yOJo5ytz5/vFYJXX/JvHBa H1gE+jtBM8NtX8Mzxu/Ysbr4EJi3G3baxqdXhFrh3W/uicYCqWnnq8ybWPNIhp3KDoco9Y 0kokm7U7CspBWyvZ9lZZW2M7cByaI6w8p9ThbbKFRVfRDilKkINM7kTWXuuxDLP5zfJAbv 3wr+1Kkp9Fm3RoeLOGEZ8UGquKDNJc/UT4r2AsZ9LW2s4LlFbULlkRFMAF89FlOXDtmi3H Yqt952WmqKdVJVSg6UP7ehpg2cuODfr9TbwovwUuREXyYoolobbwrY+PVOMM/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734987903; 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=aLXG8fIQFuuoH5FHtLdKK4tCYrNY8zfN3Tgy9AekGUc=; b=rRJ2OGDdIgTFc9zbSSKewJdXuumwDHhvf1HT9SPr8lr90mDqiTNRvP9DFEifUquHC5RE6b lBJ6p+VTND2vZFxHuHx4NzIbwRmg286E7PBtGNCvWsZ24ooUZUs1i+WR5fM8WMYGfHSwmB TdRVfuZBnPe1sYwVOHesGSROJVXzftkr+50eEdX5WGBWqdgCn3EksS4Mn3MWGLT9HP3AlV aIxD/f2vdeS8DE1XD8yUIpb/UTxlyM5IJMvyKbxsOe8uPPjKwKifjp736krggyN13USX9U nIqc70ON2CgeghEp9eRE0jm9ZVXq6nQsnguOGFN9knlA/wysH4Pq71kU//ytXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734987903; a=rsa-sha256; cv=none; b=VgLvnuB1gtNNqk0xo/m+PuFiMDFMjRCyWaMKj4mZmYc2SqbZNh5Ij1K+P2kBnW9FSShjyp oybSulVK6DVCHMu8Vvf47MlJhpIA/aSYzH6yJz644dVu5i4kcNBzu3WPw+ooNdtcuzlElG JGVD9/NGGu5sUqUvY/jfvUtfIRuPmDV1QBkCgxbrErGkwnpoq6oh1CR04fOK1Kwm6tOVC8 zXMdm4wr3YXHsVAlhGf9wROJ7dg8FIr6lqJfC9/+3ytLzXhep7OZfCpvfetZXNSDr+hCvo 2WQwt2urXdvrJIHgzAhhajnklNA+ktRkL7FPLEJPaMeyRILDKttQK+J0bqQhrA== 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 4YH9Wz3fV2z189x; Mon, 23 Dec 2024 21:05:03 +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 4BNL5386009635; Mon, 23 Dec 2024 21:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNL53KP009632; Mon, 23 Dec 2024 21:05:03 GMT (envelope-from git) Date: Mon, 23 Dec 2024 21:05:03 GMT Message-Id: <202412232105.4BNL53KP009632@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 2782fc98996b - main - net-mgmt/librenms: Update to 24.12.0 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2782fc98996b3597d00b2aceff7c30e4ea4b892a Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=2782fc98996b3597d00b2aceff7c30e4ea4b892a commit 2782fc98996b3597d00b2aceff7c30e4ea4b892a Author: Dan Langille AuthorDate: 2024-12-23 21:01:35 +0000 Commit: Dan Langille CommitDate: 2024-12-23 21:05:00 +0000 net-mgmt/librenms: Update to 24.12.0 re https://github.com/librenms/librenms/releases/tag/24.12.0 patched to fix URL validation issue - taken from this merge request: https://github.com/librenms/librenms/pull/16900 --- net-mgmt/librenms/Makefile | 4 +-- net-mgmt/librenms/distinfo | 10 +++---- .../files/patch-LibreNMS_Validations_WebServer.php | 34 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 4d8eb30ab1a2..ec492e0d931a 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,5 @@ PORTNAME= librenms -PORTVERSION= 24.11.0 +PORTVERSION= 24.12.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -128,7 +128,7 @@ _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1732114734 +_RELEASE_TIMESTAMP= 1734479713 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ scripts tests diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index bfd6e01422f8..d9c0d41f1cf0 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1732119849 -SHA256 (librenms-vendor-24.11.0.tar.gz) = 1014e59cd1a70a908307d72bd4ed54a6cb9a59bd37195199bd67e76290ec7fa6 -SIZE (librenms-vendor-24.11.0.tar.gz) = 28809754 -SHA256 (librenms-librenms-24.11.0_GH0.tar.gz) = de8f81f244852dabc82dc31a01509d5cc2a05486965007ba19d1dcf55e06e2c6 -SIZE (librenms-librenms-24.11.0_GH0.tar.gz) = 64503103 +TIMESTAMP = 1734480371 +SHA256 (librenms-vendor-24.12.0.tar.gz) = e7211b4b09793eaa46c08951c5b1c4535112144a5ad548e5b2ebafbbafb1712e +SIZE (librenms-vendor-24.12.0.tar.gz) = 28817646 +SHA256 (librenms-librenms-24.12.0_GH0.tar.gz) = 16510909a7a5d8df82fb0c90d48efc93dff8065704d02230cdcb61744d2e64d4 +SIZE (librenms-librenms-24.12.0_GH0.tar.gz) = 65974321 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php new file mode 100644 index 000000000000..3a7e1c053e74 --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php @@ -0,0 +1,34 @@ +--- LibreNMS/Validations/WebServer.php.orig 2024-12-17 23:55:13 UTC ++++ LibreNMS/Validations/WebServer.php +@@ -45,22 +45,28 @@ class WebServer extends BaseValidation + { + if (! app()->runningInConsole()) { + $url = $this->removeStandardPorts(request()->url()); +- $expected = $this->removeStandardPorts(Str::finish(Config::get('base_url'), '/') . 'validate/results'); ++ $base_url = Config::get('base_url'); ++ $expected = $this->removeStandardPorts(Str::finish($base_url, '/') . 'validate/results'); ++ $correct_base = str_replace('/validate/results', '', $url); + + if ($url !== $expected) { + preg_match($this->host_regex, $url, $actual_host_match); + preg_match($this->host_regex, $expected, $expected_host_match); + $actual_host = $actual_host_match[1] ?? ''; + $expected_host = $expected_host_match[1] ?? "parse failure ($expected)"; +- if ($actual_host != $expected_host) { ++ ++ if ($base_url == '/' && ! str_contains($actual_host, '/')) { ++ $validator->warn('base_url could be more specific', "lnms config:set base_url $correct_base"); ++ } elseif ($actual_host != $expected_host) { + $nginx = Str::startsWith(request()->server->get('SERVER_SOFTWARE'), 'nginx'); + $server_name = $nginx ? 'server_name' : 'ServerName'; + $fix = $nginx ? "server_name $actual_host;" : "ServerName $actual_host"; + $validator->fail("$server_name is set incorrectly for your webserver, update your webserver config. $actual_host $expected_host", $fix); + } else { +- $correct_base = str_replace('validate/results', '', $url); + $validator->fail('base_url is not set correctly', "lnms config:set base_url $correct_base"); + } ++ } elseif (preg_replace('#/$#', '', \config('app.url')) !== $correct_base) { ++ $validator->fail("APP_URL is not set correctly. It should be set to $correct_base"); + } + + if (request()->secure() && ! \config('session.secure')) {