Skip to content

Commit

Permalink
Merge branch 'dmc-bp-nist80053' into nist-bp
Browse files Browse the repository at this point in the history
  • Loading branch information
jomolesk authored Jul 8, 2019
2 parents e73bec4 + c51eaef commit d4dbc26
Show file tree
Hide file tree
Showing 15,259 changed files with 13,267 additions and 8,242 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .openpublishing.publish.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@
"branch": "master",
"branch_mapping": {}
},
{
"path_to_root": "samples-anomaly-detector",
"url": "https://github.com/Azure-Samples/anomalydetector",
"branch": "master",
"branch_mapping": {}
},
{
"path_to_root": "api-management-policy-samples",
"url": "https://github.com/Azure/api-management-policy-snippets",
Expand Down
53 changes: 47 additions & 6 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -22054,6 +22054,21 @@
"redirect_url": "/azure/azure-monitor/overview",
"redirect_document_id": false
},
{
"source_path": "articles/azure-monitor/platform/alerts-extend.md",
"redirect_url": "/azure/azure-monitor/platform/alerts-unified-log",
"redirect_document_id": false
},
{
"source_path": "articles/azure-monitor/platform/alerts-extend-tool.md",
"redirect_url": "/azure/azure-monitor/platform/alerts-unified-log",
"redirect_document_id": false
},
{
"source_path": "articles/azure-monitor/platform/migrate-management-alerts.md",
"redirect_url": "/azure/azure-monitor/platform/activity-log-alerts",
"redirect_document_id": false
},
{
"source_path": "articles/monitoring-and-diagnostics/monitor-alerts-unified-usage.md",
"redirect_url": "/azure/monitoring-and-diagnostics/alert-metric",
Expand Down Expand Up @@ -25734,6 +25749,11 @@
"redirect_url": "https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/",
"redirect_document_id": false
},
{
"source_path": "articles/hdinsight/storm/apache-storm-tutorial-get-started-linux.md",
"redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
"redirect_document_id": false
},
{
"source_path": "articles/hdinsight/hdinsight-apache-spark-resource-manager.md",
"redirect_url": "/azure/hdinsight/spark/apache-spark-resource-manager",
Expand All @@ -25756,8 +25776,8 @@
},
{
"source_path": "articles/hdinsight/hdinsight-apache-storm-tutorial-get-started-linux.md",
"redirect_url": "/azure/hdinsight/storm/apache-storm-tutorial-get-started-linux",
"redirect_document_id": true
"redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
"redirect_document_id": false
},
{
"source_path": "articles/hdinsight/hdinsight-connect-excel-hive-odbc-driver.md",
Expand Down Expand Up @@ -35285,8 +35305,8 @@
},
{
"source_path": "articles/monitoring-and-diagnostics/monitoring-activity-log-alerts-on-service-notifications.md",
"redirect_url": "/azure/azure-monitor/platform/alerts-activity-log-service-notifications",
"redirect_document_id": true
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications",
"redirect_document_id": false
},
{
"source_path": "articles/monitoring-and-diagnostics/monitoring-overview-alerts-classic.md",
Expand Down Expand Up @@ -35715,7 +35735,17 @@
},
{
"source_path": "articles/monitoring-and-diagnostics/monitoring-service-notifications.md",
"redirect_url": "/azure/azure-monitor/platform/service-notifications",
"redirect_url": "/azure/service-health/service-notifications",
"redirect_document_id": false
},
{
"source_path": "articles/azure-monitor/platform/service-notifications.md",
"redirect_url": "/azure/service-health/service-notifications",
"redirect_document_id": true
},
{
"source_path": "articles/azure-monitor/platform/alerts-activity-log-service-notifications.md",
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications",
"redirect_document_id": true
},
{
Expand Down Expand Up @@ -39648,6 +39678,11 @@
"redirect_url": "/azure/iot-central/howto-create-and-manage-applications-csp",
"redirect_document_id": false
},
{
"source_path": "articles/iot-central/howto-version-devicetemplate.md",
"redirect_url": "/azure/iot-central/howto-version-device-template",
"redirect_document_id": true
},
{
"source_path": "articles/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoringV2.md",
"redirect_url": "/azure/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoring-v2",
Expand Down Expand Up @@ -40028,11 +40063,17 @@
"redirect_url": "/azure/backup/backup-create-rs-vault",
"redirect_document_id": true
},
{
{
"source_path": "articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-container-instance.md",
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/use-language-detection-on-aks",
"redirect_document_id": false
},
{
"source_path": "articles/azure-monitor/insights/container-overview.md",
"redirect_url": "/azure/azure-monitor/insights/container-insights-overview",
"redirect_document_id": false
},

{
"source_path": "articles/storage/blobs/data-lake-storage-use-hdi-cluster.md",
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-use-data-lake-storage-gen2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ After your RESTful service is protected by the client ID (username) and secret,
## (Optional) Download the complete policy files and code

* After you complete the [Get started with custom policies](active-directory-b2c-get-started-custom.md) walkthrough, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [Sample policy files](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw-secure-basic).
* You can download the complete code from [Sample Visual Studio solution for reference](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw/Contoso.AADB2C.API).
* You can download the complete code from [Sample Visual Studio solution for reference](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw-secure-basic).
## Next steps

* [Use client certificates to secure your RESTful API](active-directory-b2c-custom-rest-api-netfw-secure-cert.md)
* [Use client certificates to secure your RESTful API](active-directory-b2c-custom-rest-api-netfw-secure-cert.md)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
69 changes: 50 additions & 19 deletions articles/active-directory-b2c/page-contract.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Select a page contract - Azure Active Directory B2C | Microsoft Docs
title: Select a page contract - Azure Active Directory B2C
description: Learn about how to select a page contract in Azure Active Directory B2C.
services: active-directory-b2c
author: mmacy
Expand All @@ -8,7 +8,7 @@ manager: celestedg
ms.service: active-directory
ms.workload: identity
ms.topic: conceptual
ms.date: 04/25/2019
ms.date: 07/04/2019
ms.author: marsma
ms.subservice: B2C
---
Expand All @@ -17,7 +17,11 @@ ms.subservice: B2C

[!INCLUDE [active-directory-b2c-public-preview](../../includes/active-directory-b2c-public-preview.md)]

You can enable JavaScript client-side code in your Azure Active Directory (Azure AD) B2C policies, whether you’re using user flows or custom policies. To enable JavaScript for your applications, you must add an element to your [custom policy](active-directory-b2c-overview-custom.md), select a page contract, and use [b2clogin.com](b2clogin.md) in your requests. A page contract is an association of elements that Azure AD B2C provides and the content that you provide. This article discusses how to select a page contract in Azure AD B2C by configuring it in a custom policy.
You can enable JavaScript client-side code in your Azure Active Directory (Azure AD) B2C policies whether you’re using user flows or custom policies. To enable JavaScript for your applications, you must add an element to your [custom policy](active-directory-b2c-overview-custom.md), select a page contract, and use [b2clogin.com](b2clogin.md) in your requests.

A page contract is an association of elements that Azure AD B2C provides and the content that you provide.

This article discusses how to select a page contract in Azure AD B2C by configuring it in a custom policy.

> [!NOTE]
> If you want to enable JavaScript for user flows, see [JavaScript and page contract versions in Azure Active Directory B2C](user-flow-javascript-overview.md).
Expand All @@ -38,27 +42,54 @@ In your custom policies, you may have [ContentDefinitions](contentdefinitions.md
</ContentDefinition>
```

To select a page contract, you change the **DataUri** values in your [ContentDefinitions](contentdefinitions.md) in your policies. By switching from the old **DataUri** values to the new values, you're selecting an immutable package. The benefit of using this package is that you’ll know it won't change and cause unexpected behavior on your page.
To select a page contract, you change the **DataUri** values in your [ContentDefinitions](contentdefinitions.md) in your policies. By switching from the old **DataUri** values to the new values, you're selecting an immutable package. The benefit of using this package is that you’ll know it won't change and cause unexpected behavior on your page.

To set up a page contract, use the following table to find **DataUri** values.
To set up a page contract, use the following table to find **DataUri** values.

| Old DataUri value | New DataUri value |
| ----------------- | ----------------- |
| urn:com:microsoft:aad:b2c:elements:idpselection:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:providerselection:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:unifiedssd:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:unifiedssd:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:claimsconsent:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:claimsconsent:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:multifactor:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:multifactor:1.1.0 | urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.1.0 |
| urn:com:microsoft:aad:b2c:elements:selfasserted:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:selfasserted:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:selfasserted:1.1.0 | urn:com:microsoft:aad:b2c:elements:contract:selfasserted:1.1.0 |
| urn:com:microsoft:aad:b2c:elements:unifiedssp:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:unifiedssp:1.1.0 | urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.1.0 |
| urn:com:microsoft:aad:b2c:elements:globalexception:1.0.0 | urn:com:microsoft:aad:b2c:elements:contract:globalexception:1.0.0 |
| urn:com:microsoft:aad:b2c:elements:globalexception:1.1.0 | urn:com:microsoft:aad:b2c:elements:contract:globalexception:1.1.0 |
| `urn:com:microsoft:aad:b2c:elements:claimsconsent:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:claimsconsent:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:globalexception:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:globalexception:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:globalexception:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:globalexception:1.1.0` |
| `urn:com:microsoft:aad:b2c:elements:idpselection:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:providerselection:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:multifactor:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:multifactor:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:multifactor:1.1.0` |
| `urn:com:microsoft:aad:b2c:elements:selfasserted:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:selfasserted:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:selfasserted:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:selfasserted:1.1.0` |
| `urn:com:microsoft:aad:b2c:elements:unifiedssd:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:unifiedssd:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:unifiedssp:1.0.0` | `urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.0.0` |
| `urn:com:microsoft:aad:b2c:elements:unifiedssp:1.1.0` | `urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:1.1.0` |

## Version change log

Page contract packages are periodically updated to include fixes and improvements in their page elements. The following change log specifies the changes introduced in each version.

### 1.1.0

- Exception page (globalexception)
- Accessibility fix
- Removed the default message when there is no contact from the policy
- Default CSS removed
- MFA page (multifactor)
- 'Confirm Code' button removed
- The input field for the code now only takes input up to six (6) characters
- The page will automatically attempt to verify the code entered when a 6-digit code is entered, without any button having to be clicked
- If the code is wrong then the input field is automatically cleared
- After three (3) attempts with an incorrect code, B2C sends an error back to the service
- Accessibility fixes
- Default CSS removed
- Self-asserted page (selfasserted)
- Removed cancel alert
- CSS class for error elements
- Show/hide error logic improved
- Default CSS removed
- Unified SSP (unifiedssp)
- Added keep me signed in (KMSI) control

### 1.0.0

- Initial release

## Next steps

Find more information about how you can customize the user interface of your applications in [Customize the user interface of your application using a custom policy in Azure Active Directory B2C](active-directory-b2c-ui-customization-custom.md).



2 changes: 1 addition & 1 deletion articles/active-directory-b2c/trustframeworkpolicy.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ B2C_1A_TrustFrameWorkBase or B2C_1A_TrustFrameworkExtensionPolicy:

```XML
<UserJourneys>
<UserJourney Id="SignOrSignIn">
<UserJourney Id="SignUpOrSignIn">
...
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.workload: identity
ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: conceptual
ms.date: 05/20/2019
ms.date: 06/28/2019
ms.author: iainfou

---
Expand All @@ -31,6 +31,11 @@ First, open LDP and connect to the managed domain. Click **Connection** and clic

Next, bind to the managed domain. Click **Connection** and click **Bind...** in the menu. Provide the credentials of a user account belonging to the 'AAD DC Administrators' group.

> [!IMPORTANT]
> Users (and service accounts) cannot perform LDAP simple binds if you have disabled NTLM password hash synchronization on your Azure AD Domain Services instance. For more information on disabling NTLM password hash synchronization, read [Secure your Azure AD DOmain Services managed domain](secure-your-domain.md).
>
>
Select **View**, and then select **Tree** in the menu. Leave the Base DN field blank, and click OK. Navigate to the container that you want to search, right-click the container, and select Search.

> [!TIP]
Expand Down
25 changes: 15 additions & 10 deletions articles/active-directory-domain-services/contact-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,27 @@ ms.workload: identity
ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: conceptual
ms.date: 05/22/2019
ms.date: 06/28/2019
ms.author: iainfou

---
# Azure AD Domain Services - Contact Us
## Contact the product team
If you have issues with your managed domain, check to see if the steps outlined in the [Troubleshooting Guide](troubleshoot.md) resolve the issue. If you're still having trouble, feel free to contact us.

You may email us at: [Azure AD Domain Services Feedback](mailto:aaddsfb@microsoft.com).
## Feedback
If you have feedback for our service or non-technical questions, you can share your request with the Azure AD Domain Service product group by emailing us at: [Azure AD Domain Services Feedback](mailto:aaddsfb@microsoft.com). Emails to this address are reviewed. Members of the product group **may** respond to request further information. Requests for technical support to this email address will not be answered.

Ensure that you include the following, so we can investigate the issue.
## Technical assistance
If you have issues with your managed domain, check to see if the steps outlined in the [Troubleshooting Guide](troubleshoot.md) resolve the issue. If you're still having trouble, sign in to the Azure portal. Open the **Azure AD Domain Services** home page and select **New support request** from the action pane under **Support + troubleshooting**.

* The **tenant ID/directory ID** for your Azure AD directory. The tenant ID is the GUID you see in the directory ID field on the [Properties page for your directory](https://ms.portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Properties)
* The **DNS domain name** you've configured for your AAD Domain Services managed domain.
![new support request](./media/contact-us/supportRequest.png)

## Provide Feedback
We welcome your feedback about Azure AD Domain Services via the **[Azure Active Directory User Voice channel](https://feedback.azure.com/forums/169401-azure-active-directory/)**.
Fill out each section of the support request as accurately as possible. When choosing a service, ensure you select **Azure Active Directory Domain Services (VM - Domain Controllers)** to route your request to the proper support professional.

> [!IMPORTANT]
> Select **Azure Active Directory Directories, Domains, and Objects** from the services lists for help with domain validation with Azure Active Directory.
>
>
## Feature requests
Do you have an idea on how we can improve Azure Active Directory Domain Services? We would like to hear about it. Go to the Azure Feedback Forums, navigate to the [Domain Services](https://feedback.azure.com/forums/169401-azure-active-directory?category_id=160593) category and share your idea. Members of the product group review these requests.

Ensure that you pre-pend your question or feedback with the words **'AADDS'**, for it to reach us.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit d4dbc26

Please sign in to comment.