Skip to content

Commit fddd8ff

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdhttpssupport
2 parents a8142f7 + 6c37e59 commit fddd8ff

File tree

141 files changed

+2855
-1400
lines changed

Some content is hidden

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

141 files changed

+2855
-1400
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@
908908
".openpublishing.redirection.azure-percept.json",
909909
".openpublishing.redirection.azure-productivity.json",
910910
".openpublishing.redirection.azure-australia.json",
911+
".openpublishing.redirection.iot-hub-device-update.json",
911912
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912913
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913914
"articles/azure-relay/.openpublishing.redirection.relay.json",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/iot-hub-device-update/migration-pp-to-ppr.md",
5+
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,8 @@
249249
- name: Authentication options
250250
href: enable-authentication-in-node-web-app-with-api-options.md
251251
- name: Secure access to Web API (ASP.NET Core and Node.js)
252-
displayName: REST API
253-
- name: Enable authentication in your web API
254252
href: enable-authentication-web-api.md
253+
displayName: REST API
255254
- name: Secure API Management API
256255
href: secure-api-management.md
257256
displayName: api, api management, migrate, b2clogin.com

articles/active-directory-b2c/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ productDirectory:
8787

8888
## BAND 3 - CONCEPTUAL CONTENT #############################################################################################################################
8989
conceptualContent:
90-
title: Quickly access to Azure AD B2C documentation
90+
title: Quick access to Azure AD B2C documentation
9191
summary: Get quick access to our guides and tutorials for your most common scenarios.
9292
items:
9393
## CARD 1 ######################

articles/active-directory/authentication/howto-mfa-app-passwords.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 06/20/2022
9+
ms.date: 11/01/2022
1010

1111
ms.author: justinha
1212
author: justinha
@@ -24,7 +24,7 @@ Modern authentication is supported for the Microsoft Office 2013 clients and lat
2424
This article shows you how to use app passwords for legacy applications that don't support multi-factor authentication prompts.
2525

2626
>[!NOTE]
27-
> App passwords don't work with Conditional Access based multi-factor authentication policies and modern authentication.
27+
> App passwords don't work with Conditional Access based multi-factor authentication policies and modern authentication. App passwords only work with legacy authentication protocols such as IMAP and SMTP.
2828
2929
## Overview and considerations
3030

articles/active-directory/develop/whats-new-docs.md

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
author: henrymbuguakiarie
66
manager: CelesteDG
77

8-
ms.date: 09/03/2022
8+
ms.date: 11/01/2022
99
ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: reference
@@ -18,6 +18,25 @@ ms.custom: has-adal-ref
1818

1919
Welcome to what's new in the Microsoft identity platform documentation. This article lists new docs that have been added and those that have had significant updates in the last three months.
2020

21+
## October 2022
22+
23+
### Updated articles
24+
25+
- [Access Azure AD protected resources from an app in Google Cloud](workload-identity-federation-create-trust-gcp.md)
26+
- [Configure an app to trust an external identity provider](workload-identity-federation-create-trust.md)
27+
- [Configure a user-assigned managed identity to trust an external identity provider (preview)](workload-identity-federation-create-trust-user-assigned-managed-identity.md)
28+
- [Configuration requirements and troubleshooting tips for Xamarin Android with MSAL.NET](msal-net-xamarin-android-considerations.md)
29+
- [Customize claims emitted in tokens for a specific app in a tenant](active-directory-claims-mapping.md)
30+
- [Desktop app that calls web APIs: Acquire a token using Device Code flow](scenario-desktop-acquire-token-device-code-flow.md)
31+
- [Desktop app that calls web APIs: Acquire a token using integrated Windows authentication](scenario-desktop-acquire-token-integrated-windows-authentication.md)
32+
- [Desktop app that calls web APIs: Acquire a token using Username and Password](scenario-desktop-acquire-token-username-password.md)
33+
- [Making your application multi-tenant](howto-convert-app-to-be-multi-tenant.md)
34+
- [Microsoft identity platform and OAuth 2.0 On-Behalf-Of flow](v2-oauth2-on-behalf-of-flow.md)
35+
- [Prompt behavior with MSAL.js](msal-js-prompt-behavior.md)
36+
- [Quickstart: Register an application with the Microsoft identity platform](quickstart-register-app.md)
37+
- [Tutorial: Sign in users and call the Microsoft Graph API from a JavaScript single-page application](tutorial-v2-javascript-spa.md)
38+
- [Tutorial: Sign in users and call the Microsoft Graph API from a React single-page app (SPA) using auth code flow](tutorial-v2-react.md)
39+
2140
## September 2022
2241

