Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f461d22aae | ||
|
|
cfde82ae44 | ||
|
|
132e591503 | ||
|
|
642b97707d |
No files matched your search
@@ -41,6 +41,10 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
|
|||||||
# Copy configs and web files
|
# Copy configs and web files
|
||||||
COPY ./configs/default-index.conf /etc/httpd/conf.d/
|
COPY ./configs/default-index.conf /etc/httpd/conf.d/
|
||||||
COPY ./configs/prod-php.ini /etc/php.ini
|
COPY ./configs/prod-php.ini /etc/php.ini
|
||||||
|
# php2shell mitigation (CVE-2026-109618/-109619). Named zz- so it sorts after
|
||||||
|
# every other scan-dir ini (incl. runtime-written 99-*) and wins. Remove once
|
||||||
|
# all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
||||||
COPY ./configs/phpinfo.php /var/www/html/
|
COPY ./configs/phpinfo.php /var/www/html/
|
||||||
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
||||||
COPY ./configs/index.php /var/www/html/
|
COPY ./configs/index.php /var/www/html/
|
||||||
|
|||||||
@@ -39,6 +39,10 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
|
|||||||
|
|
||||||
# Copy configs (PHP only, no Apache configs)
|
# Copy configs (PHP only, no Apache configs)
|
||||||
COPY ./configs/prod-php.ini /etc/php.ini
|
COPY ./configs/prod-php.ini /etc/php.ini
|
||||||
|
# php2shell mitigation (CVE-2026-109618/-109619). Named zz- so it sorts after
|
||||||
|
# every other scan-dir ini (incl. runtime-written 99-*) and wins. Remove once
|
||||||
|
# all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
||||||
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
||||||
|
|
||||||
# Set up cron job for log rotation
|
# Set up cron job for log rotation
|
||||||
|
|||||||
@@ -83,6 +83,10 @@ COPY ./scripts/entrypoint-litespeed.sh \
|
|||||||
/scripts/
|
/scripts/
|
||||||
RUN chmod +x /scripts/*
|
RUN chmod +x /scripts/*
|
||||||
COPY ./configs/litespeed/ /etc/lsws-templates/
|
COPY ./configs/litespeed/ /etc/lsws-templates/
|
||||||
|
## php2shell mitigation (CVE-2026-109618/-109619). Named zz- so it sorts after
|
||||||
|
## every other scan-dir ini (incl. runtime-written 99-*) and wins. Remove once
|
||||||
|
## all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/lsws-templates/zz-php2shell-mitigation.ini
|
||||||
|
|
||||||
## Apply our production lsphp ini overrides. Ask lsphp for its scan dir
|
## Apply our production lsphp ini overrides. Ask lsphp for its scan dir
|
||||||
## directly (varies by PHP minor version: 8.3/8.4/8.5 each have their own
|
## directly (varies by PHP minor version: 8.3/8.4/8.5 each have their own
|
||||||
@@ -92,6 +96,7 @@ RUN bash -c 'set -e; \
|
|||||||
SCAN_DIR=$(/usr/local/lsws/lsphp${PHPVER}/bin/lsphp -i 2>/dev/null | awk -F"=> " "/^Scan this dir/ {print \$2; exit}"); \
|
SCAN_DIR=$(/usr/local/lsws/lsphp${PHPVER}/bin/lsphp -i 2>/dev/null | awk -F"=> " "/^Scan this dir/ {print \$2; exit}"); \
|
||||||
mkdir -p "$SCAN_DIR"; \
|
mkdir -p "$SCAN_DIR"; \
|
||||||
cp /etc/lsws-templates/lsphp-overrides.ini "$SCAN_DIR/99-prod-overrides.ini"; \
|
cp /etc/lsws-templates/lsphp-overrides.ini "$SCAN_DIR/99-prod-overrides.ini"; \
|
||||||
|
cp /etc/lsws-templates/zz-php2shell-mitigation.ini "$SCAN_DIR/zz-php2shell-mitigation.ini"; \
|
||||||
echo "wrote overrides to $SCAN_DIR"'
|
echo "wrote overrides to $SCAN_DIR"'
|
||||||
|
|
||||||
## Disable the OLS WebAdmin port for customer-facing containers. Bind admin
|
## Disable the OLS WebAdmin port for customer-facing containers. Bind admin
|
||||||
|
|||||||
@@ -201,10 +201,15 @@ RUN chmod +x /scripts/entrypoint-lsphp.sh /scripts/detect-memory-lsphp.sh /scrip
|
|||||||
## Apply production lsphp ini overrides into lsphp's scan dir (path varies by
|
## Apply production lsphp ini overrides into lsphp's scan dir (path varies by
|
||||||
## PHP minor version; ask lsphp directly — same idiom as Dockerfile.litespeed).
|
## PHP minor version; ask lsphp directly — same idiom as Dockerfile.litespeed).
|
||||||
COPY ./configs/litespeed/lsphp-overrides.ini /etc/lsws-templates/lsphp-overrides.ini
|
COPY ./configs/litespeed/lsphp-overrides.ini /etc/lsws-templates/lsphp-overrides.ini
|
||||||
|
## php2shell mitigation (CVE-2026-109618/-109619). Named zz- so it sorts after
|
||||||
|
## every other scan-dir ini (incl. runtime-written 99-*) and wins. Remove once
|
||||||
|
## all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/lsws-templates/zz-php2shell-mitigation.ini
|
||||||
RUN bash -c 'set -e; \
|
RUN bash -c 'set -e; \
|
||||||
SCAN_DIR=$(/usr/local/lsws/lsphp${PHPVER}/bin/lsphp -i 2>/dev/null | awk -F"=> " "/^Scan this dir/ {print \$2; exit}"); \
|
SCAN_DIR=$(/usr/local/lsws/lsphp${PHPVER}/bin/lsphp -i 2>/dev/null | awk -F"=> " "/^Scan this dir/ {print \$2; exit}"); \
|
||||||
mkdir -p "$SCAN_DIR"; \
|
mkdir -p "$SCAN_DIR"; \
|
||||||
cp /etc/lsws-templates/lsphp-overrides.ini "$SCAN_DIR/99-prod-overrides.ini"; \
|
cp /etc/lsws-templates/lsphp-overrides.ini "$SCAN_DIR/99-prod-overrides.ini"; \
|
||||||
|
cp /etc/lsws-templates/zz-php2shell-mitigation.ini "$SCAN_DIR/zz-php2shell-mitigation.ini"; \
|
||||||
echo "wrote overrides to $SCAN_DIR"'
|
echo "wrote overrides to $SCAN_DIR"'
|
||||||
|
|
||||||
## Install the cac_path_parity extension into lsphp's own extension_dir and load
|
## Install the cac_path_parity extension into lsphp's own extension_dir and load
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
; php2shell mitigation (CVE-2026-109618 / CVE-2026-109619, GHSA-w8hw-w9fx-j79w, GHSA-6wmf-4rv5-p3rp)
|
||||||
|
; Remove once all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
|
fatal_error_backtraces = 0
|
||||||
|
session.upload_progress.enabled = 0
|
||||||
|
max_input_nesting_level = 16
|
||||||
@@ -49,11 +49,16 @@ echo "lsphp-apt-upgrade: base image lsphp${PHPVER}=$(dpkg-query -W -f='${Version
|
|||||||
|
|
||||||
# The candidate for lsphpNN must come from the LiteSpeed repo — not "none", and
|
# The candidate for lsphpNN must come from the LiteSpeed repo — not "none", and
|
||||||
# not merely whatever is already installed.
|
# not merely whatever is already installed.
|
||||||
if ! apt-cache madison "lsphp${PHPVER}" | grep -q 'rpms.litespeedtech.com'; then
|
# Read each output into a variable and match in the shell: piping into an
|
||||||
|
# early-exit reader (grep -q, awk ... exit) under pipefail can SIGPIPE the writer
|
||||||
|
# and report "missing" for a package that is there (scripts/tests/lsphp-info-probe.test.sh).
|
||||||
|
MADISON=$(apt-cache madison "lsphp${PHPVER}")
|
||||||
|
if [[ "$MADISON" != *rpms.litespeedtech.com* ]]; then
|
||||||
apt-cache policy "lsphp${PHPVER}" >&2 || true
|
apt-cache policy "lsphp${PHPVER}" >&2 || true
|
||||||
die "the LiteSpeed apt repo does not offer lsphp${PHPVER} (repo missing from sources, or its index is empty)."
|
die "the LiteSpeed apt repo does not offer lsphp${PHPVER} (repo missing from sources, or its index is empty)."
|
||||||
fi
|
fi
|
||||||
CAND=$(apt-cache policy "lsphp${PHPVER}" | awk '/Candidate:/ {print $2; exit}')
|
POLICY=$(apt-cache policy "lsphp${PHPVER}")
|
||||||
|
CAND=$(awk '/Candidate:/ {print $2; exit}' <<<"$POLICY")
|
||||||
echo "lsphp-apt-upgrade: repo candidate lsphp${PHPVER}=${CAND}"
|
echo "lsphp-apt-upgrade: repo candidate lsphp${PHPVER}=${CAND}"
|
||||||
|
|
||||||
if [ "$OS_UPGRADE" = 1 ]; then
|
if [ "$OS_UPGRADE" = 1 ]; then
|
||||||
|
|||||||
Reference in new issue
Block a user