Merge branch 'main' into Release-9.1.0

Author: AdamL-Microsoft

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -978,7 +978,9 @@ public record Job(
     StoredUserInfo? UserInfo,
     string? Error = null,
     DateTimeOffset? EndTime = null
-) : StatefulEntityBase<JobState>(State) { }
+) : StatefulEntityBase<JobState>(State) {
+
+}
 
 // This is like UserInfo but lacks the UPN:
 public record StoredUserInfo(Guid? ApplicationId, Guid? ObjectId);

src/ApiService/ApiService/OneFuzzTypes/Responses.cs

@@ -52,7 +52,9 @@ public record TaskSearchResult(
     List<NodeAssignment> Nodes,
     [property: JsonPropertyName("Timestamp")] // must retain capital T for backcompat
     DateTimeOffset? Timestamp
-) : BaseResponse();
+) : BaseResponse() {
+    public DateTimeOffset? StartTime => EndTime is DateTimeOffset endTime ? endTime.Subtract(TimeSpan.FromHours(Config.Task.Duration)) : null;
+}
 
 public record BoolResult(
     bool Result
@@ -113,6 +115,7 @@ public static JobResponse ForJob(Job j, IEnumerable<IJobTaskInfo>? taskInfo)
             UserInfo: j.UserInfo,
             Timestamp: j.Timestamp
         );
+    public DateTimeOffset? StartTime => EndTime is DateTimeOffset endTime ? endTime.Subtract(TimeSpan.FromHours(Config.Duration)) : null;
 }
 
 public record PoolGetResult(

src/agent/coverage/src/allowlist.rs

@@ -74,12 +74,13 @@ impl AllowList {
         self.allow.is_match(path) && !self.deny.is_match(path)
     }
 
-    /// Build a new `Allowlist` that adds the allow and deny rules of `other` to `self`.
-    pub fn extend(&self, other: &Self) -> Self {
+    /// Modifies the AllowList by adding the allow and deny rules of `other` to `self`.
+    pub fn extend_in_place(&mut self, other: &Self) {
         let allow = add_regexsets(&self.allow, &other.allow);
         let deny = add_regexsets(&self.deny, &other.deny);
 
-        AllowList::new(allow, deny)
+        self.allow = allow;
+        self.deny = deny;
     }
 }
 

src/agent/coverage/src/allowlist/tests.rs

@@ -121,7 +121,7 @@ fn test_allow_glob_extension() -> Result<()> {
 fn test_allowlist_extend() -> Result<()> {
     let baseline_text = "! bad/*
 other/*";
-    let baseline = AllowList::parse(baseline_text)?;
+    let mut baseline = AllowList::parse(baseline_text)?;
 
     assert!(!baseline.is_allowed("bad/a"));
     assert!(!baseline.is_allowed("bad/b"));
@@ -144,20 +144,20 @@ bad/*
     assert!(!provided.is_allowed("other/a"));
     assert!(!provided.is_allowed("other/b"));
 
-    let extended = baseline.extend(&provided);
+    baseline.extend_in_place(&provided);
 
     // Deny rules from `baseline` should not be overridden by `provided`, but
     // allow rules should be.
     //
     // A provided allowlist can deny patterns that are baseline-allowed, but
     // cannot allow patterns that are baseline-denied.
-    assert!(!extended.is_allowed("bad/a"));
-    assert!(!extended.is_allowed("bad/b"));
-    assert!(extended.is_allowed("good/a"));
-    assert!(extended.is_allowed("good/b"));
-    assert!(extended.is_allowed("good/bad/c"));
-    assert!(!extended.is_allowed("other/a"));
-    assert!(!extended.is_allowed("other/b"));
+    assert!(!baseline.is_allowed("bad/a"));
+    assert!(!baseline.is_allowed("bad/b"));
+    assert!(baseline.is_allowed("good/a"));
+    assert!(baseline.is_allowed("good/b"));
+    assert!(baseline.is_allowed("good/bad/c"));
+    assert!(!baseline.is_allowed("other/a"));
+    assert!(!baseline.is_allowed("other/b"));
 
     Ok(())
 }

src/agent/onefuzz-task/src/tasks/coverage/generic.rs

@@ -199,7 +199,9 @@ impl CoverageTask {
             // process startup functions. Setting software breakpoints in these functions breaks
             // interceptor init, and causes test case execution to diverge.
             let interceptor_denylist = AllowList::parse(WINDOWS_INTERCEPTOR_DENYLIST)?;
-            allowlist.source_files.extend(&interceptor_denylist);
+            allowlist
+                .source_files
+                .extend_in_place(&interceptor_denylist);
         }
 
         Ok(allowlist)

src/pytypes/onefuzztypes/models.py

@@ -747,6 +747,7 @@ class Task(BaseModel):
     events: Optional[List[TaskEventSummary]]
     nodes: Optional[List[NodeAssignment]]
     user_info: Optional[UserInfo]
+    start_time: Optional[datetime] = None
 
 
 class Job(BaseModel):
@@ -758,6 +759,7 @@ class Job(BaseModel):
     end_time: Optional[datetime] = None
     task_info: Optional[List[Union[Task, JobTaskInfo]]]
     user_info: Optional[UserInfo]
+    start_time: Optional[datetime] = None
 
 
 class NetworkConfig(BaseModel):