Merge branch 'main' into user/noharper/add-public-events

Author: nharper285

.gitignore

@@ -18,3 +18,5 @@ lcov.info
 
 /src/ApiService/ApiService/Properties/PublishProfiles/*
 /src/ApiService/ApiService/Properties/ServiceDependencies/*
+
+.vs

CHANGELOG.md

@@ -4,8 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 6.0.0
+## 6.1.0
+### Added
+* Service: Added support for feature flags which allows us to deploy new code in parts and turn it on when it's ready. [#2620](https://github.com/microsoft/onefuzz/pull/2620)
+* Service: Added a validation endpoint for the notification template. [#2655](https://github.com/microsoft/onefuzz/pull/2655)
+### Changed
+* Service: Update LLVM from v10 to v12 now that we are supporting Ubuntu 20.04 as our default image. [#2617](https://github.com/microsoft/onefuzz/pull/2617)
+* Agent: Remove unused coverage recorder from `input-tester`. [#2681](https://github.com/microsoft/onefuzz/pull/2681)
+* Agent: Rename `coverage` to `coverage-legacy`. [#2685](https://github.com/microsoft/onefuzz/pull/2685)
+### Fixed
+* CLI: Return an error when uppercase application names are specified when using deploy.py. [#2665](https://github.com/microsoft/onefuzz/pull/2665)
+* Agent: Fix local fuzzing mode. [#2669](https://github.com/microsoft/onefuzz/pull/2669)
+* Service: Post the JobCreated event when a job is created. [#2677](https://github.com/microsoft/onefuzz/pull/2677)
+* Service: The repro `Create` command will now fail if insert fails. Also add additional tests. [#2678](https://github.com/microsoft/onefuzz/pull/2678)
+* Service: Added support for `Contains Words` in WIQL [#2686](https://github.com/microsoft/onefuzz/pull/2686)
 
+## 6.0.0
 ## BREAKING CHANGES
 
 ### Manual Deployment Step

CURRENT_VERSION

@@ -1 +1 @@
-6.0.0
+6.1.0

contrib/deploy-onefuzz-via-azure-devops/Pipfile.lock

@@ -73,7 +73,6 @@ private async Async.Task<AgentRegistrationResponse> CreateRegistrationResponse(S
         var baseAddress = _context.Creds.GetInstanceUrl();
         var eventsUrl = new Uri(baseAddress, "/api/agents/events");
         var commandsUrl = new Uri(baseAddress, "/api/agents/commands");
-
         var workQueue = await _context.Queue.GetQueueSas(
             _context.PoolOperations.GetPoolQueue(pool.PoolId),
             StorageType.Corpus,

src/ApiService/ApiService/Functions/AgentRegistration.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
@@ -33,11 +34,16 @@ public Info(IEndpointAuthorization auth, IOnefuzzContext context) {
             var buildId = ReadResource(asm, "ApiService.onefuzzlib.build.id");
             var versionString = context.ServiceConfiguration.OneFuzzVersion;
 
+            var dotnetVersionString = $"{RuntimeInformation.FrameworkDescription} ({RuntimeInformation.RuntimeIdentifier})";
+
             return new InfoResponse(
                 ResourceGroup: resourceGroup,
                 Subscription: subscription,
                 Region: region,
-                Versions: new Dictionary<string, InfoVersion> { { "onefuzz", new(gitVersion, buildId, versionString) } },
+                Versions: new Dictionary<string, InfoVersion> {
+                    { "onefuzz", new(gitVersion, buildId, versionString) },
+                    { "dotnet", new("", "", dotnetVersionString) },
+                },
                 InstanceId: await _context.Containers.GetInstanceId(),
                 InsightsAppid: config.ApplicationInsightsAppId,
                 InsightsInstrumentationKey: config.ApplicationInsightsInstrumentationKey);

src/ApiService/ApiService/Functions/Info.cs

@@ -67,7 +67,7 @@ private async Task<HttpResponseData> Post(HttpRequestData req) {
                     Errors: new string[] { "pool with that name already exists" }),
                 "PoolCreate");
         }
-        var newPool = await _context.PoolOperations.Create(name: create.Name, os: create.Os, architecture: create.Arch, managed: create.Managed, clientId: create.ClientId);
+        var newPool = await _context.PoolOperations.Create(name: create.Name, os: create.Os, architecture: create.Arch, managed: create.Managed, objectId: create.ObjectId);
         return await RequestHandling.Ok(req, await Populate(PoolToPoolResponse(newPool), true));
     }
 
@@ -106,7 +106,7 @@ private static PoolGetResult PoolToPoolResponse(Service.Pool p)
             PoolId: p.PoolId,
             Os: p.Os,
             State: p.State,
-            ClientId: p.ClientId,
+            ObjectId: p.ObjectId,
             Managed: p.Managed,
             Arch: p.Arch,
             Nodes: p.Nodes,

src/ApiService/ApiService/Functions/Pool.cs

@@ -100,6 +100,9 @@ public Async.Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
                 null,
                 null,
                 null,
+                null,
+                null,
+                null,
                 null
             );
 

src/ApiService/ApiService/Functions/ValidateScriban.cs

@@ -15,7 +15,7 @@ public async ValueTask<bool> IsMember(IEnumerable<Guid> groupIds, Guid memberId)
     }
 }
 
-class AzureADGroupMembership : GroupMembershipChecker {
+sealed class AzureADGroupMembership : GroupMembershipChecker {
     private readonly GraphServiceClient _graphClient;
     public AzureADGroupMembership(GraphServiceClient graphClient) => _graphClient = graphClient;
     protected override async IAsyncEnumerable<Guid> GetGroups(Guid memberId) {
@@ -30,7 +30,7 @@ protected override async IAsyncEnumerable<Guid> GetGroups(Guid memberId) {
     }
 }
 
-class StaticGroupMembership : GroupMembershipChecker {
+sealed class StaticGroupMembership : GroupMembershipChecker {
     private readonly IReadOnlyDictionary<Guid, IReadOnlyList<Guid>> _memberships;
     public StaticGroupMembership(IDictionary<Guid, Guid[]> memberships) {
         _memberships = memberships.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<Guid>)kvp.Value.ToList());

src/ApiService/ApiService/GroupMembershipChecker.cs

@@ -61,7 +61,7 @@ public interface ILog {
     void Flush();
 }
 
-class AppInsights : ILog {
+sealed class AppInsights : ILog {
     private readonly TelemetryClient _telemetryClient;
 
     public AppInsights(TelemetryClient client) {
@@ -128,7 +128,7 @@ public void Flush() {
 }
 
 //TODO: Should we write errors and Exception to std err ? 
-class Console : ILog {
+sealed class Console : ILog {
 
     private static string DictToString<T>(IReadOnlyDictionary<string, T>? d) {
         if (d is null) {
@@ -187,6 +187,7 @@ public interface ILogTracer {
     void ForceFlush();
     void Info(LogStringHandler message);
     void Warning(LogStringHandler message);
+    void Warning(Error error);
     void Verbose(LogStringHandler message);
 
     ILogTracer WithTag(string k, string v);
@@ -342,6 +343,10 @@ public void ForceFlush() {
     public void Error(Error error) {
         Error($"{error:Tag:Error}");
     }
+
+    public void Warning(Error error) {
+        Warning($"{error:Tag:Error}");
+    }
 }
 
 public interface ILogTracerFactory {