Skip to content
This repository has been archived by the owner on Jun 30, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop' of github.com:criticalstack/libevhtp into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@NathanFrench
NathanFrench committed Jun 28, 2017
2 parents 1b1a037 + 311d7e6 commit 3480a68
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 102 deletions.
152 changes: 101 additions & 51 deletions evhtp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,40 @@
#include "evhtp_numtoa.h"
#include "evhtp.h"

/**
* @brief structure containing a single callback and configuration
*
* The definition structure which is used within the evhtp_callbacks_t
* structure. This holds information about what should execute for either
* a single or regex path.
*
* For example, if you registered a callback to be executed on a request
* for "/herp/derp", your defined callback will be executed.
*
* Optionally you can set callback-specific hooks just like per-connection
* hooks using the same rules.
*
*/
struct evhtp_callback_s {
evhtp_callback_type type; /**< the type of callback (regex|path) */
evhtp_callback_cb cb; /**< the actual callback function */
void * cbarg; /**< user-defind arguments passed to the cb */
evhtp_hooks_t * hooks; /**< per-callback hooks */
size_t len;

union {
char * path;
char * glob;
#ifndef EVHTP_DISABLE_REGEX
regex_t * regex;
#endif
} val;

TAILQ_ENTRY(evhtp_callback_s) next;
};

TAILQ_HEAD(evhtp_callbacks_s, evhtp_callback_s);


#ifdef EVHTP_DEBUG
static void
Expand Down Expand Up @@ -262,26 +296,6 @@ strndup(const char * s, size_t n)
* PRIVATE FUNCTIONS
*/

/**
* @brief a weak hash function
*
* @param str a null terminated string
*
* @return an unsigned integer hash of str
*/
static inline unsigned int
htp__quick_hash_(const char * str)
{
unsigned int h = 0;

for (; *str; str++)
{
h = 31 * h + *str;
}

return h;
}

