Skip to content
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

Fix access token behavior in connection pool #443

Merged
merged 4 commits into from
Feb 25, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Initial test changes
  • Loading branch information
cheenamalhotra committed Feb 24, 2020
commit 8e4bfb27430e2741a1250a9be58439f79802ae58
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
using System.IO;
using System.Linq;
using System.Reflection;
using System.Security;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Identity.Client;
using Newtonsoft.Json;
using Xunit;

Expand All @@ -26,8 +28,9 @@ public static class DataTestUtility
public static readonly string TCPConnectionStringHGSVBS = null;
public static readonly string TCPConnectionStringAASVBS = null;
public static readonly string TCPConnectionStringAASSGX = null;
public static readonly string AADAccessToken = null;
public static readonly string AADAuthorityURL = null;
public static readonly string AADPasswordConnectionString = null;
public static readonly string AADAccessToken = null;
public static readonly string AKVBaseUrl = null;
public static readonly string AKVUrl = null;
public static readonly string AKVClientId = null;
Expand Down Expand Up @@ -60,7 +63,7 @@ private class Config
public string TCPConnectionStringHGSVBS = null;
public string TCPConnectionStringAASVBS = null;
public string TCPConnectionStringAASSGX = null;
public string AADAccessToken = null;
public string AADAuthorityURL = null;
public string AADPasswordConnectionString = null;
public string AzureKeyVaultURL = null;
public string AzureKeyVaultClientId = null;
Expand All @@ -83,13 +86,20 @@ static DataTestUtility()
TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
TCPConnectionStringAASSGX = c.TCPConnectionStringAASSGX;
AADAccessToken = c.AADAccessToken;
AADAuthorityURL = c.AADAuthorityURL;
AADPasswordConnectionString = c.AADPasswordConnectionString;
SupportsLocalDb = c.SupportsLocalDb;
SupportsIntegratedSecurity = c.SupportsIntegratedSecurity;
SupportsFileStream = c.SupportsFileStream;
EnclaveEnabled = c.EnclaveEnabled;

if (IsAADPasswordConnStrSetup())
{
string username = RetrieveValueFromConnStr(AADPasswordConnectionString, new string[] { "User ID", "UID" });
string password = RetrieveValueFromConnStr(AADPasswordConnectionString, new string[] { "Password", "PWD" });
AADAccessToken = GenerateAccessToken(AADAuthorityURL, username, password);
}

string url = c.AzureKeyVaultURL;
Uri AKVBaseUri = null;
if (!string.IsNullOrEmpty(url) && Uri.TryCreate(url, UriKind.Absolute, out AKVBaseUri))
Expand Down Expand Up @@ -134,6 +144,41 @@ static DataTestUtility()
}
}

private static string GenerateAccessToken(string authorityURL, string aADAuthUserID, string aADAuthPassword)
{
return AcquireTokenAsync(authorityURL, aADAuthUserID, aADAuthPassword).Result;
}

private static Task<string> AcquireTokenAsync(string authorityURL, string userID, string password) => Task.Run(() =>
{
// The below properties are set specific to test configurations.
string scope = "https://database.windows.net/.default";
string applicationName = "Microsoft Data SqlClient Manual Tests";
string clientVersion = "1.0.0.0";
string adoClientId = "4d079b4c-cab7-4b7c-a115-8fd51b6f8239";

IPublicClientApplication app = PublicClientApplicationBuilder.Create(adoClientId)
.WithAuthority(authorityURL)
.WithClientName(applicationName)
.WithClientVersion(clientVersion)
.Build();
AuthenticationResult result;
string[] scopes = new string[] { scope };

// Note: CorrelationId, which existed in ADAL, can not be set in MSAL (yet?).
// parameter.ConnectionId was passed as the CorrelationId in ADAL to aid support in troubleshooting.
// If/When MSAL adds CorrelationId support, it should be passed from parameters here, too.

SecureString securePassword = new SecureString();

foreach (char c in password)
securePassword.AppendChar(c);
securePassword.MakeReadOnly();
result = app.AcquireTokenByUsernamePassword(scopes, userID, securePassword).ExecuteAsync().Result;

return result.AccessToken;
});

public static bool IsDatabasePresent(string name)
{
AvailableDatabases = AvailableDatabases ?? new Dictionary<string, bool>();
Expand Down Expand Up @@ -519,5 +564,27 @@ public static string GetValueString(object paramValue)

return paramValue.ToString();
}

public static string RetrieveValueFromConnStr(string connStr, string[] keywords)
{
// tokenize connection string and retrieve value for a specific key.
string res = "";
string[] keys = connStr.Split(';');
foreach (var key in keys)
{
foreach (var keyword in keywords)
{
if (!string.IsNullOrEmpty(key.Trim()))
{
if (key.Trim().ToLower().StartsWith(keyword.Trim().ToLower()))
{
res = key.Substring(key.IndexOf('=') + 1).Trim();
break;
}
}
}
}
return res;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,17 @@ private static string RemoveKeysInConnStr(string connStr, string[] keysToRemove)
return res;
}

private static string RetrieveValueFromConnStr(string connStr, string keyword)
{
// tokenize connection string and retrieve value for a specific key.
string res = "";
string[] keys = connStr.Split(';');
foreach (var key in keys)
{
if (!string.IsNullOrEmpty(key.Trim()))
{
if (key.Trim().ToLower().StartsWith(keyword.Trim().ToLower()))
{
res = key.Substring(key.IndexOf('=') + 1).Trim();
break;
}
}
}
return res;
}

private static bool IsAccessTokenSetup() => DataTestUtility.IsAccessTokenSetup();
private static bool IsAADConnStringsSetup() => DataTestUtility.IsAADPasswordConnStrSetup();

[ConditionalFact(nameof(IsAccessTokenSetup), nameof(IsAADConnStringsSetup))]
public static void AccessTokenTest()
{
using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
// Remove cred info and add invalid token
string[] credKeys = { "User ID", "Password", "UID", "PWD", "Authentication" };
string connStr = RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, credKeys);

using (SqlConnection connection = new SqlConnection(connStr))
{
connection.AccessToken = DataTestUtility.GetAccessToken();
connection.Open();
Expand Down Expand Up @@ -227,7 +212,7 @@ public static void testADPasswordAuthentication()
))
{
string customerId = (string)sqlCommand.ExecuteScalar();
string expected = RetrieveValueFromConnStr(DataTestUtility.AADPasswordConnectionString, "User ID");
string expected = DataTestUtility.RetrieveValueFromConnStr(DataTestUtility.AADPasswordConnectionString, new string[] { "User ID", "UID" });
Assert.Equal(expected, customerId);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"TCPConnectionStringAASVBS": "",
"TCPConnectionStringAASSGX": "",
"EnclaveEnabled": false,
"AADAccessToken": "",
"AADAuthorityURL": "",
"AADPasswordConnectionString": "",
"AzureKeyVaultURL": "",
"AzureKeyVaultClientId": "",
Expand Down