RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-27 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: http: Use a trash chunk to store decoded string of the HTTP auth header

Browse Source 
This string is used in sample fetches so it is safe to use a preallocated trash
chunk instead of a buffer dynamically allocated during HAProxy startup.
This commit is contained in:
Christopher Faulet 2017-07-27 15:18:52 +02:00 committed by Willy Tarreau
parent ca20d02ea8
commit 6988f678cd
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/proto_http.h
View File

@ -95,7 +95,6 @@ extern const int http_err_codes[HTTP_ERR_SIZE];
extern struct chunk http_err_chunks[HTTP_ERR_SIZE]; extern struct chunk http_err_chunks[HTTP_ERR_SIZE];
extern const char *HTTP_302; extern const char *HTTP_302;
extern const char *HTTP_303; extern const char *HTTP_303;
extern char *get_http_auth_buff;
int process_cli(struct stream *s); int process_cli(struct stream *s);
int process_srv_data(struct stream *s); int process_srv_data(struct stream *s);

2
src/haproxy.c
View File

@ -1718,7 +1718,6 @@ static void init(int argc, char **argv)
exit(1); exit(1);
} }
get_http_auth_buff = calloc(1, global.tune.bufsize);
fdinfo = calloc(1, sizeof(struct fdinfo) * (global.maxsock)); fdinfo = calloc(1, sizeof(struct fdinfo) * (global.maxsock));
fdtab = calloc(1, sizeof(struct fdtab) * (global.maxsock)); fdtab = calloc(1, sizeof(struct fdtab) * (global.maxsock));
@ -2122,7 +2121,6 @@ void deinit(void)
free(fdinfo); fdinfo = NULL; free(fdinfo); fdinfo = NULL;
free(fdtab); fdtab = NULL; free(fdtab); fdtab = NULL;
free(oldpids); oldpids = NULL; free(oldpids); oldpids = NULL;
free(get_http_auth_buff); get_http_auth_buff = NULL;
free(global_listener_queue_task); global_listener_queue_task = NULL; free(global_listener_queue_task); global_listener_queue_task = NULL;
list_for_each_entry_safe(log, logb, &global.logsrvs, list) { list_for_each_entry_safe(log, logb, &global.logsrvs, list) {

14
src/proto_http.c
View File

@ -1663,11 +1663,6 @@ const char *http_parse_reqline(struct http_msg *msg,
* have the credentials overwritten by another stream in parallel. * have the credentials overwritten by another stream in parallel.
*/ */
/* This bufffer is initialized in the file 'src/haproxy.c'. This length is
* set according to global.tune.bufsize.
*/
char *get_http_auth_buff;
int int
get_http_auth(struct stream *s) get_http_auth(struct stream *s)
{ {
@ -1713,22 +1708,23 @@ get_http_auth(struct stream *s)
chunk_initlen(&txn->auth.method_data, p + 1, 0, ctx.vlen - len - 1); chunk_initlen(&txn->auth.method_data, p + 1, 0, ctx.vlen - len - 1);
if (!strncasecmp("Basic", auth_method.str, auth_method.len)) { if (!strncasecmp("Basic", auth_method.str, auth_method.len)) {
struct chunk *http_auth = get_trash_chunk();
len = base64dec(txn->auth.method_data.str, txn->auth.method_data.len, len = base64dec(txn->auth.method_data.str, txn->auth.method_data.len,
get_http_auth_buff, global.tune.bufsize - 1); http_auth->str, global.tune.bufsize - 1);
if (len < 0) if (len < 0)
return 0; return 0;
get_http_auth_buff[len] = '\0'; http_auth->str[len] = '\0';
p = strchr(get_http_auth_buff, ':'); p = strchr(http_auth->str, ':');
if (!p) if (!p)
return 0; return 0;
txn->auth.user = get_http_auth_buff; txn->auth.user = http_auth->str;
*p = '\0'; *p = '\0';
txn->auth.pass = p+1; txn->auth.pass = p+1;