diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9807a62..58c1f6f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -313,11 +313,14 @@ jobs: cd gpgui-source tar -czf gpgui.tar.gz gpgui gp - name: Build gpgui in Docker + env: + GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }} run: | docker run --rm \ -e COREPACK_INTEGRITY_KEYS=0 \ -e GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} \ -e GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} \ + -e GPGUI_LICENSE_SIGNING_KEYS \ -v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }} - name: Install gpgui in Docker run: | @@ -568,6 +571,7 @@ jobs: set -eu export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} + export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}' cd "${{ matrix.workspace }}/gp" cargo build --release --workspace @@ -624,6 +628,7 @@ jobs: export AUTOMAKE_VERSION=1.17 export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} + export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}' cd "${{ matrix.workspace }}/gp" cargo build --release --workspace diff --git a/apps/gpservice/src/hip_approval.rs b/apps/gpservice/src/hip_approval.rs index 7479c90..3173a6e 100644 --- a/apps/gpservice/src/hip_approval.rs +++ b/apps/gpservice/src/hip_approval.rs @@ -103,10 +103,16 @@ pub fn revoke(approval_id: &str, approving_uid: u32) -> anyhow::Result<()> { } pub fn status(approval_id: &str, desktop_uid: u32) -> anyhow::Result { - status_at(Path::new(APPROVAL_DIRECTORY), approval_id, desktop_uid, 0) + status_at(Path::new(APPROVAL_DIRECTORY), approval_id, desktop_uid, 0, true) } -fn status_at(base: &Path, approval_id: &str, desktop_uid: u32, file_owner: u32) -> anyhow::Result { +fn status_at( + base: &Path, + approval_id: &str, + desktop_uid: u32, + file_owner: u32, + validate_root_ancestors: bool, +) -> anyhow::Result { ensure!(desktop_uid != 0, "HIP approval status requires a desktop user"); validate_id(approval_id)?; for path in [ @@ -121,7 +127,7 @@ fn status_at(base: &Path, approval_id: &str, desktop_uid: u32, file_owner: u32) } } if validate_private_dir(base, file_owner).is_err() - || (file_owner == 0 && validate_root_owned_path(base, false).is_err()) + || (validate_root_ancestors && validate_root_owned_path(base, false).is_err()) { return Ok(HipApprovalStatus::Corrupt); } @@ -355,22 +361,22 @@ mod tests { ) .unwrap(); assert_eq!( - status_at(base.path(), &info.approval_id, 1000, owner).unwrap(), + status_at(base.path(), &info.approval_id, 1000, owner, false).unwrap(), HipApprovalStatus::Valid ); assert_eq!( - status_at(base.path(), &info.approval_id, 1001, owner).unwrap(), + status_at(base.path(), &info.approval_id, 1001, owner, false).unwrap(), HipApprovalStatus::OtherUser ); let script = base.path().join(&info.approval_id).join(SCRIPT_NAME); fs::set_permissions(&script, fs::Permissions::from_mode(0o700)).unwrap(); assert_eq!( - status_at(base.path(), &info.approval_id, 1000, owner).unwrap(), + status_at(base.path(), &info.approval_id, 1000, owner, false).unwrap(), HipApprovalStatus::Corrupt ); fs::remove_file(base.path().join(&info.approval_id).join(METADATA_NAME)).unwrap(); assert_eq!( - status_at(base.path(), &info.approval_id, 1000, owner).unwrap(), + status_at(base.path(), &info.approval_id, 1000, owner, false).unwrap(), HipApprovalStatus::Revoked ); }