Mercurial > hg > orthanc-authorization
changeset 212:ffa6e2388943
Allow using the auth-plugin together with AuthenticationEnabled=true
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Thu, 06 Feb 2025 15:57:49 +0100 (3 months ago) |
| parents | 7adf0b08f4c5 |
| children | 93eb6ce17f6d |
| files | NEWS Plugin/Plugin.cpp |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Wed Jan 22 15:29:37 2025 +0100 +++ b/NEWS Thu Feb 06 15:57:49 2025 +0100 @@ -1,3 +1,10 @@ +Pending changes in the mainline +=============================== + +* Allow using the auth-plugin together with "AuthenticationEnabled": true. + https://discourse.orthanc-server.org/t/user-based-access-control-with-label-based-resource-access/5454 + + 2025-01-22 - v 0.8.2 ====================
--- a/Plugin/Plugin.cpp Wed Jan 22 15:29:37 2025 +0100 +++ b/Plugin/Plugin.cpp Thu Feb 06 15:57:49 2025 +0100 @@ -1534,10 +1534,11 @@ if (resourceTokensEnabled_ || userTokensEnabled_) { - if (hasBasicAuthEnabled) - { - throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Authorization plugin: you are using the plugin to grant access to resources or handle user permissions. This is not compatible with \"AuthenticationEnabled\" = true"); - } + // Disabled because of this: https://discourse.orthanc-server.org/t/user-based-access-control-with-label-based-resource-access/5454 + // if (hasBasicAuthEnabled) + // { + // throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Authorization plugin: you are using the plugin to grant access to resources or handle user permissions. This is not compatible with \"AuthenticationEnabled\" = true"); + // } LOG(WARNING) << "Authorization plugin: Registering Incoming HTTP Request Filter";