Skip to content

Commit 7b79760

Browse files
authored
Merge pull request #3 from Evilazaro/alert-autofix-44
Potential fix for code scanning alert no. 44: Log entries created from user input
2 parents 5353aa0 + af67b69 commit 7b79760

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

src/eShop.Orders.API/Services/OrderService.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,18 +425,20 @@ public async Task<bool> DeleteOrderAsync(string orderId, CancellationToken cance
425425
throw new ArgumentException("Order ID cannot be null or empty", nameof(orderId));
426426
}
427427

428+
var safeOrderIdForLog = orderId.Replace("\r", string.Empty).Replace("\n", string.Empty);
429+
428430
using var activity = _activitySource.StartActivity("DeleteOrder", ActivityKind.Internal);
429431
activity?.SetTag("order.id", orderId);
430432

431433
try
432434
{
433-
_logger.LogInformation("Deleting order with ID: {OrderId}", orderId);
435+
_logger.LogInformation("Deleting order with ID: {OrderId}", safeOrderIdForLog);
434436

435437
// First verify the order exists
436438
var order = await _orderRepository.GetOrderByIdAsync(orderId, cancellationToken);
437439
if (order == null)
438440
{
439-
_logger.LogWarning("Order with ID {OrderId} not found for deletion", orderId);
441+
_logger.LogWarning("Order with ID {OrderId} not found for deletion", safeOrderIdForLog);
440442
return false;
441443
}
442444

@@ -446,13 +448,13 @@ public async Task<bool> DeleteOrderAsync(string orderId, CancellationToken cance
446448
if (deleted)
447449
{
448450
activity?.SetStatus(ActivityStatusCode.Ok);
449-
_logger.LogInformation("Order {OrderId} deleted successfully", orderId);
451+
_logger.LogInformation("Order {OrderId} deleted successfully", safeOrderIdForLog);
450452
_ordersDeletedCounter.Add(1, new TagList { { "order.status", "success" } });
451453
}
452454
else
453455
{
454456
activity?.SetStatus(ActivityStatusCode.Error, "Failed to delete order");
455-
_logger.LogWarning("Failed to delete order {OrderId}", orderId);
457+
_logger.LogWarning("Failed to delete order {OrderId}", safeOrderIdForLog);
456458
}
457459

458460
return deleted;
@@ -467,7 +469,7 @@ public async Task<bool> DeleteOrderAsync(string orderId, CancellationToken cance
467469
{ "exception.type", ex.GetType().FullName ?? ex.GetType().Name },
468470
{ "order.id", orderId }
469471
}));
470-
_logger.LogError(ex, "Failed to delete order {OrderId}", orderId);
472+
_logger.LogError(ex, "Failed to delete order {OrderId}", safeOrderIdForLog);
471473
throw;
472474
}
473475
}

0 commit comments

Comments
 (0)