#include "../include/local-def.h"
#include "afb-method.h"
+#include "afb-hreq.h"
+#include "afb-websock.h"
-struct afb_hreq_post {
- const char *upload_data;
- size_t *upload_data_size;
-};
-
-struct afb_hreq {
- AFB_session *session;
- struct MHD_Connection *connection;
- enum afb_method method;
- const char *url;
- size_t lenurl;
- const char *tail;
- size_t lentail;
- struct afb_hreq **recorder;
- int (*post_handler) (struct afb_hreq *, struct afb_hreq_post *);
- int (*post_completed) (struct afb_hreq *, struct afb_hreq_post *);
- void *post_data;
-};
-
-struct afb_req_handler {
- struct afb_req_handler *next;
+struct afb_hsrv_handler {
+ struct afb_hsrv_handler *next;
const char *prefix;
size_t length;
int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *);
int priority;
};
-static char empty_string[1] = "";
-
-/* a valid subpath is a relative path not looking deeper than root using .. */
-static int validsubpath(const char *subpath)
-{
- int l = 0, i = 0;
-
- while (subpath[i]) {
- switch (subpath[i++]) {
- case '.':
- if (!subpath[i])
- break;
- if (subpath[i] == '/') {
- i++;
- break;
- }
- if (subpath[i++] == '.') {
- if (!subpath[i]) {
- if (--l < 0)
- return 0;
- break;
- }
- if (subpath[i++] == '/') {
- if (--l < 0)
- return 0;
- break;
- }
- }
- default:
- while (subpath[i] && subpath[i] != '/')
- i++;
- l++;
- case '/':
- break;
- }
- }
- return 1;
-}
-
-/*
- * Removes the 'prefix' of 'length' frome the tail of 'request'
- * if and only if the prefix exists and is terminated by a leading
- * slash
- */
-int afb_req_unprefix(struct afb_hreq *request, const char *prefix, size_t length)
-{
- /* check the prefix ? */
- if (length > request->lentail || (request->tail[length] && request->tail[length] != '/')
- || memcmp(prefix, request->tail, length))
- return 0;
-
- /* removes successives / */
- while (length < request->lentail && request->tail[length + 1] == '/')
- length++;
-
- /* update the tail */
- request->lentail -= length;
- request->tail += length;
- return 1;
-}
-
-int afb_req_valid_tail(struct afb_hreq *request)
-{
- return validsubpath(request->tail);
-}
-
-void afb_req_reply_error(struct afb_hreq *request, unsigned int status)
-{
- char *buffer;
- int length;
- struct MHD_Response *response;
-
- length = asprintf(&buffer, "<html><body>error %u</body></html>", status);
- if (length > 0)
- response = MHD_create_response_from_buffer((unsigned)length, buffer, MHD_RESPMEM_MUST_FREE);
- else {
- buffer = "<html><body>error</body></html>";
- response = MHD_create_response_from_buffer(strlen(buffer), buffer, MHD_RESPMEM_PERSISTENT);
- }
- if (!MHD_queue_response(request->connection, status, response))
- fprintf(stderr, "Failed to reply error code %u", status);
- MHD_destroy_response(response);
-}
-
-int afb_request_redirect_to(struct afb_hreq *request, const char *url)
-{
- struct MHD_Response *response;
-
- response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
- MHD_add_response_header(response, "Location", url);
- MHD_queue_response(request->connection, MHD_HTTP_MOVED_PERMANENTLY, response);
- MHD_destroy_response(response);
- if (verbose)
- fprintf(stderr, "redirect from [%s] to [%s]\n", request->url, url);
- return 1;
-}
+struct afb_diralias {
+ const char *alias;
+ const char *directory;
+ size_t lendir;
+ int dirfd;
+};
-int afb_request_one_page_api_redirect(struct afb_hreq *request, struct afb_hreq_post *post, void *data)
+int afb_hreq_one_page_api_redirect(
+ struct afb_hreq *hreq,
+ struct afb_hreq_post *post,
+ void *data)
{
size_t plen;
char *url;
- if (request->lentail >= 2 && request->tail[1] == '#')
+ if (hreq->lentail >= 2 && hreq->tail[1] == '#')
return 0;
/*
* Here we have for example:
*
* Let compute plen that include the / at end (for "/pre/")
*/
- plen = request->lenurl - request->lentail + 1;
- url = alloca(request->lenurl + 3);
- memcpy(url, request->url, plen);
+ plen = hreq->lenurl - hreq->lentail + 1;
+ url = alloca(hreq->lenurl + 3);
+ memcpy(url, hreq->url, plen);
url[plen++] = '#';
url[plen++] = '!';
- memcpy(&url[plen], &request->tail[1], request->lentail);
- return afb_request_redirect_to(request, url);
+ memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
+ return afb_hreq_redirect_to(hreq, url);
}
-struct afb_req_handler *afb_req_handler_new(struct afb_req_handler *head, const char *prefix,
- int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *),
- void *data, int priority)
+struct afb_hsrv_handler *afb_hsrv_handler_new(
+ struct afb_hsrv_handler *head,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *),
+ void *data,
+ int priority)
{
- struct afb_req_handler *link, *iter, *previous;
+ struct afb_hsrv_handler *link, *iter, *previous;
size_t length;
/* get the length of the prefix without its leading / */
return head;
}
-int afb_req_add_handler(AFB_session * session, const char *prefix,
- int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *), void *data, int priority)
+int afb_req_add_handler(
+ AFB_session * session,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *),
+ void *data,
+ int priority)
{
- struct afb_req_handler *head;
+ struct afb_hsrv_handler *head;
- head = afb_req_handler_new(session->handlers, prefix, handler, data, priority);
+ head = afb_hsrv_handler_new(session->handlers, prefix, handler, data, priority);
if (head == NULL)
return 0;
session->handlers = head;
return 1;
}
-static int relay_to_doRestApi(struct afb_hreq *request, struct afb_hreq_post *post, void *data)
+static int relay_to_doRestApi(struct afb_hreq *hreq, struct afb_hreq_post *post, void *data)
{
- return doRestApi(request->connection, request->session, &request->tail[1], get_method_name(request->method),
- post->upload_data, post->upload_data_size, (void **)request->recorder);
-}
-
-static int afb_req_reply_file_if_exist(struct afb_hreq *request, int dirfd, const char *filename)
-{
- int rc;
- int fd;
- unsigned int status;
- struct stat st;
- char etag[1 + 2 * sizeof(int)];
- const char *inm;
- struct MHD_Response *response;
-
- /* Opens the file or directory */
- fd = openat(dirfd, filename, O_RDONLY);
- if (fd < 0) {
- if (errno == ENOENT)
- return 0;
- afb_req_reply_error(request, MHD_HTTP_FORBIDDEN);
- return 1;
- }
-
- /* Retrieves file's status */
- if (fstat(fd, &st) != 0) {
- close(fd);
- afb_req_reply_error(request, MHD_HTTP_INTERNAL_SERVER_ERROR);
- return 1;
- }
-
- /* Don't serve directory */
- if (S_ISDIR(st.st_mode)) {
- rc = afb_req_reply_file_if_exist(request, fd, "index.html");
- close(fd);
- return rc;
- }
-
- /* Don't serve special files */
- if (!S_ISREG(st.st_mode)) {
- close(fd);
- afb_req_reply_error(request, MHD_HTTP_FORBIDDEN);
- return 1;
- }
-
- /* Check the method */
- if ((request->method & (afb_method_get | afb_method_head)) == 0) {
- close(fd);
- afb_req_reply_error(request, MHD_HTTP_METHOD_NOT_ALLOWED);
- return 1;
- }
-
- /* computes the etag */
- sprintf(etag, "%08X%08X", ((int)(st.st_mtim.tv_sec) ^ (int)(st.st_mtim.tv_nsec)), (int)(st.st_size));
-
- /* checks the etag */
- inm = MHD_lookup_connection_value(request->connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_IF_NONE_MATCH);
- if (inm && 0 == strcmp(inm, etag)) {
- /* etag ok, return NOT MODIFIED */
- close(fd);
- if (verbose)
- fprintf(stderr, "Not Modified: [%s]\n", filename);
- response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
- status = MHD_HTTP_NOT_MODIFIED;
- } else {
- /* check the size */
- if (st.st_size != (off_t) (size_t) st.st_size) {
- close(fd);
- afb_req_reply_error(request, MHD_HTTP_INTERNAL_SERVER_ERROR);
- return 1;
- }
-
- /* create the response */
- response = MHD_create_response_from_fd((size_t) st.st_size, fd);
- status = MHD_HTTP_OK;
-
-#if defined(USE_MAGIC_MIME_TYPE)
- /* set the type */
- if (request->session->magic) {
- const char *mimetype = magic_descriptor(request->session->magic, fd);
- if (mimetype != NULL)
- MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
+ int later;
+ if (afb_websock_check(hreq, &later)) {
+ if (!later) {
+ struct afb_websock *ws = afb_websock_create(hreq->connection);
}
-#endif
+ return 1;
}
- /* fills the value and send */
- MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, request->session->cacheTimeout);
- MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag);
- MHD_queue_response(request->connection, status, response);
- MHD_destroy_response(response);
- return 1;
-}
-
-static int afb_req_reply_file(struct afb_hreq *request, int dirfd, const char *filename)
-{
- int rc = afb_req_reply_file_if_exist(request, dirfd, filename);
- if (rc == 0)
- afb_req_reply_error(request, MHD_HTTP_NOT_FOUND);
- return 1;
+ return doRestApi(hreq->connection, hreq->session, &hreq->tail[1], get_method_name(hreq->method),
+ post->upload_data, post->upload_data_size, (void **)hreq->recorder);
}
-struct afb_diralias {
- const char *alias;
- const char *directory;
- size_t lendir;
- int dirfd;
-};
-
-static int handle_alias(struct afb_hreq *request, struct afb_hreq_post *post, void *data)
+static int handle_alias(struct afb_hreq *hreq, struct afb_hreq_post *post, void *data)
{
- char *path;
struct afb_diralias *da = data;
- size_t lenalias;
- if (request->method != afb_method_get) {
- afb_req_reply_error(request, MHD_HTTP_METHOD_NOT_ALLOWED);
+ if (hreq->method != afb_method_get) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED);
return 1;
}
- if (!validsubpath(request->tail)) {
- afb_req_reply_error(request, MHD_HTTP_FORBIDDEN);
+ if (!afb_hreq_valid_tail(hreq)) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
return 1;
}
- return afb_req_reply_file(request, da->dirfd, &request->tail[request->lentail + 1]);
+ return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
}
int afb_req_add_alias(AFB_session * session, const char *prefix, const char *alias, int priority)
da->directory = alias;
da->lendir = strlen(da->directory);
da->dirfd = dirfd;
- if (afb_req_add_handler(session, prefix, handle_alias, (void *)alias, priority))
+ if (afb_req_add_handler(session, prefix, handle_alias, da, priority))
return 1;
free(da);
}
if (!afb_req_add_alias(session, "", session->config->rootdir, -10))
return 0;
- if (!afb_req_add_handler(session, session->config->rootbase, afb_request_one_page_api_redirect, NULL, -20))
+ if (!afb_req_add_handler(session, session->config->rootbase, afb_hreq_one_page_api_redirect, NULL, -20))
return 0;
return 1;
void **recorder)
{
struct afb_hreq_post post;
- struct afb_hreq request;
+ struct afb_hreq hreq;
enum afb_method method;
AFB_session *session;
- struct afb_req_handler *iter;
+ struct afb_hsrv_handler *iter;
session = cls;
post.upload_data = upload_data;
method = get_method(methodstr);
if (method == afb_method_none) {
- afb_req_reply_error(&request, MHD_HTTP_BAD_REQUEST);
+ afb_hreq_reply_error(&hreq, MHD_HTTP_BAD_REQUEST);
return MHD_YES;
}
/* init the request */
- request.session = cls;
- request.connection = connection;
- request.method = method;
- request.tail = request.url = url;
- request.lentail = request.lenurl = strlen(url);
- request.recorder = (struct afb_hreq **)recorder;
- request.post_handler = NULL;
- request.post_completed = NULL;
- request.post_data = NULL;
+ hreq.session = cls;
+ hreq.connection = connection;
+ hreq.method = method;
+ hreq.version = version;
+ hreq.tail = hreq.url = url;
+ hreq.lentail = hreq.lenurl = strlen(url);
+ hreq.recorder = (struct afb_hreq **)recorder;
+ hreq.post_handler = NULL;
+ hreq.post_completed = NULL;
+ hreq.post_data = NULL;
/* search an handler for the request */
iter = session->handlers;
while (iter) {
- if (afb_req_unprefix(&request, iter->prefix, iter->length)) {
- if (iter->handler(&request, &post, iter->data))
+ if (afb_hreq_unprefix(&hreq, iter->prefix, iter->length)) {
+ if (iter->handler(&hreq, &post, iter->data))
return MHD_YES;
- request.tail = request.url;
- request.lentail = request.lenurl;
+ hreq.tail = hreq.url;
+ hreq.lentail = hreq.lenurl;
}
iter = iter->next;
}
/* no handler */
- afb_req_reply_error(&request, method != afb_method_get ? MHD_HTTP_BAD_REQUEST : MHD_HTTP_NOT_FOUND);
+ afb_hreq_reply_error(&hreq, method != afb_method_get ? MHD_HTTP_BAD_REQUEST : MHD_HTTP_NOT_FOUND);
return MHD_YES;
}
return AFB_FATAL;
}
- /* Initialise Client Session Hash Table */
- ctxStoreInit(CTX_NBCLIENTS);
-
#if defined(USE_MAGIC_MIME_TYPE)
/*TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)] */
init_lib_magic (session);
}
session->httpd = MHD_start_daemon(
- MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG,
+ MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
(uint16_t) session->config->httpdPort, /* port */
new_client_handler, NULL, /* Tcp Accept call back + extra attribute */
access_handler, session, /* Http Request Call back + extra attribute */
Code Review / src / app-framework-binder.git / blobdiff