set username on multiple uris to the actual used one + better redaction

nats-io · Nov 2, 2024 · 894faf3 · 894faf3
1 parent 13d43f2
commit 894faf3
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/NATS.Client.Core/NatsConnection.cs b/src/NATS.Client.Core/NatsConnection.cs
@@ -295,6 +295,9 @@ private static NatsOpts ReadUserInfoFromConnectionString(NatsOpts opts)
         var natsUris = opts.GetSeedUris(suppressRandomization: true);
         var maskedUris = new List<string>(natsUris.Length);
 
+        var usesPasswordInUrl = false;
+        var usesTokenInUrl = false;
+
         foreach (var natsUri in natsUris)
         {
             var uriBuilder = new UriBuilder(natsUri.Uri);
@@ -306,6 +309,7 @@ private static NatsOpts ReadUserInfoFromConnectionString(NatsOpts opts)
                     if (first)
                     {
                         first = false;
+                        usesPasswordInUrl = true;
 
                         opts = opts with
                         {
@@ -324,6 +328,7 @@ private static NatsOpts ReadUserInfoFromConnectionString(NatsOpts opts)
                     if (first)
                     {
                         first = false;
+                        usesTokenInUrl = true;
 
                         opts = opts with
                         {
@@ -338,6 +343,16 @@ private static NatsOpts ReadUserInfoFromConnectionString(NatsOpts opts)
                 }
             }
 
+            if (usesPasswordInUrl)
+            {
+                uriBuilder.UserName = opts.AuthOpts.Username; // show actual used user name in logs
+            }
+            else if (usesTokenInUrl)
+            {
+                uriBuilder.UserName = "***"; // to redact the token from logs
+                uriBuilder.Password = null; // when token is used remove password
+            }
+
             maskedUris.Add(uriBuilder.ToString().TrimEnd('/'));
         }