Merge branch 'issue37'

fhessel · fhessel · commit 7ebe38e1a2b0 · 2019-03-30T18:29:09.000+01:00
diff --git a/examples/REST-API/REST-API.ino b/examples/REST-API/REST-API.ino
@@ -76,6 +76,7 @@ char contentTypes[][2][32] = {
 #include <SSLCert.hpp>
 #include <HTTPRequest.hpp>
 #include <HTTPResponse.hpp>
+#include <util.hpp>
 
 // We use the following struct to store GPIO events:
 #define MAX_EVENTS 20
@@ -316,7 +317,7 @@ void handleSPIFFS(HTTPRequest * req, HTTPResponse * res) {
 		File file = SPIFFS.open(filename.c_str());
 
 		// Set length
-		res->setHeader("Content-Length", "" + file.size());
+		res->setHeader("Content-Length", httpsserver::intToString(file.size()));
 
 		// Content-Type is guessed using the definition of the contentTypes-table defined above
 		int cTypeIdx = 0;
diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
@@ -643,7 +643,7 @@ void handleWebsocketHandshake(HTTPRequest * req, HTTPResponse * res) {
 /**
  * Function used to compute the value of the Sec-WebSocket-Accept during Websocket handshake
  */
-std::string websocketKeyResponseHash(std::string key) {
+std::string websocketKeyResponseHash(std::string const &key) {
 	std::string newKey = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
 	uint8_t shaData[HTTPS_SHA1_LENGTH];
 	esp_sha(SHA1, (uint8_t*)newKey.data(), newKey.length(), shaData);
diff --git a/src/HTTPConnection.hpp b/src/HTTPConnection.hpp
@@ -119,7 +119,6 @@ class HTTPConnection : private ConnectionContext {
 	size_t readBuffer(byte* buffer, size_t length);
 	size_t getCacheSize();
 	bool checkWebsocket();
-	std::string websocketKeyResponseHash(std::string key);
 
 	// The receive buffer
 	char _receiveBuffer[HTTPS_CONNECTION_DATA_CHUNK_SIZE];
@@ -161,7 +160,7 @@ class HTTPConnection : private ConnectionContext {
 
 void handleWebsocketHandshake(HTTPRequest * req, HTTPResponse * res);
 
-std::string websocketKeyResponseHash(std::string key);
+std::string websocketKeyResponseHash(std::string const &key);
 
 void validationMiddleware(HTTPRequest * req, HTTPResponse * res, std::function<void()> next);
 
diff --git a/src/HTTPHeader.cpp b/src/HTTPHeader.cpp
@@ -2,10 +2,10 @@
 
 namespace httpsserver {
 
-HTTPHeader::HTTPHeader(const std::string name, const std::string value):
-	_name(std::move(name)),
-	_value(std::move(value)) {
-
+HTTPHeader::HTTPHeader(const std::string &name, const std::string &value):
+	_name(name),
+	_value(value) {
+		Serial.printf("Header Constructor: %s=%s\n4", name.c_str(), value.c_str());
 }
 
 HTTPHeader::~HTTPHeader() {
diff --git a/src/HTTPHeader.hpp b/src/HTTPHeader.hpp
@@ -1,13 +1,14 @@
 #ifndef SRC_HTTPHEADER_HPP_
 #define SRC_HTTPHEADER_HPP_
+#include <Arduino.h>
 
 #include <string>
 
 namespace httpsserver {
 
 class HTTPHeader {
 public:
-	HTTPHeader(const std::string name, const std::string value);
+	HTTPHeader(const std::string &name, const std::string &value);
 	virtual ~HTTPHeader();
 	const std::string _name;
 	const std::string _value;
diff --git a/src/HTTPHeaders.cpp b/src/HTTPHeaders.cpp
@@ -12,7 +12,7 @@ HTTPHeaders::~HTTPHeaders() {
 	delete _headers;
 }
 
-HTTPHeader * HTTPHeaders::get(const std::string name) {
+HTTPHeader * HTTPHeaders::get(std::string const &name) {
 	for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {
 		if ((*header)->_name.compare(name)==0) {
 			return (*header);
@@ -21,7 +21,7 @@ HTTPHeader * HTTPHeaders::get(const std::string name) {
 	return NULL;
 }
 
-std::string HTTPHeaders::getValue(std::string name) {
+std::string HTTPHeaders::getValue(std::string const &name) {
 	for(std::vector<HTTPHeader*>::iterator header = _headers->begin(); header != _headers->end(); ++header) {
 		if ((*header)->_name.compare(name)==0) {
 			return ((*header)->_value);
diff --git a/src/HTTPHeaders.hpp b/src/HTTPHeaders.hpp
@@ -17,8 +17,8 @@ class HTTPHeaders {
 	HTTPHeaders();
 	virtual ~HTTPHeaders();
 
-	HTTPHeader * get(std::string name);
-	std::string getValue(std::string name);
+	HTTPHeader * get(std::string const &name);
+	std::string getValue(std::string const &name);
 	void set(HTTPHeader * header);
 
 	std::vector<HTTPHeader *> * getAll();
diff --git a/src/HTTPNode.cpp b/src/HTTPNode.cpp
@@ -2,9 +2,9 @@
 
 namespace httpsserver {
 
-  HTTPNode::HTTPNode(const std::string path, const HTTPNodeType nodeType, const std::string tag):
-    _path(std::move(path)),
-    _tag(std::move(tag)),
+  HTTPNode::HTTPNode(std::string const &path, const HTTPNodeType nodeType, std::string const &tag):
+    _path(path),
+    _tag(tag),
     _nodeType(nodeType) {
 
     // Create vector for valdiators
diff --git a/src/HTTPNode.hpp b/src/HTTPNode.hpp
@@ -19,7 +19,7 @@ enum HTTPNodeType {
 
 class HTTPNode {
 public:
-	HTTPNode(const std::string path, const HTTPNodeType nodeType, const std::string tag = "");
+	HTTPNode(const std::string &path, const HTTPNodeType nodeType, const std::string &tag = "");
   virtual ~HTTPNode();
 
 	/**
diff --git a/src/HTTPRequest.cpp b/src/HTTPRequest.cpp
@@ -36,7 +36,7 @@ ResourceParameters * HTTPRequest::getParams() {
 	return _params;
 }
 
-std::string HTTPRequest::getHeader(std::string name) {
+std::string HTTPRequest::getHeader(std::string const &name) {
 	HTTPHeader * h = _headers->get(name);
 	if (h != NULL) {
 		return h->_value;
@@ -45,7 +45,7 @@ std::string HTTPRequest::getHeader(std::string name) {
 	}
 }
 
-void HTTPRequest::setHeader(std::string name, std::string value) {
+void HTTPRequest::setHeader(std::string const &name, std::string const &value) {
 	_headers->set(new HTTPHeader(name, value));
 }
 
diff --git a/src/HTTPRequest.hpp b/src/HTTPRequest.hpp
@@ -20,8 +20,8 @@ class HTTPRequest {
 	HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, HTTPNode * resolvedNode, std::string method, ResourceParameters * params, std::string requestString);
 	virtual ~HTTPRequest();
 
-	std::string getHeader(std::string name);
-	void setHeader(std::string name, std::string value);
+	std::string getHeader(std::string const &name);
+	void setHeader(std::string const &name, std::string const &value);
 	HTTPNode * getResolvedNode();
 	std::string getRequestString();
 	std::string getMethod();
diff --git a/src/HTTPResponse.cpp b/src/HTTPResponse.cpp
@@ -37,7 +37,7 @@ void HTTPResponse::setStatusCode(uint16_t statusCode) {
 	_statusCode = statusCode;
 }
 
-void HTTPResponse::setStatusText(std::string statusText) {
+void HTTPResponse::setStatusText(std::string const &statusText) {
 	_statusText = statusText;
 }
 
@@ -49,7 +49,7 @@ std::string HTTPResponse::getStatusText() {
 	return _statusText;
 }
 
-void HTTPResponse::setHeader(std::string name, std::string value) {
+void HTTPResponse::setHeader(std::string const &name, std::string const &value) {
 	_headers.set(new HTTPHeader(name, value));
 }
 
diff --git a/src/HTTPResponse.hpp b/src/HTTPResponse.hpp
@@ -25,13 +25,13 @@ class HTTPResponse : public Print {
 	virtual ~HTTPResponse();
 
 	void setStatusCode(uint16_t statusCode);
-	void setStatusText(std::string statusText);
+	void setStatusText(std::string const &statusText);
 	uint16_t getStatusCode();
 	std::string getStatusText();
-	void setHeader(std::string name, std::string value);
+	void setHeader(std::string const &name, std::string const &value);
 	bool isHeaderWritten();
 
-	void printStd(const std::string &str);
+	void printStd(std::string const &str);
 
 	// From Print:
 	size_t write(const uint8_t *buffer, size_t size);
diff --git a/src/ResourceNode.cpp b/src/ResourceNode.cpp
@@ -2,9 +2,9 @@
 
 namespace httpsserver {
 
-ResourceNode::ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback, const std::string tag):
+ResourceNode::ResourceNode(const std::string &path, const std::string &method, const HTTPSCallbackFunction * callback, const std::string &tag):
 	HTTPNode(path, HANDLER_CALLBACK, tag),
-	_method(std::move(method)),
+	_method(method),
 	_callback(callback) {
 		
 }
diff --git a/src/ResourceNode.hpp b/src/ResourceNode.hpp
@@ -10,7 +10,7 @@ namespace httpsserver {
 
 class ResourceNode : public HTTPNode {
 public:
-	ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback, const std::string tag = "");
+	ResourceNode(const std::string &path, const std::string &method, const HTTPSCallbackFunction * callback, const std::string &tag = "");
 	virtual ~ResourceNode();
 
 	const std::string _method;
diff --git a/src/ResourceParameters.cpp b/src/ResourceParameters.cpp
@@ -10,7 +10,7 @@ ResourceParameters::~ResourceParameters() {
 
 }
 
-bool ResourceParameters::isRequestParameterSet(std::string &name) {
+bool ResourceParameters::isRequestParameterSet(std::string const &name) {
 	for(auto reqParam = _reqParams.begin(); reqParam != _reqParams.end(); ++reqParam) {
 		if ((*reqParam).first.compare(name)==0) {
 			return true;
@@ -19,7 +19,7 @@ bool ResourceParameters::isRequestParameterSet(std::string &name) {
 	return false;
 }
 
-std::string ResourceParameters::getRequestParameter(std::string &name) {
+std::string ResourceParameters::getRequestParameter(std::string const &name) {
 	for(auto reqParam = _reqParams.begin(); reqParam != _reqParams.end(); ++reqParam) {
 		if ((*reqParam).first.compare(name)==0) {
 			return (*reqParam).second;
@@ -28,14 +28,14 @@ std::string ResourceParameters::getRequestParameter(std::string &name) {
 	return "";
 }
 
-uint16_t ResourceParameters::getRequestParameterInt(std::string &name) {
+uint16_t ResourceParameters::getRequestParameterInt(std::string const &name) {
 	return parseInt(getRequestParameter(name));
 }
 
-void ResourceParameters::setRequestParameter(std::string name, std::string value) {
+void ResourceParameters::setRequestParameter(std::string const &name, std::string const &value) {
 	std::pair<std::string, std::string> param;
-	param.first = std::move(name);
-	param.second = std::move(value);
+	param.first = name;
+	param.second = value;
 	_reqParams.push_back(param);
 }
 
@@ -65,7 +65,7 @@ void ResourceParameters::resetUrlParameters() {
 	_urlParams.clear();
 }
 
-void ResourceParameters::setUrlParameter(uint8_t idx, std::string val) {
+void ResourceParameters::setUrlParameter(uint8_t idx, std::string const &val) {
 	if(idx>=_urlParams.capacity()) {
 		_urlParams.resize(idx + 1);
 	}
diff --git a/src/ResourceParameters.hpp b/src/ResourceParameters.hpp
@@ -21,16 +21,16 @@ class ResourceParameters {
 	ResourceParameters();
 	virtual ~ResourceParameters();
 
-	bool isRequestParameterSet(std::string &name);
-	std::string getRequestParameter(std::string &name);
-	uint16_t getRequestParameterInt(std::string &name);
-	void setRequestParameter(std::string name, std::string value);
+	bool isRequestParameterSet(std::string const &name);
+	std::string getRequestParameter(std::string const &name);
+	uint16_t getRequestParameterInt(std::string const &name);
+	void setRequestParameter(std::string const &name, std::string const &value);
 
 	std::string getUrlParameter(uint8_t idx);
 	uint16_t getUrlParameterInt(uint8_t idx);
 	void resetUrlParameters();
 	void setUrlParameterCount(uint8_t idx);
-	void setUrlParameter(uint8_t idx, std::string val);
+	void setUrlParameter(uint8_t idx, std::string const &val);
 
 private:
 	std::vector<std::string> _urlParams;
diff --git a/src/WebsocketNode.cpp b/src/WebsocketNode.cpp
@@ -2,7 +2,7 @@
 
 namespace httpsserver {
 
-WebsocketNode::WebsocketNode(const std::string path, const WebsocketHandlerCreator * creatorFunction, const std::string tag):
+WebsocketNode::WebsocketNode(const std::string &path, const WebsocketHandlerCreator * creatorFunction, const std::string &tag):
 	HTTPNode(path, WEBSOCKET, tag),
 	_creatorFunction(creatorFunction) {
 		
diff --git a/src/WebsocketNode.hpp b/src/WebsocketNode.hpp
@@ -12,7 +12,7 @@ typedef WebsocketHandler* (WebsocketHandlerCreator)();
 
 class WebsocketNode : public HTTPNode {
 public:
-	WebsocketNode(const std::string path, const WebsocketHandlerCreator creatorFunction, const std::string tag = "");
+	WebsocketNode(const std::string &path, const WebsocketHandlerCreator creatorFunction, const std::string &tag = "");
 	virtual ~WebsocketNode();
 	WebsocketHandler* newHandler();
 	std::string getMethod() { return std::string("GET"); }
diff --git a/src/util.cpp b/src/util.cpp
@@ -2,7 +2,7 @@
 
 namespace httpsserver {
 
-uint32_t parseUInt(std::string s, uint32_t max) {
+uint32_t parseUInt(std::string const &s, uint32_t max) {
 	uint32_t i = 0; // value
 
 	// Check sign
@@ -31,7 +31,7 @@ uint32_t parseUInt(std::string s, uint32_t max) {
 	return i;
 }
 
-int32_t parseInt(std::string s) {
+int32_t parseInt(std::string const &s) {
 	uint32_t max = 0x7fffffff;
 	if (s[0]=='-') {
 		return -1 * parseUInt(s.substr(1,max));
diff --git a/src/util.hpp b/src/util.hpp
@@ -8,9 +8,9 @@
 
 namespace httpsserver {
 
-uint32_t parseUInt(std::string s, uint32_t max = 0xffffffff);
+uint32_t parseUInt(std::string const &s, uint32_t max = 0xffffffff);
 
-int32_t parseInt(std::string s);
+int32_t parseInt(std::string const &s);
 
 std::string intToString(int i);
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ ResourceParameters * HTTPRequest::getParams() {`
`36`	`36`	`return _params;`
`37`	`37`	`}`
`38`	`38`
`39`		`-std::string HTTPRequest::getHeader(std::string name) {`
	`39`	`+std::string HTTPRequest::getHeader(std::string const &name) {`
`40`	`40`	`HTTPHeader * h = _headers->get(name);`
`41`	`41`	`if (h != NULL) {`
`42`	`42`	`return h->_value;`
`@@ -45,7 +45,7 @@ std::string HTTPRequest::getHeader(std::string name) {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-void HTTPRequest::setHeader(std::string name, std::string value) {`
	`48`	`+void HTTPRequest::setHeader(std::string const &name, std::string const &value) {`
`49`	`49`	`_headers->set(new HTTPHeader(name, value));`
`50`	`50`	`}`
`51`	`51`