Skip to content

Updates to common.authentication for new graph library #1741

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.

Sign up for GitHub

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
hovsepm merged 6 commits into from
Jan 25, 2016
Merged

Updates to common.authentication for new graph library #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34431a6
Initial fix for graph endpoint
markcowl Jan 1, 2016
98017eb
Updating to pass through the desired resource id
markcowl Jan 7, 2016
35cf6aa
Removing unneeded files for graph support
markcowl Jan 25, 2016
8d72225
Updating assembly version to match changes
markcowl Jan 25, 2016
1947c6d
Merging with upstream
markcowl Jan 25, 2016
ca508a0
Cleaning up from older files
markcowl Jan 25, 2016
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
8 changes: 7 additions & 1 deletion src/Authentication/Common.Authentication.Tests/Mocks/MockCertificateAuthenticationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.Azure.Common.Authentication.Models;
using System.Security;
using System.Security.Cryptography.X509Certificates;
using Microsoft.Rest;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
{
Expand Down Expand Up @@ -74,8 +75,13 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
return new CertificateCloudCredentials(context.Subscription.Id.ToString(), Certificate);
}

public ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
{
return GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager);
}


public Rest.ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
public ServiceClientCredentials GetServiceClientCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint)
{
throw new System.NotImplementedException();
}
Expand Down
8 changes: 7 additions & 1 deletion src/Authentication/Common.Authentication.Tests/Mocks/MockTokenAuthenticationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.Azure.Common.Authentication.Models;
using Microsoft.Rest;
using System;
using System.Runtime.CompilerServices;
using System.Security;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
Expand Down Expand Up @@ -87,8 +88,13 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
return new AccessTokenCredential(context.Subscription.Id, Token);
}


public ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
{
return GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager);
}


