orthanc: OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp comparison

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 4640:66109d24d26e

"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 26 Apr 2021 15:22:44 +0200
parents	37357df3dc27
children	da1edb7d6332

comparison

equal deleted inserted replaced

-:c638dd444de0
+:66109d24d26e
 void StatelessDatabaseOperations::SetMetadata(int64_t& newRevision,
 const std::string& publicId,
 MetadataType type,
 const std::string& value,
 bool hasOldRevision,
-int64_t oldRevision)
+int64_t oldRevision,
+const std::string& oldMD5)
 {
 class Operations : public IReadWriteOperations
 {
 private:
 int64_t&            newRevision_;
 const std::string&  publicId_;
 MetadataType        type_;
 const std::string&  value_;
 bool                hasOldRevision_;
 int64_t             oldRevision_;
+const std::string&  oldMD5_;
 public:
 Operations(int64_t& newRevision,
 const std::string& publicId,
 MetadataType type,
 const std::string& value,
 bool hasOldRevision,
-int64_t oldRevision) :
+int64_t oldRevision,
+const std::string& oldMD5) :
 newRevision_(newRevision),
 publicId_(publicId),
 type_(type),
 value_(value),
 hasOldRevision_(hasOldRevision),
-oldRevision_(oldRevision)
+oldRevision_(oldRevision),
+oldMD5_(oldMD5)
 {
 }
 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
 {
 {
 std::string oldValue;
 int64_t expectedRevision;
 if (transaction.LookupMetadata(oldValue, expectedRevision, id, type_))
 {
-if (hasOldRevision_ &&
+if (hasOldRevision_)
-expectedRevision != oldRevision_)
+{
-{
+std::string expectedMD5;
-throw OrthancException(ErrorCode_Revision);
+Toolbox::ComputeMD5(expectedMD5, oldValue);
-}
-else
+if (expectedRevision != oldRevision_ ||
-{
+expectedMD5 != oldMD5_)
-newRevision_ = expectedRevision + 1;
+{
-}
+throw OrthancException(ErrorCode_Revision);
+}
+}
+newRevision_ = expectedRevision + 1;
 }
 else
 {
 // The metadata is not existing yet: Ignore "oldRevision"
 // and initialize a new sequence of revisions
 }
 }
 }
 };
-Operations operations(newRevision, publicId, type, value, hasOldRevision, oldRevision);
+Operations operations(newRevision, publicId, type, value, hasOldRevision, oldRevision, oldMD5);
 Apply(operations);
 }
 void StatelessDatabaseOperations::OverwriteMetadata(const std::string& publicId,
 MetadataType type,
 const std::string& value)
 {
 int64_t newRevision;  // Unused
-SetMetadata(newRevision, publicId, type, value, false /* no old revision */, -1 /* dummy */);
+SetMetadata(newRevision, publicId, type, value, false /* no old revision */, -1 /* dummy */, "" /* dummy */);
 }
 bool StatelessDatabaseOperations::DeleteMetadata(const std::string& publicId,
 MetadataType type,
 bool hasRevision,
-int64_t revision)
+int64_t revision,
+const std::string& md5)
 {
 class Operations : public IReadWriteOperations
 {
 private:
 const std::string&  publicId_;
 MetadataType        type_;
 bool                hasRevision_;
 int64_t             revision_;
+const std::string&  md5_;
 bool                found_;
 public:
 Operations(const std::string& publicId,
 MetadataType type,
 bool hasRevision,
-int64_t revision) :
+int64_t revision,
+const std::string& md5) :
 publicId_(publicId),
 type_(type),
 hasRevision_(hasRevision),
 revision_(revision),
+md5_(md5),
 found_(false)
 {
 }
 bool HasFound() const
 {
 throw OrthancException(ErrorCode_UnknownResource);
 }
 else
 {
-std::string s;
+std::string value;
 int64_t expectedRevision;
-if (transaction.LookupMetadata(s, expectedRevision, id, type_))
+if (transaction.LookupMetadata(value, expectedRevision, id, type_))
 {
-if (hasRevision_ &&
+if (hasRevision_)
-expectedRevision != revision_)
+{
-{
+std::string expectedMD5;
-throw OrthancException(ErrorCode_Revision);
+Toolbox::ComputeMD5(expectedMD5, value);
+if (expectedRevision != revision_ ||
+expectedMD5 != md5_)
+{
+throw OrthancException(ErrorCode_Revision);
+}
 }
 found_ = true;
 transaction.DeleteMetadata(id, type_);
 if (IsUserMetadata(type_))
 {
 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
 }
 }
 }
 }
 }
 };
