marcelb
/
api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with remove-def and http-status-code, small changes

Browse Source
namespace
marcelb 1 year ago
parent 4fdb494596 4f518f4658
commit f0b08d4f52
9 changed files with 305 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      .vscode/settings.json
  2. 3
      lib/api.hpp
  3. 112
      lib/elementary.hpp
  4. 17
      lib/http.hpp
  5. 4
      src/api.cpp
  6. 108
      src/elementary.cpp
  7. 27
      src/http.cpp
  8. 30
      test/test.cpp
  9. BIN
      test/test.o

24
.vscode/settings.json vendored
Unescape View File

@ -44,6 +44,28 @@
"limits": "cpp",
"numbers": "cpp",
"stdexcept": "cpp",
"typeinfo": "cpp"
"typeinfo": "cpp",
"csignal": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"any": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"codecvt": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"list": "cpp",
"set": "cpp",
"optional": "cpp",
"ratio": "cpp",
"iomanip": "cpp",
"mutex": "cpp",
"semaphore": "cpp",
"sstream": "cpp",
"stop_token": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"typeindex": "cpp",
"variant": "cpp"
}
}

3
lib/api.hpp
Unescape View File

@ -6,6 +6,7 @@
#include <vector>
#include <map>
// #include "elementary.hpp"
#include "http.hpp"
using namespace std;
@ -22,7 +23,7 @@ class api {
string body;
// odlazni api zahtjev
api(const string _method, const string _path, const map<string, string> _params = {}, const string _body = {});
api(const http_method _method, const string _path, const map<string, string> _params = {}, const string _body = {});
// dolazni api zahjtev
api(const http_request _req);
};

112
lib/elementary.hpp
Unescape View File

