* Set RabbitMQ logging to debug for OAuth2

lukebakken · lukebakken · commit 3861a5d25163 · 2024-08-05T11:48:48.000-07:00
* Use internal backend for HTTP API for OAuth2 tests
* Remove debug logging
diff --git a/projects/RabbitMQ.Client.OAuth2/CredentialsRefresher.cs b/projects/RabbitMQ.Client.OAuth2/CredentialsRefresher.cs
@@ -94,7 +94,6 @@ private async Task RefreshLoopAsync()
 
                     CredentialsRefresherEventSource.Log.RefreshedCredentials(_credentialsProvider.Name);
 
-                    Console.WriteLine("{0} [DEBUG] calling _onRefreshed, ValidUntil: {1}", DateTime.Now, _credentials.ValidUntil);
                     await _onRefreshed(_credentials, null, _linkedCts.Token)
                         .ConfigureAwait(false);
                 }
@@ -114,8 +113,6 @@ await _onRefreshed(null, ex, _linkedCts.Token)
                     delaySpan = TimeSpan.FromMilliseconds(_credentials.ValidUntil.Value.TotalMilliseconds * (1.0 - (1 / 3.0)));
                 }
 
-                Console.WriteLine("{0} [DEBUG] RefreshLoopAsync delaySpan : {1}",
-                    DateTime.Now, delaySpan);
                 await Task.Delay(delaySpan, _linkedCts.Token)
                     .ConfigureAwait(false);
             }
