FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Added tag attribute to ResourceNode · jasenk2/esp32_https_server@6fe85d1 · GitHub

  1. jasenk2
  2. esp32_https_server

Repository navigation

Commit 6fe85d1

Browse files
fhessel
committed
Added tag attribute to ResourceNode
ResourceNodes may be tagged and the tag can be retrieved via HTTPRequest::getTag(), which allows grouping similar nodes and processing them in the same way. For example if you want to have access protection for some nodes, give them a "PROTECTED" tag and check for it in some authorization middleware function.
1 parent d68a92d commit 6fe85d1

6 files changed

Lines changed: 17 additions & 8 deletions

File tree

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP32 HTTP(S) Webserver
2-
version=0.1.0
2+
version=0.1.1
33
author=Frank Hessel <frank@fhessel.de>
44
maintainer=Frank Hessel <frank@fhessel.de>
55
sentence=SSL/TLS-enabled HTTPS server library for the ESP32.

‎src/HTTPConnection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ void HTTPConnection::loop() {
428428
}
429429

430430
// Create request context
431-
HTTPRequest req = HTTPRequest(this, _httpHeaders, resolvedResource.getParams(), _httpResource, _httpMethod);
431+
HTTPRequest req = HTTPRequest(this, _httpHeaders, resolvedResource.getParams(), _httpResource, _httpMethod, resolvedResource.getMatchingNode()->_tag);
432432
HTTPResponse res = HTTPResponse(this);
433433

434434
// Add default headers to the response

‎src/HTTPRequest.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
namespace httpsserver {
44

5-
HTTPRequest::HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, ResourceParameters * params, std::string requestString, std::string method):
5+
HTTPRequest::HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, ResourceParameters * params, std::string requestString, std::string method, std::string tag):
66
_con(con),
77
_headers(headers),
88
_params(params),
99
_requestString(requestString),
10-
_method(method) {
10+
_method(method),
11+
_tag(tag) {
1112

1213
HTTPHeader * contentLength = headers->get("Content-Length");
1314
if (contentLength == NULL) {
@@ -74,6 +75,10 @@ std::string HTTPRequest::getMethod() {
7475
return _method;
7576
}
7677

78+
std::string HTTPRequest::getTag() {
79+
return _tag;
80+
}
81+
7782
bool HTTPRequest::requestComplete() {
7883
if (_contentLengthSet) {
7984
// If we have a content size, rely on it.

‎src/HTTPRequest.hpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ namespace httpsserver {
1616

1717
class HTTPRequest {
1818
public:
19-
HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, ResourceParameters * resource, std::string requestString, std::string method);
19+
HTTPRequest(ConnectionContext * con, HTTPHeaders * headers, ResourceParameters * resource, std::string requestString, std::string method, std::string tag);
2020
virtual ~HTTPRequest();
2121

2222
std::string getHeader(std::string name);
2323
void setHeader(std::string name, std::string value);
2424
std::string getRequestString();
2525
std::string getMethod();
26+
std::string getTag();
2627

2728
size_t readChars(char * buffer, size_t length);
2829
size_t readBytes(byte * buffer, size_t length);
@@ -44,6 +45,7 @@ class HTTPRequest {
4445

4546
std::string _requestString;
4647
std::string _method;
48+
std::string _tag;
4749

4850
bool _contentLengthSet;
4951
size_t _remainingContent;

‎src/ResourceNode.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
namespace httpsserver {
44

5-
ResourceNode::ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback):
5+
ResourceNode::ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback, const std::string tag):
66
_path(std::move(path)),
77
_method(std::move(method)),
8-
_callback(callback) {
8+
_callback(callback),
9+
_tag(tag) {
910

1011
// Count the parameters
1112
_urlParamCount = 0;

‎src/ResourceNode.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ namespace httpsserver {
99

1010
class ResourceNode {
1111
public:
12-
ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback);
12+
ResourceNode(const std::string path, const std::string method, const HTTPSCallbackFunction * callback, const std::string tag = "");
1313
virtual ~ResourceNode();
1414

1515
const std::string _path;
1616
const std::string _method;
17+
const std::string _tag;
1718
const HTTPSCallbackFunction * _callback;
1819

1920
bool hasUrlParameter();

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL