-
Notifications
You must be signed in to change notification settings - Fork 289
Managed Identity Support for Pg #1005
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
12b8b74
AD Support for Pg
gledis69 15bb791
Change how default identity is inferred
gledis69 c7e498b
Address reivews
gledis69 474671b
Optimise connection string without password scenario
gledis69 835975f
Merge branch 'main' into managed-identity-support-pg
gledis69 453d648
Improve default access token scenario logic
gledis69 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
src/Service.Tests/Unittests/PostgreSqlQueryExecutorUnitTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text.Json; | ||
| using System.Threading.Tasks; | ||
| using Azure.Core; | ||
| using Azure.DataApiBuilder.Service.Configurations; | ||
| using Azure.DataApiBuilder.Service.Resolvers; | ||
| using Azure.Identity; | ||
| using Microsoft.Extensions.Logging; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using Moq; | ||
| using Npgsql; | ||
|
|
||
| namespace Azure.DataApiBuilder.Service.Tests.UnitTests | ||
| { | ||
| [TestClass, TestCategory(TestCategory.POSTGRESQL)] | ||
| public class PostgreSqlQueryExecutorUnitTests | ||
| { | ||
| /// <summary> | ||
| /// Validates managed identity token issued ONLY when connection string does not specify password | ||
| /// </summary> | ||
| [DataTestMethod] | ||
| [DataRow("Server =<>;Database=<>;Username=xyz;", false, false, | ||
| DisplayName = "No managed identity access token even when connection string specifies Username only.")] | ||
| [DataRow("Server =<>;Database=<>;Username=xyz;", true, false, | ||
| DisplayName = "Managed identity access token from config used when connection string specifies Username only.")] | ||
| [DataRow("Server =<>;Database=<>;Username=xyz;", true, true, | ||
| DisplayName = "Default managed identity access token used when connection string specifies Username only.")] | ||
| [DataRow("Server =<>;Database=<>;Password=xyz;", false, false, | ||
| DisplayName = "No managed identity access token when connection string specifies Password only.")] | ||
| [DataRow("Server =<>;Database=<>;Username=xyz;Password=xxx", false, false, | ||
| DisplayName = "No managed identity access token when connection string specifies both Username and Password.")] | ||
| public async Task TestHandleManagedIdentityAccess( | ||
| string connectionString, | ||
| bool expectManagedIdentityAccessToken, | ||
| bool isDefaultAzureCredential) | ||
| { | ||
| RuntimeConfigProvider runtimeConfigProvider = TestHelper.GetRuntimeConfigProvider(TestCategory.POSTGRESQL); | ||
| runtimeConfigProvider.GetRuntimeConfiguration().ConnectionString = connectionString; | ||
| Mock<DbExceptionParser> dbExceptionParser = new(runtimeConfigProvider, new HashSet<string>()); | ||
| Mock<ILogger<PostgreSqlQueryExecutor>> queryExecutorLogger = new(); | ||
| PostgreSqlQueryExecutor postgreSqlQueryExecutor = new(runtimeConfigProvider, dbExceptionParser.Object, queryExecutorLogger.Object); | ||
|
|
||
| const string DEFAULT_TOKEN = "Default access token"; | ||
| const string CONFIG_TOKEN = "Configuration controller access token"; | ||
| AccessToken testValidToken = new(accessToken: DEFAULT_TOKEN, expiresOn: DateTimeOffset.MaxValue); | ||
| if (expectManagedIdentityAccessToken) | ||
| { | ||
| if (isDefaultAzureCredential) | ||
| { | ||
| Mock<DefaultAzureCredential> dacMock = new(); | ||
| dacMock | ||
| .Setup(m => m.GetTokenAsync(It.IsAny<TokenRequestContext>(), | ||
| It.IsAny<System.Threading.CancellationToken>())) | ||
| .Returns(ValueTask.FromResult(testValidToken)); | ||
| postgreSqlQueryExecutor.AzureCredential = dacMock.Object; | ||
| } | ||
| else | ||
| { | ||
| runtimeConfigProvider.Initialize( | ||
| JsonSerializer.Serialize(runtimeConfigProvider.GetRuntimeConfiguration()), | ||
| schema: null, | ||
| connectionString: connectionString, | ||
| accessToken: CONFIG_TOKEN); | ||
| postgreSqlQueryExecutor = new(runtimeConfigProvider, dbExceptionParser.Object, queryExecutorLogger.Object); | ||
| } | ||
| } | ||
|
|
||
| using NpgsqlConnection conn = new(connectionString); | ||
| await postgreSqlQueryExecutor.SetManagedIdentityAccessTokenIfAnyAsync(conn); | ||
| NpgsqlConnectionStringBuilder connStringBuilder = new(conn.ConnectionString); | ||
|
|
||
| if (expectManagedIdentityAccessToken) | ||
| { | ||
| if (isDefaultAzureCredential) | ||
| { | ||
| Assert.AreEqual(expected: DEFAULT_TOKEN, actual: connStringBuilder.Password); | ||
| } | ||
| else | ||
| { | ||
| Assert.AreEqual(expected: CONFIG_TOKEN, actual: connStringBuilder.Password); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| Assert.AreEqual(connectionString, conn.ConnectionString); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| using System; | ||
| using System.Data.Common; | ||
| using System.Threading.Tasks; | ||
| using Azure.Core; | ||
| using Azure.DataApiBuilder.Service.Configurations; | ||
| using Azure.Identity; | ||
| using Microsoft.Extensions.Logging; | ||
| using Npgsql; | ||
|
|
||
| namespace Azure.DataApiBuilder.Service.Resolvers | ||
| { | ||
| /// <summary> | ||
| /// Specialized QueryExecutor for PostgreSql mainly providing methods to | ||
| /// handle connecting to the database with a managed identity. | ||
| /// for more info: https://learn.microsoft.com/EN-us/azure/postgresql/single-server/how-to-connect-with-managed-identity | ||
| /// </summary> | ||
| public class PostgreSqlQueryExecutor : QueryExecutor<NpgsqlConnection> | ||
| { | ||
| // This is the same scope for any Azure Database for PostgreSQL that is | ||
| // required to request a default azure credential access token | ||
| // for a managed identity. | ||
| public const string DATABASE_SCOPE = @"https://ossrdbms-aad.database.windows.net/.default"; | ||
|
|
||
| /// <summary> | ||
| /// The managed identity Access Token string obtained | ||
| /// from the configuration controller. | ||
| /// </summary> | ||
| private readonly string? _accessTokenFromController; | ||
|
|
||
| public DefaultAzureCredential AzureCredential { get; set; } = new(); | ||
|
|
||
| /// <summary> | ||
| /// The saved cached access token obtained from DefaultAzureCredentials | ||
| /// representing a managed identity. | ||
| /// </summary> | ||
| private AccessToken? _defaultAccessToken; | ||
|
|
||
| private bool _attemptToSetAccessToken; | ||
|
|
||
| public PostgreSqlQueryExecutor( | ||
| RuntimeConfigProvider runtimeConfigProvider, | ||
| DbExceptionParser dbExceptionParser, | ||
| ILogger<QueryExecutor<NpgsqlConnection>> logger) | ||
| : base(runtimeConfigProvider, dbExceptionParser, logger) | ||
| { | ||
| _accessTokenFromController = runtimeConfigProvider.ManagedIdentityAccessToken; | ||
| _attemptToSetAccessToken = | ||
| ShouldManagedIdentityAccessBeAttempted(runtimeConfigProvider.GetRuntimeConfiguration().ConnectionString); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Modifies the properties of the supplied connection string to support managed identity access. | ||
| /// In the case of Postgres, if a default managed identity needs to be used, the password in the | ||
| /// connection needs to be replaced with the default access token. | ||
| /// </summary> | ||
| /// <param name="conn">The supplied connection to modify for managed identity access.</param> | ||
| public override async Task SetManagedIdentityAccessTokenIfAnyAsync(DbConnection conn) | ||
| { | ||
| // Only attempt to get the access token if the connection string is in the appropriate format | ||
| if (_attemptToSetAccessToken) | ||
| { | ||
| NpgsqlConnection sqlConn = (NpgsqlConnection)conn; | ||
|
|
||
| // If the configuration controller provided a managed identity access token use that, | ||
| // else use the default saved access token if still valid. | ||
| // Get a new token only if the saved token is null or expired. | ||
| string? accessToken = _accessTokenFromController ?? | ||
| (IsDefaultAccessTokenValid() ? | ||
| ((AccessToken)_defaultAccessToken!).Token : | ||
| await GetAccessTokenAsync()); | ||
|
|
||
| if (accessToken is not null) | ||
| { | ||
| NpgsqlConnectionStringBuilder newConnectionString = new(sqlConn.ConnectionString) | ||
| { | ||
| Password = accessToken | ||
| }; | ||
| sqlConn.ConnectionString = newConnectionString.ToString(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Determines if managed identity access should be attempted or not. | ||
| /// It should only be attempted if the password is not provided | ||
| /// </summary> | ||
| private static bool ShouldManagedIdentityAccessBeAttempted(string connString) | ||
| { | ||
| NpgsqlConnectionStringBuilder connStringBuilder = new(connString); | ||
| return string.IsNullOrEmpty(connStringBuilder.Password); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Determines if the saved default azure credential's access token is valid and not expired. | ||
| /// </summary> | ||
| /// <returns>True if valid, false otherwise.</returns> | ||
| private bool IsDefaultAccessTokenValid() | ||
| { | ||
| return _defaultAccessToken is not null && | ||
| ((AccessToken)_defaultAccessToken).ExpiresOn.CompareTo(System.DateTimeOffset.Now) > 0; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Tries to get an access token using DefaultAzureCredentials. | ||
| /// Catches any CredentialUnavailableException and logs only a warning | ||
| /// since this is best effort. | ||
| /// </summary> | ||
| /// <returns>The string representation of the access token if found, | ||
| /// null otherwise.</returns> | ||
| private async Task<string?> GetAccessTokenAsync() | ||
| { | ||
| bool firstAttemptAtDefaultAccessToken = _defaultAccessToken is null; | ||
|
|
||
| try | ||
| { | ||
| _defaultAccessToken = | ||
| await AzureCredential.GetTokenAsync( | ||
| new TokenRequestContext(new[] { DATABASE_SCOPE })); | ||
| } | ||
| // because there can be scenarios where password is not specified but | ||
| // default managed identity is not the intended method of authentication | ||
| // so a bunch of different exceptions could occur in that scenario | ||
| catch (Exception ex) | ||
| { | ||
| QueryExecutorLogger.LogWarning($"No password detected in the connection string. Attempt to retrieve " + | ||
| $"a managed identity access token using DefaultAzureCredential failed due to: \n{ex}\n" + | ||
| (firstAttemptAtDefaultAccessToken ? | ||
| $"If authentication with DefaultAzureCrendential is not intended, this warning can be safely ignored." : | ||
| string.Empty)); | ||
|
|
||
| // the config doesn't contain an identity token | ||
| // and a default identity token cannot be obtained | ||
| // so the application should not attempt to set the token | ||
| // for future conntions | ||
| // note though that if a default access token has been previously | ||
| // obtained successfully (firstAttemptAtDefaultAccessToken == false) | ||
| // this might be a transitory failure don't disable attempts to set | ||
| // the token | ||
| // | ||
| // disabling the attempts is useful in scenarios where the user | ||
| // has a valid connection string without a password in it | ||
| if (firstAttemptAtDefaultAccessToken) | ||
| { | ||
| _attemptToSetAccessToken = false; | ||
| } | ||
| } | ||
|
|
||
| return _defaultAccessToken?.Token; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.