-Operations operations(publicId, type, hasRevision, revision);
+Operations operations(publicId, type, hasRevision, revision, md5);
 Apply(operations);
 return operations.HasFound();
 }
 bool StatelessDatabaseOperations::DeleteAttachment(const std::string& publicId,
 FileContentType type,
 bool hasRevision,
-int64_t revision)
+int64_t revision,
+const std::string& md5)
 {
 class Operations : public IReadWriteOperations
 {
 private:
 const std::string&  publicId_;
 FileContentType     type_;
 bool                hasRevision_;
 int64_t             revision_;
+const std::string&  md5_;
 bool                found_;
 public:
 Operations(const std::string& publicId,
 FileContentType type,
 bool hasRevision,
-int64_t revision) :
+int64_t revision,
+const std::string& md5) :
 publicId_(publicId),
 type_(type),
 hasRevision_(hasRevision),
 revision_(revision),
+md5_(md5),
 found_(false)
 {
 }
 bool HasFound() const
 FileInfo info;
 int64_t expectedRevision;
 if (transaction.LookupAttachment(info, expectedRevision, id, type_))
 {
 if (hasRevision_ &&
-expectedRevision != revision_)
+(expectedRevision != revision_ ||
+info.GetUncompressedMD5() != md5_))
 {
 throw OrthancException(ErrorCode_Revision);
 }
 found_ = true;
 }
 }
 }
 };
-Operations operations(publicId, type, hasRevision, revision);
+Operations operations(publicId, type, hasRevision, revision, md5);
 Apply(operations);
 return operations.HasFound();
 }
 const FileInfo& attachment,
 const std::string& publicId,
 uint64_t maximumStorageSize,
 unsigned int maximumPatients,
 bool hasOldRevision,
-int64_t oldRevision)
+int64_t oldRevision,
+const std::string& oldMD5)
 {
 class Operations : public IReadWriteOperations
 {
 private:
 int64_t&            newRevision_;
 const std::string&  publicId_;
 uint64_t            maximumStorageSize_;
 unsigned int        maximumPatientCount_;
 bool                hasOldRevision_;
 int64_t             oldRevision_;
+const std::string&  oldMD5_;
 public:
 Operations(int64_t& newRevision,
 const FileInfo& attachment,
 const std::string& publicId,
 uint64_t maximumStorageSize,
 unsigned int maximumPatientCount,
 bool hasOldRevision,
-int64_t oldRevision) :
+int64_t oldRevision,
+const std::string& oldMD5) :
 newRevision_(newRevision),
 status_(StoreStatus_Failure),
 attachment_(attachment),
 publicId_(publicId),
 maximumStorageSize_(maximumStorageSize),
 maximumPatientCount_(maximumPatientCount),
 hasOldRevision_(hasOldRevision),
-oldRevision_(oldRevision)
+oldRevision_(oldRevision),
+oldMD5_(oldMD5)
 {
 }
 StoreStatus GetStatus() const
 {
 FileInfo oldFile;
 int64_t expectedRevision;
 if (transaction.LookupAttachment(oldFile, expectedRevision, resourceId, attachment_.GetContentType()))
 {
 if (hasOldRevision_ &&
-expectedRevision != oldRevision_)
+(expectedRevision != oldRevision_ ||
+oldFile.GetUncompressedMD5() != oldMD5_))
 {
 throw OrthancException(ErrorCode_Revision);
 }
 else
 {
 }
 }
 };
-Operations operations(newRevision, attachment, publicId, maximumStorageSize, maximumPatients, hasOldRevision, oldRevision);
+Operations operations(newRevision, attachment, publicId, maximumStorageSize, maximumPatients,
+hasOldRevision, oldRevision, oldMD5);
 Apply(operations);
 return operations.GetStatus();
 }
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 4640:66109d24d26e