Mercurial > hg > orthanc
comparison Core/WebServiceParameters.cpp @ 2779:d67298eec14e
fix sandboxing
author | am@osimis.io |
---|---|
date | Tue, 17 Jul 2018 14:52:32 +0200 |
parents | eaf10085ffa1 |
children | dc7330089736 |
comparison
equal
deleted
inserted
replaced
2778:8d8d2dbeef11 | 2779:d67298eec14e |
---|---|
313 target["PKCS11"] = pkcs11Enabled_; | 313 target["PKCS11"] = pkcs11Enabled_; |
314 target["AdvancedFormat"] = advancedFormat_; | 314 target["AdvancedFormat"] = advancedFormat_; |
315 } | 315 } |
316 | 316 |
317 | 317 |
318 #if ORTHANC_SANDBOXED == 0 | |
318 WebServiceParameters::WebServiceParameters(const Json::Value& serialized) : | 319 WebServiceParameters::WebServiceParameters(const Json::Value& serialized) : |
319 advancedFormat_(true) | 320 advancedFormat_(true) |
320 { | 321 { |
321 url_ = SerializationToolbox::ReadString(serialized, "URL"); | 322 url_ = SerializationToolbox::ReadString(serialized, "URL"); |
322 username_ = SerializationToolbox::ReadString(serialized, "Username"); | 323 username_ = SerializationToolbox::ReadString(serialized, "Username"); |
333 } | 334 } |
334 | 335 |
335 pkcs11Enabled_ = SerializationToolbox::ReadBoolean(serialized, "PKCS11"); | 336 pkcs11Enabled_ = SerializationToolbox::ReadBoolean(serialized, "PKCS11"); |
336 advancedFormat_ = SerializationToolbox::ReadBoolean(serialized, "AdvancedFormat"); | 337 advancedFormat_ = SerializationToolbox::ReadBoolean(serialized, "AdvancedFormat"); |
337 } | 338 } |
339 #endif | |
338 } | 340 } |