Merge pull request #95 from coding-cpp/fix/63

etag in res.sendFile
coding-cpp · Sep 12, 2024 · 27d3c45 · 27d3c45
2 parents 3997cac + 67515ab
commit 27d3c45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/include/expresso/helpers/response.h b/include/expresso/helpers/response.h
@@ -5,6 +5,7 @@
 
 #include <brewtils/os.h>
 #include <brewtils/sys.h>
+#include <zippuccino/crc.h>
 
 namespace expresso {
 
@@ -14,6 +15,8 @@ static const short CHUNK_SIZE = 1024;
 
 std::string getAvailableFile(const std::string &path);
 
+const std::string generateETag(const std::string &data);
+
 bool sendChunkedData(const int &socket, const std::string &data);
 
 bool sendFileInChunks(const int &socket, const std::string &path);

diff --git a/src/core/response.cpp b/src/core/response.cpp
@@ -91,6 +91,7 @@ void expresso::core::Response::sendFile(const std::string &path, int64_t start,
   this->set("content-type", brewtils::os::file::getMimeType(fileName));
   this->set("content-disposition", "inline; filename=\"" + fileName + "\"");
   this->set("accept-ranges", "bytes");
+  this->set("etag", expresso::helpers::generateETag(availableFile));
 
   if (!isPartial) {
     start = 0;

diff --git a/src/helpers/response.cpp b/src/helpers/response.cpp
@@ -18,6 +18,14 @@ std::string expresso::helpers::getAvailableFile(const std::string &path) {
   return "";
 }
 
+const std::string expresso::helpers::generateETag(const std::string &data) {
+  const std::string availableFile = expresso::helpers::getAvailableFile(data);
+  uint32_t crc = zippuccino::crc::compute(availableFile);
+  std::ostringstream etag;
+  etag << "\"" << std::hex << std::setw(8) << std::setfill('0') << crc << "\"";
+  return etag.str();
+}
+
 bool expresso::helpers::sendChunkedData(const int &socket,
                                         const std::string &data) {
   std::ostringstream dataSizeHex;