Merge branch 'main' of https://git.stella-ops.org/stella-ops.org/git.stella-ops.org
This commit is contained in:
@@ -119,7 +119,7 @@ internal static class AirGapCommandGroup
|
||||
|
||||
return CommandHandlers.HandleAirGapExportAsync(
|
||||
services,
|
||||
output,
|
||||
output!,
|
||||
includeAdvisories,
|
||||
includeVex,
|
||||
includePolicies,
|
||||
|
||||
@@ -594,7 +594,7 @@ internal static class BinaryCommandHandlers
|
||||
Function = function,
|
||||
FingerprintId = fingerprintId,
|
||||
FingerprintHash = Convert.ToHexStringLower(fileHash),
|
||||
GeneratedAt = DateTimeOffset.UtcNow.ToString("O")
|
||||
GeneratedAt = (services.GetService<TimeProvider>() ?? TimeProvider.System).GetUtcNow().ToString("O")
|
||||
};
|
||||
|
||||
if (format == "json")
|
||||
@@ -662,7 +662,8 @@ internal static class BinaryCommandHandlers
|
||||
}
|
||||
|
||||
// Resolve scan ID (auto-generate if not provided)
|
||||
var effectiveScanId = scanId ?? $"cli-{Path.GetFileName(filePath)}-{DateTime.UtcNow:yyyyMMddHHmmss}";
|
||||
var timeProvider = services.GetService<TimeProvider>() ?? TimeProvider.System;
|
||||
var effectiveScanId = scanId ?? $"cli-{Path.GetFileName(filePath)}-{timeProvider.GetUtcNow():yyyyMMddHHmmss}";
|
||||
|
||||
CallGraphSnapshot snapshot = null!;
|
||||
|
||||
|
||||
@@ -10379,7 +10379,7 @@ internal static partial class CommandHandlers
|
||||
.ToList();
|
||||
|
||||
var actualSigners = signatures.Select(s => s.KeyId).ToHashSet();
|
||||
var missing = required.Where(r => !actualSigners.Contains(r)).ToList();
|
||||
var missing = required.Where(r => !actualSigners.Contains(r!)).ToList();
|
||||
|
||||
if (missing.Count > 0)
|
||||
{
|
||||
@@ -11731,6 +11731,10 @@ internal static partial class CommandHandlers
|
||||
}
|
||||
|
||||
// Check 3: Integrity verification (root hash)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
_ = false; // integrityOk - tracked via checks list
|
||||
>>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
|
||||
if (index.TryGetProperty("integrity", out var integrity) &&
|
||||
integrity.TryGetProperty("rootHash", out var rootHashElem))
|
||||
{
|
||||
|
||||
@@ -223,16 +223,26 @@ internal static class CliErrorRenderer
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
string? code1 = null;
|
||||
string? code2 = null;
|
||||
|
||||
if ((!error.Metadata.TryGetValue("reason_code", out code1) || string.IsNullOrWhiteSpace(code1)) &&
|
||||
(!error.Metadata.TryGetValue("reasonCode", out code2) || string.IsNullOrWhiteSpace(code2)))
|
||||
=======
|
||||
string? tempCode;
|
||||
if ((!error.Metadata.TryGetValue("reason_code", out tempCode) || string.IsNullOrWhiteSpace(tempCode)) &&
|
||||
(!error.Metadata.TryGetValue("reasonCode", out tempCode) || string.IsNullOrWhiteSpace(tempCode)))
|
||||
>>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
reasonCode = OfflineKitReasonCodes.Normalize(code1 ?? code2 ?? "") ?? "";
|
||||
=======
|
||||
reasonCode = OfflineKitReasonCodes.Normalize(tempCode!) ?? "";
|
||||
>>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
|
||||
return reasonCode.Length > 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user