diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index fa91fa408882..af5fde898449 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -11,6 +11,8 @@ - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained. +- All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years. + ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes} diff --git a/pkgs/by-name/lo/log4j-detect/package.nix b/pkgs/by-name/lo/log4j-detect/package.nix deleted file mode 100644 index c896a16f234f..000000000000 --- a/pkgs/by-name/lo/log4j-detect/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication { - pname = "log4j-detect"; - version = "0-unstable-2021-12-14"; - format = "other"; - - src = fetchFromGitHub { - owner = "takito1812"; - repo = "log4j-detect"; - rev = "2f5b7a598a6d0b4aee8111bb574ea72c6a1c76d6"; - sha256 = "sha256-fFKW7uPBfrnze0UoPL3Mfwd4sFOuHYuDP7kv6VtdM3o="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - requests - ]; - - postPatch = '' - sed -i "1 i #!/usr/bin/python" log4j-detect.py - ''; - - installPhase = '' - runHook preInstall - install -vD log4j-detect.py $out/bin/log4j-detect - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to detect the log4j vulnerability"; - homepage = "https://github.com/takito1812/log4j-detect"; - license = licenses.unfree; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/by-name/lo/log4j-scan/package.nix b/pkgs/by-name/lo/log4j-scan/package.nix deleted file mode 100644 index e8717c32e2fd..000000000000 --- a/pkgs/by-name/lo/log4j-scan/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication { - pname = "log4j-scan"; - version = "unstable-2021-12-18"; - format = "other"; - - src = fetchFromGitHub { - owner = "fullhunt"; - repo = "log4j-scan"; - rev = "070fbd00f0945645bd5e0daa199a554ef3884b95"; - sha256 = "sha256-ORSc4KHyAMjuA7QHReDh6SYY5yZRunBBN1+lkCayqL4="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - pycryptodome - requests - termcolor - ]; - - postPatch = '' - substituteInPlace log4j-scan.py \ - --replace "headers.txt" "../share/headers.txt" - ''; - - installPhase = '' - runHook preInstall - - install -vD log4j-scan.py $out/bin/log4j-scan - install -vD headers.txt headers-large.txt -t $out/share - - runHook postInstall - ''; - - meta = with lib; { - description = "Scanner for finding hosts which are vulnerable for log4j"; - mainProgram = "log4j-scan"; - homepage = "https://github.com/fullhunt/log4j-scan"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix deleted file mode 100644 index 649e4d20efdc..000000000000 --- a/pkgs/by-name/lo/log4j-sniffer/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - gitMinimal, -}: - -buildGoModule rec { - pname = "log4j-sniffer"; - version = "1.9.0"; - - src = fetchFromGitHub { - owner = "palantir"; - repo = "log4j-sniffer"; - rev = "v${version}"; - sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU="; - }; - - vendorHash = null; - - nativeCheckInputs = [ - gitMinimal - ]; - - preCheck = '' - export HOME=$(mktemp -d); - cd $HOME - git init - ''; - - meta = with lib; { - description = "Tool that scans archives to check for vulnerable log4j versions"; - mainProgram = "log4j-sniffer"; - homepage = "https://github.com/palantir/log4j-sniffer"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix deleted file mode 100644 index 784a3db24ec9..000000000000 --- a/pkgs/by-name/lo/log4j-vuln-scanner/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "log4j-vuln-scanner"; - version = "0.13"; - - src = fetchFromGitHub { - owner = "hillu"; - repo = "local-log4j-vuln-scanner"; - rev = "v${version}"; - sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c="; - }; - - vendorHash = null; - - postInstall = '' - mv $out/bin/scanner $out/bin/$pname - mv $out/bin/patcher $out/bin/log4j-vuln-patcher - ''; - - meta = with lib; { - description = "Local log4j vulnerability scanner"; - homepage = "https://github.com/hillu/local-log4j-vuln-scanner"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/by-name/lo/log4jcheck/package.nix b/pkgs/by-name/lo/log4jcheck/package.nix deleted file mode 100644 index 3726c7e24cba..000000000000 --- a/pkgs/by-name/lo/log4jcheck/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication { - pname = "log4jcheck"; - version = "0-unstable-2021-12-14"; - format = "other"; - - src = fetchFromGitHub { - owner = "NorthwaveSecurity"; - repo = "log4jcheck"; - rev = "736f1f4044e8a9b7bf5db515e2d1b819253f0f6d"; - sha256 = "sha256-1al7EMYbE/hFXKV4mYZlkEWTUIKYxgXYU3qBLlczYvs="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - requests - ]; - - installPhase = '' - runHook preInstall - install -vD nw_log4jcheck.py $out/bin/log4jcheck - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to check for vulnerable Log4j (CVE-2021-44228) systems"; - homepage = "https://github.com/NorthwaveSecurity/log4jcheck"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - mainProgram = "log4jcheck"; - }; -} diff --git a/pkgs/by-name/lo/log4shell-detector/package.nix b/pkgs/by-name/lo/log4shell-detector/package.nix deleted file mode 100644 index b96a5df9a79a..000000000000 --- a/pkgs/by-name/lo/log4shell-detector/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, -}: - -python3.pkgs.buildPythonApplication { - pname = "log4shell-detector"; - version = "0-unstable-2021-12-16"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "Neo23x0"; - repo = "log4shell-detector"; - rev = "622b88e7ea36819da23ce6ac090785cd6cca77f9"; - sha256 = "sha256-N81x9hq473LfM+bQIQLWizCAsVc/pzyB84PV7/N5jk4="; - }; - - build-system = with python3.pkgs; [ - setuptools - ]; - - dependencies = with python3.pkgs; [ - zstandard - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - installPhase = '' - runHook preInstall - install -vD log4shell-detector.py $out/bin/log4shell-detector - install -vd $out/${python3.sitePackages}/ - cp -R Log4ShellDetector $out/${python3.sitePackages} - runHook postInstall - ''; - - meta = with lib; { - description = "Detector for Log4Shell exploitation attempts"; - homepage = "https://github.com/Neo23x0/log4shell-detector"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - mainProgram = "log4shell-detector"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 304a15922de4..c271011663e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -961,6 +961,12 @@ mapAliases { llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27 + log4j-detect = throw "'log4j-detect' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 + log4j-scan = throw "'log4j-scan' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 + log4j-sniffer = throw "'log4j-sniffer' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 + log4j-vuln-scanner = throw "'log4j-vuln-scanner' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 + log4jcheck = throw "'log4jcheck' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 + log4shell-detector = throw "'log4shell-detector' has been removed, as it was unmaintained upstream and no longer relevant given that the Log4Shell vulnerability has been fixed."; # Added 2025-11-15 lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30 LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27 luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27