Mercurial > hg > orthanc-authorization
annotate Plugin/Plugin.cpp @ 111:2b1a95c7d263
wip: adjust tools/find queries
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 30 Aug 2023 18:10:09 +0200 |
| parents | 7381a7674b36 |
| children | 572955904411 |
| rev | line source |
|---|---|
| 1 | 1 /** |
| 2 * Advanced authorization plugin for Orthanc | |
| 68 | 3 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
| 1 | 4 * |
| 5 * This program is free software: you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Affero General Public License | |
| 7 * as published by the Free Software Foundation, either version 3 of | |
| 8 * the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This program is distributed in the hope that it will be useful, but | |
| 11 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Affero General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Affero General Public License | |
| 16 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 17 **/ | |
| 18 | |
| 19 #include "AssociativeArray.h" | |
| 20 #include "DefaultAuthorizationParser.h" | |
| 21 #include "CachedAuthorizationService.h" | |
| 22 #include "AuthorizationWebService.h" | |
| 71 | 23 #include "PermissionParser.h" |
| 1 | 24 #include "MemoryCache.h" |
| 34 | 25 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
| 26 | |
|
36
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
27 #include <Compatibility.h> // For std::unique_ptr<> |
| 32 | 28 #include <Logging.h> |
| 29 #include <Toolbox.h> | |
| 111 | 30 #include <SerializationToolbox.h> |
| 71 | 31 #include <EmbeddedResources.h> |
| 1 | 32 |
| 33 | |
| 34 // Configuration of the authorization plugin | |
|
36
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
35 static std::unique_ptr<OrthancPlugins::IAuthorizationParser> authorizationParser_; |
|
8ada1b669194
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
35
diff
changeset
|
36 static std::unique_ptr<OrthancPlugins::IAuthorizationService> authorizationService_; |
| 71 | 37 static std::unique_ptr<OrthancPlugins::PermissionParser> permissionParser_; |
| 1 | 38 static std::set<std::string> uncheckedResources_; |
| 39 static std::list<std::string> uncheckedFolders_; | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
40 static std::set<OrthancPlugins::Token> tokens_; |
| 1 | 41 static std::set<OrthancPlugins::AccessLevel> uncheckedLevels_; |
| 42 | |
| 43 | |
| 71 | 44 static std::string JoinStrings(const std::set<std::string>& values) |
| 45 { | |
| 46 std::string out; | |
| 47 std::set<std::string> copy = values; // TODO: remove after upgrading to OrthancFramework 1.11.3+ | |
| 48 Orthanc::Toolbox::JoinStrings(out, copy, "|"); | |
| 49 return out; | |
| 50 } | |
| 51 | |
| 86 | 52 class TokenAndValue |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
53 { |
| 86 | 54 private: |
| 55 OrthancPlugins::Token token_; | |
| 56 std::string value_; | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
57 |
| 86 | 58 public: |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
59 TokenAndValue(const OrthancPlugins::Token& token, const std::string& value) : |
| 86 | 60 token_(token), |
| 61 value_(value) | |
| 62 { | |
| 63 } | |
| 64 | |
| 65 const OrthancPlugins::Token& GetToken() const | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
66 { |
| 86 | 67 return token_; |
| 68 } | |
| 69 | |
| 70 const std::string& GetValue() const | |
| 71 { | |
| 72 return value_; | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
73 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
74 }; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
75 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
76 |
| 1 | 77 static int32_t FilterHttpRequests(OrthancPluginHttpMethod method, |
| 78 const char *uri, | |
| 79 const char *ip, | |
| 80 uint32_t headersCount, | |
| 81 const char *const *headersKeys, | |
| 82 const char *const *headersValues, | |
| 83 uint32_t getArgumentsCount, | |
| 84 const char *const *getArgumentsKeys, | |
| 85 const char *const *getArgumentsValues) | |
| 86 { | |
| 87 try | |
| 88 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
89 unsigned int validity; // ignored |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
90 |
| 109 | 91 // Allow GET accesses to unchecked resources/folders (usually static resources) |
| 92 //////////////////////////////////////////////////////////////// | |
| 93 | |
| 1 | 94 if (method == OrthancPluginHttpMethod_Get) |
| 95 { | |
| 96 if (uncheckedResources_.find(uri) != uncheckedResources_.end()) | |
| 97 { | |
| 98 return 1; | |
| 99 } | |
| 100 | |
| 101 for (std::list<std::string>::const_iterator | |
| 102 it = uncheckedFolders_.begin(); it != uncheckedFolders_.end(); ++it) | |
| 103 { | |
| 104 if (Orthanc::Toolbox::StartsWith(uri, *it)) | |
| 105 { | |
| 106 return 1; | |
| 107 } | |
| 108 } | |
| 109 } | |
| 110 | |
| 109 | 111 // Extract auth tokens from headers and url get arguments |
| 112 //////////////////////////////////////////////////////////////// | |
| 113 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
114 OrthancPlugins::AssociativeArray headers(headersCount, headersKeys, headersValues, false); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
115 OrthancPlugins::AssociativeArray getArguments(getArgumentsCount, getArgumentsKeys, getArgumentsValues, true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
116 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
117 std::vector<TokenAndValue> authTokens; // the tokens that are set in this request |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
118 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
119 for (std::set<OrthancPlugins::Token>::const_iterator token = tokens_.begin(); token != tokens_.end(); ++token) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
120 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
121 std::string value; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
122 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
123 bool hasValue = false; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
124 switch (token->GetType()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
125 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
126 case OrthancPlugins::TokenType_HttpHeader: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
127 hasValue = headers.GetValue(value, token->GetKey()); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
128 break; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
129 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
130 case OrthancPlugins::TokenType_GetArgument: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
131 hasValue = getArguments.GetValue(value, token->GetKey()); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
132 break; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
133 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
134 default: |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
135 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
136 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
137 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
138 if (hasValue) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
139 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
140 authTokens.push_back(TokenAndValue(*token, value)); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
141 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
142 } |
| 71 | 143 |
| 109 | 144 // Based on the tokens, check if the user has access based on its permissions and the mapping between urls and permissions |
| 145 //////////////////////////////////////////////////////////////// | |
| 146 | |
| 71 | 147 if (permissionParser_.get() != NULL && |
| 148 authorizationService_.get() != NULL) | |
| 149 { | |
| 150 std::set<std::string> requiredPermissions; | |
| 151 std::string matchedPattern; | |
| 152 if (permissionParser_->Parse(requiredPermissions, matchedPattern, method, uri)) | |
| 153 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
154 if (authTokens.empty()) |
| 71 | 155 { |
| 103 | 156 std::string msg = std::string("Testing whether anonymous user has any of the required permissions '") + JoinStrings(requiredPermissions) + "'"; |
| 157 LOG(INFO) << msg; | |
| 71 | 158 if (authorizationService_->HasAnonymousUserPermission(validity, requiredPermissions)) |
| 159 { | |
| 103 | 160 LOG(INFO) << msg << " -> granted"; |
| 71 | 161 return 1; |
| 162 } | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
163 else |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
164 { |
| 103 | 165 LOG(INFO) << msg << " -> not granted"; |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
166 } |
| 71 | 167 } |
| 168 else | |
| 169 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
170 for (size_t i = 0; i < authTokens.size(); ++i) |
| 71 | 171 { |
| 103 | 172 std::string msg = std::string("Testing whether user has the required permissions '") + JoinStrings(requiredPermissions) + "' based on the HTTP header '" + authTokens[i].GetToken().GetKey() + "' required to match '" + matchedPattern + "'"; |
| 173 | |
| 174 LOG(INFO) << msg; | |
| 86 | 175 if (authorizationService_->HasUserPermission(validity, requiredPermissions, authTokens[i].GetToken(), authTokens[i].GetValue())) |
| 71 | 176 { |
| 109 | 177 // TODO: check labels permissions |
| 103 | 178 LOG(INFO) << msg << " -> granted"; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
179 return 1; |
| 71 | 180 } |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
181 else |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
182 { |
| 103 | 183 LOG(INFO) << msg << " -> not granted"; |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
184 } |
| 71 | 185 } |
| 186 } | |
| 187 } | |
| 188 } | |
| 109 | 189 |
| 190 | |
| 191 // | |
| 192 | |
| 1 | 193 if (authorizationParser_.get() != NULL && |
| 194 authorizationService_.get() != NULL) | |
| 195 { | |
| 196 // Parse the resources that are accessed through this URI | |
| 197 OrthancPlugins::IAuthorizationParser::AccessedResources accesses; | |
|
56
c02f0646297d
added support for /dicom-web/studies?0020000D=1.2.3&...
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
198 |
|
57
55539d564f4f
added support for /dicom-web/series? & /dicom-web/instances?
Alain Mazy <am@osimis.io>
parents:
56
diff
changeset
|
199 if (!authorizationParser_->Parse(accesses, uri, getArguments.GetMap())) |
| 1 | 200 { |
| 201 return 0; // Unable to parse this URI | |
| 202 } | |
| 203 | |
| 204 // Loop over all the accessed resources to ensure access is | |
| 205 // granted to each of them | |
| 206 for (OrthancPlugins::IAuthorizationParser::AccessedResources::const_iterator | |
| 207 access = accesses.begin(); access != accesses.end(); ++access) | |
| 208 { | |
| 209 // Ignored the access levels that are unchecked | |
| 210 // (cf. "UncheckedLevels" option) | |
| 211 if (uncheckedLevels_.find(access->GetLevel()) == uncheckedLevels_.end()) | |
| 212 { | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
213 std::string msg = std::string("Testing whether access to ") + OrthancPlugins::EnumerationToString(access->GetLevel()) + " \"" + access->GetOrthancId() + "\" is allowed with a resource token"; |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
214 LOG(INFO) << msg; |
| 1 | 215 |
| 216 bool granted = false; | |
| 217 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
218 if (authTokens.empty()) |
| 1 | 219 { |
| 71 | 220 granted = authorizationService_->IsGrantedToAnonymousUser(validity, method, *access); |
| 1 | 221 } |
| 222 else | |
| 223 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
224 // Loop over all the authorization tokens in the request until finding one that is granted |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
225 for (size_t i = 0; i < authTokens.size(); ++i) |
| 1 | 226 { |
| 86 | 227 if (authorizationService_->IsGranted(validity, method, *access, authTokens[i].GetToken(), authTokens[i].GetValue())) |
| 1 | 228 { |
| 229 granted = true; | |
| 230 break; | |
| 231 } | |
| 232 } | |
| 233 } | |
| 234 | |
| 235 if (!granted) | |
| 236 { | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
237 LOG(INFO) << msg << " -> not granted"; |
| 1 | 238 return 0; |
| 239 } | |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
240 else |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
241 { |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
242 LOG(INFO) << msg << " -> granted"; |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
243 } |
| 1 | 244 } |
| 245 } | |
| 246 | |
| 247 // Access is granted to all the resources | |
| 248 return 1; | |
| 249 } | |
| 250 | |
| 251 // By default, forbid access to all the resources | |
| 252 return 0; | |
| 253 } | |
| 254 catch (std::runtime_error& e) | |
| 255 { | |
| 256 LOG(ERROR) << e.what(); | |
| 257 return OrthancPluginErrorCode_Success; // Ignore error | |
| 258 } | |
| 259 catch (Orthanc::OrthancException& e) | |
| 260 { | |
| 261 LOG(ERROR) << e.What(); | |
| 262 return OrthancPluginErrorCode_Success; // Ignore error | |
| 263 } | |
| 264 catch (...) | |
| 265 { | |
| 266 LOG(ERROR) << "Unhandled internal exception"; | |
| 267 return OrthancPluginErrorCode_Success; // Ignore error | |
| 268 } | |
| 269 } | |
| 270 | |
| 271 | |
| 272 #if !ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 2, 1) | |
| 273 static int32_t FilterHttpRequestsFallback(OrthancPluginHttpMethod method, | |
| 274 const char *uri, | |
| 275 const char *ip, | |
| 276 uint32_t headersCount, | |
| 277 const char *const *headersKeys, | |
| 278 const char *const *headersValues) | |
| 279 { | |
| 280 // Fallback wrapper function for Orthanc <= 1.2.0, where the GET | |
| 281 // arguments were not available in the HTTP filters | |
| 282 return FilterHttpRequests(method, uri, ip, | |
| 283 headersCount, headersKeys, headersValues, | |
| 284 0, NULL, NULL); | |
| 285 } | |
| 286 #endif | |
| 287 | |
| 288 | |
| 289 static OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, | |
| 290 OrthancPluginResourceType resourceType, | |
| 291 const char* resourceId) | |
| 292 { | |
| 293 try | |
| 294 { | |
| 295 if (authorizationParser_.get() == NULL) | |
| 296 { | |
| 71 | 297 return OrthancPluginErrorCode_Success; |
| 1 | 298 } |
| 299 | |
| 300 if (changeType == OrthancPluginChangeType_Deleted) | |
| 301 { | |
| 302 switch (resourceType) | |
| 303 { | |
| 304 case OrthancPluginResourceType_Patient: | |
| 305 authorizationParser_->Invalidate(Orthanc::ResourceType_Patient, resourceId); | |
| 306 break; | |
| 307 | |
| 308 case OrthancPluginResourceType_Study: | |
| 309 authorizationParser_->Invalidate(Orthanc::ResourceType_Study, resourceId); | |
| 310 break; | |
| 311 | |
| 312 case OrthancPluginResourceType_Series: | |
| 313 authorizationParser_->Invalidate(Orthanc::ResourceType_Series, resourceId); | |
| 314 break; | |
| 315 | |
| 316 case OrthancPluginResourceType_Instance: | |
| 317 authorizationParser_->Invalidate(Orthanc::ResourceType_Instance, resourceId); | |
| 318 break; | |
| 319 | |
| 320 default: | |
| 321 break; | |
| 322 } | |
| 323 } | |
| 324 | |
| 325 return OrthancPluginErrorCode_Success; | |
| 326 } | |
| 327 catch (std::runtime_error& e) | |
| 328 { | |
| 329 LOG(ERROR) << e.what(); | |
| 330 return OrthancPluginErrorCode_Success; // Ignore error | |
| 331 } | |
| 332 catch (Orthanc::OrthancException& e) | |
| 333 { | |
| 334 LOG(ERROR) << e.What(); | |
| 335 return OrthancPluginErrorCode_Success; // Ignore error | |
| 336 } | |
| 337 catch (...) | |
| 338 { | |
| 339 LOG(ERROR) << "Unhandled internal exception"; | |
| 340 return OrthancPluginErrorCode_Success; // Ignore error | |
| 341 } | |
| 342 } | |
| 343 | |
| 111 | 344 |
| 345 bool GetUserProfileInternal(OrthancPlugins::IAuthorizationService::UserProfile& profile, const OrthancPluginHttpRequest* request) | |
| 346 { | |
| 347 OrthancPlugins::AssociativeArray headers | |
| 348 (request->headersCount, request->headersKeys, request->headersValues, false); | |
| 349 | |
| 350 OrthancPlugins::AssociativeArray getArguments | |
| 351 (request->getCount, request->getKeys, request->getValues, true); | |
| 352 | |
| 353 // Loop over all the authorization tokens stored in the HTTP | |
| 354 // headers, until finding one that is granted | |
| 355 for (std::set<OrthancPlugins::Token>::const_iterator | |
| 356 token = tokens_.begin(); token != tokens_.end(); ++token) | |
| 357 { | |
| 358 OrthancPlugins::IAuthorizationService::UserProfile tryProfile; | |
| 359 | |
| 360 std::string value; | |
| 361 | |
| 362 bool hasValue = false; | |
| 363 switch (token->GetType()) | |
| 364 { | |
| 365 case OrthancPlugins::TokenType_HttpHeader: | |
| 366 hasValue = headers.GetValue(value, token->GetKey()); | |
| 367 break; | |
| 368 | |
| 369 case OrthancPlugins::TokenType_GetArgument: | |
| 370 hasValue = getArguments.GetValue(value, token->GetKey()); | |
| 371 break; | |
| 372 | |
| 373 default: | |
| 374 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 375 } | |
| 376 | |
| 377 if (hasValue) | |
| 378 { | |
| 379 unsigned int validity; // not used | |
| 380 if (authorizationService_->GetUserProfile(validity, tryProfile, *token, value)) | |
| 381 { | |
| 382 profile = tryProfile; | |
| 383 return true; | |
| 384 } | |
| 385 } | |
| 386 } | |
| 387 | |
| 388 return false; | |
| 389 } | |
| 390 | |
| 391 | |
| 392 void AdjustToolsFindQueryLabels(Json::Value& query, const OrthancPlugins::IAuthorizationService::UserProfile& profile) | |
| 393 { | |
| 394 std::set<std::string> labelsToFind; | |
| 395 std::string labelsConstraint = "Invalid"; | |
| 396 | |
| 397 if (query.isMember("Labels") && query.isMember("LabelsConstraint")) | |
| 398 { | |
| 399 Orthanc::SerializationToolbox::ReadSetOfStrings(labelsToFind, query, "Labels"); | |
| 400 labelsConstraint = Orthanc::SerializationToolbox::ReadString(query, "LabelsConstraint"); | |
| 401 } | |
| 402 else if (query.isMember("Labels") || query.isMember("LabelsConstraint")) | |
| 403 { | |
| 404 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query, both 'Labels' and 'LabelsConstraint' must be defined together if one of them is defined."); | |
| 405 } | |
| 406 | |
| 407 if (profile.authorizedLabels.size() > 0 || profile.forbiddenLabels.size() > 0) | |
| 408 { | |
| 409 // if the user has access to all labels: no need to transform the tools/find body, we keep it as is | |
| 410 if (profile.authorizedLabels.find("*") == profile.authorizedLabels.end()) | |
| 411 { // the user does not have access to all labels -> transform the tools/find body | |
| 412 | |
| 413 if (labelsToFind.size() == 0) | |
| 414 { | |
| 415 if (profile.authorizedLabels.size() > 0) | |
| 416 { | |
| 417 Orthanc::SerializationToolbox::WriteSetOfStrings(query, profile.authorizedLabels, "Labels"); | |
| 418 query["LabelsConstraint"] = "Any"; | |
| 419 } | |
| 420 else if (profile.forbiddenLabels.size() > 0) | |
| 421 { | |
| 422 if (labelsToFind.size() == 0) | |
| 423 { // in this case, we can add a None constraint | |
| 424 Orthanc::SerializationToolbox::WriteSetOfStrings(query, profile.forbiddenLabels, "Labels"); | |
| 425 query["LabelsConstraint"] = "None"; | |
| 426 } | |
| 427 } | |
| 428 } | |
| 429 else if (labelsConstraint == "All") | |
| 430 { | |
| 431 if (profile.authorizedLabels.size() > 0) | |
| 432 { | |
| 433 if (!Orthanc::Toolbox::IsSetInSet(labelsToFind, profile.authorizedLabels)) | |
| 434 { | |
| 435 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query with 'All' labels constraint when the user does not have access to all listed labels."); | |
| 436 } | |
| 437 } | |
| 438 else if (profile.forbiddenLabels.size() > 0) | |
| 439 { | |
| 440 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query with 'All' labels constraint when the user has forbidden labels."); | |
| 441 } | |
| 442 } | |
| 443 else if (labelsConstraint == "Any") | |
| 444 { | |
| 445 if (profile.authorizedLabels.size() > 0) | |
| 446 { | |
| 447 std::set<std::string> newLabelsToFind; | |
| 448 for (std::set<std::string>::const_iterator itLabel = labelsToFind.begin(); itLabel != labelsToFind.end(); ++itLabel) | |
| 449 { | |
| 450 if (profile.authorizedLabels.find(*itLabel) != profile.authorizedLabels.end()) | |
| 451 { | |
| 452 newLabelsToFind.insert(*itLabel); | |
| 453 } | |
| 454 } | |
| 455 | |
| 456 if (newLabelsToFind.size() == 0) | |
| 457 { | |
| 458 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query with 'All' labels constraint when none of the labels to find is authorized for the user."); | |
| 459 } | |
| 460 | |
| 461 query.removeMember("Labels"); | |
| 462 Orthanc::SerializationToolbox::WriteSetOfStrings(query, newLabelsToFind, "Labels"); | |
| 463 } | |
| 464 else if (profile.forbiddenLabels.size() > 0) | |
| 465 { | |
| 466 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query with 'Any' labels constraint when the user has forbidden labels."); | |
| 467 } | |
| 468 } | |
| 469 else if (labelsConstraint == "None") | |
| 470 { | |
| 471 if (profile.authorizedLabels.size() > 0) | |
| 472 { | |
| 473 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Auth plugin: unable to transform tools/find query with 'None' labels constraint when the user only has authorized_labels."); | |
| 474 } | |
| 475 else if (profile.forbiddenLabels.size() > 0) | |
| 476 { | |
| 477 std::set<std::string> newLabelsToFind = labelsToFind; | |
| 478 Orthanc::Toolbox::AppendSets(newLabelsToFind, profile.forbiddenLabels); | |
| 479 | |
| 480 query.removeMember("Labels"); | |
| 481 Orthanc::SerializationToolbox::WriteSetOfStrings(query, newLabelsToFind, "Labels"); | |
| 482 } | |
| 483 } | |
| 484 } | |
| 485 } | |
| 486 } | |
| 487 | |
| 488 void ToolsFind(OrthancPluginRestOutput* output, | |
| 489 const char* /*url*/, | |
| 490 const OrthancPluginHttpRequest* request) | |
| 491 { | |
| 492 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
| 493 | |
| 494 if (request->method != OrthancPluginHttpMethod_Post) | |
| 495 { | |
| 496 OrthancPluginSendMethodNotAllowed(context, output, "POST"); | |
| 497 } | |
| 498 else | |
| 499 { | |
| 500 // The filtering to this route is performed by this plugin as it is done for any other route before we get here. | |
| 501 | |
| 502 Json::Value body; | |
| 503 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) | |
| 504 { | |
| 505 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); | |
| 506 } | |
| 507 | |
| 508 // If the logged in user has restrictions on the labels he can access, modify the tools/find payload before reposting it to Orthanc | |
| 509 OrthancPlugins::IAuthorizationService::UserProfile profile; | |
| 510 if (GetUserProfileInternal(profile, request)) | |
| 511 { | |
| 512 AdjustToolsFindQueryLabels(body, profile); | |
| 513 | |
| 514 Json::Value result; | |
| 515 if (OrthancPlugins::RestApiPost(result, "/tools/find", body, false)) | |
| 516 { | |
| 517 OrthancPlugins::AnswerJson(result, output); | |
| 518 } | |
| 519 | |
| 520 } | |
| 521 else | |
| 522 { | |
| 523 OrthancPluginSendHttpStatusCode(context, output, 403); // TODO: check | |
| 524 } | |
| 525 | |
| 526 | |
| 527 } | |
| 528 } | |
| 529 | |
| 530 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
531 void CreateToken(OrthancPluginRestOutput* output, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
532 const char* /*url*/, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
533 const OrthancPluginHttpRequest* request) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
534 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
535 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
536 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
537 if (request->method != OrthancPluginHttpMethod_Put) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
538 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
539 OrthancPluginSendMethodNotAllowed(context, output, "PUT"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
540 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
541 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
542 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
543 // The filtering to this route is performed by this plugin as it is done for any other route before we get here. |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
544 // Since the route contains the tokenType, we can allow/forbid creating them based on the url |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
545 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
546 // simply forward the request to the auth-service |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
547 std::string tokenType; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
548 if (request->groupsCount == 1) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
549 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
550 tokenType = request->groups[0]; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
551 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
552 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
553 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
554 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
555 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
556 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
557 // convert from Orthanc flavored API to WebService API |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
558 Json::Value body; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
559 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
560 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
561 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
562 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
563 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
564 std::string id; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
565 std::vector<OrthancPlugins::IAuthorizationService::OrthancResource> resources; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
566 std::string expirationDateString; |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
567 uint64_t validityDuration; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
568 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
569 if (body.isMember("ID")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
570 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
571 id = body["ID"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
572 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
573 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
574 for (Json::ArrayIndex i = 0; i < body["Resources"].size(); ++i) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
575 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
576 const Json::Value& jsonResource = body["Resources"][i]; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
577 OrthancPlugins::IAuthorizationService::OrthancResource resource; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
578 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
579 if (jsonResource.isMember("DicomUid")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
580 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
581 resource.dicomUid = jsonResource["DicomUid"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
582 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
583 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
584 if (jsonResource.isMember("OrthancId")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
585 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
586 resource.orthancId = jsonResource["OrthancId"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
587 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
588 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
589 if (jsonResource.isMember("Url")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
590 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
591 resource.url = jsonResource["Url"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
592 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
593 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
594 resource.level = jsonResource["Level"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
595 resources.push_back(resource); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
596 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
597 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
598 if (body.isMember("ExpirationDate")) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
599 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
600 expirationDateString = body["ExpirationDate"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
601 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
602 |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
603 if (body.isMember("ValidityDuration")) |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
604 { |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
605 validityDuration = body["ValidityDuration"].asUInt64(); |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
606 } |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
607 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
608 OrthancPlugins::IAuthorizationService::CreatedToken createdToken; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
609 if (authorizationService_->CreateToken(createdToken, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
610 tokenType, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
611 id, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
612 resources, |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
613 expirationDateString, |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
614 validityDuration)) |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
615 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
616 Json::Value createdJsonToken; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
617 createdJsonToken["Token"] = createdToken.token; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
618 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
619 if (!createdToken.url.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
620 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
621 createdJsonToken["Url"] = createdToken.url; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
622 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
623 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
624 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
625 createdJsonToken["Url"] = Json::nullValue; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
626 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
627 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
628 OrthancPlugins::AnswerJson(createdJsonToken, output); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
629 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
630 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
631 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
632 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
633 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
634 |
| 74 | 635 void DecodeToken(OrthancPluginRestOutput* output, |
| 636 const char* /*url*/, | |
| 637 const OrthancPluginHttpRequest* request) | |
| 638 { | |
| 639 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); | |
| 640 | |
| 641 if (request->method != OrthancPluginHttpMethod_Post) | |
| 642 { | |
| 643 OrthancPluginSendMethodNotAllowed(context, output, "POST"); | |
| 644 } | |
| 645 else | |
| 646 { | |
| 647 // convert from Orthanc flavored API to WebService API | |
| 648 Json::Value body; | |
| 649 if (!OrthancPlugins::ReadJson(body, request->body, request->bodySize)) | |
| 650 { | |
| 651 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "A JSON payload was expected"); | |
| 652 } | |
| 653 | |
| 654 Json::Value authPayload; | |
| 655 | |
| 656 authPayload["token-key"] = body["TokenKey"].asString(); | |
| 657 authPayload["token-value"] = body["TokenValue"].asString(); | |
| 658 | |
| 659 OrthancPlugins::IAuthorizationService::DecodedToken decodedToken; | |
| 660 if (authorizationService_->DecodeToken(decodedToken, | |
| 661 body["TokenKey"].asString(), | |
| 662 body["TokenValue"].asString())) | |
| 663 { | |
| 664 Json::Value decodedJsonToken; | |
| 665 | |
| 666 if (!decodedToken.redirectUrl.empty()) | |
| 667 { | |
| 668 decodedJsonToken["RedirectUrl"] = decodedToken.redirectUrl; | |
| 669 } | |
| 670 | |
| 671 if (!decodedToken.errorCode.empty()) | |
| 672 { | |
| 673 decodedJsonToken["ErrorCode"] = decodedToken.errorCode; | |
| 674 } | |
| 675 | |
| 676 if (!decodedToken.tokenType.empty()) | |
| 677 { | |
| 678 decodedJsonToken["TokenType"] = decodedToken.tokenType; | |
| 679 } | |
| 680 | |
| 681 OrthancPlugins::AnswerJson(decodedJsonToken, output); | |
| 682 } | |
| 683 } | |
| 684 } | |
| 685 | |
| 111 | 686 |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
687 void GetUserProfile(OrthancPluginRestOutput* output, |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
688 const char* /*url*/, |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
689 const OrthancPluginHttpRequest* request) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
690 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
691 OrthancPluginContext* context = OrthancPlugins::GetGlobalContext(); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
692 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
693 if (request->method != OrthancPluginHttpMethod_Get) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
694 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
695 OrthancPluginSendMethodNotAllowed(context, output, "GET"); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
696 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
697 else |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
698 { |
| 111 | 699 OrthancPlugins::IAuthorizationService::UserProfile profile; |
| 700 if (GetUserProfileInternal(profile, request)) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
701 { |
| 111 | 702 Json::Value jsonProfile; |
| 703 jsonProfile["name"] = profile.name; | |
| 704 jsonProfile["permissions"] = Json::arrayValue; | |
| 705 for (std::set<std::string>::const_iterator it = profile.permissions.begin(); it != profile.permissions.end(); ++it) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
706 { |
| 111 | 707 jsonProfile["permissions"].append(*it); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
708 } |
| 111 | 709 for (std::set<std::string>::const_iterator it = profile.authorizedLabels.begin(); it != profile.authorizedLabels.end(); ++it) |
| 710 { | |
| 711 jsonProfile["authorized-labels"].append(*it); | |
| 712 } | |
| 713 for (std::set<std::string>::const_iterator it = profile.forbiddenLabels.begin(); it != profile.forbiddenLabels.end(); ++it) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
714 { |
| 111 | 715 jsonProfile["forbidden-labels"].append(*it); |
| 716 } | |
| 109 | 717 |
| 111 | 718 OrthancPlugins::AnswerJson(jsonProfile, output); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
719 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
720 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
721 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
722 |
| 71 | 723 void MergeJson(Json::Value &a, const Json::Value &b) { |
| 724 | |
| 725 if (!a.isObject() || !b.isObject()) | |
| 726 { | |
| 727 return; | |
| 728 } | |
| 729 | |
| 730 Json::Value::Members members = b.getMemberNames(); | |
| 731 | |
| 732 for (size_t i = 0; i < members.size(); i++) | |
| 733 { | |
| 734 std::string key = members[i]; | |
| 735 | |
| 736 if (!a[key].isNull() && a[key].type() == Json::objectValue && b[key].type() == Json::objectValue) | |
| 737 { | |
| 738 MergeJson(a[key], b[key]); | |
| 739 } | |
| 740 else | |
| 741 { | |
| 742 a[key] = b[key]; | |
| 743 } | |
| 744 } | |
| 745 } | |
| 746 | |
| 1 | 747 |
| 748 extern "C" | |
| 749 { | |
| 750 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
| 751 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
752 OrthancPlugins::SetGlobalContext(context); |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
753 OrthancPluginLogWarning(context, "Initializing the authorization plugin"); |
| 1 | 754 |
| 755 /* Check the version of the Orthanc core */ | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
756 if (OrthancPluginCheckVersion(context) == 0) |
| 1 | 757 { |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
758 OrthancPlugins::ReportMinimalOrthancVersion(ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, |
| 1 | 759 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, |
| 760 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
| 761 return -1; | |
| 762 } | |
| 763 | |
| 41 | 764 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) |
| 32 | 765 Orthanc::Logging::InitializePluginContext(context); |
|
33
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
766 #else |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
767 Orthanc::Logging::Initialize(context); |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
768 #endif |
|
b9c536bf598b
improved Orthanc::Logging::Initialize()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
32
diff
changeset
|
769 |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
770 OrthancPluginSetDescription(context, "Advanced authorization plugin for Orthanc."); |
| 1 | 771 |
| 772 try | |
| 773 { | |
| 71 | 774 static const char* PLUGIN_SECTION = "Authorization"; |
| 775 | |
| 776 OrthancPlugins::OrthancConfiguration orthancFullConfiguration; | |
| 777 | |
| 778 // read default configuration | |
| 779 std::string defaultConfigurationFileContent; | |
| 780 Orthanc::EmbeddedResources::GetFileResource(defaultConfigurationFileContent, Orthanc::EmbeddedResources::DEFAULT_CONFIGURATION); | |
| 781 Json::Value pluginJsonDefaultConfiguration; | |
| 782 OrthancPlugins::ReadJsonWithoutComments(pluginJsonDefaultConfiguration, defaultConfigurationFileContent); | |
| 783 Json::Value pluginJsonConfiguration = pluginJsonDefaultConfiguration[PLUGIN_SECTION]; | |
| 1 | 784 |
| 71 | 785 OrthancPlugins::OrthancConfiguration pluginProvidedConfiguration; |
| 786 | |
| 787 if (orthancFullConfiguration.IsSection(PLUGIN_SECTION)) | |
| 1 | 788 { |
| 71 | 789 // get the configuration provided by the user |
| 790 orthancFullConfiguration.GetSection(pluginProvidedConfiguration, PLUGIN_SECTION); | |
| 791 | |
| 792 // merge it with the default configuration. This is a way to apply the all default values in a single step | |
| 793 MergeJson(pluginJsonConfiguration, pluginProvidedConfiguration.GetJson()); | |
| 794 | |
| 795 // recreate a OrthancConfiguration object from the merged configuration | |
| 796 OrthancPlugins::OrthancConfiguration pluginConfiguration(pluginJsonConfiguration, PLUGIN_SECTION); | |
| 1 | 797 |
| 798 // TODO - The size of the caches is set to 10,000 items. Maybe add a configuration option? | |
| 799 OrthancPlugins::MemoryCache::Factory factory(10000); | |
| 800 | |
| 71 | 801 std::string dicomWebRoot = "/dicom-web/"; |
| 802 std::string oe2Root = "/ui/"; | |
| 1 | 803 |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
804 bool hasBasicAuthEnabled = orthancFullConfiguration.GetBooleanValue("AuthenticationEnabled", "true"); |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
805 |
| 71 | 806 if (orthancFullConfiguration.IsSection("DicomWeb")) |
| 807 { | |
| 808 OrthancPlugins::OrthancConfiguration dicomWeb; | |
| 809 dicomWeb.GetSection(orthancFullConfiguration, "DicomWeb"); | |
| 810 dicomWebRoot = dicomWeb.GetStringValue("Root", "/dicom-web/"); | |
| 811 } | |
| 1 | 812 |
| 71 | 813 if (orthancFullConfiguration.IsSection("OrthancExplorer2")) |
| 814 { | |
| 815 OrthancPlugins::OrthancConfiguration oe2; | |
| 816 oe2.GetSection(orthancFullConfiguration, "OrthancExplorer2"); | |
| 817 oe2Root = oe2.GetStringValue("Root", "/ui/"); | |
| 1 | 818 } |
| 819 | |
| 820 std::list<std::string> tmp; | |
| 821 | |
| 71 | 822 pluginConfiguration.LookupListOfStrings(tmp, "TokenHttpHeaders", true); |
| 1 | 823 for (std::list<std::string>::const_iterator |
| 824 it = tmp.begin(); it != tmp.end(); ++it) | |
| 825 { | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
826 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, *it)); |
| 1 | 827 } |
| 828 | |
| 71 | 829 pluginConfiguration.LookupListOfStrings(tmp, "TokenGetArguments", true); |
| 1 | 830 |
|
8
4362026afddf
orthanc 1.2.1 renamed as 1.3.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1
diff
changeset
|
831 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 3, 0) |
| 1 | 832 for (std::list<std::string>::const_iterator |
| 833 it = tmp.begin(); it != tmp.end(); ++it) | |
| 834 { | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
835 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, *it)); |
| 1 | 836 } |
| 837 #else | |
| 838 if (!tmp.empty()) | |
| 839 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
840 throw Orthanc::OrthancException( |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
841 Orthanc::ErrorCode_Plugin, |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
842 "The option \"TokenGetArguments\" of the authorization plugin " |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
843 "is only valid if compiled against Orthanc >= 1.3.0" |
| 1 | 844 } |
| 845 #endif | |
| 846 | |
| 71 | 847 pluginConfiguration.LookupSetOfStrings(uncheckedResources_, "UncheckedResources", false); |
| 848 pluginConfiguration.LookupListOfStrings(uncheckedFolders_, "UncheckedFolders", false); | |
| 1 | 849 |
| 74 | 850 std::string urlTokenDecoder; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
851 std::string urlTokenValidation; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
852 std::string urlTokenCreationBase; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
853 std::string urlUserProfile; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
854 std::string urlRoot; |
| 1 | 855 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
856 static const char* WEB_SERVICE_ROOT = "WebServiceRootUrl"; |
| 74 | 857 static const char* WEB_SERVICE_TOKEN_DECODER = "WebServiceTokenDecoderUrl"; |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
858 static const char* WEB_SERVICE_TOKEN_VALIDATION = "WebServiceTokenValidationUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
859 static const char* WEB_SERVICE_TOKEN_CREATION_BASE = "WebServiceTokenCreationBaseUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
860 static const char* WEB_SERVICE_USER_PROFILE = "WebServiceUserProfileUrl"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
861 static const char* WEB_SERVICE_TOKEN_VALIDATION_LEGACY = "WebService"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
862 if (pluginConfiguration.LookupStringValue(urlRoot, WEB_SERVICE_ROOT)) |
| 71 | 863 { |
| 74 | 864 urlTokenDecoder = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/decode"); |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
865 urlTokenValidation = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/validate"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
866 urlTokenCreationBase = Orthanc::Toolbox::JoinUri(urlRoot, "/tokens/"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
867 urlUserProfile = Orthanc::Toolbox::JoinUri(urlRoot, "/user/get-profile"); |
| 71 | 868 } |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
869 else |
| 71 | 870 { |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
871 pluginConfiguration.LookupStringValue(urlTokenValidation, WEB_SERVICE_TOKEN_VALIDATION); |
| 74 | 872 pluginConfiguration.LookupStringValue(urlTokenDecoder, WEB_SERVICE_TOKEN_DECODER); |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
873 if (urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
874 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
875 pluginConfiguration.LookupStringValue(urlTokenValidation, WEB_SERVICE_TOKEN_VALIDATION_LEGACY); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
876 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
877 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
878 pluginConfiguration.LookupStringValue(urlTokenCreationBase, WEB_SERVICE_TOKEN_CREATION_BASE); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
879 pluginConfiguration.LookupStringValue(urlUserProfile, WEB_SERVICE_USER_PROFILE); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
880 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
881 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
882 if (!urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
883 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
884 LOG(WARNING) << "Authorization plugin: url defined for Token Validation: " << urlTokenValidation; |
| 71 | 885 authorizationParser_.reset |
| 886 (new OrthancPlugins::DefaultAuthorizationParser(factory, dicomWebRoot)); | |
| 887 } | |
| 888 else | |
| 889 { | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
890 LOG(WARNING) << "Authorization plugin: no url defined for Token Validation"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
891 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
892 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
893 if (!urlUserProfile.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
894 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
895 LOG(WARNING) << "Authorization plugin: url defined for User Profile: " << urlUserProfile; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
896 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
897 static const char* PERMISSIONS = "Permissions"; |
| 71 | 898 if (!pluginConfiguration.GetJson().isMember(PERMISSIONS)) |
| 899 { | |
| 900 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "Authorization plugin: Missing required \"" + std::string(PERMISSIONS) + | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
901 "\" option since you have defined the \"" + std::string(WEB_SERVICE_ROOT) + "\" option"); |
| 71 | 902 } |
| 903 permissionParser_.reset | |
| 904 (new OrthancPlugins::PermissionParser(dicomWebRoot, oe2Root)); | |
| 905 | |
| 906 permissionParser_->Add(pluginConfiguration.GetJson()[PERMISSIONS]); | |
| 907 } | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
908 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
909 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
910 LOG(WARNING) << "Authorization plugin: no url defined for User Profile"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
911 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
912 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
913 if (!urlTokenCreationBase.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
914 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
915 LOG(WARNING) << "Authorization plugin: base url defined for Token Creation : " << urlTokenCreationBase; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
916 // TODO Token Creation |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
917 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
918 else |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
919 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
920 LOG(WARNING) << "Authorization plugin: no base url defined for Token Creation"; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
921 } |
| 71 | 922 |
| 923 if (authorizationParser_.get() == NULL && permissionParser_.get() == NULL) | |
| 924 { | |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
925 if (hasBasicAuthEnabled) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
926 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
927 LOG(WARNING) << "Authorization plugin: No Token Validation or User Profile url defined -> will only be able to generate tokens. All API routes are accessible to all registered users."; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
928 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
929 else |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
930 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
931 LOG(WARNING) << "Authorization plugin: ----------- insecure setup ---------- No Token Validation or User Profile url defined -> will only be able to generate tokens. Authentication is not enabled -> anyone will have access to all API routes."; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
932 } |
| 1 | 933 } |
| 934 | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
935 std::set<std::string> standardConfigurations; |
| 71 | 936 if (pluginConfiguration.LookupSetOfStrings(standardConfigurations, "StandardConfigurations", false)) |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
937 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
938 if (standardConfigurations.find("osimis-web-viewer") != standardConfigurations.end()) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
939 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
940 uncheckedFolders_.push_back("/osimis-viewer/app/"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
941 uncheckedFolders_.push_back("/osimis-viewer/languages/"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
942 uncheckedResources_.insert("/osimis-viewer/config.js"); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
943 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
944 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "token")); |
|
95
dff72e397f90
fix standard configuration 'orthanc-explorer-2' for TokenGetArguments
Alain Mazy <am@osimis.io>
parents:
86
diff
changeset
|
945 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, "token")); // for download links in Webviewer |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
946 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
947 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
948 if (standardConfigurations.find("stone-webviewer") != standardConfigurations.end()) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
949 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
950 uncheckedFolders_.push_back("/stone-webviewer/"); |
| 65 | 951 uncheckedResources_.insert("/system"); // for Stone to check that Orthanc is the server providing the data |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
952 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
953 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "Authorization")); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
954 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
955 |
| 65 | 956 if (standardConfigurations.find("orthanc-explorer-2") != standardConfigurations.end()) |
| 957 { | |
| 958 uncheckedFolders_.push_back("/ui/app/"); | |
| 74 | 959 uncheckedFolders_.push_back("/ui/landing/"); |
| 76 | 960 uncheckedResources_.insert("/"); // for the redirect to /ui/app/ |
| 66 | 961 uncheckedResources_.insert("/ui/api/pre-login-configuration"); // for the UI to know, i.e. if Keycloak is enabled or not |
| 71 | 962 uncheckedResources_.insert("/ui/api/configuration"); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
963 uncheckedResources_.insert("/auth/user-profile"); |
| 65 | 964 |
| 965 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "Authorization")); // for basic-auth | |
| 966 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_HttpHeader, "token")); // for keycloak | |
|
95
dff72e397f90
fix standard configuration 'orthanc-explorer-2' for TokenGetArguments
Alain Mazy <am@osimis.io>
parents:
86
diff
changeset
|
967 tokens_.insert(OrthancPlugins::Token(OrthancPlugins::TokenType_GetArgument, "token")); // for download links in OE2 |
| 65 | 968 } |
| 969 | |
| 102 | 970 if (standardConfigurations.find("ohif") != standardConfigurations.end()) |
| 971 { | |
| 972 uncheckedFolders_.push_back("/ohif/"); | |
| 973 } | |
| 974 | |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
975 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
976 |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
977 std::string checkedLevelString; |
| 71 | 978 if (pluginConfiguration.LookupStringValue(checkedLevelString, "CheckedLevel")) |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
979 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
980 OrthancPlugins::AccessLevel checkedLevel = OrthancPlugins::StringToAccessLevel(checkedLevelString); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
981 if (checkedLevel == OrthancPlugins::AccessLevel_Instance) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
982 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
983 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
984 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
985 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
986 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
987 else if (checkedLevel == OrthancPlugins::AccessLevel_Series) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
988 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
989 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
990 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
991 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
992 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
993 else if (checkedLevel == OrthancPlugins::AccessLevel_Study) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
994 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
995 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Patient); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
996 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
997 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
998 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
999 else if (checkedLevel == OrthancPlugins::AccessLevel_Patient) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1000 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1001 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Study); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1002 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Series); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1003 uncheckedLevels_.insert(OrthancPlugins::AccessLevel_Instance); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1004 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1005 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1006 |
| 71 | 1007 if (pluginConfiguration.LookupListOfStrings(tmp, "UncheckedLevels", false)) |
| 1 | 1008 { |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1009 if (uncheckedLevels_.size() == 0) |
| 1 | 1010 { |
|
58
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1011 for (std::list<std::string>::const_iterator |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1012 it = tmp.begin(); it != tmp.end(); ++it) |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1013 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1014 uncheckedLevels_.insert(OrthancPlugins::StringToAccessLevel(*it)); |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1015 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1016 } |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1017 else |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1018 { |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1019 LOG(ERROR) << "Authorization plugin: you may only provide one of 'CheckedLevel' or 'UncheckedLevels' configurations"; |
|
ad279c70c22d
added a new configuration 'StandardConfigurations'
Alain Mazy <am@osimis.io>
parents:
57
diff
changeset
|
1020 return -1; |
| 1 | 1021 } |
| 1022 } | |
| 1023 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1024 std::unique_ptr<OrthancPlugins::AuthorizationWebService> webService(new OrthancPlugins::AuthorizationWebService(urlTokenValidation, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1025 urlTokenCreationBase, |
| 74 | 1026 urlUserProfile, |
| 1027 urlTokenDecoder)); | |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1028 |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1029 std::string webServiceIdentifier; |
| 71 | 1030 if (pluginConfiguration.LookupStringValue(webServiceIdentifier, "WebServiceIdentifier")) |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1031 { |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1032 webService->SetIdentifier(webServiceIdentifier); |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1033 } |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1034 |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1035 std::string webServiceUsername; |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1036 std::string webServicePassword; |
| 71 | 1037 if (pluginConfiguration.LookupStringValue(webServiceUsername, "WebServiceUsername") && pluginConfiguration.LookupStringValue(webServicePassword, "WebServicePassword")) |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1038 { |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1039 webService->SetCredentials(webServiceUsername, webServicePassword); |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1040 } |
|
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1041 |
| 1 | 1042 authorizationService_.reset |
| 1043 (new OrthancPlugins::CachedAuthorizationService | |
|
54
317b31e99501
Added 3 new configurations: WebServiceUsername, WebServicePassword, WebServiceIdentifier. WebServiceIdentifier is now included in the payload as the 'identifier' field
Alain Mazy <am@osimis.io>
parents:
51
diff
changeset
|
1044 (webService.release(), factory)); |
| 1 | 1045 |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1046 if (!urlTokenValidation.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1047 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1048 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1049 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1050 |
| 74 | 1051 if (!urlTokenDecoder.empty()) |
| 1052 { | |
| 1053 OrthancPlugins::RegisterRestCallback<DecodeToken>("/auth/tokens/decode", true); | |
| 1054 } | |
| 1055 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1056 if (!urlUserProfile.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1057 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1058 OrthancPlugins::RegisterRestCallback<GetUserProfile>("/auth/user/profile", true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1059 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1060 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1061 if (!urlTokenCreationBase.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1062 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1063 OrthancPlugins::RegisterRestCallback<CreateToken>("/auth/tokens/(.*)", true); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
1064 } |
| 74 | 1065 |
| 111 | 1066 OrthancPlugins::RegisterRestCallback<ToolsFind>("/tools/find", true); |
| 1067 | |
| 74 | 1068 |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1069 if (authorizationParser_.get() != NULL || permissionParser_.get() != NULL) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1070 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1071 if (hasBasicAuthEnabled) |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1072 { |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1073 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"); |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1074 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1075 |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1076 LOG(WARNING) << "Authorization plugin: Registering Incoming HTTP Request Filter"; |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1077 |
| 1 | 1078 #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 2, 1) |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1079 OrthancPluginRegisterIncomingHttpRequestFilter2(context, FilterHttpRequests); |
| 1 | 1080 #else |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1081 OrthancPluginRegisterIncomingHttpRequestFilter(context, FilterHttpRequestsFallback); |
| 1 | 1082 #endif |
|
81
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1083 } |
|
fac45493d547
more flexibility wrt configuration
Alain Mazy <am@osimis.io>
parents:
77
diff
changeset
|
1084 |
| 1 | 1085 } |
| 1086 else | |
| 1087 { | |
| 71 | 1088 LOG(WARNING) << "No section \"" << PLUGIN_SECTION << "\" in the configuration file, " |
| 1 | 1089 << "the authorization plugin is disabled"; |
| 1090 } | |
| 1091 } | |
| 1092 catch (Orthanc::OrthancException& e) | |
| 1093 { | |
| 1094 LOG(ERROR) << e.What(); | |
| 1095 return -1; | |
| 1096 } | |
| 1097 | |
| 1098 return 0; | |
| 1099 } | |
| 1100 | |
| 1101 | |
| 1102 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
| 1103 { | |
| 1104 authorizationParser_.reset(NULL); | |
| 1105 } | |
| 1106 | |
| 1107 | |
| 1108 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
| 1109 { | |
| 1110 return "authorization"; | |
| 1111 } | |
| 1112 | |
| 1113 | |
| 1114 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
| 1115 { | |
|
22
c44013681a51
now using the Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
8
diff
changeset
|
1116 return ORTHANC_PLUGIN_VERSION; |
| 1 | 1117 } |
| 1118 } |