@ -0,0 +1,112 @@
#ifndef _HTTP_ELMY_
#define _HTTP_ELMY_
#include <string>
using namespace std;
typedef enum {
GET=0, POST=1, PUT=2, DELETE=3, PATCH=4, get=GET, post=POST, put=PUT, del=DELETE, patch=PATCH
} http_method;
string http_method_to_str(http_method methode);
typedef enum {
/*####### 1xx - Informational #######*/
/* Indicates an interim response for communicating connection status
* or request progress prior to completing the requested action and
* sending a final response.
*/
Continue = 100, //!< Indicates that the initial part of a request has been received and has not yet been rejected by the server.
SwitchingProtocols = 101, //!< Indicates that the server understands and is willing to comply with the client's request, via the Upgrade header field, for a change in the application protocol being used on this connection.
Processing = 102, //!< Is an interim response used to inform the client that the server has accepted the complete request, but has not yet completed it.
EarlyHints = 103, //!< Indicates to the client that the server is likely to send a final response with the header fields included in the informational response.
/*####### 2xx - Successful #######*/
/* Indicates that the client's request was successfully received,
* understood, and accepted.
*/
OK = 200, //!< Indicates that the request has succeeded.
Created = 201, //!< Indicates that the request has been fulfilled and has resulted in one or more new resources being created.
Accepted = 202, //!< Indicates that the request has been accepted for processing, but the processing has not been completed.
NonAuthoritativeInformation = 203, //!< Indicates that the request was successful but the enclosed payload has been modified from that of the origin server's 200 (OK) response by a transforming proxy.
NoContent = 204, //!< Indicates that the server has successfully fulfilled the request and that there is no additional content to send in the response payload body.
ResetContent = 205, //!< Indicates that the server has fulfilled the request and desires that the user agent reset the \"document view\", which caused the request to be sent, to its original state as received from the origin server.
PartialContent = 206, //!< Indicates that the server is successfully fulfilling a range request for the target resource by transferring one or more parts of the selected representation that correspond to the satisfiable ranges found in the requests's Range header field.
MultiStatus = 207, //!< Provides status for multiple independent operations.
AlreadyReported = 208, //!< Used inside a DAV:propstat response element to avoid enumerating the internal members of multiple bindings to the same collection repeatedly. [RFC 5842]
IMUsed = 226, //!< The server has fulfilled a GET request for the resource, and the response is a representation of the result of one or more instance-manipulations applied to the current instance.
/*####### 3xx - Redirection #######*/
/* Indicates that further action needs to be taken by the user agent
* in order to fulfill the request.
*/
MultipleChoices = 300, //!< Indicates that the target resource has more than one representation, each with its own more specific identifier, and information about the alternatives is being provided so that the user (or user agent) can select a preferred representation by redirecting its request to one or more of those identifiers.
MovedPermanently = 301, //!< Indicates that the target resource has been assigned a new permanent URI and any future references to this resource ought to use one of the enclosed URIs.
Found = 302, //!< Indicates that the target resource resides temporarily under a different URI.
SeeOther = 303, //!< Indicates that the server is redirecting the user agent to a different resource, as indicated by a URI in the Location header field, that is intended to provide an indirect response to the original request.
NotModified = 304, //!< Indicates that a conditional GET request has been received and would have resulted in a 200 (OK) response if it were not for the fact that the condition has evaluated to false.
UseProxy = 305, //!< \deprecated \parblock Due to security concerns regarding in-band configuration of a proxy. \endparblock
//!< The requested resource MUST be accessed through the proxy given by the Location field.
TemporaryRedirect = 307, //!< Indicates that the target resource resides temporarily under a different URI and the user agent MUST NOT change the request method if it performs an automatic redirection to that URI.
PermanentRedirect = 308, //!< The target resource has been assigned a new permanent URI and any future references to this resource outght to use one of the enclosed URIs. [...] This status code is similar to 301 Moved Permanently (Section 7.3.2 of rfc7231), except that it does not allow rewriting the request method from POST to GET.
/*####### 4xx - Client Error #######*/
/* Indicates that the client seems to have erred.
*/
BadRequest = 400, //!< Indicates that the server cannot or will not process the request because the received syntax is invalid, nonsensical, or exceeds some limitation on what the server is willing to process.
Unauthorized = 401, //!< Indicates that the request has not been applied because it lacks valid authentication credentials for the target resource.
PaymentRequired = 402, //!< *Reserved*
Forbidden = 403, //!< Indicates that the server understood the request but refuses to authorize it.
NotFound = 404, //!< Indicates that the origin server did not find a current representation for the target resource or is not willing to disclose that one exists.
MethodNotAllowed = 405, //!< Indicates that the method specified in the request-line is known by the origin server but not supported by the target resource.
NotAcceptable = 406, //!< Indicates that the target resource does not have a current representation that would be acceptable to the user agent, according to the proactive negotiation header fields received in the request, and the server is unwilling to supply a default representation.
ProxyAuthenticationRequired = 407, //!< Is similar to 401 (Unauthorized), but indicates that the client needs to authenticate itself in order to use a proxy.
RequestTimeout = 408, //!< Indicates that the server did not receive a complete request message within the time that it was prepared to wait.
Conflict = 409, //!< Indicates that the request could not be completed due to a conflict with the current state of the resource.
Gone = 410, //!< Indicates that access to the target resource is no longer available at the origin server and that this condition is likely to be permanent.
LengthRequired = 411, //!< Indicates that the server refuses to accept the request without a defined Content-Length.
PreconditionFailed = 412, //!< Indicates that one or more preconditions given in the request header fields evaluated to false when tested on the server.
ContentTooLarge = 413, //!< Indicates that the server is refusing to process a request because the request payload is larger than the server is willing or able to process.
PayloadTooLarge = 413, //!< Alias for ContentTooLarge for backward compatibility.
URITooLong = 414, //!< Indicates that the server is refusing to service the request because the request-target is longer than the server is willing to interpret.
UnsupportedMediaType = 415, //!< Indicates that the origin server is refusing to service the request because the payload is in a format not supported by the target resource for this method.
RangeNotSatisfiable = 416, //!< Indicates that none of the ranges in the request's Range header field overlap the current extent of the selected resource or that the set of ranges requested has been rejected due to invalid ranges or an excessive request of small or overlapping ranges.
ExpectationFailed = 417, //!< Indicates that the expectation given in the request's Expect header field could not be met by at least one of the inbound servers.
ImATeapot = 418, //!< Any attempt to brew coffee with a teapot should result in the error code 418 I'm a teapot.
MisdirectedRequest = 421, //!< Indicates that the request was directed at a server that is unable or unwilling to produce an authoritative response for the target URI.
UnprocessableContent = 422, //!< Means the server understands the content type of the request entity (hence a 415(Unsupported Media Type) status code is inappropriate), and the syntax of the request entity is correct (thus a 400 (Bad Request) status code is inappropriate) but was unable to process the contained instructions.
UnprocessableEntity = 422, //!< Alias for UnprocessableContent for backward compatibility.
Locked = 423, //!< Means the source or destination resource of a method is locked.
FailedDependency = 424, //!< Means that the method could not be performed on the resource because the requested action depended on another action and that action failed.
TooEarly = 425, //!< Indicates that the server is unwilling to risk processing a request that might be replayed.
UpgradeRequired = 426, //!< Indicates that the server refuses to perform the request using the current protocol but might be willing to do so after the client upgrades to a different protocol.
PreconditionRequired = 428, //!< Indicates that the origin server requires the request to be conditional.
TooManyRequests = 429, //!< Indicates that the user has sent too many requests in a given amount of time (\"rate limiting\").
RequestHeaderFieldsTooLarge = 431, //!< Indicates that the server is unwilling to process the request because its header fields are too large.
UnavailableForLegalReasons = 451, //!< This status code indicates that the server is denying access to the resource in response to a legal demand.
/*####### 5xx - Server Error #######*/
/* Indicates that the server is aware that it has erred
* or is incapable of performing the requested method.
*/
InternalServerError = 500, //!< Indicates that the server encountered an unexpected condition that prevented it from fulfilling the request.
NotImplemented = 501, //!< Indicates that the server does not support the functionality required to fulfill the request.
BadGateway = 502, //!< Indicates that the server, while acting as a gateway or proxy, received an invalid response from an inbound server it accessed while attempting to fulfill the request.
ServiceUnavailable = 503, //!< Indicates that the server is currently unable to handle the request due to a temporary overload or scheduled maintenance, which will likely be alleviated after some delay.
GatewayTimeout = 504, //!< Indicates that the server, while acting as a gateway or proxy, did not receive a timely response from an upstream server it needed to access in order to complete the request.
HTTPVersionNotSupported = 505, //!< Indicates that the server does not support, or refuses to support, the protocol version that was used in the request message.
VariantAlsoNegotiates = 506, //!< Indicates that the server has an internal configuration error: the chosen variant resource is configured to engage in transparent content negotiation itself, and is therefore not a proper end point in the negotiation process.
InsufficientStorage = 507, //!< Means the method could not be performed on the resource because the server is unable to store the representation needed to successfully complete the request.
LoopDetected = 508, //!< Indicates that the server terminated an operation because it encountered an infinite loop while processing a request with "Depth: infinity". [RFC 5842]
NotExtended = 510, //!< \deprecated \parblock Obsoleted as the experiment has ended and there is no evidence of widespread use. \endparblock
//!< The policy for accessing the resource has not been met in the request. [RFC 2774]
NetworkAuthenticationRequired = 511, //!< Indicates that the client needs to authenticate to gain network access.
xxx_max = 1023
} http_response_code;
string http_response_code_txt(uint code);
#endif

