TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-05 15:41:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

drm: second review pass on the phase-2 split

Browse Source 
1- make PipeWire init atomic: build every per-display capturer into owned staging
first and publish them to CAP_DISPLAY_INFO only after all succeed, so a mid-loop
Capturer::new failure neither leaves partial entries (which the next check_init
would treat as already-initialized) nor leaks the raw pointers already created.
2- pin the immutable libdrmtap commit, not just the tag: git clone --branch
follows a mutable tag, so verify the cloned HEAD equals DRMTAP_SHA in both the CI
workflow and build.py, failing on a moved/compromised tag.
3- drop the stale comment claiming a libdrmtap-sys crate pin (the drm backend has
no such dependency).
This commit is contained in:
Mariano Abad
2026-07-21 00:31:12 -03:00
parent 6cc426e9f5
commit cf77ee87a1
3 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/flutter-build.yml vendored
View File

@@ -1702,11 +1702,13 @@ jobs:
# exported so build.py reuses the exact same source. We clone + build
# the .so here and hand it to build.py via DRMTAP_PREBUILT_DIR, because
# a later build step in this container disturbs the working tree.
# DRMTAP_REF is an EXACT release tag (vX.Y.Z), NOT a branch: the bundled
# .so version must match the `libdrmtap-sys = "=0.4.13"` crate pin in
# libs/scrap/Cargo.toml (the loader only checks ABI-major). Bump both together.
# DRMTAP_REF is an EXACT release tag (vX.Y.Z), NOT a branch, and it is verified
# against the pinned immutable commit DRMTAP_SHA after clone (below). The drm backend
# has NO libdrmtap-sys Cargo dependency: rustdesk dlopens this .so at runtime
# (drmtap_dl.rs checks ABI-major). Keep DRMTAP_SHA in sync with the tag on every bump.
export DRMTAP_REPO="https://github.com/rustdesk-org/libdrmtap"
export DRMTAP_REF="v0.4.13"
export DRMTAP_SHA="${DRMTAP_SHA:-c9cf0938f3b10a3d4a9eeb9c6f97aaa1606c6b4a}"
# Guard: refuse a loose/branch ref so a moving `main` can never silently
# regress the pin. Only an EXACT vX.Y.Z tag is accepted (a strict anchored
# match, so values like v0.4.13-ci or a branch that resolves under
@@ -1718,6 +1720,13 @@ jobs:
rm -rf third_party/libdrmtap
git clone --depth 1 --branch "$DRMTAP_REF" "$DRMTAP_REPO" third_party/libdrmtap
test -f third_party/libdrmtap/meson.build || { echo "FATAL: libdrmtap source missing"; exit 1; }
# Pin the immutable commit, not only the tag name: `git clone --branch` follows a
# mutable tag, so a moved or compromised v0.4.13 could swap the root-loaded .so while
# the regex above still passes. Verify the cloned HEAD is exactly the pinned SHA.
got_sha="$(git -C third_party/libdrmtap rev-parse HEAD)"
if [ "$got_sha" != "$DRMTAP_SHA" ]; then
echo "FATAL: libdrmtap $DRMTAP_REF resolved to $got_sha, expected $DRMTAP_SHA (moved/compromised tag?)"; exit 1
fi
# Build libdrmtap.so now, while the cloned source is definitely
# present, and stash the real object OUTSIDE the source tree. A later
# build step in this container disturbs that working tree (it ends up