Skip to content

Commit 79cbd20

Browse files
authored
Merge pull request #104441 from MicrosoftDocs/master
2/14 AM Publish
2 parents 0eb0673 + 432c9f7 commit 79cbd20

File tree

51 files changed

+231
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+231
-183
lines changed

articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Any parameter name included as part of an OIDC or OAuth2 request can be mapped t
102102

103103
## Using claim resolvers
104104

105-
You can use claims resolvers with following elements:
105+
You can use claims resolvers with the following elements:
106106

107107
| Item | Element | Settings |
108108
| ----- | ----------------------- | --------|
@@ -119,16 +119,16 @@ You can use claims resolvers with following elements:
119119
|[RelyingParty](relyingparty.md#technicalprofile) technical profile| `OutputClaim`| 2 |
120120

121121
Settings:
122-
1. The `IncludeClaimResolvingInClaimsHandling` metadata must set to `true`
123-
1. The input or output claims attribute `AlwaysUseDefaultValue` must set to `true`
122+
1. The `IncludeClaimResolvingInClaimsHandling` metadata must be set to `true`.
123+
1. The input or output claims attribute `AlwaysUseDefaultValue` must be set to `true`.
124124

125125
## Claim resolvers samples
126126

127127
### RESTful technical profile
128128

129129
In a [RESTful](restful-technical-profile.md) technical profile, you may want to send the user language, policy name, scope, and client ID. Based on these claims the REST API can run custom business logic, and if necessary raise a localized error message.
130130

131-
The following example shows a RESTful technical profile:
131+
The following example shows a RESTful technical profile with this scenario:
132132

133133
```XML
134134
<TechnicalProfile Id="REST">
@@ -156,9 +156,9 @@ Using claim resolvers, you can prepopulate the sign-in name or direct sign-in to
156156

157157
### Dynamic UI customization
158158

159-
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints so that you can dynamically render the page content. For example, you can change the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization-dynamic.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
159+
Azure AD B2C enables you to pass query string parameters to your HTML content definition endpoints to dynamically render the page content. For example, this allows the ability to modify the background image on the Azure AD B2C sign-up or sign-in page based on a custom parameter that you pass from your web or mobile application. For more information, see [Dynamically configure the UI by using custom policies in Azure Active Directory B2C](custom-policy-ui-customization-dynamic.md). You can also localize your HTML page based on a language parameter, or you can change the content based on the client ID.
160160

161-
The following example passes in the query string a parameter named **campaignId** with a value of `hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
161+
The following example passes in the query string parameter named **campaignId** with a value of `hawaii`, a **language** code of `en-US`, and **app** representing the client ID:
162162

163163
```XML
164164
<UserJourneyBehaviors>
@@ -170,7 +170,7 @@ The following example passes in the query string a parameter named **campaignId*
170170
</UserJourneyBehaviors>
171171
```
172172

173-
As a result Azure AD B2C sends the above parameters to the HTML content page:
173+
As a result, Azure AD B2C sends the above parameters to the HTML content page:
174174

175175
```
176176
/selfAsserted.aspx?campaignId=hawaii&language=en-US&app=0239a9cc-309c-4d41-87f1-31288feb2e82
@@ -207,7 +207,7 @@ With Azure Application Insights and claim resolvers you can gain insights on use
207207

208208
### Relying party policy
209209

210-
In a [Relying party](relyingparty.md) policy technical profile, you may want to send the tenant ID, or correlation ID to the relying party application.
210+
In a [Relying party](relyingparty.md) policy technical profile, you may want to send the tenant ID, or correlation ID to the relying party application within the JWT.
211211

212212
```XML
213213
<RelyingParty>

articles/active-directory/azuread-dev/active-directory-authentication-libraries.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ The Azure Active Directory Authentication Library (ADAL) v1.0 enables applicatio
3636
| Platform | Library | Download | Source Code | Sample | Reference
3737
| --- | --- | --- | --- | --- | --- |
3838
| .NET Client, Windows Store, UWP, Xamarin iOS and Android |ADAL .NET v3 |[NuGet](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet) | [Desktop app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-dotnet) |[Reference](https://docs.microsoft.com/dotnet/api/microsoft.identitymodel.clients.activedirectory?view=azure-dotnet) |
39-
| .NET Client, Windows Store, Windows Phone 8.1 |ADAL .NET v2 |[NuGet](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory/2.28.4) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet/releases/tag/v2.28.4) | [Desktop app](https://github.com/AzureADQuickStarts/NativeClient-DotNet/releases/tag/v2.X) | |
4039
| JavaScript |ADAL.js |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[Single-page app](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi) | |
4140
| iOS, macOS |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc/releases) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc) |[iOS app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-ios) | [Reference](http://cocoadocs.org/docsets/ADAL/2.5.1/)|
4241
| Android |ADAL |[Maven](https://search.maven.org/search?q=g:com.microsoft.aad+AND+a:adal&core=gav) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-android) | [JavaDocs](https://javadoc.io/doc/com.microsoft.aad/adal/)|

articles/active-directory/b2b/current-limitations.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,6 @@ Azure AD B2B is subject to Azure AD service directory limits. For details about
3131
## National clouds
3232
[National clouds](https://docs.microsoft.com/azure/active-directory/develop/authentication-national-cloud) are physically isolated instances of Azure. B2B collaboration is not supported across national cloud boundaries. For example, if your Azure tenant is in the public, global cloud, you can't invite a user whose account is in a national cloud. To collaborate with the user, ask them for another email address or create a member user account for them in your directory.
3333

34-
## Azure US Government clouds
35-
Within the Azure US Government cloud, B2B collaboration is currently only supported between tenants that are both within Azure US Government cloud and that both support B2B collaboration. If you invite a user in a tenant that isn't part of the Azure US Government cloud or that doesn't yet support B2B collaboration, the invitation will fail or the user won't be able to redeem the invitation. For details about other limitations, see [Azure Active Directory Premium P1 and P2 Variations](https://docs.microsoft.com/azure/azure-government/documentation-government-services-securityandidentity#azure-active-directory-premium-p1-and-p2).
36-
37-
### How can I tell if B2B collaboration is available in my Azure US Government tenant?
38-
To find out if your Azure US Government cloud tenant supports B2B collaboration, do the following:
39-
40-
1. In a browser, go to the following URL, substituting your tenant name for *&lt;tenantname&gt;*:
41-
42-
`https://login.microsoftonline.com/<tenantname>/v2.0/.well-known/openid-configuration`
43-
44-
2. Find `"tenant_region_scope"` in the JSON response:
45-
46-
- If `"tenant_region_scope":"USGOV”` appears, B2B is supported.
47-
- If `"tenant_region_scope":"USG"` appears, B2B is not supported.
48-
49-
5034
## Next steps
5135

5236
See the following articles on Azure AD B2B collaboration:

articles/active-directory/b2b/troubleshoot.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ If the identity tenant is a just-in-time (JIT) or viral tenant (meaning it's a s
9494

9595
As of November 18, 2019, guest users in your directory (defined as user accounts where the **userType** property equals **Guest**) are blocked from using the AzureAD PowerShell V1 module. Going forward, a user will need to either be a member user (where **userType** equals **Member**) or use the AzureAD PowerShell V2 module.
9696

97-
## In an Azure US Government tenant, I can't invite a B2B collaboration guest user
98-
99-
Within the Azure US Government cloud, B2B collaboration is currently only supported between tenants that are both within Azure US Government cloud and that both support B2B collaboration. If you invite a user in a tenant that isn't part of the Azure US Government cloud or that doesn't yet support B2B collaboration, you'll get an error. For details and limitations, see [Azure Active Directory Premium P1 and P2 Variations](https://docs.microsoft.com/azure/azure-government/documentation-government-services-securityandidentity#azure-active-directory-premium-p1-and-p2).
100-
101-
10297
## Next steps
10398

10499
[Get support for B2B collaboration](get-support.md)

articles/active-directory/saas-apps/jamfprosamlconnector-tutorial.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ In this section, you grant B.Simon access to Jamf Pro.
151151

152152
b. Select the **Enable Single Sign-On Authentication** check box.
153153

154-
c. Select **Azure** as an option from the **Identity Provider** drop-down menu.
154+
c. Select **Azure** as an option from the **Identity Provider** drop-down menu.
155155

156-
d. Copy the **ENTITY ID** value and paste it into the **Identifier (Entity ID)** field in the **Basic SAML Configuration** section in the Azure portal.
156+
d. Copy the **ENTITY ID** value and paste it into the **Identifier (Entity ID)** field in the **Basic SAML Configuration** section in the Azure portal.
157157

158-
> [!NOTE]
159-
> Use the value in the `<SUBDOMAIN>` field to complete the sign-on URL and reply URL in the **Basic SAML Configuration** section in the Azure portal.
158+
> [!NOTE]
159+
> Use the value in the `<SUBDOMAIN>` field to complete the sign-on URL and reply URL in the **Basic SAML Configuration** section in the Azure portal.
160160
161-
e. Select **Metadata URL** from the **Identity Provider Metadata Source** drop-down menu. In the field that appears, paste the **App Federation Metadata Url** value that you've copied from the Azure portal.
161+
e. Select **Metadata URL** from the **Identity Provider Metadata Source** drop-down menu. In the field that appears, paste the **App Federation Metadata Url** value that you've copied from the Azure portal.
162162

163-
f. (Optional) Edit the token expiration value or select "Disable SAML token expiration".
163+
f. (Optional) Edit the token expiration value or select "Disable SAML token expiration".
164164

165165
7. On the same page, scroll down to the **User Mapping** section. Then, take the following steps.
166166

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Users in this role can read settings and administrative information across Micro
242242
> These features are currently in development.
243243
>
244244
245-
### [Group Administrator](#group-administrator-permissions)
245+
### [Groups Administrator](#groups-administrator-permissions)
246246

247247
Users in this role can create/manage groups and its settings like naming and expiration policies. It is important to understand that assigning a user to this role gives them the ability to manage all groups in the tenant across various workloads like Teams, SharePoint, Yammer in addition to Outlook. Also the user will be able to manage the various groups settings across various admin portals like Microsoft Admin Center, Azure portal, as well as workload specific ones like Teams and SharePoint Admin Centers.
248248

@@ -1077,7 +1077,7 @@ Can read everything that a Global Administrator can, but not edit anything.
10771077
| microsoft.office365.usageReports/allEntities/read | Read Office 365 usage reports. |
10781078
| microsoft.office365.webPortal/allEntities/standard/read | Read standard properties on all resources in microsoft.office365.webPortal. |
10791079

1080-
### Group Administrator permissions
1080+
### Groups Administrator permissions
10811081
Can manage all aspects of groups and group settings like naming and expiration policies.
10821082

10831083
| **Actions** | **Description** |
@@ -1714,7 +1714,7 @@ Directory Writers | Directory writers | 9360feb5-f418-4baa-8175-e2a00bac4301
17141714
Exchange Service Administrator | Exchange administrator | 29232cdf-9323-42fd-ade2-1d097af3e4de
17151715
External Identity Provider Administrator | External Identity Provider Administrator | be2f45a1-457d-42af-a067-6ec1fa63bc45
17161716
Global Reader | Global reader | f2ef992c-3afb-46b9-b7cf-a126ee74c451
1717-
Group Administrator | Group administrator | fdd7a751-b60b-444a-984c-02652fe8fa1c
1717+
Groups Administrator | Groups administrator | fdd7a751-b60b-444a-984c-02652fe8fa1c
17181718
Guest Inviter | Guest inviter | 95e79109-95c0-4d8e-aee3-d01accf2d47b
17191719
Helpdesk Administrator | Helpdesk administrator | 729827e3-9c14-49f7-bb1b-9608f156bbb8
17201720
Intune Service Administrator | Intune administrator | 3a2c62db-5318-420d-8d74-23affee5d9d5

articles/aks/limit-egress-traffic.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,24 @@ The following outbound ports / network rules are required for an AKS cluster:
5757
* UDP port *53* for DNS is also required if you have pods directly accessing the API server.
5858

5959
The following FQDN / application rules are required:
60+
61+
> [!IMPORTANT]
62+
> ***.blob.core.windows.net and aksrepos.azurecr.io** are no longer required FQDN rules for egress lockdown. For existing clusters, [perform a cluster upgrade operation][aks-upgrade] using the `az aks upgrade` command to remove these rules.
63+
6064
- Azure Global
6165

6266
| FQDN | Port | Use |
6367
|----------------------------|-----------|----------|
6468
| *.hcp.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
6569
| *.tun.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
66-
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). This registry contains third-party images/charts (for example, metrics server, core dns, etc.) required for the functioning of the cluster during upgrade and scale of the cluster|
67-
| *.blob.core.windows.net | HTTPS:443 | This address is the backend store for images stored in ACR. |
6870
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
6971
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure content delivery network (CDN). |
7072
| management.azure.com | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
7173
| login.microsoftonline.com | HTTPS:443 | This address is required for Azure Active Directory authentication. |
7274
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
7375
| packages.microsoft.com | HTTPS:443 | This address is the Microsoft packages repository used for cached *apt-get* operations. Example packages include Moby, PowerShell, and Azure CLI. |
7476
| acs-mirror.azureedge.net | HTTPS:443 | This address is for the repository required to install required binaries like kubenet and Azure CNI. |
77+
7578
- Azure China 21Vianet
7679

7780
| FQDN | Port | Use |
@@ -85,21 +88,21 @@ The following FQDN / application rules are required:
8588
| login.chinacloudapi.cn | HTTPS:443 | This address is required for Azure Active Directory authentication. |
8689
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
8790
| packages.microsoft.com | HTTPS:443 | This address is the Microsoft packages repository used for cached *apt-get* operations. Example packages include Moby, PowerShell, and Azure CLI. |
91+
8892
- Azure Government
8993

9094
| FQDN | Port | Use |
9195
|----------------------------|-----------|----------|
9296
| *.hcp.\<location\>.cx.aks.containerservice.azure.us | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
9397
| *.tun.\<location\>.cx.aks.containerservice.azure.us | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
94-
| aksrepos.azurecr.io | HTTPS:443 | This address is required to access images in Azure Container Registry (ACR). This registry contains third-party images/charts (for example, metrics server, core dns, etc.) required for the functioning of the cluster during upgrade and scale of the cluster|
95-
| *.blob.core.windows.net | HTTPS:443 | This address is the backend store for images stored in ACR. |
9698
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
9799
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure Content Delivery Network (CDN). |
98100
| management.usgovcloudapi.net | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
99101
| login.microsoftonline.us | HTTPS:443 | This address is required for Azure Active Directory authentication. |
100102
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
101103
| packages.microsoft.com | HTTPS:443 | This address is the Microsoft packages repository used for cached *apt-get* operations. Example packages include Moby, PowerShell, and Azure CLI. |
102104
| acs-mirror.azureedge.net | HTTPS:443 | This address is for the repository required to install required binaries like kubenet and Azure CNI. |
105+
103106
## Optional recommended addresses and ports for AKS clusters
104107

105108
The following outbound ports / network rules are optional for an AKS cluster:

articles/aks/servicemesh-istio-install.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ The [Helm][helm] installation approach for Istio will be deprecated in the futur
9494
> Istio currently must be scheduled to run on Linux nodes. If you have Windows Server nodes in your cluster, you must ensure that the Istio pods are only scheduled to run on Linux nodes. We'll use [node selectors][kubernetes-node-selectors] to make sure pods are scheduled to the correct nodes.
9595
9696
> [!CAUTION]
97-
> The [SDS (secret discovery service)][istio-feature-sds] and [Istio CNI][istio-feature-cni] Istio features are currently in [Alpha][istio-feature-stages], so thought should be given before enabling these. In addition, the [Service Account Token Volume Projection][kubernetes-feature-sa-projected-volume] Kubernetes feature (a requirement for SDS) is not enabled in current AKS versions.
97+
> The [SDS (secret discovery service)][istio-feature-sds] and [Istio CNI][istio-feature-cni] Istio features are currently in [Alpha][istio-feature-stages], so thought should be given before enabling these.
98+
>
99+
> Note that the [Service Account Token Volume Projection][kubernetes-feature-sa-projected-volume] Kubernetes feature (a requirement for SDS) is now **enabled** for all Kubernetes 1.13 and higher versions on AKS.
98100
99101
Create a file called `istio.aks.yaml` with the following content. This file will hold the [Istio control plane spec][istio-control-plane] details for configuring Istio.
100102

0 commit comments

Comments
 (0)