Qualify protected Chrony socket permissions on cloud Linux
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
@@ -675,6 +675,17 @@ impl Drop for Client {
|
||||
}
|
||||
}
|
||||
|
||||
// Linux pathname DGRAM send requires socket write permission; read/execute
|
||||
// bits grant no sending authority. Directory ancestry is separately held and
|
||||
// verified. Neither group nor other may write this daemon-owned socket.
|
||||
fn protected_server_socket(socket: Identity, uid: u32, gid: u32) -> bool {
|
||||
socket.mode & libc::S_IFMT == libc::S_IFSOCK
|
||||
&& socket.links == 1
|
||||
&& socket.uid == uid
|
||||
&& socket.gid == gid
|
||||
&& socket.mode & 0o022 == 0
|
||||
}
|
||||
|
||||
/// Root-only source broker primitive. No daemon discovery, adoption, commands,
|
||||
/// configurable endpoint, retry, IP transport or time-setting entrypoint.
|
||||
pub struct NativeTimeSource {
|
||||
@@ -698,11 +709,11 @@ impl NativeTimeSource {
|
||||
)?;
|
||||
let server_identity = socket_identity(server_dir.as_raw_fd(), "chronyd.sock")?;
|
||||
ensure!(
|
||||
server_identity.mode & libc::S_IFMT == libc::S_IFSOCK
|
||||
&& server_identity.links == 1
|
||||
&& server_identity.uid == daemon.pin.daemon_uid
|
||||
&& server_identity.gid == daemon.pin.daemon_gid
|
||||
&& server_identity.mode & 0o007 == 0,
|
||||
protected_server_socket(
|
||||
server_identity,
|
||||
daemon.pin.daemon_uid,
|
||||
daemon.pin.daemon_gid,
|
||||
),
|
||||
"TIME_CHRONY_SOCKET_PROTECTION"
|
||||
);
|
||||
Ok(Self {
|
||||
@@ -854,6 +865,21 @@ mod tests {
|
||||
.unwrap();
|
||||
let old = UnixDatagram::bind(path.join("own.sock")).unwrap();
|
||||
let expected = socket_identity(dir.as_raw_fd(), "own.sock").unwrap();
|
||||
let server = Identity {
|
||||
mode: libc::S_IFSOCK | 0o755,
|
||||
..expected
|
||||
};
|
||||
assert!(protected_server_socket(server, server.uid, server.gid));
|
||||
for mode in [0o775, 0o757] {
|
||||
assert!(!protected_server_socket(
|
||||
Identity {
|
||||
mode: libc::S_IFSOCK | mode,
|
||||
..server
|
||||
},
|
||||
server.uid,
|
||||
server.gid,
|
||||
));
|
||||
}
|
||||
std::fs::rename(path.join("own.sock"), path.join("held.sock")).unwrap();
|
||||
let new = UnixDatagram::bind(path.join("own.sock")).unwrap();
|
||||
assert!(unlink_owned(dir.as_raw_fd(), "own.sock", expected).is_err());
|
||||
|
||||
Reference in New Issue
Block a user