Skip to content

Commit 40a5652

Browse files
committed
Merge branch 'main' into release-ga-ddos-ip
2 parents 060ceec + d98761d commit 40a5652

File tree

370 files changed

+8101
-4161
lines changed

Some content is hidden

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

370 files changed

+8101
-4161
lines changed

.openpublishing.redirection.azure-productivity.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
"source_path": "articles/lab-services/quick-create-lab-template.md",
145145
"redirect_url": "/azure/lab-services/how-to-create-lab-template",
146146
"redirect_document_id": true
147+
},
148+
{
149+
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150+
"redirect_url": "/azure/lab-services/lab-services-overview",
151+
"redirect_document_id": false
147152
}
148153
]
149154
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,11 @@
809809
"source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
810810
"redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
811811
"redirect_document_id": true
812+
},
813+
{
814+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
815+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
816+
"redirect_document_id": true
812817
}
813818
]
814819
}

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/queues/storage-ruby-how-to-use-queue-storage.md",
5+
"redirect_url": "/previous-versions/azure/storage/queues/storage-ruby-how-to-use-queue-storage",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/storage/queues/storage-php-how-to-use-queues.md",
10+
"redirect_url": "/previous-versions/azure/storage/queues/storage-php-how-to-use-queues",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/storage/tables/table-storage-design-encrypt-data.md",
515
"redirect_url": "/previous-versions/azure/storage/tables/table-storage-design-encrypt-data",
@@ -22031,6 +22041,16 @@
2203122041
"redirect_url": "/azure/active-directory/develop/zero-trust-for-developers",
2203222042
"redirect_document_id": false
2203322043
},
22044+
{
22045+
"source_path_from_root": "/articles/active-directory/develop/web-app-quickstart-portal-node-js-passport.md",
22046+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
22047+
"redirect_document_id": false
22048+
},
22049+
{
22050+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
22051+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
22052+
"redirect_document_id": false
22053+
},
2203422054
{
2203522055
"source_path_from_root": "/articles/networking/azure-orbital-overview.md",
2203622056
"redirect_url": "/azure/orbital/overview",

articles/active-directory/app-provisioning/customize-application-attributes.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.workload: identity
1010
ms.topic: tutorial
11-
ms.date: 03/27/2023
11+
ms.date: 03/28/2023
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
@@ -118,7 +118,7 @@ Applications and systems that support customization of the attribute list includ
118118

119119

120120
> [!NOTE]
121-
> Editing the list of supported attributes is only recommended for administrators who have customized the schema of their applications and systems, and have first-hand knowledge of how their custom attributes have been defined or if a source attribute isn't automatically displayed in the Azure Portal UI. This sometimes requires familiarity with the APIs and developer tools provided by an application or system. The ability to edit the list of supported attributes is locked down by default, but customers can enable the capability by navigating to the following URL: https://portal.azure.com/?Microsoft_AAD_Connect_Provisioning_forceSchemaEditorEnabled=true . You can then navigate to your application to view the attribute list as described [above](#editing-the-list-of-supported-attributes).
121+
> Editing the list of supported attributes is only recommended for administrators who have customized the schema of their applications and systems, and have first-hand knowledge of how their custom attributes have been defined or if a source attribute isn't automatically displayed in the Azure Portal UI. This sometimes requires familiarity with the APIs and developer tools provided by an application or system. The ability to edit the list of supported attributes is locked down by default, but customers can enable the capability by navigating to the following URL: https://portal.azure.com/?Microsoft_AAD_Connect_Provisioning_forceSchemaEditorEnabled=true . You can then navigate to your application to view the [attribute list](#editing-the-list-of-supported-attributes).
122122
123123
> [!NOTE]
124124
> When a directory extension attribute in Azure AD doesn't show up automatically in your attribute mapping drop-down, you can manually add it to the "Azure AD attribute list". When manually adding Azure AD directory extension attributes to your provisioning app, note that directory extension attribute names are case-sensitive. For example: If you have a directory extension attribute named `extension_53c9e2c0exxxxxxxxxxxxxxxx_acmeCostCenter`, make sure you enter it in the same format as defined in the directory.
@@ -138,7 +138,7 @@ When you're editing the list of supported attributes, the following properties a
138138
- **Multi-value?** - Whether the attribute supports multiple values.
139139
- **Exact case?** - Whether the attributes values are evaluated in a case-sensitive way.
140140
- **API Expression** - Don't use, unless instructed to do so by the documentation for a specific provisioning connector (such as Workday).
141-
- **Referenced Object Attribute** - If it's a Reference type attribute, then this menu lets you select the table and attribute in the target application that contains the value associated with the attribute. For example, if you have an attribute named "Department" whose stored value references an object in a separate "Departments" table, you would select "Departments.Name". The reference tables and the primary ID fields supported for a given application are preconfigured and currently can't be edited using the Azure portal, but can be edited using the [Microsoft Graph API](/graph/api/resources/synchronization-configure-with-custom-target-attributes).
141+
- **Referenced Object Attribute** - If it's a Reference type attribute, then this menu lets you select the table and attribute in the target application that contains the value associated with the attribute. For example, if you have an attribute named "Department" whose stored value references an object in a separate "Departments" table, you would select "Departments.Name". The reference tables and the primary ID fields supported for a given application are preconfigured and can't be edited using the Azure portal. However, you can edit them using the [Microsoft Graph API](/graph/api/resources/synchronization-configure-with-custom-target-attributes).
142142

143143
#### Provisioning a custom extension attribute to a SCIM compliant application
144144
The SCIM RFC defines a core user and group schema, while also allowing for extensions to the schema to meet your application's needs. To add a custom attribute to a SCIM application:
@@ -152,7 +152,7 @@ For SCIM applications, the attribute name must follow the pattern shown in the e
152152

153153
These instructions are only applicable to SCIM-enabled applications. Applications such as ServiceNow and Salesforce aren't integrated with Azure AD using SCIM, and therefore they don't require this specific namespace when adding a custom attribute.
154154

155-
Custom attributes can't be referential attributes, multi-value or complex-typed attributes. Custom multi-value and complex-typed extension attributes are currently supported only for applications in the gallery. The custom extension schema header is omitted in the example because it isn't sent in requests from the Azure AD SCIM client. This issue will be fixed in the future and the header will be sent in the request.
155+
Custom attributes can't be referential attributes, multi-value or complex-typed attributes. Custom multi-value and complex-typed extension attributes are currently supported only for applications in the gallery. The custom extension schema header is omitted in the example because it isn't sent in requests from the Azure AD SCIM client.
156156

157157
**Example representation of a user with an extension attribute:**
158158

@@ -196,17 +196,17 @@ Custom attributes can't be referential attributes, multi-value or complex-typed
196196

197197

198198
## Provisioning a role to a SCIM app
199-
Use the steps in the example to provision roles for a user to your application. Note that the description is specific to custom SCIM applications. For gallery applications such as Salesforce and ServiceNow, use the predefined role mappings. The bullets describe how to transform the AppRoleAssignments attribute to the format your application expects.
199+
Use the steps in the example to provision roles for a user to your application. The description is specific to custom SCIM applications. For gallery applications such as Salesforce and ServiceNow, use the predefined role mappings. The bullets describe how to transform the AppRoleAssignments attribute to the format your application expects.
200200

201201
- Mapping an appRoleAssignment in Azure AD to a role in your application requires that you transform the attribute using an [expression](../app-provisioning/functions-for-customizing-application-data.md). The appRoleAssignment attribute **shouldn't be mapped directly** to a role attribute without using an expression to parse the role details.
202202

203203
- **SingleAppRoleAssignment**
204204
- **When to use:** Use the SingleAppRoleAssignment expression to provision a single role for a user and to specify the primary role.
205-
- **How to configure:** Use the steps described above to navigate to the attribute mappings page and use the SingleAppRoleAssignment expression to map to the roles attribute. There are three role attributes to choose from (`roles[primary eq "True"].display`, `roles[primary eq "True"].type`, and `roles[primary eq "True"].value`). You can choose to include any or all of the role attributes in your mappings. If you would like to include more than one, just add a new mapping and include it as the target attribute.
205+
- **How to configure:** Use the steps described to navigate to the attribute mappings page and use the SingleAppRoleAssignment expression to map to the roles attribute. There are three role attributes to choose from (`roles[primary eq "True"].display`, `roles[primary eq "True"].type`, and `roles[primary eq "True"].value`). You can choose to include any or all of the role attributes in your mappings. If you would like to include more than one, just add a new mapping and include it as the target attribute.
206206

207207
![Add SingleAppRoleAssignment](./media/customize-application-attributes/edit-attribute-singleapproleassignment.png)
208208
- **Things to consider**
209-
- Ensure that multiple roles aren't assigned to a user. We can't guarantee which role will be provisioned.
209+
- Ensure that multiple roles aren't assigned to a user. There is no guarantee which role is provisioned.
210210
- SingleAppRoleAssignments isn't compatible with setting scope to "Sync All users and groups."
211211
- **Example request (POST)**
212212

@@ -249,15 +249,15 @@ The request formats in the PATCH and POST differ. To ensure that POST and PATCH
249249

250250
- **AppRoleAssignmentsComplex**
251251
- **When to use:** Use the AppRoleAssignmentsComplex expression to provision multiple roles for a user.
252-
- **How to configure:** Edit the list of supported attributes as described above to include a new attribute for roles:
252+
- **How to configure:** Edit the list of supported attributes as described to include a new attribute for roles:
253253

254254
![Add roles](./media/customize-application-attributes/add-roles.png)<br>
255255

256256
Then use the AppRoleAssignmentsComplex expression to map to the custom role attribute as shown in the image:
257257

258258
![Add AppRoleAssignmentsComplex](./media/customize-application-attributes/edit-attribute-approleassignmentscomplex.png)<br>
259259
- **Things to consider**
260-
- All roles will be provisioned as primary = false.
260+
- All roles are provisioned as primary = false.
261261
- The POST contains the role type. The PATCH request doesn't contain type. We're working on sending the type in both POST and PATCH requests.
262262
- AppRoleAssignmentsComplex isn't compatible with setting scope to "Sync All users and groups."
263263

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,12 @@ You can use scoping filters to define attribute-based rules that determine which
7474

7575
### B2B (guest) users
7676

77-
It's possible to use the Azure AD user provisioning service to provision B2B (guest) users in Azure AD to SaaS applications.
78-
However, for B2B users to sign in to the SaaS application using Azure AD, the SaaS application must have its SAML-based single sign-on capability configured in a specific way. For more information on how to configure SaaS applications to support sign-ins from B2B users, see [Configure SaaS apps for B2B collaboration](../external-identities/configure-saas-apps.md).
77+
It's possible to use the Azure AD user provisioning service to provision B2B (guest) users in Azure AD to SaaS applications. However, for B2B users to sign in to the SaaS application using Azure AD, you must manually configure the SaaS application to use Azure AD as a Security Assertion Markup Language (SAML) identity provider.
78+
79+
Follow these general guidelines when configuring SaaS apps for B2B (guest) users:
80+
- For most of the apps, user setup needs to happen manually. Users must be created manually in the app as well.
81+
- For apps that support automatic setup, such as Dropbox, separate invitations are created from the apps. Users must be sure to accept each invitation.
82+
- In the user attributes, to mitigate any issues with mangled user profile disk (UPD) in guest users, always set the user identifier to **user.mail**.
7983

8084
> [!NOTE]
8185
> The userPrincipalName for a B2B user represents the external user's email address alias@theirdomain as "alias_theirdomain#EXT#@yourdomain". When the userPrincipalName attribute is included in your attribute mappings as a source attribute, and a B2B user is being provisioned, the #EXT# and your domain is stripped from the userPrincipalName, so only their original alias@theirdomain is used for matching or provisioning. If you require the full user principal name including #EXT# and your domain to be present, replace userPrincipalName with originalUserPrincipalName as the source attribute. <br />

articles/active-directory/conditional-access/location-condition.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The location found using the public IP address a client provides to Azure Active
3535

3636
Locations exist in the Azure portal under **Azure Active Directory** > **Security** > **Conditional Access** > **Named locations**. These named network locations may include locations like an organization's headquarters network ranges, VPN network ranges, or ranges that you wish to block. Named locations are defined by IPv4 and IPv6 address ranges or by countries/regions.
3737

38-
![Named locations in the Azure portal](./media/location-condition/new-named-location.png)
38+
> [!VIDEO https://www.youtube.com/embed/P80SffTIThY]
3939
4040
### IPv4 and IPv6 address ranges
4141

@@ -52,7 +52,6 @@ Named locations defined by IPv4/IPv6 address ranges are subject to the following
5252
- Configure up to 195 named locations.
5353
- Configure up to 2000 IP ranges per named location.
5454
- Both IPv4 and IPv6 ranges are supported.
55-
- Private IP ranges can't be configured.
5655
- The number of IP addresses contained in a range is limited. Only CIDR masks greater than /8 are allowed when defining an IP range.
5756

5857
#### Trusted locations

0 commit comments

Comments
 (0)