Skip to content

fix(security): sanitize validated ids before logging in PokManagerClient #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JerrettDavis merged 1 commit into from
Jun 23, 2026
Merged

fix(security): sanitize validated ids before logging in PokManagerClient #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/Infrastructure/PokManager.Infrastructure/PokManager/PokManagerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public PokManagerClient(
/// argument injection through the bash executor.
/// </summary>
private static string ValidateId(string value, string paramName) =>
SafePath.ValidateIdentifier(value, paramName);
SafePath.SanitizeLogValue(SafePath.ValidateIdentifier(value, paramName));

#region Discovery & Query - IMPLEMENTED

Expand Down Expand Up @@ -107,7 +107,7 @@ public async Task<Result<InstanceStatus>> GetInstanceStatusAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -162,7 +162,7 @@ public async Task<Result<InstanceDetails>> GetInstanceDetailsAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -310,7 +310,7 @@ public async Task<Result<Unit>> StartInstanceAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -378,7 +378,7 @@ public async Task<Result<Unit>> StopInstanceAsync(
StopInstanceOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -465,7 +465,7 @@ public async Task<Result<Unit>> RestartInstanceAsync(
RestartInstanceOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -552,7 +552,7 @@ public async Task<Result<Unit>> DeleteInstanceAsync(
bool deleteBackups = false,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -633,7 +633,7 @@ public async Task<Result<IReadOnlyList<BackupInfo>>> ListBackupsAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -696,7 +696,7 @@ public async Task<Result<string>> CreateBackupAsync(
CreateBackupOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -782,9 +782,9 @@ public async Task<Result<Unit>> RestoreBackupAsync(
RestoreBackupOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

SafePath.ValidateFileToken(backupId, nameof(backupId));
backupId = SafePath.SanitizeLogValue(SafePath.ValidateFileToken(backupId, nameof(backupId)));

try
{
Expand Down Expand Up @@ -852,9 +852,9 @@ public async Task<Result<Stream>> DownloadBackupAsync(
string backupId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

SafePath.ValidateFileToken(backupId, nameof(backupId));
backupId = SafePath.SanitizeLogValue(SafePath.ValidateFileToken(backupId, nameof(backupId)));

try
{
Expand Down Expand Up @@ -932,9 +932,9 @@ public async Task<Result<Unit>> DeleteBackupAsync(
string backupId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

SafePath.ValidateFileToken(backupId, nameof(backupId));
backupId = SafePath.SanitizeLogValue(SafePath.ValidateFileToken(backupId, nameof(backupId)));

try
{
Expand Down Expand Up @@ -993,7 +993,7 @@ public async Task<Result<UpdateAvailability>> CheckForUpdatesAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -1054,7 +1054,7 @@ public async Task<Result<UpdateResult>> ApplyUpdatesAsync(
ApplyUpdatesOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -1142,7 +1142,7 @@ public async Task<Result<IReadOnlyDictionary<string, string>>> GetConfigurationA
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -1203,7 +1203,7 @@ public async Task<Result<ConfigurationValidationResult>> ValidateConfigurationAs
IReadOnlyDictionary<string, string> configuration,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

if (configuration == null)
{
Expand Down Expand Up @@ -1282,7 +1282,7 @@ public async Task<Result<ApplyConfigurationResult>> ApplyConfigurationAsync(
ApplyConfigurationOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

if (configuration == null)
{
Expand Down Expand Up @@ -1380,7 +1380,7 @@ public async Task<Result<IReadOnlyList<LogEntry>>> GetLogsAsync(
GetLogsOptions? options = null,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -1467,7 +1467,7 @@ public async IAsyncEnumerable<LogEntry> StreamLogsAsync(
string instanceId,
[System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

_logger.LogDebug("Starting log stream for instance {InstanceId}", instanceId);

Expand Down Expand Up @@ -1502,7 +1502,7 @@ public async Task<Result<HealthCheckResult>> HealthCheckAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

var startTime = DateTimeOffset.UtcNow;

Expand Down Expand Up @@ -1577,7 +1577,7 @@ public async Task<Result<Unit>> SendChatMessageAsync(
string message,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

if (string.IsNullOrWhiteSpace(message))
{
Expand Down Expand Up @@ -1636,7 +1636,7 @@ public async Task<Result<Unit>> SaveWorldAsync(
string instanceId,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

try
{
Expand Down Expand Up @@ -1685,7 +1685,7 @@ public async Task<Result<string>> ExecuteCustomCommandAsync(
string command,
CancellationToken cancellationToken = default)
{
ValidateId(instanceId, nameof(instanceId));
instanceId = ValidateId(instanceId, nameof(instanceId));

if (string.IsNullOrWhiteSpace(command))
{
Expand Down
Loading