Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- 'backend/api/**'
- '.github/workflows/**'

permissions:
contents: read

jobs:
validate_dotnet_migrations_against_temp_db:
uses: equinor/armada/.github/workflows/validate_dotnet_migrations_against_temp_db.yml@main
Expand Down
9 changes: 6 additions & 3 deletions backend/api/Services/AreaPolygonService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Api.Database.Models;
using Api.Utilities;

namespace Api.Services
{
Expand Down Expand Up @@ -40,9 +41,11 @@ public bool MissionTasksAreInsideAreaPolygon(
)
{
logger.LogWarning(
"Robot position {robotPosition} is outside the inspection area polygon for task {taskId}",
robotPosition,
missionTask.Id
"Robot position (X={X}, Y={Y}, Z={Z}) is outside the inspection area polygon for task {taskId}",
robotPosition.X,
robotPosition.Y,
robotPosition.Z,
Sanitize.SanitizeUserInput(missionTask.Id)
);
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions backend/api/Utilities/SanitizeInput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ namespace Api.Utilities
{
public static class Sanitize
{
public static string SanitizeUserInput(string inputString)
public static string SanitizeUserInput(string? inputString)
{
return inputString.Replace("\n", "").Replace("\r", "");
return inputString?.Replace("\n", "").Replace("\r", "") ?? string.Empty;
}

public static ScheduleMissionQuery SanitizeUserInput(ScheduleMissionQuery inputQuery)
Expand Down
Loading