Mercurial > hg > orthanc

diff OrthancServer/OrthancInitialization.cpp @ 2800:dc7330089736

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"OrthancPeers" configuration option now allows to specify HTTP headers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 23 Aug 2018 13:11:48 +0200
parents 6e3a60b85da6
children 3ee82c7313e7
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp	Wed Aug 22 16:55:07 2018 +0200
+++ b/OrthancServer/OrthancInitialization.cpp	Thu Aug 23 13:11:48 2018 +0200
@@ -277,6 +277,7 @@
     {
       WebServiceParameters peer;
       Configuration::GetOrthancPeer(peer, *it);
+      peer.CheckClientCertificate();
     }
 
     Configuration::GetListOfDicomModalities(ids);
@@ -628,7 +629,7 @@
       }
       else
       {
-        peer.FromJson(modalities[name]);
+        peer.Unserialize(modalities[name]);
         return true;
       }
     }
@@ -942,6 +943,8 @@
   void Configuration::UpdatePeer(const std::string& symbolicName,
                                  const WebServiceParameters& peer)
   {
+    peer.CheckClientCertificate();
+
     boost::recursive_mutex::scoped_lock lock(globalMutex_);
 
     if (!configuration_.isMember("OrthancPeers"))
@@ -960,7 +963,9 @@
     peers.removeMember(symbolicName);
 
     Json::Value v;
-    peer.ToJson(v, true);
+    peer.Serialize(v, 
+                   false /* use simple format if possible */, 
+                   true  /* include passwords */);
     peers[symbolicName] = v;
   }