Skip to content

Commit 1ccf368

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into importOverview
2 parents 001e8e2 + a24884b commit 1ccf368

File tree

41 files changed

+518
-306
lines changed

Some content is hidden

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

41 files changed

+518
-306
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9093,6 +9093,11 @@
90939093
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
90949094
"redirect_document_id": false
90959095
},
9096+
{
9097+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-forced-tunneling-rm.md",
9098+
"redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
9099+
"redirect_document_id": false
9100+
},
90969101
{
90979102
"source_path_from_root": "/articles/azure-vmware/public-ip-usage.md",
90989103
"redirect_url": "/azure/azure-vmware/enable-public-ip-nsx-edge",

articles/active-directory/develop/access-tokens.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: develop
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 05/26/2023
11+
ms.date: 8/1/2023
1212
ms.author: davidmu
1313
ms.custom: aaddev, curation-claims
1414
---
@@ -161,11 +161,15 @@ Azure AD also supports multi-tenant applications. These applications support:
161161
- Accounts in any organizational directory (any Azure AD directory): `https://login.microsoftonline.com/organizations`
162162
- Accounts in any organizational directory (any Azure AD directory) and personal Microsoft accounts (e.g. Skype, XBox): `https://login.microsoftonline.com/common`
163163

164-
For these applications Azure AD exposes tenant-independent versions of the OIDC document at [https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration](https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration) and [https://login.microsoftonline.com/organizations/v2.0/.well-known/openid-configuration](https://login.microsoftonline.com/organizations/v2.0/.well-known/openid-configuration) respectively. These endpoints return an issuer value, which is a template parametrized by the `tenantid`: `https://login.microsoftonline.com/{tenantid}/v2.0`. Applications may use these tenant-independent endpoints to validate tokens from every tenant with the following modifications: instead of expecting the issuer claim in the token to exactly match the issuer value from metadata, the application should replace the `{tenantid}` value in the issuer metadata with the tenant ID that is the target of the current request, and then check the exact match (`tid` claim of the token).
164+
For these applications Azure AD exposes tenant-independent versions of the OIDC document at [https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration](https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration) and [https://login.microsoftonline.com/organizations/v2.0/.well-known/openid-configuration](https://login.microsoftonline.com/organizations/v2.0/.well-known/openid-configuration) respectively. These endpoints return an issuer value, which is a template parametrized by the `tenantid`: `https://login.microsoftonline.com/{tenantid}/v2.0`. Applications may use these tenant-independent endpoints to validate tokens from every tenant with the following stipulations:
165+
- Validate the signing key issuer (below)
166+
- Instead of expecting the issuer claim in the token to exactly match the issuer value from metadata, the application should replace the `{tenantid}` value in the issuer metadata with the tenant ID that is the target of the current request, and then check the exact match (`tid` claim of the token).
167+
- Validate the `tid` claim is a GUID and the `iss` claim is of the form `https://login.microsoftonline.com/{tid}/v2.0` where `{tid}` is the exact `tid` claim. This ties the tenant back to the issuer and back to the scope of the signing key creating a chain of trust.
168+
- Use `tid` claim when they locate data associated with the subject of the claim. In other words, the `tid` claim must be part of the key used to access the user's data.
165169

166170
### Validate the signing key issuer
167171

168-
In addition to the issuer of the token, applications using the v2.0 tenant-independant metadata need to validate the signing key issuer.
172+
Applications using the v2.0 tenant-independant metadata need to validate the signing key issuer.
169173

170174
#### Keys document and signing key issuer
171175

@@ -194,15 +198,13 @@ tenant-independent "common" key endpoint [https://login.microsoftonline.com/comm
194198

195199
The application should use the `issuer` property of the keys document, associated with the key used to sign the token, in order to restrict the scope of keys:
196200
- Keys that have an issuer value with a GUID like `https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0` should only be used when the `iss` claim in the token matches the value exactly.
197-
- Keys that have a templated issuer value like `https://login.microsoftonline.com/{tenantid}/v2.0` need to ensure that:
198-
- the `tid` claim is a GUID and the `iss` claim is of the form `https://login.microsoftonline.com/{tid}/v2.0` where `{tid}` is the exact `tid` claim. This ties the tenant back to the issuer. back to the scope of the signing key creating a chain of trust.
199-
- Multi-tenant applications must use `tid` claim when they locate data associated with the subject of the claim. In other words, the `tid` claim must be part of the key used to access the user's data.
201+
- Keys that have a templated issuer value like `https://login.microsoftonline.com/{tenantid}/v2.0` should only be used when the `iss` claim in the token matches this value after substituting the `tid` claim in the token for the `{tenantid}` placeholder.
200202

201203
Using tenant-independent metadata is more efficient for applications that accept tokens from many tenants.
204+
202205
> [!NOTE]
203206
> With Azure AD tenant-independent metadata, claims should be interpreted within the tenant, just as under standard OpenID Connect, claims are interpreted within the issuer. That is, `{"sub":"ABC123","iss":"https://login.microsoftonline.com/{example-tenant-id}/v2.0","tid":"{example-tenant-id}"}` and `{"sub":"ABC123","iss":"https://login.microsoftonline.com/{another-tenand-id}/v2.0","tid":"{another-tenant-id}"}` describe different users, even though the `sub` is the same, because claims like `sub` are interpreted within the context of the issuer/tenant.
204207
205-
206208
#### Recap
207209

208210
Here is some pseudo code that recapitulates how to validate issuer and signing key issuer:
@@ -266,4 +268,3 @@ A *non-password-based* login is one where the user didn't type in a password to
266268
## Next steps
267269

268270
- Learn more about the [security tokens used in Azure AD](security-tokens.md).
269-

articles/ai-services/document-intelligence/concept-document-intelligence-studio.md

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,59 @@ The following image shows the landing page for Document Intelligence Studio.
2323

2424
:::image border="true" type="content" source="media/studio/welcome-to-studio.png" alt-text="Document Intelligence Studio Homepage":::
2525

26-
## Document Intelligence Studio features
26+
## July 2023 (GA) features and updates
2727

28-
The following Document Intelligence service features are available in the Studio.
28+
✔️ **Analyze Options**</br>
29+
30+
* Document Intelligence now supports more sophisticated analysis capabilities and the Studio allows one entry point (Analyze options button) for configuring the add-on capabilities with ease.
31+
* Depending on the document extraction scenario, configure the analysis range, document page range, optional detection, and premium detection features.
32+
33+
:::image type="content" source="media/studio/analyze-options.gif" alt-text="Animated screenshot showing use of the analyze options button to configure options in Studio.":::
34+
35+
> [!NOTE]
36+
> Font extraction is not visualized in Document Intelligence Studio. However, you can check the styles seciton of the JSON output for the font detection results.
37+
38+
✔️ **Auto labeling documents with prebuilt models or one of your own models**
39+
40+
* In custom extraction model labeling page, you can now auto label your documents using one of Document Intelligent Service prebuilt models or models you have trained before.
41+
42+
:::image type="content" source="media/studio/auto-label.gif" alt-text="Animated screenshot showing auto labeling in Studio.":::
43+
44+
* For some documents, there may be duplicate labels after running auto label. Make sure to modify the labels so that there are no duplicate labels in the labeling page afterwards.
45+
46+
:::image type="content" source="media/studio/duplicate-labels.png" alt-text="Screenshot showing duplicate label warning after auto labeling.":::
47+
48+
✔️ **Auto labeling tables**
49+
50+
* In custom extraction model labeling page, you can now auto label the tables in the document without having to label the tables manually.
51+
52+
:::image type="content" source="media/studio/auto-table-label.gif" alt-text="Animated screenshot showing auto table labeling in Studio.":::
53+
54+
✔️ **Add test files directly to your training dataset**
55+
56+
* Once you have trained a custom extraction model, make use of the test page to improve your model quality by uploading test documents to training dataset if needed.
57+
58+
* If a low confidence score is returned for some labels, make sure they're correctly labeled. If not, add them to the training dataset and relabel to improve the model quality.
59+
60+
:::image type="content" source="media/studio/add-from-test.gif" alt-text="Animated screenshot showing how to add test files to training dataset.":::
61+
62+
✔️ **Make use of the document list options and filters in custom projects**
63+
64+
* In custom extraction model labeling page, you can now navigate through your training documents with ease by making use of the search, filter and sort by feature.
65+
66+
* Utilize the grid view to preview documents or use the list view to scroll through the documents more easily.
67+
68+
:::image type="content" source="media/studio/document-options.png" alt-text="Screenshot of document list view options and filters.":::
69+
70+
✔️ **Project sharing**
71+
72+
* Share custom extraction projects with ease. For more information, see [Project sharing with custom models](how-to-guides/project-share-custom-models.md).
73+
74+
✔️ **Query fields**
75+
76+
* With Document Intelligence [General documents](concept-general-document.md) model, utilize the query fields feature to add fields to the extraction process without the need for added training. For more information, see [Document Intelligence query field extraction](concept-query-fields.md).
77+
78+
## Document Intelligence model support
2979

3080
* **Read**: Try out Document Intelligence's Read feature to extract text lines, words, detected languages, and handwritten style if detected. Start with the [Studio Read feature](https://formrecognizer.appliedai.azure.com/studio/read). Explore with sample documents and your documents. Use the interactive visualization and JSON output to understand how the feature works. See the [Read overview](concept-read.md) to learn more and get started with the [Python SDK quickstart for Layout](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.0.0&preserve-view=true).
3181

@@ -41,12 +91,8 @@ The following Document Intelligence service features are available in the Studio
4191

4292
* **Add-on Capabilities**: Document Intelligence now supports more sophisticated analysis capabilities. These optional capabilities can be enabled and disabled in the studio using the `Analze Options` button in each model page. There are four add-on capabilities available: highResolution, formula, font, and barcode extraction capabilities. See [Add-on capabilities](concept-add-on-capabilities.md) to learn more.
4393

44-
4594
## Next steps
4695

47-
* Follow our [**Document Intelligence v3.0 migration guide**](v3-migration-guide.md) to learn the differences from the previous version of the REST API.
48-
* Explore our [**v3.0 SDK quickstarts**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.0.0&preserve-view=true) to try the v3.0 features in your applications using the new SDKs.
49-
* Refer to our [**v3.0 REST API quickstarts**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.0.0&preserve-view=true) to try the v3.0features using the new REST API.
96+
* Visit the [Document Intelligence Studio](https://formrecognizer.appliedai.azure.com/studio) to begin using the models and features.
5097

51-
> [!div class="nextstepaction"]
52-
> [Document Intelligence Studio quickstart](quickstarts/try-document-intelligence-studio.md)
98+
* Get started with our [Document Intelligence Studio quickstart](quickstarts/try-document-intelligence-studio.md).

articles/ai-services/document-intelligence/containers/disconnected.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ The following example shows the formatting for the `docker run` command to use w
119119

120120
```docker
121121
122-
docker run --rm -it -p 5000:5000 \
122+
docker run --rm -it -p 5000:5050 \
123123
124124
-v {LICENSE_MOUNT} \
125125
@@ -166,7 +166,7 @@ Placeholder | Value | Format or example |
166166
**Example `docker run` command**
167167

168168
```docker
169-
docker run --rm -it -p 5000:5000 --memory {MEMORY_SIZE} --cpus {NUMBER_CPUS} \
169+
docker run --rm -it -p 5000:5050 --memory {MEMORY_SIZE} --cpus {NUMBER_CPUS} \
170170
171171
-v {LICENSE_MOUNT} \
172172
@@ -194,7 +194,7 @@ services:
194194
volumes:
195195
- ${NGINX_CONF_FILE}:/etc/nginx/nginx.conf
196196
ports:
197-
- "5000:5000"
197+
- "5000:5050"
198198
layout:
199199
container_name: azure-cognitive-service-layout
200200
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0:latest

articles/ai-services/document-intelligence/containers/install-run.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ services:
222222
- billing={FORM_RECOGNIZER_ENDPOINT_URI}
223223
- apiKey={FORM_RECOGNIZER_KEY}
224224
ports:
225-
- "5000:5000"
225+
- "5000:5050"
226226
networks:
227227
- ocrvnet
228228
networks:
@@ -252,7 +252,7 @@ services:
252252
- apiKey={FORM_RECOGNIZER_KEY}
253253
- AzureCognitiveServiceLayoutHost=http://azure-cognitive-service-layout:5000
254254
ports:
255-
- "5000:5000"
255+
- "5000:5050"
256256
azure-cognitive-service-layout:
257257
container_name: azure-cognitive-service-layout
258258
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0
@@ -285,7 +285,7 @@ services:
285285
- billing={FORM_RECOGNIZER_ENDPOINT_URI}
286286
- apiKey={FORM_RECOGNIZER_KEY}
287287
ports:
288-
- "5000:5000"
288+
- "5000:5050"
289289
networks:
290290
- ocrvnet
291291
networks:
@@ -315,7 +315,7 @@ services:
315315
- apiKey={FORM_RECOGNIZER_KEY}
316316
- AzureCognitiveServiceLayoutHost=http://azure-cognitive-service-layout:5000
317317
ports:
318-
- "5000:5000"
318+
- "5000:5050"
319319
azure-cognitive-service-layout:
320320
container_name: azure-cognitive-service-layout
321321
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0
@@ -347,7 +347,7 @@ services:
347347
- apiKey={FORM_RECOGNIZER_KEY}
348348
- AzureCognitiveServiceReadHost=http://azure-cognitive-service-read:5000
349349
ports:
350-
- "5000:5000"
350+
- "5000:5050"
351351
azure-cognitive-service-read:
352352
container_name: azure-cognitive-service-read
353353
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/read-3.0
@@ -379,7 +379,7 @@ services:
379379
- apiKey={FORM_RECOGNIZER_KEY}
380380
- AzureCognitiveServiceReadHost=http://azure-cognitive-service-read:5000
381381
ports:
382-
- "5000:5000"
382+
- "5000:5050"
383383
azure-cognitive-service-read:
384384
container_name: azure-cognitive-service-read
385385
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/read-3.0
@@ -409,7 +409,7 @@ services:
409409
- apiKey={FORM_RECOGNIZER_KEY}
410410
- AzureCognitiveServiceLayoutHost=http://azure-cognitive-service-layout:5000
411411
ports:
412-
- "5000:5000"
412+
- "5000:5050"
413413
azure-cognitive-service-layout:
414414
container_name: azure-cognitive-service-layout
415415
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0
@@ -581,7 +581,7 @@ services:
581581
volumes:
582582
- ${NGINX_CONF_FILE}:/etc/nginx/nginx.conf
583583
ports:
584-
- "5000:5000"
584+
- "5000:5050"
585585
layout:
586586
container_name: azure-cognitive-service-layout
587587
image: mcr.microsoft.com/azure-cognitive-services/form-recognizer/layout-3.0:latest
@@ -782,7 +782,7 @@ services:
782782
- apiKey={FORM_RECOGNIZER_KEY}
783783
- AzureCognitiveServiceLayoutHost=http://azure-cognitive-service-layout:5000
784784
ports:
785-
- "5000:5000"
785+
- "5000:5050"
786786
networks:
787787
- ocrvnet
788788
azure-cognitive-service-layout:
@@ -822,7 +822,7 @@ services:
822822
- apiKey={FORM_RECOGNIZER_KEY}
823823
- AzureCognitiveServiceReadHost=http://azure-cognitive-service-read:5000
824824
ports:
825-
- "5000:5000"
825+
- "5000:5050"
826826
networks:
827827
- ocrvnet
828828
azure-cognitive-service-read:
@@ -862,7 +862,7 @@ services:
862862
- apiKey={FORM_RECOGNIZER_KEY}
863863
- AzureCognitiveServiceReadHost=http://azure-cognitive-service-read:5000
864864
ports:
865-
- "5000:5000"
865+
- "5000:5050"
866866
networks:
867867
- ocrvnet
868868
azure-cognitive-service-read:
@@ -902,7 +902,7 @@ services:
902902
- apiKey={FORM_RECOGNIZER_KEY}
903903
- AzureCognitiveServiceReadHost=http://azure-cognitive-service-read:5000
904904
ports:
905-
- "5000:5000"
905+
- "5000:5050"
906906
networks:
907907
- ocrvnet
908908
azure-cognitive-service-read:
@@ -1059,7 +1059,7 @@ services:
10591059
volumes:
10601060
- ${NGINX_CONF_FILE}:/etc/nginx/nginx.conf
10611061
ports:
1062-
- "5000:5000"
1062+
- "5000:5050"
10631063
rabbitmq:
10641064
container_name: ${RABBITMQ_HOSTNAME}
10651065
image: rabbitmq:3
2.45 MB
Loading
895 KB
Loading
1.01 MB
Loading
1.6 MB
Loading
577 KB
Loading

0 commit comments

Comments
 (0)