2342
### New articles
@@ -47,20 +66,3 @@ Welcome to what's new in the Microsoft identity platform documentation. This art
4766
- [Protected web API: Code configuration](scenario-protected-web-api-app-configuration.md)
4867
- [Provide optional claims to your app](active-directory-optional-claims.md)
4968
- [Using directory extension attributes in claims](active-directory-schema-extensions.md)
50-
51-
## July 2022
52-
53-
### New articles
54-
55-
- [Configure SAML app multi-instancing for an application in Azure Active Directory](reference-app-multi-instancing.md)
56-
57-
### Updated articles
58-
59-
- [Application and service principal objects in Azure Active Directory](app-objects-and-service-principals.md)
60-
- [Application configuration options](msal-client-application-configuration.md)
61-
- [A web API that calls web APIs: Code configuration](scenario-web-api-call-api-app-configuration.md)
62-
- [Claims mapping policy type](reference-claims-mapping-policy-type.md)
63-
- [Customize claims issued in the SAML token for enterprise applications](active-directory-saml-claims-customization.md)
64-
- [Microsoft identity platform access tokens](access-tokens.md)
65-
- [Single-page application: Sign-in and Sign-out](scenario-spa-sign-in.md)
66-
- [Tutorial: Add sign-in to Microsoft to an ASP.NET web app](tutorial-v2-asp-webapp.md)

articles/active-directory/external-identities/whats-new-docs.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,25 @@ manager: CelesteDG
1515

1616
Welcome to what's new in Azure Active Directory External Identities documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the External Identities service, see [What's new in Azure Active Directory](../fundamentals/whats-new.md).
1717

