mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: add a list of bind_conf in struct crtlist

Browse Source 
In order to be able to add new certificate in a crt-list, we need the
list of bind_conf that uses this crt-list so we can create a ckch_inst
for each of them.
This commit is contained in:
William Lallemand 2020-03-25 15:10:49 +01:00 committed by William Lallemand
parent 638f6ad033
commit 79d31ec0d4
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/types/ssl_sock.h
View File

@ -138,8 +138,15 @@ struct ckch_inst {
struct list by_crtlist_entry; /* chained in crtlist_entry list of inst */ struct list by_crtlist_entry; /* chained in crtlist_entry list of inst */
}; };
/* list of bind conf used by struct crtlist */
struct bind_conf_list {
struct bind_conf *bind_conf;
struct bind_conf_list *next;
};
/* This structure is basically a crt-list or a directory */ /* This structure is basically a crt-list or a directory */
struct crtlist { struct crtlist {
struct bind_conf_list *bind_conf; /* list of bind_conf which use this crtlist */
struct eb_root entries; struct eb_root entries;
struct list ord_entries; /* list to keep the line order of the crt-list file */ struct list ord_entries; /* list to keep the line order of the crt-list file */
struct ebmb_node node; /* key is the filename or directory */ struct ebmb_node node; /* key is the filename or directory */

18
src/ssl_sock.c
View File

@ -4456,6 +4456,7 @@ static int crtlist_load_cert_dir(char *path, struct bind_conf *bind_conf, struct
} }
memcpy(dir->node.key, path, strlen(path) + 1); memcpy(dir->node.key, path, strlen(path) + 1);
dir->entries = EB_ROOT_UNIQUE; /* it's a directory, files are unique */ dir->entries = EB_ROOT_UNIQUE; /* it's a directory, files are unique */
dir->bind_conf = NULL;
LIST_INIT(&dir->ord_entries); LIST_INIT(&dir->ord_entries);
n = scandir(path, &de_list, 0, alphasort); n = scandir(path, &de_list, 0, alphasort);
@ -4719,6 +4720,7 @@ static int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct pr
} }
memcpy(newlist->node.key, file, strlen(file) + 1); memcpy(newlist->node.key, file, strlen(file) + 1);
newlist->entries = EB_ROOT; newlist->entries = EB_ROOT;
newlist->bind_conf = NULL;
LIST_INIT(&newlist->ord_entries); LIST_INIT(&newlist->ord_entries);
while (fgets(thisline, sizeof(thisline), f) != NULL) { while (fgets(thisline, sizeof(thisline), f) != NULL) {
@ -4896,9 +4898,20 @@ int ssl_sock_load_cert_list_file(char *file, int dir, struct bind_conf *bind_con
struct ebmb_node *eb; struct ebmb_node *eb;
struct crtlist_entry *entry; struct crtlist_entry *entry;
struct list instances; /* temporary list head */ struct list instances; /* temporary list head */
struct bind_conf_list *bind_conf_node = NULL;
int cfgerr = 0; int cfgerr = 0;
LIST_INIT(&instances); LIST_INIT(&instances);
bind_conf_node = malloc(sizeof(*bind_conf_node));
if (!bind_conf_node) {
memprintf(err, "%sCan't alloc memory!\n", err && *err ? *err : "");
cfgerr |= ERR_FATAL | ERR_ALERT;
goto error;
}
bind_conf_node->next = NULL;
bind_conf_node->bind_conf = bind_conf;
/* look for an existing crtlist or create one */ /* look for an existing crtlist or create one */
eb = ebst_lookup(&crtlists_tree, file); eb = ebst_lookup(&crtlists_tree, file);
if (eb) { if (eb) {
@ -4935,6 +4948,10 @@ int ssl_sock_load_cert_list_file(char *file, int dir, struct bind_conf *bind_con
/* add the instances to the actual instance list in the crtlist_entry */ /* add the instances to the actual instance list in the crtlist_entry */
LIST_SPLICE(&entry->ckch_inst, &instances); LIST_SPLICE(&entry->ckch_inst, &instances);
/* add the bind_conf to the list */
bind_conf_node->next = crtlist->bind_conf;
crtlist->bind_conf = bind_conf_node;
return cfgerr; return cfgerr;
error: error:
{ {
@ -4952,6 +4969,7 @@ error:
LIST_DEL(&inst->by_crtlist_entry); LIST_DEL(&inst->by_crtlist_entry);
free(inst); free(inst);
} }
free(bind_conf_node);
} }
return cfgerr; return cfgerr;
} }