Skip to content

Use Markup.Escape around content being written to the console #515

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
scowing merged 2 commits into from
Nov 20, 2025
Merged

Use Markup.Escape around content being written to the console #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9149be
- use Markup.Escape around content being written to the console
scowing Nov 19, 2025
c02b6f5
Auto format escape-console-output (#516)
github-actions[bot] Nov 19, 2025
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
1 change: 1 addition & 0 deletions src/D2L.Bmx/Aws/AwsCacheModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace D2L.Bmx.Aws;

internal record AwsCacheModel(
string Org,
string User,
Expand Down
13 changes: 8 additions & 5 deletions src/D2L.Bmx/MessageWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ private readonly bool _noColor
void IMessageWriter.WriteParameter( string description, string value, ParameterSource source ) {
string valueColor = _noColor ? "default" : "cyan2";
string sourceColor = _noColor ? "default" : "grey";
_ansiConsole.MarkupLine( $"[default]{description}:[/] [{valueColor}]{value}[/] [{sourceColor}](from {source})[/]" );
string message = $"[default]{Markup.Escape( description )}:[/] "
+ $"[{valueColor}]{Markup.Escape( value )}[/] "
+ $"[{sourceColor}](from {Markup.Escape( source.ToString() )})[/]";
_ansiConsole.MarkupLine( message );
}

void IMessageWriter.WriteUpdateMessage( string text ) {
Expand All @@ -42,20 +45,20 @@ void IMessageWriter.WriteUpdateMessage( string text ) {
string color = _noColor ? "default" : "black on white";
foreach( string line in lines ) {
string paddedLine = line.PadRight( maxLineLength );
_ansiConsole.MarkupLine( $"[{color}]{paddedLine}[/]" );
_ansiConsole.MarkupLine( $"[{color}]{Markup.Escape( paddedLine )}[/]" );
}
Console.Error.WriteLine();
}

void IMessageWriter.WriteWarning( string text ) {
string color = _noColor ? "default" : "yellow";
_ansiConsole.MarkupLine( $"[{color}]{text}[/]" );
_ansiConsole.MarkupLine( $"[{color}]{Markup.Escape( text )}[/]" );
WriteToFile( $"[WARNING] {text}" );
}

void IMessageWriter.WriteError( string text ) {
string color = _noColor ? "default" : "red";
_ansiConsole.MarkupLine( $"[{color}]{text}[/]" );
_ansiConsole.MarkupLine( $"[{color}]{Markup.Escape( text )}[/]" );
WriteToFile( $"[ERROR] {text}" );
}

Expand Down Expand Up @@ -83,7 +86,7 @@ private void WriteToFile( string text ) {
writer.Flush();
} catch( Exception ex ) {
string color = _noColor ? "default" : "red";
_ansiConsole.MarkupLine( $"[{color}] Error writing to log file: {ex.Message}[/]" );
_ansiConsole.MarkupLine( $"[{color}] Error writing to log file: {Markup.Escape( ex.Message )}[/]" );
}
}
}
1 change: 1 addition & 0 deletions src/D2L.Bmx/Okta/Models/OktaSessionCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace D2L.Bmx.Okta.Models;

internal record OktaSessionCache(
string UserId,
string Org,
Expand Down
Loading