18+
## October 2022
19+
20+
### Updated articles
21+
22+
- [Tutorial: Bulk invite Azure AD B2B collaboration users](tutorial-bulk-invite.md)
23+
- [Quickstart: Add a guest user and send an invitation](b2b-quickstart-add-guest-users-portal.md)
24+
- [Define custom attributes for user flows](user-flow-add-custom-attributes.md)
25+
- [Create dynamic groups in Azure Active Directory B2B collaboration](use-dynamic-groups.md)
26+
- [Properties of an Azure Active Directory B2B collaboration user](user-properties.md)
27+
- [Authentication and Conditional Access for External Identities](authentication-conditional-access.md)
28+
- [Leave an organization as an external user](leave-the-organization.md)
29+
- [Azure Active Directory External Identities: What's new](whats-new-docs.md)
30+
- [Federation with SAML/WS-Fed identity providers for guest users](direct-federation.md)
31+
- [Example: Configure SAML/WS-Fed based identity provider federation with AD FS](direct-federation-adfs.md)
32+
- [The elements of the B2B collaboration invitation email - Azure Active Directory](invitation-email-elements.md)
33+
- [Configure Microsoft cloud settings for B2B collaboration (Preview)](cross-cloud-settings.md)
34+
- [Add Microsoft account (MSA) as an identity provider for External Identities](microsoft-account.md)
35+
- [How users in your organization can invite guest users to an app](add-users-information-worker.md)
36+
1837
## September 2022
1938

2039
### Updated articles
@@ -51,15 +70,3 @@ Welcome to what's new in Azure Active Directory External Identities documentatio
5170
- [Overview: Cross-tenant access with Azure AD External Identities](cross-tenant-access-overview.md)
5271
- [Configure cross-tenant access settings for B2B direct connect](cross-tenant-access-settings-b2b-direct-connect.md)
5372
- [Azure Active Directory External Identities: What's new](whats-new-docs.md)
54-
55-
## July 2022
56-
57-
### Updated articles
58-
59-
- [Configure cross-tenant access settings for B2B collaboration](cross-tenant-access-settings-b2b-collaboration.md)
60-
- [Configure cross-tenant access settings for B2B direct connect](cross-tenant-access-settings-b2b-direct-connect.md)
61-
- [Add Google as an identity provider for B2B guest users](google-federation.md)
62-
- [Azure Active Directory External Identities: What's new](whats-new-docs.md)
63-
- [Overview: Cross-tenant access with Azure AD External Identities](cross-tenant-access-overview.md)
64-
- [B2B direct connect overview](b2b-direct-connect-overview.md)
65-
- [Azure Active Directory B2B collaboration invitation redemption](redemption-experience.md)

articles/app-service/configure-vnet-integration-routing.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Configure virtual network integration with application routing.
3-
description: This how-to article walks you through configuring app routing on a regional virtual network integration.
2+
title: Configure virtual network integration with application and configuration routing.
3+
description: This how-to article walks you through configuring routing on a regional virtual network integration.
44
author: madsd
55
ms.author: madsd
66
ms.topic: how-to
@@ -9,13 +9,17 @@ ms.date: 10/20/2021
99

1010
# Manage Azure App Service virtual network integration routing
1111

12-
When you configure application routing, you can either route all traffic or only private traffic (also known as [RFC1918](https://datatracker.ietf.org/doc/html/rfc1918#section-3) traffic) into your Azure virtual network (VNet). This article describes how to configure application routing.
12+
Through application routing or configuration routing options, you can configure what traffic will be sent through the virtual network integration. See the [overview section](./overview-vnet-integration.md#routes) for more details.
1313

1414
## Prerequisites
1515

16-
Your app is already integrated using the regional VNet integration feature.
16+
Your app is already integrated using the regional virtual network integration feature.
1717

18-
## Configure in the Azure portal
18+
## Configure application routing
19+
20+
Application routing defines what traffic is routed from your app and into the virtual network. We recommend that you use the **Route All** site setting to enable routing of all traffic. Using the configuration setting allows you to audit the behavior with [a built-in policy](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F33228571-70a4-4fa1-8ca1-26d0aba8d6ef). The existing `WEBSITE_VNET_ROUTE_ALL` app setting can still be used, and you can enable all traffic routing with either setting.
21+
22+
### Configure in the Azure portal
1923

2024
Follow these steps to disable **Route All** in your app through the portal.
2125

@@ -28,26 +32,38 @@ Follow these steps to disable **Route All** in your app through the portal.
2832

2933
1. Select **Yes** to confirm.
3034

31-
## Configure with the Azure CLI
35+
### Configure with the Azure CLI
36+
37+
You can also configure **Route All** by using the Azure CLI.
38+
39+
```azurecli-interactive
40+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --properties.vnetRouteAllEnabled [true|false]
41+
```
42+
43+
## Configure configuration routing
44+
45+
When you're using virtual network integration, you can configure how parts of the configuration traffic are managed. By default, configuration traffic will go directly over the public route, but for the mentioned individual components, you can actively configure it to be routed through the virtual network integration.
46+
47+
### Container image pull
3248

33-
You can also configure **Route All** by using the Azure CLI. The minimum az version required is 2.27.0.
49+
Routing container image pull over virtual network integration can be configured using the Azure CLI.
3450

3551
```azurecli-interactive
36-
az webapp config set --resource-group <group-name> --name <app-name> --vnet-route-all-enabled [true|false]
52+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --properties.vnetImagePullEnabled [true|false]
3753
```
3854

39-
## Configure with Azure PowerShell
55+
We recommend that you use the site property to enable routing image pull traffic through the virtual network integration. Using the configuration setting allows you to audit the behavior with Azure Policy. The existing `WEBSITE_PULL_IMAGE_OVER_VNET` app setting with the value `true` can still be used, and you can enable routing through the virtual network with either setting.
4056

41-
```azurepowershell
42-
# Parameters
43-
$siteName = '<app-name>'
44-
$resourceGroupName = '<group-name>'
57+
### Content storage
4558

46-
# Configure VNet Integration
47-
$webApp = Get-AzResource -ResourceType Microsoft.Web/sites -ResourceGroupName $resourceGroupName -ResourceName $siteName
48-
Set-AzResource -ResourceId ($webApp.Id + "/config/web") -Properties @{ vnetRouteAllEnabled = $true } -Force
59+
Routing content storage over virtual network integration can be configured using the Azure CLI. In addition to enabling the feature, you must also ensure that any firewall or Network Security Group configured on traffic from the subnet allow traffic to port 443 and 445.
60+
61+
```azurecli-interactive
62+
az resource update --resource-group <group-name> --name <app-name> --resource-type "Microsoft.Web/sites" --properties.vnetContentStorageEnabled [true|false]
4963
```
5064

65+
We recommend that you use the site property to enable content storage traffic through the virtual network integration. Using the configuration setting allows you to audit the behavior with Azure Policy. The existing `WEBSITE_CONTENTOVERVNET` app setting with the value `1` can still be used, and you can enable routing through the virtual network with either setting.
66+
5167
## Next steps
5268

5369
- [Enable virtual network integration](./configure-vnet-integration-enable.md)

articles/app-service/environment/how-to-custom-domain-suffix.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ If you don't have an App Service Environment, see [How to Create an App Service
2020
2121
The custom domain suffix defines a root domain that can be used by the App Service Environment. In the public variation of Azure App Service, the default root domain for all web apps is *azurewebsites.net*. For ILB App Service Environments, the default root domain is *appserviceenvironment.net*. However, since an ILB App Service Environment is internal to a customer's virtual network, customers can use a root domain in addition to the default one that makes sense for use within a company's internal virtual network. For example, a hypothetical Contoso Corporation might use a default root domain of *internal-contoso.com* for apps that are intended to only be resolvable and accessible within Contoso's virtual network. An app in this virtual network could be reached by accessing *APP-NAME.internal-contoso.com*.
2222

23-
The custom domain name works for app requests but doesn't for the scm site. The scm site is only available at *APP-NAME.scm.ASE-NAME.appserviceenvironment.net*.
24-
2523
The custom domain suffix is for the App Service Environment. This feature is different from a custom domain binding on an App Service. For more information on custom domain bindings, see [Map an existing custom DNS name to Azure App Service](../app-service-web-tutorial-custom-domain.md).
2624

25+
If the certificate used for the custom domain suffix contains a Subject Alternate Name (SAN) entry for **.scm.CUSTOM-DOMAIN*, the scm site will then also be reachable from *APP-NAME.scm.CUSTOM-DOMAIN*. You can only access scm over custom domain using basic authentication. Single sign-on is only possible with the default root domain.
26+
2727
## Prerequisites
2828

2929
- ILB variation of App Service Environment v3.
@@ -59,7 +59,7 @@ The certificate for custom domain suffix must be stored in an Azure Key Vault. A
5959

6060
:::image type="content" source="./media/custom-domain-suffix/key-vault-networking.png" alt-text="Screenshot of a sample networking page for key vault to allow custom domain suffix feature.":::
6161

62-
Your certificate must be a wildcard certificate for the selected custom domain name. For example, *contoso.com* would need a certificate covering **.contoso.com*.
62+
Your certificate must be a wildcard certificate for the selected custom domain name. For example, *internal-contoso.com* would need a certificate covering **.internal-contoso.com*. If the certificate used custom domain suffix contains a Subject Alternate Name (SAN) entry for scm, for example **.scm.internal-contoso.com*, the scm site will also available using the custom domain suffix.
6363

6464
::: zone pivot="experience-azp"
6565

@@ -160,6 +160,7 @@ If you want to use your own DNS server, add the following records:
160160
1. Create a zone for your custom domain.
161161
1. Create an A record in that zone that points * to the inbound IP address used by your App Service Environment.
162162
1. Create an A record in that zone that points @ to the inbound IP address used by your App Service Environment.
163+
1. Optionally create a zone for scm sub-domain with a * A record that points to the inbound IP address used by your App Service Environment
163164

164165
To configure DNS in Azure DNS private zones:
165166

@@ -169,6 +170,7 @@ To configure DNS in Azure DNS private zones:
169170
:::image type="content" source="./media/custom-domain-suffix/custom-domain-suffix-dns-configuration.png" alt-text="Screenshot of a sample DNS configuration for your custom domain suffix.":::
170171
1. Link your Azure DNS private zone to your App Service Environment's virtual network.
171172
:::image type="content" source="./media/custom-domain-suffix/private-dns-zone-vnet-link.png" alt-text="Screenshot of a sample virtual network link for private DNS zone.":::
173+
1. Optionally create an A record in that zone that points *.scm to the inbound IP address used by your App Service Environment.
172174

173175
For more information on configuring DNS for your domain, see [Use an App Service Environment](./using.md#dns-configuration).
174176

0 commit comments

Comments
 (0)