public ServiceClientCredentials GetServiceClientCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint)
{
return new TokenCredentials(Token.AccessToken);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Authentication/Common.Authentication/Authentication/UserTokenProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ private AuthenticationResult DoAcquireToken(AdalConfiguration config, PromptBeha
{
result = context.AcquireToken(config.ResourceClientUri, config.ClientId,
config.ClientRedirectUri, promptBehavior,
new UserIdentifier(userId, UserIdentifierType.OptionalDisplayableId),
new UserIdentifier(userId, UserIdentifierType.RequiredDisplayableId),
AdalConfiguration.EnableEbdMagicCookie);
}
else
Expand Down
46 changes: 26 additions & 20 deletions src/Authentication/Common.Authentication/Factories/AuthenticationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ public AuthenticationFactory()
public ITokenProvider TokenProvider { get; set; }

public IAccessToken Authenticate(
AzureAccount account,
AzureEnvironment environment,
string tenant,
SecureString password,
AzureAccount account,
AzureEnvironment environment,
string tenant,
SecureString password,
ShowDialog promptBehavior,
TokenCache tokenCache,
TokenCache tokenCache,
AzureEnvironment.Endpoint resourceId = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId)
{
var configuration = GetAdalConfiguration(environment, tenant, resourceId, tokenCache);

TracingAdapter.Information(Resources.AdalAuthConfigurationTrace, configuration.AdDomain, configuration.AdEndpoint,
TracingAdapter.Information(Resources.AdalAuthConfigurationTrace, configuration.AdDomain, configuration.AdEndpoint,
configuration.ClientId, configuration.ClientRedirectUri, configuration.ResourceClientUri, configuration.ValidateAuthority);
IAccessToken token;
if (account.IsPropertySet(AzureAccount.Property.CertificateThumbprint))
Expand Down Expand Up @@ -89,7 +89,7 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
: Resources.NoSubscriptionInContext;
throw new ApplicationException(exceptionMessage);
}

if (context.Account == null)
{
var exceptionMessage = targetEndpoint == AzureEnvironment.Endpoint.ServiceManagement
Expand Down Expand Up @@ -133,29 +133,29 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext

try
{
TracingAdapter.Information(Resources.UPNAuthenticationTrace,
TracingAdapter.Information(Resources.UPNAuthenticationTrace,
context.Account.Id, context.Environment.Name, tenant);
var tokenCache = AzureSession.TokenCache;
if(context.TokenCache != null && context.TokenCache.Length > 0)
if (context.TokenCache != null && context.TokenCache.Length > 0)
{
tokenCache = new TokenCache(context.TokenCache);
}

var token = Authenticate(context.Account, context.Environment,
tenant, null, ShowDialog.Never, tokenCache);
tenant, null, ShowDialog.Never, tokenCache, context.Environment.GetTokenAudience(targetEndpoint));

if (context.TokenCache != null && context.TokenCache.Length > 0)
{
context.TokenCache = tokenCache.Serialize();
}

TracingAdapter.Information(Resources.UPNAuthenticationTokenTrace,
TracingAdapter.Information(Resources.UPNAuthenticationTokenTrace,
token.LoginType, token.TenantId, token.UserId);
return new AccessTokenCredential(context.Subscription.Id, token);
}
catch (Exception ex)
{
TracingAdapter.Information(Resources.AdalAuthException, ex.Message);
TracingAdapter.Information(Resources.AdalAuthException, ex.Message);
var exceptionMessage = targetEndpoint == AzureEnvironment.Endpoint.ServiceManagement
? Resources.InvalidSubscriptionState
: Resources.InvalidArmContext;
Expand All @@ -164,6 +164,12 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
}

public ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
{
return GetServiceClientCredentials(context,
AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId);
}

public ServiceClientCredentials GetServiceClientCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint)
{
if (context.Account == null)
{
Expand Down Expand Up @@ -211,7 +217,7 @@ public ServiceClientCredentials GetServiceClientCredentials(AzureContext context
var env = new ActiveDirectoryServiceSettings
{
AuthenticationEndpoint = context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ActiveDirectory),
TokenAudience = context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId),
TokenAudience = context.Environment.GetEndpointAsUri(context.Environment.GetTokenAudience(targetEndpoint)),
ValidateAuthority = !context.Environment.OnPremise
};

Expand All @@ -224,13 +230,13 @@ public ServiceClientCredentials GetServiceClientCredentials(AzureContext context

ServiceClientCredentials result = null;

if(context.Account.Type == AzureAccount.AccountType.User)
if (context.Account.Type == AzureAccount.AccountType.User)
{
result = Rest.Azure.Authentication.UserTokenProvider.CreateCredentialsFromCache(
AdalConfiguration.PowerShellClientId,
tenant,
context.Account.Id,
env,
AdalConfiguration.PowerShellClientId,
tenant,
context.Account.Id,
env,
tokenCache).ConfigureAwait(false).GetAwaiter().GetResult();
}
else if (context.Account.Type == AzureAccount.AccountType.ServicePrincipal)
Expand Down Expand Up @@ -287,7 +293,7 @@ private AdalConfiguration GetAdalConfiguration(AzureEnvironment environment, str
{
AdEndpoint = adEndpoint,
ResourceClientUri = environment.Endpoints[resourceId],
AdDomain = tenantId,
AdDomain = tenantId,
ValidateAuthority = !environment.OnPremise,
TokenCache = tokenCache
};
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication/Common.Authentication/Interfaces/IAuthenticationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,8 @@ IAccessToken Authenticate(
SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint);

ServiceClientCredentials GetServiceClientCredentials(AzureContext context);

ServiceClientCredentials GetServiceClientCredentials(AzureContext context,
AzureEnvironment.Endpoint targetEndpoint);
}
}
2 changes: 1 addition & 1 deletion src/Authentication/Common.Authentication/Microsoft.Azure.Common.Authentication.nuget.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Microsoft.Azure.Common.Authentication
-->
<SdkNuGetPackage Include="Microsoft.Azure.Common.Authentication">
<PackageVersion>1.5.2-preview</PackageVersion>
<PackageVersion>1.6.0-preview</PackageVersion>
<Folder>$(MSBuildThisFileDirectory)</Folder>
</SdkNuGetPackage>
</ItemGroup>
Expand Down
24 changes: 19 additions & 5 deletions src/Authentication/Common.Authentication/Models/AzureEnvironment.Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ private string StorageFileEndpointFormat()
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.AzureKeyVaultDnsSuffix},
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.AzureKeyVaultServiceEndpointResourceId},
{ AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, AzureEnvironmentConstants.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix},
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix}
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix},
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.AzureGraphEndpoint}
}
}
},
Expand All @@ -122,8 +123,9 @@ private string StorageFileEndpointFormat()
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.ChinaGraphEndpoint },
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.ChinaTrafficManagerDnsSuffix },
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.ChinaKeyVaultDnsSuffix },
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.ChinaKeyVaultServiceEndpointResourceId }
// TODO: DataLakeAnalytics and ADL do not have a China endpoint yet. Once they do, add them here.
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.ChinaKeyVaultServiceEndpointResourceId },
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.ChinaGraphEndpoint}
// TODO: DataLakeAnalytics and ADL do not have a China endpoint yet. Once they do, add them here.
}
}
},
Expand All @@ -148,7 +150,8 @@ private string StorageFileEndpointFormat()
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix},
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId},
{ AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null},
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null}
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null},
{AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint}
}
}
}
Expand All @@ -174,6 +177,15 @@ public string GetEndpoint(AzureEnvironment.Endpoint endpoint)
return null;
}

public AzureEnvironment.Endpoint GetTokenAudience(AzureEnvironment.Endpoint targetEndpoint)
{
return targetEndpoint == AzureEnvironment.Endpoint.Graph
? AzureEnvironment.Endpoint.GraphEndpointResourceId
: AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
}



public bool IsEndpointSet(AzureEnvironment.Endpoint endpoint)
{
return Endpoints.IsPropertySet(endpoint);
Expand Down Expand Up @@ -316,7 +328,9 @@ public enum Endpoint

AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix,

AzureDataLakeStoreFileSystemEndpointSuffix
AzureDataLakeStoreFileSystemEndpointSuffix,

GraphEndpointResourceId
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Authentication/Common.Authentication/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
[assembly: AssemblyVersion("1.5.0.0")]
[assembly: AssemblyFileVersion("1.5.2.0")]
[assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.6.0.0")]
#if CODESIGN
[assembly: InternalsVisibleTo("Common.Authentication.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
Expand Down