/**
*
* @brief helper macro to determine if http version is HTTP/1.0
Expand Down Expand Up @@ -554,8 +568,8 @@ htp__hook_connection_write_(evhtp_connection_t * connection)
* @return
*/
static int
htp__glob_match2_(const char * pattern, size_t plen,
const char * string, size_t str_len)
htp__glob_match_(const char * pattern, size_t plen,
const char * string, size_t str_len)
{
while (plen)
{
Expand All @@ -574,8 +588,8 @@ htp__glob_match2_(const char * pattern, size_t plen,

while (str_len)
{
if (htp__glob_match2_(pattern + 1, plen - 1,
string, str_len))
if (htp__glob_match_(pattern + 1, plen - 1,
string, str_len))
{
return 1; /* match */
}
Expand Down Expand Up @@ -617,27 +631,6 @@ htp__glob_match2_(const char * pattern, size_t plen,
}

return 0;
} /* htp__glob_match2_ */

static inline int
htp__glob_match_(const char * pattern, size_t pat_len, const char * string, size_t str_len)
{
if (evhtp_unlikely(!pattern || !string))
{
return 0;
}

if (pat_len == 0)
{
pat_len = strlen(pattern);
}

if (str_len == 0)
{
str_len = strlen(string);
}

return htp__glob_match2_(pattern, pat_len, string, str_len);
} /* htp__glob_match_ */

static evhtp_callback_t *
Expand All @@ -660,6 +653,11 @@ htp__callback_find_(evhtp_callbacks_t * cbs,
{
switch (callback->type) {
case evhtp_callback_type_hash:
if (callback->val.path[1] != path[1])
{
continue;
}

if (strcmp(callback->val.path, path) == 0)
{
*start_offset = 0;
Expand Down Expand Up @@ -1224,7 +1222,7 @@ htp__request_find_vhost_(evhtp_t * evhtp, const char * name)
continue;
}

if (htp__glob_match_(evhtp_vhost->server_name, 0, name, 0) == 1)
if (htp__glob_match_(evhtp_vhost->server_name, strlen(evhtp_vhost->server_name), name, strlen(name)) == 1)
{
return evhtp_vhost;
}
Expand All @@ -1236,7 +1234,7 @@ htp__request_find_vhost_(evhtp_t * evhtp, const char * name)
continue;
}

if (htp__glob_match_(evhtp_alias->alias, 0, name, 0) == 1)
if (htp__glob_match_(evhtp_alias->alias, strlen(evhtp_alias->alias), name, strlen(name)) == 1)
{
return evhtp_vhost;
}
Expand Down Expand Up @@ -3779,7 +3777,6 @@ evhtp_callback_new(const char * path, evhtp_callback_type type, evhtp_callback_c

switch (type) {
case evhtp_callback_type_hash:
hcb->hash = htp__quick_hash_(path);
hcb->val.path = strdup(path);
break;
#ifndef EVHTP_DISABLE_REGEX
Expand Down Expand Up @@ -3848,8 +3845,8 @@ evhtp_callbacks_add_callback(evhtp_callbacks_t * cbs, evhtp_callback_t * cb)
return 0;
}

int
evhtp_set_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type, evhtp_hook cb, void * arg)
static int
htp__set_hook_(evhtp_hooks_t ** hooks, evhtp_hook_type type, evhtp_hook cb, void * arg)
{
if (*hooks == NULL)
{
Expand Down Expand Up @@ -3925,7 +3922,31 @@ evhtp_set_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type, evhtp_hook cb, void
} /* switch */

return 0;
} /* evhtp_set_hook */
} /* htp__set_hook_ */

int
evhtp_set_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type, evhtp_hook cb, void * arg)
{
return htp__set_hook_(hooks, type, cb, arg);
}

int
evhtp_callback_set_hook(evhtp_callback_t * callback, evhtp_hook_type type, evhtp_hook cb, void * arg)
{
return htp__set_hook_(&callback->hooks, type, cb, arg);
}

int
evhtp_request_set_hook(evhtp_request_t * req, evhtp_hook_type type, evhtp_hook cb, void * arg)
{
return htp__set_hook_(&req->hooks, type, cb, arg);
}

int
evhtp_connection_set_hook(evhtp_connection_t * conn, evhtp_hook_type type, evhtp_hook cb, void * arg)
{
return htp__set_hook_(&conn->hooks, type, cb, arg);
}

int
evhtp_unset_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type)
Expand Down Expand Up @@ -4016,6 +4037,34 @@ evhtp_unset_all_hooks(evhtp_hooks_t ** hooks)
return res;
} /* evhtp_unset_all_hooks */

evhtp_hooks_t *
evhtp_connection_get_hooks(evhtp_connection_t * c)
{
if (evhtp_unlikely(c == NULL))
{
return NULL;
}

return c->hooks;
}

evhtp_hooks_t *
evhtp_request_get_hooks(evhtp_request_t * r)
{
if (evhtp_unlikely(r == NULL))
{
return NULL;
}

return r->hooks;
}

evhtp_hooks_t *
evhtp_callback_get_hooks(evhtp_callback_t * cb)
{
return cb->hooks;
}

evhtp_callback_t *
evhtp_set_cb(evhtp_t * htp, const char * path, evhtp_callback_cb cb, void * arg)
{
Expand Down Expand Up @@ -4690,6 +4739,7 @@ evhtp_set_parser_flags(evhtp_t * htp, int flags)
{ \
return v->flags; \
} \
return -1; \
}

HTP_FLAG_FNGEN(, evhtp_t *);
Expand Down
42 changes: 7 additions & 35 deletions evhtp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ extern "C" {
} while (0)
#endif

struct evhtp_callback_s;
struct evhtp_callbacks_s;

#ifndef EVHTP_DISABLE_SSL
typedef SSL_SESSION evhtp_ssl_sess_t;
Expand Down Expand Up @@ -337,39 +339,6 @@ struct evhtp_s {
TAILQ_ENTRY(evhtp_s) next_vhost;
};

/**
* @brief structure containing a single callback and configuration
*
* The definition structure which is used within the evhtp_callbacks_t
* structure. This holds information about what should execute for either
* a single or regex path.
*
* For example, if you registered a callback to be executed on a request
* for "/herp/derp", your defined callback will be executed.
*
* Optionally you can set callback-specific hooks just like per-connection
* hooks using the same rules.
*
*/
struct evhtp_callback_s {
evhtp_callback_type type; /**< the type of callback (regex|path) */
evhtp_callback_cb cb; /**< the actual callback function */
unsigned int hash; /**< the full hash generated integer */
void * cbarg; /**< user-defind arguments passed to the cb */
evhtp_hooks_t * hooks; /**< per-callback hooks */

union {
char * path;
char * glob;
#ifndef EVHTP_DISABLE_REGEX
regex_t * regex;
#endif
} val;

TAILQ_ENTRY(evhtp_callback_s) next;
};

TAILQ_HEAD(evhtp_callbacks_s, evhtp_callback_s);

/**
* @brief a generic key/value structure
Expand Down Expand Up @@ -796,9 +765,12 @@ EVHTP_EXPORT evhtp_callback_t * evhtp_get_cb(evhtp_t * htp, const char * needle)
*
* @return 0 on success, -1 on error (if hooks is NULL, it is allocated)
*/
EVHTP_EXPORT int evhtp_set_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type,
evhtp_hook cb, void * arg);
EVHTP_EXPORT int evhtp_set_hook(evhtp_hooks_t ** hooks, evhtp_hook_type type, evhtp_hook cb, void * arg);
DEPRECATED("use evhtp_[connection|request|callback]_set_hook() instead of set_hook directly");

EVHTP_EXPORT int evhtp_connection_set_hook(evhtp_connection_t * c, evhtp_hook_type type, evhtp_hook cb, void * arg);
EVHTP_EXPORT int evhtp_request_set_hook(evhtp_request_t * r, evhtp_hook_type type, evhtp_hook cb, void * arg);
EVHTP_EXPORT int evhtp_callback_set_hook(evhtp_callback_t * cb, evhtp_hook_type type, evhtp_hook hookcb, void * arg);

