fix(systemd): harden shipped x-ui unit files (#6718)

* fix(systemd): harden shipped x-ui unit files

The units ran the panel as root with no sandboxing: systemd-analyze
security rates them 9.6 UNSAFE.

Add NoNewPrivileges, ProtectSystem=full with ReadWritePaths for the
default XUI_DB_FOLDER/XUI_BIN_FOLDER/XUI_LOG_FOLDER stores, kernel and
clock protections, UMask=0077, RestrictAddressFamilies, a
CapabilityBoundingSet with NET_ADMIN/NET_BIND_SERVICE/NET_RAW and
SystemCallFilter=@system-service.

PrivateTmp is deliberately omitted: the web updater hands a path inside
the system temp directory to a systemd-run transient unit, which does not
share the service's private tmpfs. ProtectHome stays read-only because
installs keep TLS certificates under the root home directory.

Fixes #6605

* fix(systemd): ship ReadWriteDirectories= alias for systemd < 231

ReadWritePaths= only exists since systemd 231; install.sh still supports
CentOS 7 (systemd 219), where the directive is ignored and ProtectSystem=full
would leave the panel state directory read-only, breaking its database.

* fix(systemd): keep root's DAC bits and regenerate the write paths

Two follow-ups to the hardening, both reported by review on #6718.

CAP_DAC_OVERRIDE and CAP_DAC_READ_SEARCH were dropped from the bounding set.
Root holds them normally, and a bounding set is subtracted from root too: the
panel could no longer read a private key it does not own (a Caddy-issued
certificate under its own state dir, an acme.sh home, any 0600 file owned by
another account). That fails quietly for TLS -- the panel listener logs the
tls.LoadX509KeyPair error and keeps serving plain HTTP, and Xray inbounds using
that key stop -- so both bits stay.

ProtectSystem=full plus a hard-coded ReadWritePaths list broke installs whose
XUI_DB_FOLDER/XUI_LOG_FOLDER/XUI_BIN_FOLDER live outside the defaults, and the
workaround of editing the unit did not survive an update, because install.sh and
update.sh reinstall the unit from the release tarball. The folders actually in
use are now resolved from the same env file the unit passes to the panel and
regenerated into x-ui.service.d/10-xui-write-paths.conf on every install and
update, so a relocated store stays writable and the list is not reset. The unit
keeps the plain-install defaults plus XUI_SERVICE, which the in-panel updater
needs when systemd-run is unavailable and it falls back to a child process that
inherits this sandbox while update.sh lands the unit again. Uninstall removes
the drop-in with the unit.

* fix(systemd): keep the seccomp whitelist off old systemd, tighten the rest

Review of the previous head found that SystemCallFilter=@system-service plus
SystemCallErrorNumber=EPERM is a hard regression on the platforms this PR means
to keep working. @-named filter groups exist from systemd 239 on, and older
systemd does not ignore an unknown group name: on <231 the name fails to resolve
and the filter stays the built-in whitelist of execve/exit/exit_group/
rt_sigreturn/sigreturn, on 231..238 it degrades to @default. Either way the panel
then gets EPERM on read/openat/mmap/clone and cannot start -- a CentOS 7 or
Ubuntu 18.04 install would come up dead after this update. The two directives now
live in the generated drop-in and are written only when "systemctl --version"
reports 239 or newer, so old hosts keep the rest of the hardening and simply go
without seccomp.

The same review listed three more items, all addressed here:

- a comment claiming ProtectSystem=full "keeps everything outside /var, /run and
  the listed ReadWritePaths read-only" -- that is `strict`; `full` locks down
  /usr, /boot, /efi and /etc;
- /etc/systemd/system was granted writable for the in-panel updater's fallback,
  but that fallback cannot work under this sandbox at all: update.sh also stages
  the release archive beside the main folder, replaces /usr/bin/x-ui and calls
  the package manager. The entry is gone and update.sh now stops up front with
  one clear message when the directories it needs are read-only, instead of
  failing halfway with "Failed to download x-ui";
- CAP_DAC_READ_SEARCH is redundant next to CAP_DAC_OVERRIDE, so the bounding set
  keeps just the latter.

Relocating a store by editing the env file alone is documented in the unit and
in the generated drop-in: the drop-in is only written by install/update, so one
of those has to be re-run afterwards.

Verified with a local harness (9 checks: plain defaults, relocated store read
from the env file, the same list produced by update.sh, duplicate collapse,
seccomp present at systemd 249 and absent at 238, read-only guard) and bash -n
on install.sh, update.sh, x-ui.sh. systemd-analyze is not available here, so the
unit files themselves are unverified by a parser.

* fix(systemd): actually wire the read-only guard, drop the superseded drop-in

Re-review of the previous head caught two leftovers from that commit:

- require_writable_update_paths was defined but never called, so the guard the
  unit comments, the commit message and the PR comment promise did not exist at
  all. It is now called at the top level, before install_base, i.e. before
  anything with a side effect: a sandboxed fallback run stops with one clear
  message instead of failing halfway, which on a relocated main folder meant the
  old install removed and the service folder rewritten before dying on /usr/bin.
- the drop-in this branch replaced (10-xui-write-paths.conf) is no longer written
  or referenced, but nothing removed it either. Whoever installed the build that
  wrote it keeps its wider list, including the writable service folder, until it
  is deleted by hand. Both generators now remove it.

Harness extended to 11 checks: the superseded file is gone after a run, the guard
is actually called, plus the previous nine (defaults, env-file relocation, same
list from update.sh, dedupe, seccomp at 249 / absent at 238, read-only guard) and
bash -n on the three scripts.

* fix(systemd): correct two comments and keep spaces out of the path list

Second-opinion review of the previous head (two models, both asked to state
platforms and versions) produced three actionable items: a wrong comment kept
from the earlier commits, a wrong generalisation about the filter groups, and a
path-list case that would leave the panel unable to start.

- the ProtectSystem= comment claimed strict leaves /var and /run writable. It
  does not: strict mounts the whole hierarchy read-only and only the kernel API
  filesystems stay as they are. The sentence was already wrong before this
  branch and moving it to ProtectSystem=full did not fix it.
- "the @-named filter groups need systemd >= 239" is the wrong generalisation:
  named groups exist since 231, it is @system-service that arrived in 239. The
  unit files, both script comments and the drop-in body now name the group.
- a folder containing whitespace (XUI_DB_FOLDER="/srv/panel data") was written
  into ReadWritePaths= verbatim. That directive is a whitespace-separated list,
  so the entry splits into "-/srv/panel" and "data", and systemd rejects the
  whole drop-in: the panel then does not start at all. Such folders are left
  out and reported to the operator instead; the other paths are still written.

Harness extended with three checks for the whitespace case (folder left out,
remaining paths intact, warning emitted) and the duplicate-store case now reads
its own env file instead of the previous one, so it tests what it claims.
14 checks plus bash -n on the three scripts, all passing.

* fix(systemd): act on the independent review of the drop-in generator

A read-only review of the branch head (another model, given the diff and the
sources, asked to cite only verified lines) confirmed the earlier work and
turned up four items that are fixed here:

- a folder name carrying a literal % went into ReadWritePaths= as it was, and
  systemd expands %-specifiers in unit files: with XUI_DB_FOLDER=/srv/x%-ui the
  entry no longer named the directory the panel writes to and the panel could
  not write its database. The path is now emitted as %%; the duplicate check
  keeps comparing the unescaped value.
- systemd older than 229/242/244 does not know NoNewPrivileges, ProtectClock,
  ProtectHostname and ProtectKernelLogs. It logs them and carries on, so
  CentOS 7 (systemd 219, which install.sh explicitly supports) runs with less
  hardening than the unit lists. install.sh and update.sh now print which
  protections need a newer systemd, which ones still apply, and that upgrading
  systemd is what changes it.
- the updater's writability guard asked [[ -w ]] about the parent directories.
  It creates and removes a probe file instead, so an immutable attribute or a
  full filesystem is caught as well (a read-only mount was already caught).
- the generator's comment claimed to resolve the folders the service actually
  uses, while the shipped unit hard-codes WorkingDirectory= and ExecStart= under
  /usr/local/x-ui. The comment now states what XUI_MAIN_FOLDER really feeds --
  the location install.sh/update.sh install into and the base for a relative
  XUI_BIN_FOLDER -- and that a relocated main folder needs the unit edited too.

Rejected from the same review, with the evidence: that [[ -w ]] cannot see a
read-only mount (access(W_OK)/faccessat consults __mnt_is_readonly before the
mode bits), and that the /etc ReadWritePaths entry is an exception granted for
/etc rather than a default store already in the list.

Harness extended: 19 checks (escaped %, the old-systemd note, whitespace and
duplicate folders, seccomp gating, the read-only guard) plus bash -n on the
three scripts, all passing.

* fix(systemd): name the hardening old systemd really ignores

The old-systemd note fired only below 239 and listed wrong versions:
RHEL 8 (239) and Debian 10 (241) silently lose ProtectHostname and
RestrictSUIDSGID (242), ProtectKernelLogs (244) and ProtectClock (245)
with no note, while CentOS 7 was told NoNewPrivileges (187) and
ProtectHome=read-only (214) were not applied although both are. The
note is now built from a directive/version table taken from
systemd.exec(5) and lists only what the running systemd lacks.

Also drop the removal of 10-xui-write-paths.conf: only an intermediate
commit of this branch wrote that file, no release ever shipped it.

---------

Co-authored-by: Кот <kot@zeroclaw.local>
Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
Chester Fishmans
2026-10-05 21:47:10 +05:00
committed by GitHub
parent a8d65a55b0
commit b42a1c0ba1
6 changed files with 582 additions and 0 deletions
+168
View File
@@ -1384,6 +1384,169 @@ setup_fail2ban() {
return 0
}
# Major version of the local systemd, 0 when it cannot be determined. The
# SystemCallFilter=@system-service group only exists from systemd 239 on (other
# @-named groups exist since 231); on older versions an unknown group is not
# ignored safely, the filter stays in force and leaves a whitelist the panel
# cannot run under.
_xui_systemd_major_version() {
local version=""
if command -v systemctl > /dev/null 2>&1; then
version="$(systemctl --version 2>/dev/null | awk 'NR == 1 {print $2}')"
fi
if [[ ! "$version" =~ ^[0-9]+$ ]]; then
echo 0
return 0
fi
echo "$version"
}
# The shipped units list hardening that older systemd does not know: the
# directive is logged and ignored at load time rather than rejected, so the
# panel still starts, only without that protection. Each entry is the systemd
# release that introduced the directive (systemd.exec(5)); everything else in
# the unit predates the oldest systemd install.sh supports (CentOS 7 has 219).
# SystemCallFilter= is listed because the drop-in only writes it from 239 on.
_xui_warn_unsupported_hardening() {
local version entry missing=""
version="$(_xui_systemd_major_version)"
[[ "$version" -gt 0 ]] || return 0
for entry in RestrictRealtime:231 ReadWritePaths:231 ProtectKernelTunables:232 \
ProtectKernelModules:232 RestrictNamespaces:233 LockPersonality:235 \
SystemCallFilter:239 ProtectHostname:242 RestrictSUIDSGID:242 \
ProtectKernelLogs:244 ProtectClock:245; do
if [[ "$version" -lt "${entry##*:}" ]]; then
missing="${missing:+$missing, }${entry%%:*} (${entry##*:})"
fi
done
[[ -n "$missing" ]] || return 0
echo -e "${yellow}Note: systemd ${version} ignores part of the hardening in x-ui.service; the panel still starts.${plain}"
echo " Not applied, needs a newer systemd: ${missing}."
if [[ "$version" -lt 231 ]]; then
echo " The panel's folders stay writable through ReadWriteDirectories=, the alias this script installs."
fi
echo " The rest of the hardening is in force. Upgrade systemd to apply the above."
return 0
}
# ProtectSystem=full makes /usr, /boot, /efi and /etc read-only. ProtectSystem=
# strict would make the whole hierarchy read-only (only the kernel API
# filesystems stay as they are), and that would break the panel's own use of
# /tmp. The panel's stores are configurable (XUI_DB_FOLDER, XUI_LOG_FOLDER,
# XUI_BIN_FOLDER), and XUI_MAIN_FOLDER is the folder install.sh/update.sh place
# the files in -- the unit's WorkingDirectory on a stock install, and what a
# relative XUI_BIN_FOLDER is resolved against. So a hard-coded list in the unit
# either misses a relocated store -- the panel then cannot write its own SQLite
# database and sits in a Restart=on-failure loop -- or forces the operator to
# edit a file that every install/update overwrites from the release tarball.
# install.sh and update.sh therefore regenerate the drop-in from the folders
# actually in use, and the unit's own ReadWritePaths only carry the
# plain-install defaults. A relocated store means re-running install or update:
# the drop-in is only written here.
_xui_service_write_paths_dropin() {
# $1 is the env file to resolve the XUI_* folders from; callers pass nothing
# and get the OS-specific path the unit itself uses.
local env_file="${1:-}"
local dropin_dir dropin temp_file
local db_folder log_folder bin_folder main_folder
local path line="" whitespace_paths="" seen_paths="" escaped_path
if [[ -z "$env_file" ]]; then
case "${release}" in
ubuntu | debian | armbian)
env_file="/etc/default/x-ui"
;;
arch | manjaro | parch | alpine)
env_file="/etc/conf.d/x-ui"
;;
*)
env_file="/etc/sysconfig/x-ui"
;;
esac
fi
if [[ -r "$env_file" ]]; then
set -a
# shellcheck disable=SC1090
source "$env_file"
set +a
fi
# XUI_* wins over the script's own default: the unit hands that same env
# file to the panel through EnvironmentFile=, so these are the folders it
# will actually use.
main_folder="${XUI_MAIN_FOLDER:-${xui_folder}}"
db_folder="${XUI_DB_FOLDER:-/etc/x-ui}"
log_folder="${XUI_LOG_FOLDER:-/var/log/x-ui}"
# An empty XUI_BIN_FOLDER resolves to "bin" relative to the panel's working
# directory, which the unit sets to the main folder.
bin_folder="${XUI_BIN_FOLDER:-bin}"
if [[ "$bin_folder" != /* ]]; then
bin_folder="${main_folder%/}/${bin_folder#./}"
fi
for path in "$db_folder" "$log_folder" "$bin_folder" "$main_folder"; do
[[ "$path" == /* ]] || continue
# ReadWritePaths= is a whitespace-separated list, and a folder whose
# name contains whitespace cannot be written into it without relying on
# quoting. A wrong entry makes systemd reject the whole drop-in and the
# panel would not start, so leave such a folder out and say so instead.
if [[ "$path" != "${path//[[:space:]]/}" ]]; then
whitespace_paths="${whitespace_paths:+$whitespace_paths }$path"
continue
fi
case " $seen_paths " in
*" $path "*) continue ;;
esac
seen_paths="${seen_paths}${seen_paths:+ }$path"
# systemd expands %-specifiers in unit files, so a folder name carrying
# a literal % has to be written as %%, or the entry stops naming the
# folder systemd is meant to keep writable.
escaped_path="${path//%/%%}"
line="${line} -${escaped_path}"
done
if [[ -n "$whitespace_paths" ]]; then
echo "Warning: these folders contain whitespace and were left out of" >&2
echo " 10-xui-sandbox.conf: $whitespace_paths" >&2
echo " The panel cannot write to them under the unit's sandbox." >&2
fi
line="${line# }"
[[ -n "$line" ]] || return 1
dropin_dir="${xui_service}/x-ui.service.d"
dropin="${dropin_dir}/10-xui-sandbox.conf"
temp_file="${dropin}.tmp.$$"
mkdir -p "$dropin_dir" || return 1
cat > "$temp_file" << EOF
# Regenerated by install.sh/update.sh on every install and update: edits here
# are lost, and the list only reflects the XUI_* variables read from
# ${env_file} at that moment. Re-run install/update after moving a store.
# It lists the folders the panel writes to. Put local additions in their own
# drop-in, for example 20-x-ui-local.conf, which nothing here touches.
[Service]
ReadWritePaths=${line}
ReadWriteDirectories=${line}
EOF
if [[ "$(_xui_systemd_major_version)" -ge 239 ]]; then
cat >> "$temp_file" << 'EOF'
# @system-service needs systemd >= 239; on older versions the unknown group
# would leave the panel with a filter it cannot start under (x-ui.service.*).
SystemCallFilter=@system-service
SystemCallErrorNumber=EPERM
EOF
fi
if [[ ! -s "$temp_file" ]]; then
rm -f "$temp_file"
return 1
fi
chmod 644 "$temp_file"
mv -f "$temp_file" "$dropin" || { rm -f "$temp_file"; return 1; }
if command -v systemctl > /dev/null 2>&1; then
systemctl daemon-reload > /dev/null 2>&1 || true
fi
return 0
}
# Lands a systemd unit file at ${xui_service}/x-ui.service via a temp file +
# atomic mv, so a failed cp/curl or an interrupted mv never leaves a
# truncated unit file at the live path -- systemd would then fail to parse
@@ -1415,6 +1578,11 @@ _install_xui_service_unit() {
rm -f "$temp_file"
return 1
fi
if ! _xui_service_write_paths_dropin; then
echo -e "${yellow}Warning: could not refresh ${xui_service}/x-ui.service.d/10-xui-sandbox.conf.${plain}"
echo -e "${yellow}If XUI_DB_FOLDER or XUI_LOG_FOLDER points outside /etc/x-ui and /var/log/x-ui, the panel may not be able to write to it under ProtectSystem=full.${plain}"
fi
_xui_warn_unsupported_hardening
return 0
}
+180
View File
@@ -940,6 +940,180 @@ setup_fail2ban() {
return 0
}
# The hardened unit makes /usr, /boot, /efi and /etc read-only. The panel's own
# updater is expected to escape that sandbox by running this script through a
# transient systemd-run unit; when systemd-run is unavailable it starts this
# script as a plain child instead, and that child inherits the sandbox and then
# cannot write anything this update needs. Say so once, up front, instead of
# dying partway through with "Failed to download x-ui".
require_writable_update_paths() {
local dir probe
for dir in "${xui_folder%/*}" "/usr/bin"; do
[[ -n "$dir" && -d "$dir" ]] || continue
probe="${dir}/.x-ui-write-test.$$"
# A real write test rather than [[ -w ]]: this runs as root, where a
# permission bit means little and the test only reflects the file mode
# and the mount flags, not an immutable attribute or a full filesystem.
if ! : > "$probe" 2> /dev/null; then
_fail "ERROR: ${dir} is not writable for this process (read-only mount, attribute or full filesystem). The panel's fallback updater cannot run inside the hardened systemd sandbox; update from the panel UI (which uses systemd-run) or run 'x-ui update' in a shell."
fi
rm -f "$probe"
done
}
# Major version of the local systemd, 0 when it cannot be determined. The
# SystemCallFilter=@system-service group only exists from systemd 239 on (other
# @-named groups exist since 231); on older versions an unknown group is not
# ignored safely, the filter stays in force and leaves a whitelist the panel
# cannot run under.
_xui_systemd_major_version() {
local version=""
if command -v systemctl > /dev/null 2>&1; then
version="$(systemctl --version 2>/dev/null | awk 'NR == 1 {print $2}')"
fi
if [[ ! "$version" =~ ^[0-9]+$ ]]; then
echo 0
return 0
fi
echo "$version"
}
# The shipped units list hardening that older systemd does not know: the
# directive is logged and ignored at load time rather than rejected, so the
# panel still starts, only without that protection. Each entry is the systemd
# release that introduced the directive (systemd.exec(5)); everything else in
# the unit predates the oldest systemd install.sh supports (CentOS 7 has 219).
# SystemCallFilter= is listed because the drop-in only writes it from 239 on.
_xui_warn_unsupported_hardening() {
local version entry missing=""
version="$(_xui_systemd_major_version)"
[[ "$version" -gt 0 ]] || return 0
for entry in RestrictRealtime:231 ReadWritePaths:231 ProtectKernelTunables:232 \
ProtectKernelModules:232 RestrictNamespaces:233 LockPersonality:235 \
SystemCallFilter:239 ProtectHostname:242 RestrictSUIDSGID:242 \
ProtectKernelLogs:244 ProtectClock:245; do
if [[ "$version" -lt "${entry##*:}" ]]; then
missing="${missing:+$missing, }${entry%%:*} (${entry##*:})"
fi
done
[[ -n "$missing" ]] || return 0
echo -e "${yellow}Note: systemd ${version} ignores part of the hardening in x-ui.service; the panel still starts.${plain}"
echo " Not applied, needs a newer systemd: ${missing}."
if [[ "$version" -lt 231 ]]; then
echo " The panel's folders stay writable through ReadWriteDirectories=, the alias this script installs."
fi
echo " The rest of the hardening is in force. Upgrade systemd to apply the above."
return 0
}
# ProtectSystem=full makes /usr, /boot, /efi and /etc read-only. ProtectSystem=
# strict would make the whole hierarchy read-only (only the kernel API
# filesystems stay as they are), and that would break the panel's own use of
# /tmp. The panel's stores are configurable (XUI_DB_FOLDER, XUI_LOG_FOLDER,
# XUI_BIN_FOLDER), and XUI_MAIN_FOLDER is the folder install.sh/update.sh place
# the files in -- the unit's WorkingDirectory on a stock install, and what a
# relative XUI_BIN_FOLDER is resolved against. So a hard-coded list in the unit
# either misses a relocated store -- the panel then cannot write its own SQLite
# database and sits in a Restart=on-failure loop -- or forces the operator to
# edit a file that every install/update overwrites from the release tarball.
# install.sh and update.sh therefore regenerate the drop-in from the folders
# actually in use, and the unit's own ReadWritePaths only carry the
# plain-install defaults. A relocated store means re-running install or update:
# the drop-in is only written here.
_xui_service_write_paths_dropin() {
# $1 is the env file to resolve the XUI_* folders from; callers pass nothing
# and get the OS-specific path the unit itself uses.
local env_file="${1:-}"
local dropin_dir dropin temp_file
local db_folder log_folder bin_folder main_folder
local path line="" whitespace_paths="" seen_paths="" escaped_path
if [[ -z "$env_file" ]]; then
env_file="$(xui_env_file_path)"
fi
if [[ -r "$env_file" ]]; then
set -a
# shellcheck disable=SC1090
source "$env_file"
set +a
fi
# XUI_* wins over the script's own default: the unit hands that same env
# file to the panel through EnvironmentFile=, so these are the folders it
# will actually use.
main_folder="${XUI_MAIN_FOLDER:-${xui_folder}}"
db_folder="${XUI_DB_FOLDER:-/etc/x-ui}"
log_folder="${XUI_LOG_FOLDER:-/var/log/x-ui}"
# An empty XUI_BIN_FOLDER resolves to "bin" relative to the panel's working
# directory, which the unit sets to the main folder.
bin_folder="${XUI_BIN_FOLDER:-bin}"
if [[ "$bin_folder" != /* ]]; then
bin_folder="${main_folder%/}/${bin_folder#./}"
fi
for path in "$db_folder" "$log_folder" "$bin_folder" "$main_folder"; do
[[ "$path" == /* ]] || continue
# ReadWritePaths= is a whitespace-separated list, and a folder whose
# name contains whitespace cannot be written into it without relying on
# quoting. A wrong entry makes systemd reject the whole drop-in and the
# panel would not start, so leave such a folder out and say so instead.
if [[ "$path" != "${path//[[:space:]]/}" ]]; then
whitespace_paths="${whitespace_paths:+$whitespace_paths }$path"
continue
fi
case " $seen_paths " in
*" $path "*) continue ;;
esac
seen_paths="${seen_paths}${seen_paths:+ }$path"
# systemd expands %-specifiers in unit files, so a folder name carrying
# a literal % has to be written as %%, or the entry stops naming the
# folder systemd is meant to keep writable.
escaped_path="${path//%/%%}"
line="${line} -${escaped_path}"
done
if [[ -n "$whitespace_paths" ]]; then
echo "Warning: these folders contain whitespace and were left out of" >&2
echo " 10-xui-sandbox.conf: $whitespace_paths" >&2
echo " The panel cannot write to them under the unit's sandbox." >&2
fi
line="${line# }"
[[ -n "$line" ]] || return 1
dropin_dir="${xui_service}/x-ui.service.d"
dropin="${dropin_dir}/10-xui-sandbox.conf"
temp_file="${dropin}.tmp.$$"
mkdir -p "$dropin_dir" || return 1
cat > "$temp_file" << EOF
# Regenerated by install.sh/update.sh on every install and update: edits here
# are lost, and the list only reflects the XUI_* variables read from
# ${env_file} at that moment. Re-run install/update after moving a store.
# It lists the folders the panel writes to. Put local additions in their own
# drop-in, for example 20-x-ui-local.conf, which nothing here touches.
[Service]
ReadWritePaths=${line}
ReadWriteDirectories=${line}
EOF
if [[ "$(_xui_systemd_major_version)" -ge 239 ]]; then
cat >> "$temp_file" << 'EOF'
# @system-service needs systemd >= 239; on older versions the unknown group
# would leave the panel with a filter it cannot start under (x-ui.service.*).
SystemCallFilter=@system-service
SystemCallErrorNumber=EPERM
EOF
fi
if [[ ! -s "$temp_file" ]]; then
rm -f "$temp_file"
return 1
fi
chmod 644 "$temp_file"
mv -f "$temp_file" "$dropin" || { rm -f "$temp_file"; return 1; }
if command -v systemctl > /dev/null 2>&1; then
systemctl daemon-reload > /dev/null 2>&1 || true
fi
return 0
}
# Lands a systemd unit file at ${xui_service}/x-ui.service via a temp file +
# atomic mv, so a failed cp/curl or an interrupted mv never leaves a
# truncated unit file at the live path -- systemd would then fail to parse
@@ -971,6 +1145,11 @@ _install_xui_service_unit() {
rm -f "$temp_file"
return 1
fi
if ! _xui_service_write_paths_dropin; then
echo -e "${yellow}Warning: could not refresh ${xui_service}/x-ui.service.d/10-xui-sandbox.conf.${plain}"
echo -e "${yellow}If XUI_DB_FOLDER or XUI_LOG_FOLDER points outside /etc/x-ui and /var/log/x-ui, the panel may not be able to write to it under ProtectSystem=full.${plain}"
fi
_xui_warn_unsupported_hardening
return 0
}
@@ -1292,5 +1471,6 @@ update_x-ui() {
}
echo -e "${green}Running...${plain}"
require_writable_update_paths
install_base
update_x-ui $1
+76
View File
@@ -15,5 +15,81 @@ ExecReload=/bin/kill -USR1 $MAINPID
Restart=on-failure
RestartSec=5s
# The panel intentionally stays root: it supervises the Xray child processes,
# edits netfilter state and reads TLS private keys. These settings only bound
# what a panel-level flaw can reach.
#
# PrivateTmp=yes is deliberately absent: the web updater writes its script into
# /tmp and hands the absolute path to a "systemd-run" transient unit, which
# does not share this service's private /tmp (the download would vanish).
NoNewPrivileges=yes
ProtectSystem=full
# Default stores: DB/update status/node-token in XUI_DB_FOLDER (/etc/x-ui),
# xray binary/config/geo in XUI_BIN_FOLDER under /usr/local/x-ui, logs in
# XUI_LOG_FOLDER (/var/log/x-ui). These are the plain-install defaults and the
# floor, not the whole list: install.sh and update.sh regenerate a drop-in
# (x-ui.service.d/10-xui-sandbox.conf) with the folders resolved from the XUI_*
# variables, so a relocated XUI_DB_FOLDER or XUI_LOG_FOLDER stays writable and
# the list survives an update instead of being reset to these defaults. Changing
# one of those variables in the env file is not enough by itself: the drop-in has
# to be refreshed as well, i.e. install or update the panel again.
# Add local extras in your own drop-in (e.g. 20-local.conf).
# The leading '-' keeps the unit startable if a path does not exist yet.
# What ProtectSystem=full covers, precisely: /usr, /boot, /efi and /etc become
# read-only, everything else stays writable. So this list matters for stores
# under those trees -- the default main folder under /usr/local is one.
#
# The in-panel updater is expected to leave this sandbox: it runs update.sh
# through a transient systemd-run unit, which does not inherit these settings.
# Its plain-child fallback (taken when systemd-run is unavailable) cannot work
# here -- update.sh stages the release archive beside the main folder, replaces
# /usr/bin/x-ui and calls the package manager -- so it stops with one clear
# message instead of failing halfway, and the sandbox deliberately does not
# grant /usr or /etc to accommodate it.
# ReadWritePaths= requires systemd >= 231; ReadWriteDirectories= is the deprecated
# alias for older systemd, needed so ProtectSystem=full keeps /etc/x-ui writable.
ReadWritePaths=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ReadWriteDirectories=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ProtectKernelTunables=yes
ProtectKernelModules=yes
ProtectKernelLogs=yes
ProtectClock=yes
ProtectHostname=yes
# read-only rather than yes: installs keep TLS certs under /root/cert, and the
# panel must still be able to read them.
ProtectHome=read-only
LockPersonality=yes
RestrictRealtime=yes
RestrictSUIDSGID=yes
RestrictNamespaces=yes
UMask=0077
# AF_NETLINK for interface/route lookups and the ip(8) child used by the
# AmneziaWG IPv6-alias feature.
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX AF_NETLINK
# NET_ADMIN for ip(8)/tproxy, NET_BIND_SERVICE for ports below 1024, NET_RAW
# for raw sockets and SO_BINDTODEVICE.
#
# DAC_OVERRIDE has to stay. The panel runs as root, but a bounding set is
# subtracted from root's own privileges too: without it root can only read a
# file when the owner/group/other bits let uid 0 through, and any TLS private
# key belonging to another account becomes unreadable -- a certificate issued to
# Caddy, an acme.sh home, any 0600 file that root does not own. TLS then fails
# quietly: the panel listener catches the tls.LoadX509KeyPair error, logs it and
# keeps serving plain HTTP, and every Xray inbound using that key stops. Those
# reads worked before the sandbox because the panel is root.
# DAC_READ_SEARCH is deliberately absent: directory search is already covered by
# DAC_OVERRIDE, so it would only widen the set without adding anything.
CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
SystemCallArchitectures=native
# No seccomp whitelist here on purpose. @system-service needs systemd >= 239
# (other @-named groups exist since 231), and older systemd does not ignore an
# unknown group name gracefully: on
# <231 the name fails to resolve and the filter stays the built-in whitelist of
# execve/exit/exit_group/rt_sigreturn/sigreturn, on 231..238 it degrades to
# @default -- either way the panel then gets EPERM on read/openat/mmap/clone and
# cannot start. install.sh and update.sh add SystemCallFilter=@system-service and
# SystemCallErrorNumber=EPERM to the generated drop-in, but only when
# "systemctl --version" reports 239 or newer.
[Install]
WantedBy=multi-user.target
+76
View File
@@ -15,5 +15,81 @@ ExecReload=/bin/kill -USR1 $MAINPID
Restart=on-failure
RestartSec=5s
# The panel intentionally stays root: it supervises the Xray child processes,
# edits netfilter state and reads TLS private keys. These settings only bound
# what a panel-level flaw can reach.
#
# PrivateTmp=yes is deliberately absent: the web updater writes its script into
# /tmp and hands the absolute path to a "systemd-run" transient unit, which
# does not share this service's private /tmp (the download would vanish).
NoNewPrivileges=yes
ProtectSystem=full
# Default stores: DB/update status/node-token in XUI_DB_FOLDER (/etc/x-ui),
# xray binary/config/geo in XUI_BIN_FOLDER under /usr/local/x-ui, logs in
# XUI_LOG_FOLDER (/var/log/x-ui). These are the plain-install defaults and the
# floor, not the whole list: install.sh and update.sh regenerate a drop-in
# (x-ui.service.d/10-xui-sandbox.conf) with the folders resolved from the XUI_*
# variables, so a relocated XUI_DB_FOLDER or XUI_LOG_FOLDER stays writable and
# the list survives an update instead of being reset to these defaults. Changing
# one of those variables in the env file is not enough by itself: the drop-in has
# to be refreshed as well, i.e. install or update the panel again.
# Add local extras in your own drop-in (e.g. 20-local.conf).
# The leading '-' keeps the unit startable if a path does not exist yet.
# What ProtectSystem=full covers, precisely: /usr, /boot, /efi and /etc become
# read-only, everything else stays writable. So this list matters for stores
# under those trees -- the default main folder under /usr/local is one.
#
# The in-panel updater is expected to leave this sandbox: it runs update.sh
# through a transient systemd-run unit, which does not inherit these settings.
# Its plain-child fallback (taken when systemd-run is unavailable) cannot work
# here -- update.sh stages the release archive beside the main folder, replaces
# /usr/bin/x-ui and calls the package manager -- so it stops with one clear
# message instead of failing halfway, and the sandbox deliberately does not
# grant /usr or /etc to accommodate it.
# ReadWritePaths= requires systemd >= 231; ReadWriteDirectories= is the deprecated
# alias for older systemd, needed so ProtectSystem=full keeps /etc/x-ui writable.
ReadWritePaths=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ReadWriteDirectories=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ProtectKernelTunables=yes
ProtectKernelModules=yes
ProtectKernelLogs=yes
ProtectClock=yes
ProtectHostname=yes
# read-only rather than yes: installs keep TLS certs under /root/cert, and the
# panel must still be able to read them.
ProtectHome=read-only
LockPersonality=yes
RestrictRealtime=yes
RestrictSUIDSGID=yes
RestrictNamespaces=yes
UMask=0077
# AF_NETLINK for interface/route lookups and the ip(8) child used by the
# AmneziaWG IPv6-alias feature.
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX AF_NETLINK
# NET_ADMIN for ip(8)/tproxy, NET_BIND_SERVICE for ports below 1024, NET_RAW
# for raw sockets and SO_BINDTODEVICE.
#
# DAC_OVERRIDE has to stay. The panel runs as root, but a bounding set is
# subtracted from root's own privileges too: without it root can only read a
# file when the owner/group/other bits let uid 0 through, and any TLS private
# key belonging to another account becomes unreadable -- a certificate issued to
# Caddy, an acme.sh home, any 0600 file that root does not own. TLS then fails
# quietly: the panel listener catches the tls.LoadX509KeyPair error, logs it and
# keeps serving plain HTTP, and every Xray inbound using that key stops. Those
# reads worked before the sandbox because the panel is root.
# DAC_READ_SEARCH is deliberately absent: directory search is already covered by
# DAC_OVERRIDE, so it would only widen the set without adding anything.
CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
SystemCallArchitectures=native
# No seccomp whitelist here on purpose. @system-service needs systemd >= 239
# (other @-named groups exist since 231), and older systemd does not ignore an
# unknown group name gracefully: on
# <231 the name fails to resolve and the filter stays the built-in whitelist of
# execve/exit/exit_group/rt_sigreturn/sigreturn, on 231..238 it degrades to
# @default -- either way the panel then gets EPERM on read/openat/mmap/clone and
# cannot start. install.sh and update.sh add SystemCallFilter=@system-service and
# SystemCallErrorNumber=EPERM to the generated drop-in, but only when
# "systemctl --version" reports 239 or newer.
[Install]
WantedBy=multi-user.target
+76
View File
@@ -15,5 +15,81 @@ ExecReload=/bin/kill -USR1 $MAINPID
Restart=on-failure
RestartSec=5s
# The panel intentionally stays root: it supervises the Xray child processes,
# edits netfilter state and reads TLS private keys. These settings only bound
# what a panel-level flaw can reach.
#
# PrivateTmp=yes is deliberately absent: the web updater writes its script into
# /tmp and hands the absolute path to a "systemd-run" transient unit, which
# does not share this service's private /tmp (the download would vanish).
NoNewPrivileges=yes
ProtectSystem=full
# Default stores: DB/update status/node-token in XUI_DB_FOLDER (/etc/x-ui),
# xray binary/config/geo in XUI_BIN_FOLDER under /usr/local/x-ui, logs in
# XUI_LOG_FOLDER (/var/log/x-ui). These are the plain-install defaults and the
# floor, not the whole list: install.sh and update.sh regenerate a drop-in
# (x-ui.service.d/10-xui-sandbox.conf) with the folders resolved from the XUI_*
# variables, so a relocated XUI_DB_FOLDER or XUI_LOG_FOLDER stays writable and
# the list survives an update instead of being reset to these defaults. Changing
# one of those variables in the env file is not enough by itself: the drop-in has
# to be refreshed as well, i.e. install or update the panel again.
# Add local extras in your own drop-in (e.g. 20-local.conf).
# The leading '-' keeps the unit startable if a path does not exist yet.
# What ProtectSystem=full covers, precisely: /usr, /boot, /efi and /etc become
# read-only, everything else stays writable. So this list matters for stores
# under those trees -- the default main folder under /usr/local is one.
#
# The in-panel updater is expected to leave this sandbox: it runs update.sh
# through a transient systemd-run unit, which does not inherit these settings.
# Its plain-child fallback (taken when systemd-run is unavailable) cannot work
# here -- update.sh stages the release archive beside the main folder, replaces
# /usr/bin/x-ui and calls the package manager -- so it stops with one clear
# message instead of failing halfway, and the sandbox deliberately does not
# grant /usr or /etc to accommodate it.
# ReadWritePaths= requires systemd >= 231; ReadWriteDirectories= is the deprecated
# alias for older systemd, needed so ProtectSystem=full keeps /etc/x-ui writable.
ReadWritePaths=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ReadWriteDirectories=-/etc/x-ui -/usr/local/x-ui -/var/log/x-ui
ProtectKernelTunables=yes
ProtectKernelModules=yes
ProtectKernelLogs=yes
ProtectClock=yes
ProtectHostname=yes
# read-only rather than yes: installs keep TLS certs under /root/cert, and the
# panel must still be able to read them.
ProtectHome=read-only
LockPersonality=yes
RestrictRealtime=yes
RestrictSUIDSGID=yes
RestrictNamespaces=yes
UMask=0077
# AF_NETLINK for interface/route lookups and the ip(8) child used by the
# AmneziaWG IPv6-alias feature.
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX AF_NETLINK
# NET_ADMIN for ip(8)/tproxy, NET_BIND_SERVICE for ports below 1024, NET_RAW
# for raw sockets and SO_BINDTODEVICE.
#
# DAC_OVERRIDE has to stay. The panel runs as root, but a bounding set is
# subtracted from root's own privileges too: without it root can only read a
# file when the owner/group/other bits let uid 0 through, and any TLS private
# key belonging to another account becomes unreadable -- a certificate issued to
# Caddy, an acme.sh home, any 0600 file that root does not own. TLS then fails
# quietly: the panel listener catches the tls.LoadX509KeyPair error, logs it and
# keeps serving plain HTTP, and every Xray inbound using that key stops. Those
# reads worked before the sandbox because the panel is root.
# DAC_READ_SEARCH is deliberately absent: directory search is already covered by
# DAC_OVERRIDE, so it would only widen the set without adding anything.
CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW
SystemCallArchitectures=native
# No seccomp whitelist here on purpose. @system-service needs systemd >= 239
# (other @-named groups exist since 231), and older systemd does not ignore an
# unknown group name gracefully: on
# <231 the name fails to resolve and the filter stays the built-in whitelist of
# execve/exit/exit_group/rt_sigreturn/sigreturn, on 231..238 it degrades to
# @default -- either way the panel then gets EPERM on read/openat/mmap/clone and
# cannot start. install.sh and update.sh add SystemCallFilter=@system-service and
# SystemCallErrorNumber=EPERM to the generated drop-in, but only when
# "systemctl --version" reports 239 or newer.
[Install]
WantedBy=multi-user.target
+6
View File
@@ -294,6 +294,12 @@ uninstall() {
systemctl stop x-ui
systemctl disable x-ui
rm ${xui_service}/x-ui.service -f
# The sandbox drop-in generated by install.sh/update.sh lives beside the
# unit; leaving it behind would keep an empty x-ui.service.d around and
# silently re-apply on a later install of another unit of the same name.
# Local drop-ins the operator added go with it, which is what an
# uninstall is expected to do.
rm -rf -- "${xui_service}/x-ui.service.d"
systemctl daemon-reload
systemctl reset-failed
fi