Skip to content

Commit 155c68a

Browse files
committed
fix(protocol): encode process start times as timestamps
Signed-off-by: Vineeth Sai Narajala <[email protected]>
1 parent 2c080c3 commit 155c68a

2 files changed

Lines changed: 53 additions & 6 deletions

File tree

‎crates/openshell-sandbox-backend/src/protobuf.rs‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,13 @@ impl WireMessage for w::ProcessIdentityWire {
9696
name: self.name.clone(),
9797
pid: self.pid,
9898
uid: self.uid.clone(),
99-
created_time_ms: self.created_time_ms,
99+
created_time: self.created_time_ms.map(timestamp_i64_ms).transpose()?,
100100
parent_pid: self.parent_pid,
101101
parent_uid: self.parent_uid.clone(),
102-
parent_created_time_ms: self.parent_created_time_ms,
102+
parent_created_time: self
103+
.parent_created_time_ms
104+
.map(timestamp_i64_ms)
105+
.transpose()?,
103106
})
104107
}
105108

@@ -108,10 +111,10 @@ impl WireMessage for w::ProcessIdentityWire {
108111
name: value.name,
109112
pid: value.pid,
110113
uid: value.uid,
111-
created_time_ms: value.created_time_ms,
114+
created_time_ms: value.created_time.map(millis_i64).transpose()?,
112115
parent_pid: value.parent_pid,
113116
parent_uid: value.parent_uid,
114-
parent_created_time_ms: value.parent_created_time_ms,
117+
parent_created_time_ms: value.parent_created_time.map(millis_i64).transpose()?,
115118
})
116119
}
117120
}
@@ -489,6 +492,14 @@ fn millis(v: prost_types::Timestamp) -> Result<u64, FrameError> {
489492
Ok(u64::try_from(v.seconds).map_err(invalid)? * 1000
490493
+ u64::try_from(v.nanos).map_err(invalid)? / 1_000_000)
491494
}
495+
fn timestamp_i64_ms(value: i64) -> Result<prost_types::Timestamp, FrameError> {
496+
timestamp(u64::try_from(value).map_err(invalid)?)
497+
}
498+
499+
fn millis_i64(value: prost_types::Timestamp) -> Result<i64, FrameError> {
500+
i64::try_from(millis(value)?).map_err(invalid)
501+
}
502+
492503
impl WireMessage for w::RequestEnvelope {
493504
type Proto = p::RequestEnvelope;
494505
fn to_proto(&self) -> Result<Self::Proto, FrameError> {
@@ -879,6 +890,42 @@ where
879890
mod tests {
880891
use super::*;
881892

893+
#[test]
894+
fn process_identity_uses_well_known_timestamps() {
895+
let identity = w::ProcessIdentityWire {
896+
name: "/bin/true".to_string(),
897+
pid: 42,
898+
uid: None,
899+
created_time_ms: Some(1_793_620_000_123),
900+
parent_pid: Some(1),
901+
parent_uid: None,
902+
parent_created_time_ms: Some(1_793_619_999_456),
903+
};
904+
let encoded = identity.to_proto().unwrap();
905+
assert_eq!(
906+
encoded.created_time,
907+
Some(prost_types::Timestamp {
908+
seconds: 1_793_620_000,
909+
nanos: 123_000_000,
910+
})
911+
);
912+
assert_eq!(
913+
encoded.parent_created_time,
914+
Some(prost_types::Timestamp {
915+
seconds: 1_793_619_999,
916+
nanos: 456_000_000,
917+
})
918+
);
919+
assert_eq!(
920+
w::ProcessIdentityWire::from_proto(encoded.clone()).unwrap(),
921+
identity
922+
);
923+
924+
let mut invalid_time = encoded;
925+
invalid_time.created_time.as_mut().unwrap().nanos = 123_000_001;
926+
assert!(w::ProcessIdentityWire::from_proto(invalid_time).is_err());
927+
}
928+
882929
#[test]
883930
fn process_identity_survives_start_exec_and_legacy_responses() {
884931
let identity = w::ProcessIdentityWire {

‎proto/sandbox_protocol.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ message ProcessIdentity {
371371
string name = 1;
372372
uint32 pid = 2;
373373
optional string uid = 3;
374-
optional int64 created_time_ms = 4;
374+
google.protobuf.Timestamp created_time = 4;
375375
optional uint32 parent_pid = 5;
376376
optional string parent_uid = 6;
377-
optional int64 parent_created_time_ms = 7;
377+
google.protobuf.Timestamp parent_created_time = 7;
378378
}
379379
enum ProcessKind {
380380
PROCESS_KIND_UNSPECIFIED = 0;

0 commit comments

Comments
 (0)