Mercurial > hg > orthanc-authorization
annotate Plugin/AuthorizationWebService.cpp @ 74:aa73b10c2db9
new API route to decode tokens
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Fri, 03 Mar 2023 18:03:22 +0100 |
| parents | 512247750f0a |
| children | e2c3c497eb8d |
| 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 "AuthorizationWebService.h" | |
| 20 | |
| 34 | 21 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
| 22 | |
| 32 | 23 #include <Logging.h> |
|
59
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
24 #include <Toolbox.h> |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
25 #include <HttpClient.h> |
| 71 | 26 #include <algorithm> |
| 1 | 27 |
| 28 namespace OrthancPlugins | |
| 29 { | |
| 71 | 30 static const char* GRANTED = "granted"; |
| 31 static const char* VALIDITY = "validity"; | |
| 32 static const char* PERMISSIONS = "permissions"; | |
| 33 | |
| 34 | |
| 1 | 35 bool AuthorizationWebService::IsGrantedInternal(unsigned int& validity, |
| 36 OrthancPluginHttpMethod method, | |
| 37 const AccessedResource& access, | |
| 38 const Token* token, | |
| 39 const std::string& tokenValue) | |
| 40 { | |
| 41 Json::Value body = Json::objectValue; | |
| 42 | |
| 43 switch (method) | |
| 44 { | |
| 45 case OrthancPluginHttpMethod_Get: | |
| 46 body["method"] ="get"; | |
| 47 break; | |
| 48 | |
| 49 case OrthancPluginHttpMethod_Post: | |
| 50 body["method"] ="post"; | |
| 51 break; | |
| 52 | |
| 53 case OrthancPluginHttpMethod_Put: | |
| 54 body["method"] ="put"; | |
| 55 break; | |
| 56 | |
| 57 case OrthancPluginHttpMethod_Delete: | |
| 58 body["method"] ="delete"; | |
| 59 break; | |
| 60 | |
| 61 default: | |
| 62 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 63 } | |
| 64 | |
| 65 body["level"] = EnumerationToString(access.GetLevel()); | |
| 66 | |
| 67 if (access.GetLevel() == AccessLevel_System) | |
| 68 { | |
| 69 body["uri"] = access.GetOrthancId(); | |
| 70 } | |
| 71 else | |
| 72 { | |
| 73 body["orthanc-id"] = access.GetOrthancId(); | |
| 74 body["dicom-uid"] = access.GetDicomUid(); | |
| 75 } | |
| 76 | |
| 77 if (token != NULL) | |
| 78 { | |
| 79 body["token-key"] = token->GetKey(); | |
| 80 body["token-value"] = tokenValue; | |
| 81 } | |
| 82 | |
|
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:
46
diff
changeset
|
83 if (!identifier_.empty()) |
|
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:
46
diff
changeset
|
84 { |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
85 body["server-id"] = identifier_; |
|
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:
46
diff
changeset
|
86 } |
|
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:
46
diff
changeset
|
87 else |
|
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:
46
diff
changeset
|
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 body["server-id"] = Json::nullValue; |
|
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:
46
diff
changeset
|
90 } |
|
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:
46
diff
changeset
|
91 |
| 70 | 92 Orthanc::WebServiceParameters authWebservice; |
| 93 | |
| 94 if (!username_.empty()) | |
| 95 { | |
| 96 authWebservice.SetCredentials(username_, password_); | |
| 97 } | |
| 1 | 98 |
| 70 | 99 std::string bodyAsString; |
| 100 Orthanc::Toolbox::WriteFastJson(bodyAsString, body); | |
| 101 | |
| 102 Orthanc::HttpClient authClient(authWebservice, ""); | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
103 authClient.SetUrl(tokenValidationUrl_); |
| 70 | 104 authClient.AssignBody(bodyAsString); |
| 105 authClient.SetMethod(Orthanc::HttpMethod_Post); | |
| 106 authClient.AddHeader("Content-Type", "application/json"); | |
| 107 authClient.AddHeader("Expect", ""); | |
| 108 authClient.SetTimeout(10); | |
| 109 | |
| 1 | 110 if (token != NULL && |
| 111 token->GetType() == TokenType_HttpHeader) | |
| 112 { | |
| 113 // If the token source is a HTTP header, forward it also as a | |
|
59
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
114 // HTTP header except if it is the Authorization header that might conflict with username_ and password_ |
|
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
115 std::string lowerTokenKey; |
|
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
116 Orthanc::Toolbox::ToLowerCase(lowerTokenKey, token->GetKey()); |
|
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
117 |
|
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
118 if (!(lowerTokenKey == "authorization" && !username_.empty())) |
|
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
119 { |
| 70 | 120 authClient.AddHeader(token->GetKey(), tokenValue); |
|
59
a5f2976fe8a0
fix Authorization header conflicting with WebServiceUsername
Alain Mazy <am@osimis.io>
parents:
54
diff
changeset
|
121 } |
| 1 | 122 } |
| 123 | |
| 124 Json::Value answer; | |
| 70 | 125 authClient.ApplyAndThrowException(answer); |
| 1 | 126 |
| 127 if (answer.type() != Json::objectValue || | |
| 128 !answer.isMember(GRANTED) || | |
| 129 answer[GRANTED].type() != Json::booleanValue || | |
| 130 (answer.isMember(VALIDITY) && | |
| 131 answer[VALIDITY].type() != Json::intValue)) | |
| 132 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
133 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol, |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
134 "Syntax error in the result of the Web service"); |
| 1 | 135 } |
| 136 | |
| 137 validity = 0; | |
| 138 if (answer.isMember(VALIDITY)) | |
| 139 { | |
| 140 int tmp = answer[VALIDITY].asInt(); | |
| 141 if (tmp < 0) | |
| 142 { | |
|
29
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
143 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol, |
|
bc0431cb6b8f
fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
22
diff
changeset
|
144 "A validity duration cannot be negative"); |
| 1 | 145 } |
| 146 | |
| 147 validity = static_cast<unsigned int>(tmp); | |
| 148 } | |
| 149 | |
| 150 return answer[GRANTED].asBool(); | |
| 151 } | |
| 152 | |
| 153 | |
| 154 void AuthorizationWebService::SetCredentials(const std::string& username, | |
| 155 const std::string& password) | |
| 156 { | |
| 157 username_ = username; | |
| 158 password_ = password; | |
| 159 } | |
|
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:
46
diff
changeset
|
160 |
|
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:
46
diff
changeset
|
161 void AuthorizationWebService::SetIdentifier(const std::string& 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:
46
diff
changeset
|
162 { |
|
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:
46
diff
changeset
|
163 identifier_ = 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:
46
diff
changeset
|
164 } |
|
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:
46
diff
changeset
|
165 |
| 74 | 166 |
| 167 bool AuthorizationWebService::DecodeToken(DecodedToken& response, | |
| 168 const std::string& tokenKey, | |
| 169 const std::string& tokenValue) | |
| 170 { | |
| 171 if (tokenDecoderUrl_.empty()) | |
| 172 { | |
| 173 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "Can not create tokens if the 'WebServiceTokenValidationUrl' is not configured"); | |
| 174 } | |
| 175 Orthanc::WebServiceParameters authWebservice; | |
| 176 | |
| 177 if (!username_.empty()) | |
| 178 { | |
| 179 authWebservice.SetCredentials(username_, password_); | |
| 180 } | |
| 181 | |
| 182 Json::Value body; | |
| 183 | |
| 184 body["token-key"] = tokenKey; | |
| 185 body["token-value"] = tokenValue; | |
| 186 | |
| 187 std::string bodyAsString; | |
| 188 Orthanc::Toolbox::WriteFastJson(bodyAsString, body); | |
| 189 | |
| 190 Json::Value tokenResponse; | |
| 191 try | |
| 192 { | |
| 193 Orthanc::HttpClient authClient(authWebservice, ""); | |
| 194 authClient.SetUrl(tokenDecoderUrl_); | |
| 195 authClient.AssignBody(bodyAsString); | |
| 196 authClient.SetMethod(Orthanc::HttpMethod_Post); | |
| 197 authClient.AddHeader("Content-Type", "application/json"); | |
| 198 authClient.AddHeader("Expect", ""); | |
| 199 authClient.SetTimeout(10); | |
| 200 | |
| 201 authClient.ApplyAndThrowException(tokenResponse); | |
| 202 | |
| 203 if (tokenResponse.isMember("redirect-url")) | |
| 204 { | |
| 205 response.redirectUrl = tokenResponse["redirect-url"].asString(); | |
| 206 } | |
| 207 | |
| 208 if (tokenResponse.isMember("error-code")) | |
| 209 { | |
| 210 response.errorCode = tokenResponse["error-code"].asString(); | |
| 211 } | |
| 212 | |
| 213 if (tokenResponse.isMember("token-type")) | |
| 214 { | |
| 215 response.tokenType = tokenResponse["token-type"].asString(); | |
| 216 } | |
| 217 | |
| 218 return true; | |
| 219 } | |
| 220 catch (Orthanc::OrthancException& ex) | |
| 221 { | |
| 222 return false; | |
| 223 } | |
| 224 | |
| 225 } | |
| 226 | |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
227 bool AuthorizationWebService::CreateToken(IAuthorizationService::CreatedToken& response, |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
228 const 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
|
229 const 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
|
230 const std::vector<IAuthorizationService::OrthancResource>& resources, |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
231 const std::string& expirationDateString, |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
232 const 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
|
233 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
234 if (tokenCreationBaseUrl_.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
235 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
236 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "Can not create tokens if the 'WebServiceTokenCreationBaseUrl' is not configured"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
237 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
238 std::string url = Orthanc::Toolbox::JoinUri(tokenCreationBaseUrl_, tokenType); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
239 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
240 Orthanc::WebServiceParameters authWebservice; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
241 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
242 if (!username_.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
243 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
244 authWebservice.SetCredentials(username_, password_); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
245 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
246 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
247 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
|
248 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
249 if (!id.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
250 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
251 body["id"] = id; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
252 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
253 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
254 body["resources"] = Json::arrayValue; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
255 for (size_t i = 0; i < 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
|
256 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
257 Json::Value resource; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
258 if (!resources[i].dicomUid.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
259 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
260 resource["dicom-uid"] = resources[i].dicomUid; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
261 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
262 if (!resources[i].orthancId.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
263 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
264 resource["orthanc-id"] = resources[i].orthancId; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
265 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
266 if (!resources[i].url.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
267 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
268 resource["url"] = resources[i].url; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
269 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
270 if (!resources[i].level.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
271 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
272 resource["level"] = resources[i].level; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
273 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
274 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
275 body["resources"].append(resource); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
276 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
277 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
278 body["type"] = tokenType; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
279 if (!expirationDateString.empty()) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
280 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
281 body["expiration-date"] = expirationDateString; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
282 } |
|
73
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
283 if (validityDuration > 0) |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
284 { |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
285 body["validity-duration"] = validityDuration; |
|
512247750f0a
new ValidityDuration arg in create token API
Alain Mazy <am@osimis.io>
parents:
72
diff
changeset
|
286 } |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
287 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
288 std::string bodyAsString; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
289 Orthanc::Toolbox::WriteFastJson(bodyAsString, body); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
290 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
291 Json::Value tokenResponse; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
292 try |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
293 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
294 Orthanc::HttpClient authClient(authWebservice, ""); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
295 authClient.SetUrl(url); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
296 authClient.AssignBody(bodyAsString); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
297 authClient.SetMethod(Orthanc::HttpMethod_Put); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
298 authClient.AddHeader("Content-Type", "application/json"); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
299 authClient.AddHeader("Expect", ""); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
300 authClient.SetTimeout(10); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
301 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
302 authClient.ApplyAndThrowException(tokenResponse); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
303 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
304 response.token = tokenResponse["token"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
305 response.url = tokenResponse["url"].asString(); |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
306 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
307 return true; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
308 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
309 catch (Orthanc::OrthancException& ex) |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
310 { |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
311 return false; |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
312 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
313 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
314 } |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
315 |
|
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
316 |
| 71 | 317 bool AuthorizationWebService::GetUserProfileInternal(unsigned int& validity, |
| 318 Json::Value& profile /* out */, | |
| 319 const Token* token, | |
| 320 const std::string& tokenValue) | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
321 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
322 if (userProfileUrl_.empty()) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
323 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
324 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadRequest, "Can not get user profile if the 'WebServiceUserProfileUrl' is not configured"); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
325 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
326 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
327 Orthanc::WebServiceParameters authWebservice; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
328 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
329 if (!username_.empty()) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
330 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
331 authWebservice.SetCredentials(username_, password_); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
332 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
333 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
334 Json::Value body; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
335 |
| 71 | 336 if (token != NULL) |
| 337 { | |
| 338 body["token-key"] = token->GetKey(); | |
| 339 body["token-value"] = tokenValue; | |
| 340 } | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
341 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
342 if (!identifier_.empty()) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
343 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
344 body["identifier"] = identifier_; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
345 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
346 else |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
347 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
348 body["identifier"] = Json::nullValue; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
349 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
350 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
351 std::string bodyAsString; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
352 Orthanc::Toolbox::WriteFastJson(bodyAsString, body); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
353 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
354 try |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
355 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
356 Orthanc::HttpClient authClient(authWebservice, ""); |
|
72
e381ba725669
new PUT auth/tokens/{token-type} API route + updated interface with WebService
Alain Mazy <am@osimis.io>
parents:
71
diff
changeset
|
357 authClient.SetUrl(userProfileUrl_); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
358 authClient.AssignBody(bodyAsString); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
359 authClient.SetMethod(Orthanc::HttpMethod_Post); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
360 authClient.AddHeader("Content-Type", "application/json"); |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
361 authClient.AddHeader("Expect", ""); |
| 70 | 362 authClient.SetTimeout(10); |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
363 |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
364 authClient.ApplyAndThrowException(profile); |
| 71 | 365 |
| 366 if (profile.isMember("validity")) | |
| 367 { | |
| 368 validity = profile["validity"].asInt(); | |
| 369 } | |
| 370 else | |
| 371 { | |
| 372 validity = 0; | |
| 373 } | |
| 374 | |
|
69
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
375 return true; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
376 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
377 catch (Orthanc::OrthancException& ex) |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
378 { |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
379 return false; |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
380 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
381 } |
|
af44dce56328
new 'auth/user-profile' Rest API route
Alain Mazy <am@osimis.io>
parents:
68
diff
changeset
|
382 |
| 71 | 383 bool AuthorizationWebService::HasUserPermissionInternal(unsigned int& validity, |
| 384 const std::string& permission, | |
| 385 const Token* token, | |
| 386 const std::string& tokenValue) | |
| 387 { | |
| 388 Json::Value profile; | |
| 389 | |
| 390 | |
| 391 if (GetUserProfileInternal(validity, profile, token, tokenValue)) | |
| 392 { | |
| 393 if (profile.type() != Json::objectValue || | |
| 394 !profile.isMember(PERMISSIONS) || | |
| 395 !profile.isMember(VALIDITY) || | |
| 396 profile[PERMISSIONS].type() != Json::arrayValue || | |
| 397 profile[VALIDITY].type() != Json::intValue) | |
| 398 { | |
| 399 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol, | |
| 400 "Syntax error in the result of the Web service"); | |
| 401 } | |
| 402 | |
| 403 validity = profile[VALIDITY].asUInt(); | |
| 404 | |
| 405 Json::Value& permissions = profile[PERMISSIONS]; | |
| 406 for (Json::ArrayIndex i = 0; i < permissions.size(); ++i) | |
| 407 { | |
| 408 if (permission == permissions[i].asString()) | |
| 409 { | |
| 410 return true; | |
| 411 } | |
| 412 } | |
| 413 } | |
| 414 | |
| 415 return false; | |
| 416 } | |
| 417 | |
| 1 | 418 } |