17
lib/http.hpp
Unescape View File

@ -5,6 +5,7 @@
#include <string>
#include <map>
#include "elementary.hpp"
#include "api.hpp"
using namespace std;
@ -13,6 +14,7 @@ class api;
class http_request {
public:
string protocol;
string method;
string url;
map<string, string> headers;
@ -21,8 +23,8 @@ class http_request {
// konstruktori zahtjeva
// odlazni
http_request(const string _method, const string _url, const string _body = "");
http_request(const api *_api);
http_request(const http_method _method, const string _url, const string _body = "", const string _protocol = "1.1");
http_request(const api *_api, const string _protocol = "1.1");
//dolazni
http_request(const string _raw);
@ -36,6 +38,7 @@ class http_request {
class http_response {
public:
string protocol;
string status;
map<string, string> headers;
string body;
@ -43,12 +46,18 @@ class http_response {
//konstruktor odgovora
// odlazni
void send(const string _body);
http_response(const http_response_code _status, const string _body, const string _protocol = "1.1");
// dolaznih
void get(const string _raw);
http_response(const string _raw);
//bool validate();
// void putheader(const string _key, const string _value);
// void putheaders(const map<string, string> _headers);
void mold(); // za slanje
void parse(); // čitaj http
};
static string set_protcol(const string _protocol);
#endif

4
src/api.cpp
Unescape View File

@ -1,7 +1,7 @@
#include "../lib/api.hpp"
api::api(const string _method, const string _path, const map<string, string> _params, const string _body) {
method = _method;
api::api(const http_method _method, const string _path, const map<string, string> _params, const string _body) {
method = http_method_to_str(_method);
path = _path;
url = path;

108
src/elementary.cpp
Unescape View File

@ -0,0 +1,108 @@
#include "../lib/elementary.hpp"
string http_method_to_str(http_method methode) {
string methode_str;
switch (methode) {
case 0:
methode_str = "GET";
break;
case 1:
methode_str = "POST";
break;
case 2:
methode_str = "PUT";
break;
case 3:
methode_str = "DELETE";
break;
case 4:
methode_str = "PATCH";
break;
default:
throw string("[ERROR] Bad HTTP REST method ");
break;
}
return methode_str;
};
string http_response_code_txt(uint code) {
switch (code) {
//####### 1xx - Informational #######
case 100: return "Continue";
case 101: return "Switching Protocols";
case 102: return "Processing";
case 103: return "Early Hints";
//####### 2xx - Successful #######
case 200: return "OK";
case 201: return "Created";
case 202: return "Accepted";
case 203: return "Non-Authoritative Information";
case 204: return "No Content";
case 205: return "Reset Content";
case 206: return "Partial Content";
case 207: return "Multi-Status";
case 208: return "Already Reported";
case 226: return "IM Used";
//####### 3xx - Redirection #######
case 300: return "Multiple Choices";
case 301: return "Moved Permanently";
case 302: return "Found";
case 303: return "See Other";
case 304: return "Not Modified";
case 305: return "Use Proxy";
case 307: return "Temporary Redirect";
case 308: return "Permanent Redirect";
//####### 4xx - Client Error #######
case 400: return "Bad Request";
case 401: return "Unauthorized";
case 402: return "Payment Required";
case 403: return "Forbidden";
case 404: return "Not Found";
case 405: return "Method Not Allowed";
case 406: return "Not Acceptable";
case 407: return "Proxy Authentication Required";
case 408: return "Request Timeout";
case 409: return "Conflict";
case 410: return "Gone";
case 411: return "Length Required";
case 412: return "Precondition Failed";
case 413: return "Content Too Large";
case 414: return "URI Too Long";
case 415: return "Unsupported Media Type";
case 416: return "Range Not Satisfiable";
case 417: return "Expectation Failed";
case 418: return "I'm a teapot";
case 421: return "Misdirected Request";
case 422: return "Unprocessable Content";
case 423: return "Locked";
case 424: return "Failed Dependency";
case 425: return "Too Early";
case 426: return "Upgrade Required";
case 428: return "Precondition Required";
case 429: return "Too Many Requests";
case 431: return "Request Header Fields Too Large";
case 451: return "Unavailable For Legal Reasons";
//####### 5xx - Server Error #######
case 500: return "Internal Server Error";
case 501: return "Not Implemented";
case 502: return "Bad Gateway";
case 503: return "Service Unavailable";
case 504: return "Gateway Timeout";
case 505: return "HTTP Version Not Supported";
case 506: return "Variant Also Negotiates";
case 507: return "Insufficient Storage";
case 508: return "Loop Detected";
case 510: return "Not Extended";
case 511: return "Network Authentication Required";
default: {
throw string("[ERROR] Nonexistent error code ");
}
}
return string();
}

27
src/http.cpp
Unescape View File

@ -1,16 +1,18 @@
#include "../lib/http.hpp"
http_request::http_request(const string _method, const string _url, const string _body) {
method = _method;
http_request::http_request(const http_method _method, const string _url, const string _body, const string _protocol) {
method = http_method_to_str(_method);
url = _url;
body = _body;
protocol = set_protcol(_protocol);
mold();
}
http_request::http_request(const api *_api) {
http_request::http_request(const api *_api, const string _protocol) {
method = _api->method;
url = _api->url;
body = _api->body;
protocol = set_protcol(_protocol);
mold();
}
@ -74,13 +76,15 @@ void http_request::mold() {
raw += "\r\n" + body;
}
void http_response::send(const string _body) {
http_response::http_response(const http_response_code _status, const string _body, const string _protocol) {
status = to_string(_status) + " " + http_response_code_txt(_status);
body = _body;
protocol = set_protcol(_protocol);
mold();
}
void http_response::get(const string _raw) {
http_response::http_response(const string _raw) {
raw = _raw;
parse();
}
@ -91,7 +95,7 @@ void http_response::get(const string _raw) {
void http_response::mold() {
raw = "HTTP/1.1 200 OK\r\n"; // implementirati status
raw = protocol + " " + status + "\r\n"; //"HTTP/1.1 200 OK\r\n"; // implementirati status
if (!headers.empty()) {
raw += '?';
for (auto i : headers) {
@ -130,4 +134,15 @@ void http_response::parse() {
else if ((size_t)raw.find("\r\n\r\n") < raw.length())
body = raw.substr(raw.find("\r\n\r\n")+4, raw.find("\r\n")-raw.find("\r\n\r\n")-4);
}
static string set_protcol(const string _protocol) {
string protocol;
if (_protocol == "1.0" || _protocol == "1.1" || _protocol == "2.0") {
protocol = "HTTP/" + _protocol;
}
else {
protocol = "HTTP/1.1";
}
return protocol;
}

30
test/test.cpp
Unescape View File

@ -8,7 +8,25 @@ int main() {
try {
api uf("GET", "/delete", {make_pair("id", "4")}, "bay");
api uf(GET, "delete", {make_pair("id", "4")}, "bay");
http_request myreq(&uf);
myreq.putheader("Content-type", "text/plain");
cout << myreq.raw << endl;
http_response myres("HTTP/1.1 200 OK\r\n\r\nnotauth");
cout << myres.protocol << endl;
cout << myres.status << endl;
// cout << myres.headers << endl;
cout << myres.body << endl;
http_response myres2(OK, "nnotauth", "1.0" );
cout << myres2.protocol << endl;
cout << myres2.status << endl;
// cout << myres2.headers << endl;
cout << myres2.body << endl;
@ -24,10 +42,10 @@ int main() {
// cout << mojzahtjev.method << " " << mojzahtjev.url << endl << mojzahtjev.raw;
http_request myres(&uf);
myres.putheader("Content-type", "text/plain");
// http_request myres(&uf);
// http_request myres();
// http_request myres("GET /delete?id=4 HTTP/1.1\r\nContent-type: text/plain\r\n\n\rBAY");
// myres.get("HTTP/1.1 200 OK\r\n\r\nnotauth");
// myres.get("HTTP/1.1 200 OK");
@ -35,8 +53,8 @@ int main() {
// api uf(&myApi, myres);
cout << uf.method << " " << uf.path << " " << uf.body << endl;
cout << myres.method << " " << myres.url << " " << myres.body << endl << myres.raw << endl;
// cout << uf.method << " " << uf.path << " " << uf.body << endl;
// cout << myres.method << " " << myres.url << " " << myres.body << endl << myres.raw << endl;
// for(auto i : uf.params)

BIN
test/test.o
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save