/**
* @brief remove a specific hook from being called.
Expand Down
1 change: 0 additions & 1 deletion evhtp_json.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <ctype.h>
#include <unistd.h>

#include "internal.h"

#include "evhtp_heap.h"
#include "evhtp_json.h"
Expand Down
35 changes: 20 additions & 15 deletions examples/test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,15 @@ pause_init_cb(evhtp_request_t * req, evhtp_path_t * path, void * arg) {
pause->timer_ev = evtimer_new(evbase, resume_request_timer, pause);
pause->request = req;

evhtp_set_hook(&req->hooks, evhtp_hook_on_header, pause_cb, pause);
evhtp_set_hook(&req->hooks, evhtp_hook_on_request_fini, pause_request_fini, pause);
evhtp_set_hook(&req->conn->hooks, evhtp_hook_on_connection_fini, pause_connection_fini, NULL);
evhtp_request_set_hook(req,
evhtp_hook_on_header, pause_cb, pause);

evhtp_request_set_hook(req,
evhtp_hook_on_request_fini, pause_request_fini, pause);

evhtp_connection_set_hook(req->conn,
evhtp_hook_on_connection_fini,
pause_connection_fini, NULL);

return EVHTP_RES_OK;
}
Expand Down Expand Up @@ -377,14 +383,13 @@ set_my_connection_handlers(evhtp_connection_t * conn, void * arg) {
struct timeval tick;
struct ev_token_bucket_cfg * tcfg = NULL;

evhtp_set_hook(&conn->hooks, evhtp_hook_on_header, print_kv, "foo");
evhtp_set_hook(&conn->hooks, evhtp_hook_on_headers, print_kvs, "bar");
evhtp_set_hook(&conn->hooks, evhtp_hook_on_path, print_path, "baz");
evhtp_set_hook(&conn->hooks, evhtp_hook_on_read, print_data, "derp");
evhtp_set_hook(&conn->hooks, evhtp_hook_on_new_chunk, print_new_chunk_len, NULL);
evhtp_set_hook(&conn->hooks, evhtp_hook_on_chunk_complete, print_chunk_complete, NULL);
evhtp_set_hook(&conn->hooks, evhtp_hook_on_chunks_complete, print_chunks_complete, NULL);
/* evhtp_set_hook(&conn->hooks, evhtp_hook_on_hostname, print_hostname, NULL); */
evhtp_connection_set_hook(conn, evhtp_hook_on_header, print_kv, "foo");
evhtp_connection_set_hook(conn, evhtp_hook_on_headers, print_kvs, "bar");
evhtp_connection_set_hook(conn, evhtp_hook_on_path, print_path, "baz");
evhtp_connection_set_hook(conn, evhtp_hook_on_read, print_data, "derp");
evhtp_connection_set_hook(conn, evhtp_hook_on_new_chunk, print_new_chunk_len, NULL);
evhtp_connection_set_hook(conn, evhtp_hook_on_chunk_complete, print_chunk_complete, NULL);
evhtp_connection_set_hook(conn, evhtp_hook_on_chunks_complete, print_chunks_complete, NULL);

if (bw_limit > 0) {
tick.tv_sec = 0;
Expand All @@ -395,7 +400,7 @@ set_my_connection_handlers(evhtp_connection_t * conn, void * arg) {
bufferevent_set_rate_limit(conn->bev, tcfg);
}

evhtp_set_hook(&conn->hooks, evhtp_hook_on_request_fini, test_fini, tcfg);
evhtp_connection_set_hook(conn, evhtp_hook_on_request_fini, test_fini, tcfg);

return EVHTP_RES_OK;
}
Expand Down Expand Up @@ -585,14 +590,14 @@ main(int argc, char ** argv) {
evhtp_assert(cb_12 != NULL);

/* set a callback to pause on each header for cb_7 */
evhtp_set_hook(&cb_7->hooks, evhtp_hook_on_path, pause_init_cb, NULL);
evhtp_callback_set_hook(cb_7, evhtp_hook_on_path, pause_init_cb, NULL);

/* set a callback to set hooks specifically for the cb_6 callback */
#ifndef EVHTP_DISABLE_REGEX
evhtp_set_hook(&cb_6->hooks, evhtp_hook_on_headers, test_regex_hdrs_cb, NULL);
evhtp_callback_set_hook(cb_6, evhtp_hook_on_headers, test_regex_hdrs_cb, NULL);
#endif

evhtp_set_hook(&cb_10->hooks, evhtp_hook_on_headers, set_max_body, NULL);
evhtp_callback_set_hook(cb_10, evhtp_hook_on_headers, set_max_body, NULL);

/* set a default request handler */
evhtp_set_gencb(htp, test_default_cb, "foobarbaz");
Expand Down

0 comments on commit 3480a68

Please sign in to comment.