modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Stop logging stdio transport environment variables (#1538)

Browse source
This commit is contained in:
Copilot 2026-05-08 10:39:07 -07:00 • committed by GitHub
commit 3118fcd6cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ModelContextProtocol.Core/Client/StdioClientTransport.cs
View file

@ -126,9 +126,8 @@ public sealed partial class StdioClientTransport : IClientTransport
if (logger.IsEnabled(LogLevel.Trace)) if (logger.IsEnabled(LogLevel.Trace))
{ {
LogCreateProcessForTransportSensitive(logger, endpointName, _options.Command, LogCreateProcessForTransportDetailed(logger, endpointName, _options.Command,
startInfo.Arguments, startInfo.Arguments,
string.Join(", ", startInfo.Environment.Select(kvp => $"{kvp.Key}={kvp.Value}")),
startInfo.WorkingDirectory); startInfo.WorkingDirectory);
} }
else else
@ -300,8 +299,8 @@ public sealed partial class StdioClientTransport : IClientTransport
[LoggerMessage(Level = LogLevel.Information, Message = "{EndpointName} starting server process. Command: '{Command}'.")] [LoggerMessage(Level = LogLevel.Information, Message = "{EndpointName} starting server process. Command: '{Command}'.")]
private static partial void LogCreateProcessForTransport(ILogger logger, string endpointName, string command); private static partial void LogCreateProcessForTransport(ILogger logger, string endpointName, string command);
[LoggerMessage(Level = LogLevel.Trace, Message = "{EndpointName} starting server process. Command: '{Command}', Arguments: {Arguments}, Environment: {Environment}, Working directory: {WorkingDirectory}.")] [LoggerMessage(Level = LogLevel.Trace, Message = "{EndpointName} starting server process. Command: '{Command}', Arguments: {Arguments}, Working directory: {WorkingDirectory}.")]
private static partial void LogCreateProcessForTransportSensitive(ILogger logger, string endpointName, string command, string? arguments, string environment, string workingDirectory); private static partial void LogCreateProcessForTransportDetailed(ILogger logger, string endpointName, string command, string? arguments, string workingDirectory);
[LoggerMessage(Level = LogLevel.Warning, Message = "{EndpointName} failed to start server process.")] [LoggerMessage(Level = LogLevel.Warning, Message = "{EndpointName} failed to start server process.")]
private static partial void LogTransportProcessStartFailed(ILogger logger, string endpointName); private static partial void LogTransportProcessStartFailed(ILogger logger, string endpointName);

39
tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
View file

@ -1,4 +1,5 @@
using ModelContextProtocol.Client; using Microsoft.Extensions.Logging;
using ModelContextProtocol.Client;
using ModelContextProtocol.Protocol; using ModelContextProtocol.Protocol;
using ModelContextProtocol.Tests.Utils; using ModelContextProtocol.Tests.Utils;
using System.IO.Pipelines; using System.IO.Pipelines;
@ -12,6 +13,42 @@ public class StdioClientTransportTests(ITestOutputHelper testOutputHelper) : Log
{ {
public static bool IsStdErrCallbackSupported => !PlatformDetection.IsMonoRuntime; public static bool IsStdErrCallbackSupported => !PlatformDetection.IsMonoRuntime;
[Fact]
public async Task ConnectAsync_DoesNotLogEnvironmentVariablesAtTrace()
{
string secretName = $"MCP_TEST_SECRET_{Guid.NewGuid():N}";
string secretValue = $"secret-{Guid.NewGuid():N}";
using var loggerFactory = Microsoft.Extensions.Logging.LoggerFactory.Create(builder =>
{
builder.AddProvider(MockLoggerProvider);
builder.SetMinimumLevel(LogLevel.Trace);
});
StdioClientTransport transport = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
new(new()
{
Command = "cmd.exe",
Arguments = ["/c", "exit /b 0"],
EnvironmentVariables = new Dictionary<string, string?> { [secretName] = secretValue },
}, loggerFactory) :
new(new()
{
Command = "sh",
Arguments = ["-c", "exit 0"],
EnvironmentVariables = new Dictionary<string, string?> { [secretName] = secretValue },
}, loggerFactory);
await using var _ = await transport.ConnectAsync(TestContext.Current.CancellationToken);
Assert.Contains(MockLoggerProvider.LogMessages, log =>
log.LogLevel == LogLevel.Trace &&
log.Message.Contains("starting server process", StringComparison.Ordinal));
Assert.DoesNotContain(MockLoggerProvider.LogMessages, log =>
log.Message.Contains(secretName, StringComparison.Ordinal) ||
log.Message.Contains(secretValue, StringComparison.Ordinal));
}
[Fact] [Fact]
public async Task CreateAsync_ValidProcessInvalidServer_Throws() public async Task CreateAsync_ValidProcessInvalidServer_Throws()
{ {