mirror of
https://github.com/okieselbach/AutopilotMonitor.git
synced 2026-10-25 13:10:13 +00:00
2f8ad82b0a
Codex follow-ups to 1ebc2675:
- guardrails.json now mirrors blockedCommandPatterns + maxCommandLength and
carries C:\Windows\System32\config in blockedFilePrefixes; portal
(guardValidation.ts) and MCP (rule-validation.ts) enforce them in agent
order (before the unrestricted-mode early-return), so hard-blocked commands
no longer show "Allowed" in unrestricted tenants. GuardrailsParityTests
pins the JSON mirror to the C# constants.
- gather-rule schema: collectorType enum gains json/xml (agent + portal
supported both; MCP validate_rule falsely rejected them); MCP validates
json/xml targets with file semantics and rejects activePhases +
activeFromPhase set together (backend 400 parity); authoring guide updated.
- Author anti-spoof: tenant + global UpdateRule stamp the caller's JWT
display name before the service call, closing the PUT-upsert hole where a
non-existing ruleId stored the payload author; true updates still preserve
the original. GatherRulesFunctionAuthorEndpointTests drives the real
endpoints (first HttpRequestData-level test) proving body authors never win.
- AgentBootstrap.RetrySelfUpdateAfterEnrollment: internal + UpdateInvokerOverride
test seam (RequestGracefulShutdown idiom), LastVersionCheckSucceeded setter
internal; AgentBootstrapSelfUpdateRetryTests pin the guard, the relaxed
await_enrollment timeouts, and the swallow-everything exception contract
with save/restore of the static state.
Functions 3958, Agent-Core 2200, Web 670, MCP 543 tests green.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
228 lines
10 KiB
C#
228 lines
10 KiB
C#
using System.Net;
|
|
using AutopilotMonitor.Functions.Helpers;
|
|
using AutopilotMonitor.Functions.Services;
|
|
using AutopilotMonitor.Shared.Models;
|
|
using Microsoft.Azure.Functions.Worker;
|
|
using Microsoft.Azure.Functions.Worker.Http;
|
|
using Microsoft.Extensions.Logging;
|
|
using Newtonsoft.Json;
|
|
|
|
namespace AutopilotMonitor.Functions.Functions.Rules
|
|
{
|
|
/// <summary>
|
|
/// CRUD API for managing gather rules (portal-facing, JWT auth)
|
|
/// </summary>
|
|
public class GatherRulesFunction
|
|
{
|
|
private readonly ILogger<GatherRulesFunction> _logger;
|
|
private readonly GatherRuleService _ruleService;
|
|
|
|
public GatherRulesFunction(
|
|
ILogger<GatherRulesFunction> logger,
|
|
GatherRuleService ruleService)
|
|
{
|
|
_logger = logger;
|
|
_ruleService = ruleService;
|
|
}
|
|
|
|
[Function("GetGatherRules")]
|
|
public async Task<HttpResponseData> GetRules(
|
|
[HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "rules/gather")] HttpRequestData req)
|
|
{
|
|
// Authentication + MemberRead authorization enforced by PolicyEnforcementMiddleware
|
|
var tenantId = TenantHelper.GetTenantId(req);
|
|
|
|
var rules = await _ruleService.GetAllRulesForTenantAsync(tenantId);
|
|
|
|
var response = req.CreateResponse(HttpStatusCode.OK);
|
|
await response.WriteAsJsonAsync(new { success = true, rules });
|
|
return response;
|
|
}
|
|
|
|
[Function("CreateGatherRule")]
|
|
public async Task<HttpResponseData> CreateRule(
|
|
[HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "rules/gather")] HttpRequestData req)
|
|
{
|
|
// Authentication + TenantAdminOrGA authorization enforced by PolicyEnforcementMiddleware
|
|
var tenantId = TenantHelper.GetTenantId(req);
|
|
|
|
if (req.Headers.TryGetValues("Content-Length", out var clValues)
|
|
&& long.TryParse(clValues.FirstOrDefault(), out var contentLength)
|
|
&& contentLength > 1_048_576) // 1 MB limit
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = "Request body too large" });
|
|
return badRequest;
|
|
}
|
|
var body = await new StreamReader(req.Body).ReadToEndAsync();
|
|
var rule = JsonConvert.DeserializeObject<GatherRule>(body);
|
|
|
|
if (rule == null || string.IsNullOrEmpty(rule.RuleId))
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = "Invalid rule data" });
|
|
return badRequest;
|
|
}
|
|
|
|
var scopeError = ValidateScopeAndEmitMode(rule);
|
|
if (scopeError != null)
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = scopeError });
|
|
return badRequest;
|
|
}
|
|
|
|
// Author is stamped from the creator's token, never from the payload
|
|
// (anti-spoof), and stays immutable through every later update.
|
|
rule.Author = TenantHelper.GetUserDisplayName(req) ?? "Autopilot Monitor";
|
|
|
|
try
|
|
{
|
|
var success = await _ruleService.CreateRuleAsync(tenantId, rule);
|
|
|
|
var response = req.CreateResponse(success ? HttpStatusCode.Created : HttpStatusCode.InternalServerError);
|
|
await response.WriteAsJsonAsync(new { success, message = success ? "Rule created" : "Failed to create rule" });
|
|
return response;
|
|
}
|
|
catch (InvalidOperationException ex)
|
|
{
|
|
var conflict = req.CreateResponse(HttpStatusCode.Conflict);
|
|
await conflict.WriteAsJsonAsync(new { success = false, message = ex.Message });
|
|
return conflict;
|
|
}
|
|
}
|
|
|
|
[Function("UpdateGatherRule")]
|
|
public async Task<HttpResponseData> UpdateRule(
|
|
[HttpTrigger(AuthorizationLevel.Anonymous, "put", Route = "rules/gather/{ruleId}")] HttpRequestData req,
|
|
string ruleId)
|
|
{
|
|
// Authentication + TenantAdminOrGA authorization enforced by PolicyEnforcementMiddleware
|
|
var tenantId = TenantHelper.GetTenantId(req);
|
|
|
|
if (req.Headers.TryGetValues("Content-Length", out var clValues2)
|
|
&& long.TryParse(clValues2.FirstOrDefault(), out var contentLength2)
|
|
&& contentLength2 > 1_048_576) // 1 MB limit
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = "Request body too large" });
|
|
return badRequest;
|
|
}
|
|
var body = await new StreamReader(req.Body).ReadToEndAsync();
|
|
var rule = JsonConvert.DeserializeObject<GatherRule>(body);
|
|
|
|
if (rule == null)
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = "Invalid rule data" });
|
|
return badRequest;
|
|
}
|
|
|
|
rule.RuleId = ruleId;
|
|
|
|
var scopeError = ValidateScopeAndEmitMode(rule);
|
|
if (scopeError != null)
|
|
{
|
|
var badRequest = req.CreateResponse(HttpStatusCode.BadRequest);
|
|
await badRequest.WriteAsJsonAsync(new { success = false, message = scopeError });
|
|
return badRequest;
|
|
}
|
|
|
|
// Same anti-spoof stamp as CreateRule: on a true update the service replaces
|
|
// this with the original author (immutable attribution), but a full-payload PUT
|
|
// that upserts a rule with no existing row must not store the payload's author.
|
|
rule.Author = TenantHelper.GetUserDisplayName(req) ?? "Autopilot Monitor";
|
|
|
|
try
|
|
{
|
|
var success = await _ruleService.UpdateRuleAsync(tenantId, rule);
|
|
var response = req.CreateResponse(success ? HttpStatusCode.OK : HttpStatusCode.InternalServerError);
|
|
await response.WriteAsJsonAsync(new { success, message = success ? "Rule updated" : "Failed to update rule" });
|
|
return response;
|
|
}
|
|
catch (InvalidOperationException ex)
|
|
{
|
|
var conflict = req.CreateResponse(HttpStatusCode.Conflict);
|
|
await conflict.WriteAsJsonAsync(new { success = false, message = ex.Message });
|
|
return conflict;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Selectable phase-scope tokens: the <see cref="EnrollmentPhase"/> enum NAMES from
|
|
/// Start(0) through Complete(7). Explicit name list (not Enum.TryParse) so numeric
|
|
/// tokens ("4") and the non-selectable Unknown/Failed members are rejected — the
|
|
/// canonical vocabulary the agent, schema, and portal share.
|
|
/// </summary>
|
|
private static readonly HashSet<string> ValidScopePhases = new(StringComparer.OrdinalIgnoreCase)
|
|
{
|
|
nameof(EnrollmentPhase.Start),
|
|
nameof(EnrollmentPhase.DevicePreparation),
|
|
nameof(EnrollmentPhase.DeviceSetup),
|
|
nameof(EnrollmentPhase.AppsDevice),
|
|
nameof(EnrollmentPhase.AccountSetup),
|
|
nameof(EnrollmentPhase.AppsUser),
|
|
nameof(EnrollmentPhase.FinalizingSetup),
|
|
nameof(EnrollmentPhase.Complete),
|
|
};
|
|
|
|
/// <summary>
|
|
/// Validates the phase-scope + emit-mode fields on create/update.
|
|
/// Returns an error message for a 400 response, or null when valid.
|
|
/// Toggle-style partial payloads carry none of these fields and pass through.
|
|
/// </summary>
|
|
internal static string? ValidateScopeAndEmitMode(GatherRule rule)
|
|
{
|
|
var hasActivePhases = rule.ActivePhases != null && rule.ActivePhases.Count > 0;
|
|
var hasFromPhase = !string.IsNullOrEmpty(rule.ActiveFromPhase);
|
|
|
|
if (hasActivePhases && hasFromPhase)
|
|
return "activePhases and activeFromPhase are mutually exclusive — set only one.";
|
|
|
|
if (hasActivePhases)
|
|
{
|
|
foreach (var phase in rule.ActivePhases!)
|
|
{
|
|
if (string.IsNullOrEmpty(phase) || !ValidScopePhases.Contains(phase))
|
|
return $"Invalid phase '{phase}' in activePhases. Valid phases: {string.Join(", ", ValidScopePhases)}.";
|
|
}
|
|
}
|
|
|
|
if (hasFromPhase && !ValidScopePhases.Contains(rule.ActiveFromPhase!))
|
|
return $"Invalid activeFromPhase '{rule.ActiveFromPhase}'. Valid phases: {string.Join(", ", ValidScopePhases)}.";
|
|
|
|
if (!string.IsNullOrEmpty(rule.EmitMode)
|
|
&& !string.Equals(rule.EmitMode, "always", StringComparison.OrdinalIgnoreCase)
|
|
&& !string.Equals(rule.EmitMode, "on_change", StringComparison.OrdinalIgnoreCase))
|
|
return "emitMode must be \"always\" or \"on_change\".";
|
|
|
|
return null;
|
|
}
|
|
|
|
[Function("DeleteGatherRule")]
|
|
public async Task<HttpResponseData> DeleteRule(
|
|
[HttpTrigger(AuthorizationLevel.Anonymous, "delete", Route = "rules/gather/{ruleId}")] HttpRequestData req,
|
|
string ruleId)
|
|
{
|
|
// Authentication + TenantAdminOrGA authorization enforced by PolicyEnforcementMiddleware
|
|
var tenantId = TenantHelper.GetTenantId(req);
|
|
|
|
// Load the rule to determine its type (built-in/community vs. custom)
|
|
var rules = await _ruleService.GetAllRulesForTenantAsync(tenantId);
|
|
var rule = rules.FirstOrDefault(r => r.RuleId == ruleId);
|
|
|
|
if (rule == null)
|
|
{
|
|
var notFound = req.CreateResponse(HttpStatusCode.NotFound);
|
|
await notFound.WriteAsJsonAsync(new { success = false, message = "Rule not found" });
|
|
return notFound;
|
|
}
|
|
|
|
var success = await _ruleService.DeleteRuleAsync(tenantId, rule);
|
|
var response = req.CreateResponse(success ? HttpStatusCode.OK : HttpStatusCode.InternalServerError);
|
|
await response.WriteAsJsonAsync(new { success, message = success ? "Rule deleted" : "Failed to delete rule" });
|
|
return response;
|
|
}
|
|
}
|
|
}
|