Skip to content

Commit 6186daf

Browse files
isra-felYeming Liu
andauthored
Added SSH auth scope to environment (#447)
Co-authored-by: Yeming Liu <[email protected]>
1 parent f6b0b96 commit 6186daf

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

src/Authentication.Abstractions/AzureEnvironment.BuiltIn.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
165165
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.AzureContainerRegistryEndpointResourceId);
166166
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix, AzureEnvironmentConstants.AzureCommunicationEmailEndpointSuffix);
167167
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId, AzureEnvironmentConstants.AzureCommunicationEmailEndpointResourceId);
168+
azureEnvironments[EnvironmentName.AzureCloud].SetProperty(ExtendedEndpoint.AzureSshAuthScope, AzureEnvironmentConstants.AzureSshAuthScope);
168169
}
169170

170171
if (azureEnvironments.ContainsKey(EnvironmentName.AzureChinaCloud))
@@ -178,6 +179,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
178179
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointResourceId, AzureEnvironmentConstants.ChinaAppConfigurationEndpointResourceId);
179180
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointSuffix, AzureEnvironmentConstants.ChinaAppConfigurationEndpointSuffix);
180181
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.ChinaContainerRegistryEndpointResourceId);
182+
azureEnvironments[EnvironmentName.AzureChinaCloud].SetProperty(ExtendedEndpoint.AzureSshAuthScope, AzureEnvironmentConstants.ChinaSshAuthScope);
181183
}
182184

183185
if (azureEnvironments.ContainsKey(EnvironmentName.AzureUSGovernment))
@@ -191,6 +193,7 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
191193
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointResourceId, AzureEnvironmentConstants.USGovernmentAppConfigurationEndpointResourceId);
192194
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.AzureAppConfigurationEndpointSuffix, AzureEnvironmentConstants.USGovernmentAppConfigurationEndpointSuffix);
193195
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.ContainerRegistryEndpointResourceId, AzureEnvironmentConstants.USGovernmentContainerRegistryEndpointResourceId);
196+
azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.AzureSshAuthScope, AzureEnvironmentConstants.USGovernmentSshAuthScope);
194197
}
195198
}
196199
}

src/Authentication.Abstractions/AzureEnvironment.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,8 @@ public static class ExtendedEndpoint
571571
AzureAppConfigurationEndpointResourceId = "AzureAppConfigurationEndpointResourceId",
572572
ContainerRegistryEndpointResourceId = "ContainerRegistryEndpointResourceId",
573573
AzureCommunicationEmailEndpointSuffix = "AzureCommunicationEmailEndpointSuffix",
574-
AzureCommunicationEmailEndpointResourceId = "AzureCommunicationEmailEndpointResourceId";
574+
AzureCommunicationEmailEndpointResourceId = "AzureCommunicationEmailEndpointResourceId",
575+
AzureSshAuthScope = "AzureSshAuthScope";
575576
}
576577
}
577578
}

src/Authentication.Abstractions/AzureEnvironmentConstants.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,12 @@ public static class AzureEnvironmentConstants
294294
/// </summary>
295295
public const string AzureCommunicationEmailEndpointSuffix = "communication.azure.com";
296296
public const string AzureCommunicationEmailEndpointResourceId = "https://communication.azure.com";
297+
298+
/// <summary>
299+
/// The scope for SSH authentication. See <see cref="SshCredentialFactory"/>
300+
/// </summary>
301+
public const string AzureSshAuthScope = "https://pas.windows.net/CheckMyAccess/Linux/.default";
302+
public const string ChinaSshAuthScope = "https://pas.chinacloudapi.cn/CheckMyAccess/Linux/.default";
303+
public const string USGovernmentSshAuthScope = "https://pasff.usgovcloudapi.net/CheckMyAccess/Linux/.default";
297304
}
298305
}

src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
328328
case AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId:
329329
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId, propertyValue);
330330
break;
331+
case AzureEnvironment.ExtendedEndpoint.AzureSshAuthScope:
332+
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AzureSshAuthScope, propertyValue);
333+
break;
331334
}
332335
}
333336
}

0 commit comments

Comments
 (0)