diff --git a/projects/Test/OAuth2/OAuth2Options.cs b/projects/Test/OAuth2/OAuth2Options.cs
@@ -96,7 +96,7 @@ public override string ClientId
             {
                 return _mode switch
                 {
-                    Mode.uaa => "mgt_api_client_2",
+                    Mode.uaa => "rabbit_client_code",
                     Mode.keycloak => "mgt_api_client",
                     _ => throw new InvalidOperationException(),
                 };
@@ -109,7 +109,7 @@ public override string ClientSecret
             {
                 return _mode switch
                 {
-                    Mode.uaa => "mgt_api_client",
+                    Mode.uaa => "rabbit_client_code",
                     Mode.keycloak => "LWOuYqJ8gjKg3D2U8CJZDuID3KiRZVDa",
                     _ => throw new InvalidOperationException(),
                 };
diff --git a/projects/Test/OAuth2/TestOAuth2.cs b/projects/Test/OAuth2/TestOAuth2.cs
@@ -51,7 +51,8 @@ public class TestOAuth2 : IAsyncLifetime
         private readonly IConnectionFactory _connectionFactory;
         private readonly int _tokenExpiresInSeconds;
         private readonly OAuth2ClientCredentialsProvider _producerCredentialsProvider;
-        private readonly OAuth2ClientCredentialsProvider _httpApiCredentialsProvider;
+        // TODO rabbitmq-dotnet-client-1639
+        // private readonly OAuth2ClientCredentialsProvider _httpApiCredentialsProvider;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
 
         private IConnection? _connection;
@@ -67,8 +68,9 @@ public TestOAuth2(ITestOutputHelper testOutputHelper)
             var producerOptions = new OAuth2ProducerOptions(mode);
             _producerCredentialsProvider = GetCredentialsProvider(producerOptions);
 
-            var httpApiOptions = new OAuth2HttpApiOptions(mode);
-            _httpApiCredentialsProvider = GetCredentialsProvider(httpApiOptions);
+            // TODO rabbitmq-dotnet-client-1639
+            // var httpApiOptions = new OAuth2HttpApiOptions(mode);
+            // _httpApiCredentialsProvider = GetCredentialsProvider(httpApiOptions);
 
             _connectionFactory = new ConnectionFactory
             {
@@ -127,27 +129,24 @@ public async Task DisposeAsync()
         private Task OnCredentialsRefreshedAsync(Credentials? credentials, Exception? exception,
             CancellationToken cancellationToken = default)
         {
-            Console.WriteLine("{0} [INFO] OnCredentialsRefreshedAsync start", DateTime.Now);
-
             if (_connection is null)
             {
+                _testOutputHelper.WriteLine("connection is unexpectedly null!");
                 Assert.Fail("_connection is unexpectedly null!");
             }
 
             if (exception != null)
             {
-                Console.WriteLine("{0} [ERROR] OnCredentialsRefreshedAsync exception: {1}",
-                    DateTime.Now, exception);
+                _testOutputHelper.WriteLine("exception is unexpectedly not-null: {0}", exception);
                 Assert.Fail($"exception is unexpectedly not-null: {exception}");
             }
 
             if (credentials is null)
             {
+                _testOutputHelper.WriteLine("credentials arg is unexpectedly null!");
                 Assert.Fail("credentials arg is unexpectedly null!");
             }
 
-            _testOutputHelper.WriteLine("{0} [INFO] calling UpdateSecretAsync", DateTime.Now);
-            Console.WriteLine("{0} [INFO] calling UpdateSecretAsync", DateTime.Now);
             return _connection.UpdateSecretAsync(credentials.Password, "Token refresh", cancellationToken);
         }
 
@@ -177,8 +176,10 @@ public async void IntegrationTest()
                                 async Task CloseConnection()
                                 {
                                     Assert.NotNull(_connection);
-                                    Credentials httpApiCredentials = await _httpApiCredentialsProvider.GetCredentialsAsync();
-                                    closeConnectionUtil = new Util("mgt_api_client", httpApiCredentials.Password);
+                                    // TODO rabbitmq-dotnet-client-1639
+                                    // Credentials httpApiCredentials = await _httpApiCredentialsProvider.GetCredentialsAsync();
+                                    // closeConnectionUtil = new Util("mgt_api_client", httpApiCredentials.Password);
+                                    closeConnectionUtil = new Util();
                                     await closeConnectionUtil.CloseConnectionAsync(_connection.ClientProvidedName);
                                 }
 
diff --git a/projects/Test/OAuth2/keycloak/rabbitmq.conf b/projects/Test/OAuth2/keycloak/rabbitmq.conf
@@ -1,4 +1,8 @@
-auth_backends.1 = rabbit_auth_backend_oauth2
+log.console = true
+log.console.level = debug
+
+auth_backends.1 = internal
+auth_backends.2 = oauth2
 
 auth_oauth2.resource_server_id = rabbitmq
 auth_oauth2.preferred_username_claims.1 = username
diff --git a/projects/Test/OAuth2/uaa/rabbitmq.conf b/projects/Test/OAuth2/uaa/rabbitmq.conf
@@ -1,4 +1,9 @@
-auth_backends.1 = rabbit_auth_backend_oauth2
+log.console = true
+log.console.level = debug
+
+auth_backends.1 = internal
+auth_backends.2 = oauth2
+
 management.oauth_enabled = true
 management.oauth_client_id = rabbit_client_code
 management.oauth_provider_url = http://localhost:8080/

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ private async Task RefreshLoopAsync()`
`94`	`94`
`95`	`95`	`CredentialsRefresherEventSource.Log.RefreshedCredentials(_credentialsProvider.Name);`
`96`	`96`
`97`		`- Console.WriteLine("{0} [DEBUG] calling _onRefreshed, ValidUntil: {1}", DateTime.Now, _credentials.ValidUntil);`
`98`	`97`	`await _onRefreshed(_credentials, null, _linkedCts.Token)`
`99`	`98`	`.ConfigureAwait(false);`
`100`	`99`	`}`
`@@ -114,8 +113,6 @@ await _onRefreshed(null, ex, _linkedCts.Token)`
`114`	`113`	`delaySpan = TimeSpan.FromMilliseconds(_credentials.ValidUntil.Value.TotalMilliseconds * (1.0 - (1 / 3.0)));`
`115`	`114`	`}`
`116`	`115`
`117`		`- Console.WriteLine("{0} [DEBUG] RefreshLoopAsync delaySpan : {1}",`
`118`		`- DateTime.Now, delaySpan);`
`119`	`116`	`await Task.Delay(delaySpan, _linkedCts.Token)`
`120`	`117`	`.ConfigureAwait(false);`
`121`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public override string ClientId`
`96`	`96`	`{`
`97`	`97`	`return _mode switch`
`98`	`98`	`{`
`99`		`- Mode.uaa => "mgt_api_client_2",`
	`99`	`+ Mode.uaa => "rabbit_client_code",`
`100`	`100`	`Mode.keycloak => "mgt_api_client",`
`101`	`101`	`_ => throw new InvalidOperationException(),`
`102`	`102`	`};`
`@@ -109,7 +109,7 @@ public override string ClientSecret`
`109`	`109`	`{`
`110`	`110`	`return _mode switch`
`111`	`111`	`{`
`112`		`- Mode.uaa => "mgt_api_client",`
	`112`	`+ Mode.uaa => "rabbit_client_code",`
`113`	`113`	`Mode.keycloak => "LWOuYqJ8gjKg3D2U8CJZDuID3KiRZVDa",`
`114`	`114`	`_ => throw new InvalidOperationException(),`
`115`	`115`	`};`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public class TestOAuth2 : IAsyncLifetime`
`51`	`51`	`private readonly IConnectionFactory _connectionFactory;`
`52`	`52`	`private readonly int _tokenExpiresInSeconds;`
`53`	`53`	`private readonly OAuth2ClientCredentialsProvider _producerCredentialsProvider;`
`54`		`- private readonly OAuth2ClientCredentialsProvider _httpApiCredentialsProvider;`
	`54`	`+ // TODO rabbitmq-dotnet-client-1639`
	`55`	`+ // private readonly OAuth2ClientCredentialsProvider _httpApiCredentialsProvider;`
`55`	`56`	`private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();`
`56`	`57`
`57`	`58`	`private IConnection? _connection;`
`@@ -67,8 +68,9 @@ public TestOAuth2(ITestOutputHelper testOutputHelper)`
`67`	`68`	`var producerOptions = new OAuth2ProducerOptions(mode);`
`68`	`69`	`_producerCredentialsProvider = GetCredentialsProvider(producerOptions);`
`69`	`70`
`70`		`- var httpApiOptions = new OAuth2HttpApiOptions(mode);`
`71`		`- _httpApiCredentialsProvider = GetCredentialsProvider(httpApiOptions);`
	`71`	`+ // TODO rabbitmq-dotnet-client-1639`
	`72`	`+ // var httpApiOptions = new OAuth2HttpApiOptions(mode);`
	`73`	`+ // _httpApiCredentialsProvider = GetCredentialsProvider(httpApiOptions);`
`72`	`74`
`73`	`75`	`_connectionFactory = new ConnectionFactory`
`74`	`76`	`{`
`@@ -127,27 +129,24 @@ public async Task DisposeAsync()`
`127`	`129`	`private Task OnCredentialsRefreshedAsync(Credentials? credentials, Exception? exception,`
`128`	`130`	`CancellationToken cancellationToken = default)`
`129`	`131`	`{`
`130`		`- Console.WriteLine("{0} [INFO] OnCredentialsRefreshedAsync start", DateTime.Now);`
`131`		`-`
`132`	`132`	`if (_connection is null)`
`133`	`133`	`{`
	`134`	`+ _testOutputHelper.WriteLine("connection is unexpectedly null!");`
`134`	`135`	`Assert.Fail("_connection is unexpectedly null!");`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`if (exception != null)`
`138`	`139`	`{`
`139`		`- Console.WriteLine("{0} [ERROR] OnCredentialsRefreshedAsync exception: {1}",`
`140`		`- DateTime.Now, exception);`
	`140`	`+ _testOutputHelper.WriteLine("exception is unexpectedly not-null: {0}", exception);`
`141`	`141`	`Assert.Fail($"exception is unexpectedly not-null: {exception}");`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if (credentials is null)`
`145`	`145`	`{`
	`146`	`+ _testOutputHelper.WriteLine("credentials arg is unexpectedly null!");`
`146`	`147`	`Assert.Fail("credentials arg is unexpectedly null!");`
`147`	`148`	`}`
`148`	`149`
`149`		`- _testOutputHelper.WriteLine("{0} [INFO] calling UpdateSecretAsync", DateTime.Now);`
`150`		`- Console.WriteLine("{0} [INFO] calling UpdateSecretAsync", DateTime.Now);`
`151`	`150`	`return _connection.UpdateSecretAsync(credentials.Password, "Token refresh", cancellationToken);`
`152`	`151`	`}`
`153`	`152`
`@@ -177,8 +176,10 @@ public async void IntegrationTest()`
`177`	`176`	`async Task CloseConnection()`
`178`	`177`	`{`
`179`	`178`	`Assert.NotNull(_connection);`
`180`		`- Credentials httpApiCredentials = await _httpApiCredentialsProvider.GetCredentialsAsync();`
`181`		`- closeConnectionUtil = new Util("mgt_api_client", httpApiCredentials.Password);`
	`179`	`+ // TODO rabbitmq-dotnet-client-1639`
	`180`	`+ // Credentials httpApiCredentials = await _httpApiCredentialsProvider.GetCredentialsAsync();`
	`181`	`+ // closeConnectionUtil = new Util("mgt_api_client", httpApiCredentials.Password);`
	`182`	`+ closeConnectionUtil = new Util();`
`182`	`183`	`await closeConnectionUtil.CloseConnectionAsync(_connection.ClientProvidedName);`
`183`	`184`	`}`
`184`	`185`