Compare commits
2
Commits
39ed0cc3ae
...
ccef1f145f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccef1f145f | ||
|
|
be9afb2f53 |
+69
-2
@@ -18,9 +18,42 @@
|
|||||||
#
|
#
|
||||||
# To fall back to PHP 8.4 (nixpkgs' current default `pkgs.php`) change only
|
# To fall back to PHP 8.4 (nixpkgs' current default `pkgs.php`) change only
|
||||||
# the `phpBase` line below.
|
# the `phpBase` line below.
|
||||||
|
#
|
||||||
|
# Security floor (October 2026):
|
||||||
|
# CVE-2026-109618 (RCE via OOM corruption) and CVE-2026-109619 (RCE via
|
||||||
|
# stale global state) are critical, unauthenticated flaws in PHP itself,
|
||||||
|
# CVSS v4.0 9.2 each, fixed in 8.5.12 / 8.4.27 / 8.3.36 / 8.2.35 on
|
||||||
|
# 2026-10-21. PHP-FPM is named as susceptible in both advisories, so the
|
||||||
|
# pools below are in scope; updating is the only complete mitigation.
|
||||||
|
# nixpkgs bumped php85 in 81513f364091c759812f716cef3c175109d07342 the same
|
||||||
|
# day, but the nixpkgs revision this flake pins predates it, so the floor is
|
||||||
|
# enforced here. Once flake.lock is at or past that commit the `else`
|
||||||
|
# branch below stops being taken and can be deleted.
|
||||||
|
|
||||||
let
|
let
|
||||||
phpBase = pkgs.php85;
|
# The first 8.5.x release that carries the fixes above. Bump only upward.
|
||||||
|
phpSecurityFloor = "8.5.12";
|
||||||
|
|
||||||
|
# php-8.5.12.tar.bz2, the same artifact and URL shape nixpkgs' own
|
||||||
|
# generic.nix fetches. Verified against php.net on 2026-10-23.
|
||||||
|
phpSourceHash = "sha256-/7YO3EN87WO1E35JhNs3moERxQBJxxFRDYuVgnfvwag=";
|
||||||
|
|
||||||
|
# `.override` (not `overrideAttrs`) on purpose: php85 is a `makeOverridable`
|
||||||
|
# buildEnv, so this threads `version`/`phpSrc` into generic.nix while
|
||||||
|
# keeping the default extension set. `overrideAttrs` would keep the new
|
||||||
|
# source but drop the extension set, which would silently strip gd, intl,
|
||||||
|
# pdo_pgsql and friends out of the pools below.
|
||||||
|
phpBase =
|
||||||
|
if lib.versionAtLeast pkgs.php85.version phpSecurityFloor then
|
||||||
|
pkgs.php85
|
||||||
|
else
|
||||||
|
pkgs.php85.override {
|
||||||
|
version = phpSecurityFloor;
|
||||||
|
phpSrc = pkgs.fetchurl {
|
||||||
|
url = "https://www.php.net/distributions/php-${phpSecurityFloor}.tar.bz2";
|
||||||
|
hash = phpSourceHash;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
custom-php = phpBase.buildEnv {
|
custom-php = phpBase.buildEnv {
|
||||||
# `enabled` is nixpkgs' default extension set. It already contains every
|
# `enabled` is nixpkgs' default extension set. It already contains every
|
||||||
@@ -29,7 +62,41 @@ let
|
|||||||
# xmlreader, xmlwriter, zip, zlib, pdo_pgsql, pdo_mysql, bcmath, gmp,
|
# xmlreader, xmlwriter, zip, zlib, pdo_pgsql, pdo_mysql, bcmath, gmp,
|
||||||
# exif, sodium, sysvsem, pcntl, ...). OPcache is compiled into PHP >= 8.5
|
# exif, sodium, sysvsem, pcntl, ...). OPcache is compiled into PHP >= 8.5
|
||||||
# and no longer appears as a separate extension.
|
# and no longer appears as a separate extension.
|
||||||
extensions = { enabled, all }: enabled ++ (with all; [
|
extensions = { enabled, all }:
|
||||||
|
let
|
||||||
|
# nixpkgs builds PHP with `--disable-all` and every extension as a
|
||||||
|
# shared module. Three of the OOM regression tests shipped with
|
||||||
|
# 8.5.12 spawn `php-cgi -n` on purpose — no php.ini, so no shared
|
||||||
|
# module, so filter_input() is never defined and the request never
|
||||||
|
# reaches the code under test. php-filter's `make test` then fails
|
||||||
|
# with "doesn't reach hard limit" for oom_filter_input,
|
||||||
|
# oom_filter_input_array and oom_filter_default_encoded, and the
|
||||||
|
# whole system build stops there.
|
||||||
|
#
|
||||||
|
# Upstream nixpkgs fixes this in a5fc1be5b6 ("php: fix `filter`
|
||||||
|
# tests"), shipped alongside the 8.5.12 bump. This lock predates
|
||||||
|
# it, so apply the same substitution here; drop this once flake.lock
|
||||||
|
# is past a5fc1be5b6, since the two would otherwise both patch.
|
||||||
|
#
|
||||||
|
# Done by rewriting the filter derivation in the extension list
|
||||||
|
# rather than through buildEnv's `packageOverrides`: that argument
|
||||||
|
# only reaches the unwrapped PHP, while the extension set is folded
|
||||||
|
# from mkPhp's own packageOverrides, so it is silently ignored here.
|
||||||
|
patchFilterTests = ext:
|
||||||
|
if (ext.extensionName or "") != "filter" then
|
||||||
|
ext
|
||||||
|
else
|
||||||
|
ext.overrideAttrs (prevAttrs: {
|
||||||
|
postConfigure = (prevAttrs.postConfigure or "") + ''
|
||||||
|
substituteInPlace \
|
||||||
|
tests/oom_filter_input.phpt \
|
||||||
|
tests/oom_filter_input_array.phpt \
|
||||||
|
tests/oom_filter_default_encoded.phpt \
|
||||||
|
--replace-fail "'-n'," "'-n', '-d', 'extension=$PWD/modules/filter.so',"
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
in
|
||||||
|
map patchFilterTests enabled ++ (with all; [
|
||||||
bz2 # Nextcloud: bz2 archive support
|
bz2 # Nextcloud: bz2 archive support
|
||||||
apcu # Nextcloud: memcache.local (apc.enable_cli=1 below is mandatory for occ + cron)
|
apcu # Nextcloud: memcache.local (apc.enable_cli=1 below is mandatory for occ + cron)
|
||||||
redis # Nextcloud: memcache.distributed / file locking once a Redis server is configured
|
redis # Nextcloud: memcache.distributed / file locking once a Redis server is configured
|
||||||
|
|||||||
Reference in new issue
Block a user