Merge pull request fhessel#77 from fhessel/fix/headers-case-insensitive

fhessel · web-flow · commit a10f4e833eb7 · 2020-04-04T14:41:43.000+02:00
Normalize Case of Header Names
diff --git a/src/HTTPHeader.cpp b/src/HTTPHeader.cpp
@@ -1,9 +1,13 @@
 #include "HTTPHeader.hpp"
 
+#include <locale>
+#include <ostream>
+#include <sstream>
+
 namespace httpsserver {
 
 HTTPHeader::HTTPHeader(const std::string &name, const std::string &value):
-  _name(name),
+  _name(normalizeHeaderName(name)),
   _value(value) {
     
 }
@@ -16,4 +20,24 @@ std::string HTTPHeader::print() {
   return _name + ": " + _value;
 }
 
+std::string normalizeHeaderName(std::string const &name) {
+  std::locale loc;
+  std::stringbuf buf;
+  std::ostream oBuf(&buf);
+  bool upper = true;
+  std::string::size_type len = name.length();
+  for (std::string::size_type i = 0; i < len; ++i) {
+    if (upper) {
+      oBuf << std::toupper(name[i], loc);
+      upper = false;
+    } else {
+      oBuf << std::tolower(name[i], loc);
+      if (!std::isalnum(name[i], loc)) {
+        upper=true;
+      }
+    }
+  }
+  return buf.str();
+}
+
 } /* namespace httpsserver */
diff --git a/src/HTTPHeader.hpp b/src/HTTPHeader.hpp
@@ -18,6 +18,15 @@ class HTTPHeader {
   std::string print();
 };
 
+/**
+ * \brief Normalizes case in header names
+ * 
+ * It converts the first letter and every letter after a non-alnum character
+ * to uppercase. For example, "content-length" becomes "Content-Length" and
+ * "HOST" becomes "Host".
+ */
+std::string normalizeHeaderName(std::string const &name);
+
 } /* namespace httpsserver */
 
 #endif /* SRC_HTTPHEADER_HPP_ */
diff --git a/src/HTTPHeaders.cpp b/src/HTTPHeaders.cpp
@@ -13,17 +13,19 @@ HTTPHeaders::~HTTPHeaders() {
 }
 
 HTTPHeader * HTTPHeaders::get(std::string const &name) {
+  std::string normalizedName = normalizeHeaderName(name);
   for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {
-    if ((*header)->_name.compare(name)==0) {
+    if ((*header)->_name.compare(normalizedName)==0) {
       return (*header);
     }
   }
   return NULL;
 }
 
 std::string HTTPHeaders::getValue(std::string const &name) {
+  std::string normalizedName = normalizeHeaderName(name);
   for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {
-    if ((*header)->_name.compare(name)==0) {
+    if ((*header)->_name.compare(normalizedName)==0) {
       return ((*header)->_value);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -13,17 +13,19 @@ HTTPHeaders::~HTTPHeaders() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`HTTPHeader * HTTPHeaders::get(std::string const &name) {`
	`16`	`+ std::string normalizedName = normalizeHeaderName(name);`
`16`	`17`	`for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {`
`17`		`- if ((*header)->_name.compare(name)==0) {`
	`18`	`+ if ((*header)->_name.compare(normalizedName)==0) {`
`18`	`19`	`return (*header);`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`return NULL;`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`std::string HTTPHeaders::getValue(std::string const &name) {`
	`26`	`+ std::string normalizedName = normalizeHeaderName(name);`
`25`	`27`	`for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {`
`26`		`- if ((*header)->_name.compare(name)==0) {`
	`28`	`+ if ((*header)->_name.compare(normalizedName)==0) {`
`27`	`29`	`return ((*header)->_value);`
`28`	`30`	`}`
`29`	`31`	`}`