1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
#![cfg(target_os = "linux")]
use std::io::{BufRead, Read, Write};
use std::os::unix::net::UnixStream;
use std::path::Path;
use std::process::{Child, Command, Stdio};
use std::sync::{Arc, Mutex};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
struct ChildGuard(Child);
impl Drop for ChildGuard {
fn drop(&mut self) {
let _ = self.0.kill();
let _ = self.0.wait();
}
}
struct LoginManager {
peer: Arc<Mutex<Option<UnixStream>>>,
}
#[zbus::interface(name = "org.freedesktop.login1.Manager")]
impl LoginManager {
fn inhibit(
&self,
what: &str,
_who: &str,
_why: &str,
mode: &str,
) -> zbus::fdo::Result<zbus::zvariant::OwnedFd> {
assert_eq!((what, mode), ("shutdown", "delay"));
let (lock, peer) = UnixStream::pair().unwrap();
peer.set_nonblocking(true).unwrap();
*self.peer.lock().unwrap() = Some(peer);
Ok(std::os::fd::OwnedFd::from(lock).into())
}
#[zbus(property)]
fn preparing_for_shutdown(&self) -> bool {
false
}
}
fn private_bus(address: &str) -> ChildGuard {
let mut child = ChildGuard(
Command::new("dbus-daemon")
.args([
"--session",
"--nofork",
"--print-address=1",
"--address",
address,
])
.stdout(Stdio::piped())
.spawn()
.unwrap(),
);
let mut ready = String::new();
std::io::BufReader::new(child.0.stdout.take().unwrap())
.read_line(&mut ready)
.unwrap();
child
}
async fn login_service(address: &str, peer: Arc<Mutex<Option<UnixStream>>>) -> zbus::Connection {
zbus::connection::Builder::address(address)
.unwrap()
.name("org.freedesktop.login1")
.unwrap()
.serve_at("/org/freedesktop/login1", LoginManager { peer })
.unwrap()
.build()
.await
.unwrap()
}
async fn wait_for_inhibitor(peer: &Mutex<Option<UnixStream>>) {
tokio::time::timeout(Duration::from_secs(10), async {
while peer.lock().unwrap().is_none() {
tokio::time::sleep(Duration::from_millis(10)).await;
}
})
.await
.unwrap();
}
fn api(socket: &Path, method: &str, params: serde_json::Value) -> serde_json::Value {
let mut stream = UnixStream::connect(socket).unwrap();
stream
.set_read_timeout(Some(Duration::from_secs(5)))
.unwrap();
writeln!(
stream,
"{}",
serde_json::json!({"id":"test", "method":method, "params":params})
)
.unwrap();
let mut line = String::new();
std::io::BufReader::new(stream)
.read_line(&mut line)
.unwrap();
let response: serde_json::Value = serde_json::from_str(&line).unwrap();
assert!(response.get("error").is_none(), "{response}");
response
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[ignore = "requires dbus-daemon; exercises a private bus and disposable named server, not host shutdown"]
async fn host_shutdown_saves_layout_before_releasing_delay_lock() {
let base = std::path::PathBuf::from(format!(
"/var/tmp/hhs-{}-{}",
std::process::id(),
SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap()
.as_nanos()
));
std::fs::create_dir_all(&base).unwrap();
let address = format!("unix:path={}", base.join("bus").display());
let mut bus = private_bus(&address);
let peer = Arc::new(Mutex::new(None));
let mut service = login_service(&address, peer.clone()).await;
let socket = base.join("herdr-dev/sessions/shutdown/herdr.sock");
let config = base.join("config.toml");
std::fs::write(&config, "onboarding = false\n[experimental]\nallow_nested = true\n[terminal]\ndefault_shell = \"/bin/sh\"\n").unwrap();
let mut server = ChildGuard(
Command::new(env!("CARGO_BIN_EXE_herdr"))
.args(["--session", "shutdown", "server"])
.env("XDG_CONFIG_HOME", &base)
.env("XDG_STATE_HOME", &base)
.env("XDG_RUNTIME_DIR", &base)
.env("HERDR_CONFIG_PATH", &config)
.env_remove("HERDR_SOCKET_PATH")
.env("DBUS_SYSTEM_BUS_ADDRESS", address.trim())
.env_remove("HERDR_CLIENT_SOCKET_PATH")
.env_remove("HERDR_SESSION")
.env_remove("HERDR_WORKSPACE_ID")
.env_remove("HERDR_TAB_ID")
.env_remove("HERDR_PANE_ID")
.stdin(Stdio::null())
.stdout(Stdio::null())
.spawn()
.unwrap(),
);
tokio::time::timeout(Duration::from_secs(10), async {
while !socket.exists() || peer.lock().unwrap().is_none() {
assert!(
server.0.try_wait().unwrap().is_none(),
"server exited during startup"
);
tokio::time::sleep(Duration::from_millis(10)).await;
}
})
.await
.unwrap();
// Neither a login1 owner change nor a bus restart may leave a stale inhibitor.
peer.lock().unwrap().take();
service
.release_name("org.freedesktop.login1")
.await
.unwrap();
drop(service);
service = login_service(&address, peer.clone()).await;
wait_for_inhibitor(&peer).await;
peer.lock().unwrap().take();
drop(service);
drop(bus);
if base.join("bus").exists() {
std::fs::remove_file(base.join("bus")).unwrap();
}
bus = private_bus(&address);
service = login_service(&address, peer.clone()).await;
wait_for_inhibitor(&peer).await;
for label in ["one", "two", "three"] {
api(
&socket,
"workspace.create",
serde_json::json!({"cwd":base,"label":label,"focus":true}),
);
}
service
.emit_signal(
None::<&str>,
"/org/freedesktop/login1",
"org.freedesktop.login1.Manager",
"PrepareForShutdown",
&true,
)
.await
.unwrap();
let mut peer = peer.lock().unwrap().take().unwrap();
tokio::time::timeout(Duration::from_secs(10), async {
loop {
match peer.read(&mut [0]) {
Ok(0) => break,
Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {}
other => panic!("unexpected inhibitor state: {other:?}"),
}
tokio::time::sleep(Duration::from_millis(5)).await;
}
})
.await
.unwrap();
let saved = base.join("herdr-dev/sessions/shutdown/session.json");
let layout: serde_json::Value = serde_json::from_slice(&std::fs::read(saved).unwrap()).unwrap();
assert_eq!(layout["workspaces"].as_array().unwrap().len(), 3);
assert_eq!(layout["workspaces"][2]["custom_name"], "three");
tokio::time::timeout(Duration::from_secs(5), async {
while server.0.try_wait().unwrap().is_none() {
tokio::time::sleep(Duration::from_millis(10)).await;
}
})
.await
.unwrap();
drop(server);
drop(service);
drop(bus);
std::fs::remove_dir_all(base).unwrap();
}
|
