export portal dbus interfaces

Status	File	+	-
M	`README.md`	16	11
M	`garwarp/src/dbus.rs`	61	1
A	`scripts/test-dbus-interfaces.sh`	45	0

README.mdmodified

  Planning documents live in `docs/` and are currently local-only.
--## Sprint 01 Status
++## Current Status
--Current scaffold includes:
++1. Sprint 01 complete: workspace, daemon lifecycle, control protocol scaffold, activation files.
--1. Rust workspace with `garwarp`, `garwarp-ipc`, and `garwarpctl`.
++2. Sprint 02 complete: control-plane hardening (idempotence, parser strictness, trusted peers, store durability/fallback, health recovery policy).
--2. Single-instance daemon lock with stale lock cleanup.
++3. Sprint 03 in progress: portal DBus interfaces are exported and introspectable at `/org/freedesktop/portal/desktop`.
--3. Local Unix socket control path (`status`, `stop`).
--4. D-Bus and systemd user activation file scaffolding.
  ## Local Commands
 . Start daemon: `cargo run -p garwarp -- daemon`
 . Check health and request counters: `cargo run -p garwarpctl -- status`
 . Stop daemon: `cargo run -p garwarpctl -- stop`
 . Verify D-Bus activation: `./scripts/test-dbus-activation.sh`
--5. Verify request-store fallback: `./scripts/test-request-store-fallback.sh`
++5. Verify DBus interfaces are exported: `./scripts/test-dbus-interfaces.sh`
--6. Create mock request: `cargo run -p garwarpctl -- begin req-1 :1.2 - x11:0x2a`
++6. Verify request-store fallback: `./scripts/test-request-store-fallback.sh`
--7. Transition mock request: `cargo run -p garwarpctl -- transition req-1 :1.2 awaiting_user`
++7. Create mock request: `cargo run -p garwarpctl -- begin req-1 :1.2 - x11:0x2a`
--8. List known requests: `cargo run -p garwarpctl -- list`
++8. Transition mock request: `cargo run -p garwarpctl -- transition req-1 :1.2 awaiting_user`
--9. Inspect request snapshot: `cargo run -p garwarpctl -- inspect req-1`
++9. List known requests: `cargo run -p garwarpctl -- list`
++10. Inspect request snapshot: `cargo run -p garwarpctl -- inspect req-1`
  ## Runtime Tuning
 . `GARWARP_REQUEST_TIMEOUT_MS`: timeout before in-flight requests are marked `expired`.
 . `GARWARP_TERMINAL_RETENTION_MS`: retention window before terminal requests are pruned.
++
++## Control Protocol Compatibility
++1. Protocol version is reported by `status protocol=<n>` and currently fixed at `v1`.
++2. Unknown or duplicate request fields are rejected as `invalid_request` (fail-closed parsing).
++3. Stable error reasons are part of the control contract; new reasons may be added, existing reasons should not be repurposed.
++4. Sender identity for begin/transition is derived from Unix peer credentials; payload `sender` is ignored for ownership.

garwarp/src/dbus.rsmodified

--use zbus::blocking::Connection;
++use zbus::{blocking::Connection, interface};
  pub const BACKEND_DBUS_NAME: &str = "org.freedesktop.impl.portal.desktop.garwarp";
++pub const BACKEND_OBJECT_PATH: &str = "/org/freedesktop/portal/desktop";
++const INTERFACE_VERSION: u32 = 1;
  pub struct SessionNameGuard {
      _connection: Connection,
      pub fn acquire() -> zbus::Result<Self> {
          let connection = Connection::session()?;
          connection.request_name(BACKEND_DBUS_NAME)?;
++        {
++            let object_server = connection.object_server();
++            object_server.at(BACKEND_OBJECT_PATH, ScreenshotPortal)?;
++            object_server.at(BACKEND_OBJECT_PATH, OpenUriPortal)?;
++            object_server.at(BACKEND_OBJECT_PATH, AppChooserPortal)?;
++        }
          Ok(Self {
              _connection: connection,
          })
+     }
+ }
++
++#[derive(Debug)]
++struct ScreenshotPortal;
++
++#[interface(name = "org.freedesktop.impl.portal.Screenshot")]
++impl ScreenshotPortal {
++    #[zbus(property)]
++    fn version(&self) -> u32 {
++        INTERFACE_VERSION
++    }
++}
++
++#[derive(Debug)]
++struct OpenUriPortal;
++
++#[interface(name = "org.freedesktop.impl.portal.OpenURI")]
++impl OpenUriPortal {
++    #[zbus(property)]
++    fn version(&self) -> u32 {
++        INTERFACE_VERSION
++    }
++}
++
++#[derive(Debug)]
++struct AppChooserPortal;
++
++#[interface(name = "org.freedesktop.impl.portal.AppChooser")]
++impl AppChooserPortal {
++    #[zbus(property)]
++    fn version(&self) -> u32 {
++        INTERFACE_VERSION
++    }
++}
++
++#[cfg(test)]
++mod tests {
++    use super::{
++        AppChooserPortal, BACKEND_OBJECT_PATH, INTERFACE_VERSION, OpenUriPortal, ScreenshotPortal,
++    };
++
++    #[test]
++    fn backend_object_path_is_portal_desktop_path() {
++        assert_eq!(BACKEND_OBJECT_PATH, "/org/freedesktop/portal/desktop");
++    }
++
++    #[test]
++    fn portal_interfaces_report_expected_version() {
++        assert_eq!(ScreenshotPortal.version(), INTERFACE_VERSION);
++        assert_eq!(OpenUriPortal.version(), INTERFACE_VERSION);
++        assert_eq!(AppChooserPortal.version(), INTERFACE_VERSION);
++    }
++}

scripts/test-dbus-interfaces.shadded

++#!/usr/bin/env bash
++set -euo pipefail
++
++repo_root="$(cd "$(dirname "$0")/.." && pwd)"
++runtime_dir="$(mktemp -d)"
++introspection_file="$(mktemp)"
++log_file="$(mktemp)"
++
++cleanup() {
++  rm -f "$introspection_file" "$log_file"
++  rm -rf "$runtime_dir"
++}
++trap cleanup EXIT
++
++DBUS_FATAL_WARNINGS=0 dbus-run-session -- bash -lc '
++set -euo pipefail
++export XDG_RUNTIME_DIR="'"$runtime_dir"'"
++cd "'"$repo_root"'"
++
++cargo run -q -p garwarp -- daemon >"'"$log_file"'" 2>&1 &
++pid=$!
++
++for _ in $(seq 1 200); do
++  if dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus \
++      org.freedesktop.DBus.NameHasOwner string:org.freedesktop.impl.portal.desktop.garwarp \
++      | rg -q "boolean true"; then
++    break
++  fi
++  sleep 0.05
++done
++
++dbus-send --session --print-reply \
++  --dest=org.freedesktop.impl.portal.desktop.garwarp \
++  /org/freedesktop/portal/desktop \
++  org.freedesktop.DBus.Introspectable.Introspect >"'"$introspection_file"'"
++
++cargo run -q -p garwarpctl -- stop >/dev/null
++wait "$pid"
++'
++
++rg -q "org.freedesktop.impl.portal.Screenshot" "$introspection_file"
++rg -q "org.freedesktop.impl.portal.OpenURI" "$introspection_file"
++rg -q "org.freedesktop.impl.portal.AppChooser" "$introspection_file"
++
++printf "dbus interface export smoke test passed\n"

gardesk/garwarp / `a8c0e5f`

3 changed files