changeset 879:f4b3e015d57f

merge
author Alain Mazy <am@osimis.io>
date Mon, 26 Sep 2022 19:14:04 +0200
parents 2e3493d618ad (diff) 9eae6d0b8032 (current diff)
children ac9b677b73c3
files
diffstat 2 files changed, 22 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Sphinx/source/plugins/authorization.rst	Fri Sep 23 08:24:53 2022 +0200
+++ b/Sphinx/source/plugins/authorization.rst	Mon Sep 26 19:14:04 2022 +0200
@@ -52,7 +52,10 @@
       "/home/user/OrthancAuthorization/Build/libOrthancAuthorization.so"
     ],
     "Authorization" : {
-      "WebService" : "http://localhost:8000/"
+      "WebService" : "http://localhost:8000/",
+      "WebServiceUsername": "my-user",
+      "WebServicePassword": "my-password",
+      "WebServiceIdentifier": "my-id"
     }
   }
 
@@ -86,7 +89,8 @@
     "dicom-uid" : "123ABC",
     "level" : "patient",
     "method" : "get",
-    "orthanc-id" : "6eeded74-75005003-c3ae9738-d4a06a4f-6beedeb8"
+    "orthanc-id" : "6eeded74-75005003-c3ae9738-d4a06a4f-6beedeb8",
+    "identifier": "my-id"
   }
 
 In this example, the user is accessing an URI that is related to some
@@ -109,6 +113,9 @@
   contains its ``SOPInstanceUID``.
 * The ``orthanc-id`` field gives the :ref:`Orthanc identifier
   <orthanc-ids>` of the resource.
+* The ``identifier`` field contains the value of the ``WebServiceIdentifier``
+  configuration or ``null`` if this configuration is not defined.  This allows
+  the WebService to identity which Orthanc instance is calling it (new in v 0.3.0).
 
 When the user accesses a lower-level resource in the DICOM hierarchy
 (a study, a series or an instance), the authorization plugin will
@@ -273,6 +280,9 @@
     [...]
     "Authorization" : {
       "WebService" : "http://localhost:8000/",
+      "WebServiceUsername": "my-user",          // new in v 0.3.0
+      "WebServicePassword": "my-password",      // new in v 0.3.0
+      "WebServiceIdentifier": "my-id",          // new in v 0.3.0
       "TokenGetArguments" : [ "user" ],
       "TokenHttpHeaders" : [ "hello" ],
       "UncheckedResources" : [
--- a/Sphinx/source/users/anonymization.rst	Fri Sep 23 08:24:53 2022 +0200
+++ b/Sphinx/source/users/anonymization.rst	Mon Sep 26 19:14:04 2022 +0200
@@ -210,15 +210,20 @@
       "Path" : "/studies/1c3f7bf4-85b4aa20-236e6315-5d450dcc-3c1bcf28"
     }
 
-Pay attention to the fact that Orthanc implements safety checks to
+Up to version 1.11.2, Orthanc implemented safety checks to
 preserve the :ref:`DICOM model of the real world <model-world>`. These
-checks prevent the modification of some tags that are known to belong
+checks prevented the modification of some tags that are known to belong
 to a level in the patient/study/series/instance hierarchy that is
 higher than the level that corresponds to the REST API call. For
-instance, the tag ``PatientID`` cannot be modified if using the
+instance, the tag ``PatientID`` could not be modified if using the
 ``/studies/{id}/modify`` route (in the latter case, the
-``/patients/{id}/modify`` route must be used, cf. next section). You
-also have to set the ``Force`` argument to ``true`` if modifying one
+``/patients/{id}/modify`` route had to be used, cf. next section).
+These sanity checks have been loosened in more recent versions and users must
+be very careful to preserve the DICOM model when updating these tags (e.g.
+if you modify the ``PatientID`` at study level, also make sure to modify all other Patient related
+tags (``PatientName``, ``PatientBirthDate``, ...)).
+
+Also note that you have to set the ``Force`` argument to ``true`` if modifying one
 of the :ref:`DICOM identifiers tags <orthanc-ids>`
 (i.e. ``PatientID``, ``StudyInstanceUID``, ``SeriesInstanceUID`` and
 ``SOPInstanceUID``).