mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: handle PARSE_TYPE_INT and PARSE_TYPE_ONOFF in ckch_store_load_files()

Browse Source 
The callback used by ckch_store_load_files() only works with
PARSE_TYPE_STR.

This allows to use a callback which will use a integer type for PARSE_TYPE_INT
and PARSE_TYPE_ONOFF.

This require to change the type of the callback to void * to pass either
a char * or a int depending of the parsing type.

The ssl_sock_load_* functions were encapsuled in ckch_conf_load_*
function just to match the type.

This will allow to handle crt-store keywords that are ONOFF or INT
types.
This commit is contained in:
William Lallemand 2024-04-30 19:20:21 +02:00
parent c5a665f5d8
commit 462e5b0098
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/ssl_ckch-t.h
View File

@ -179,7 +179,7 @@ struct ckch_conf_kws {
const char *name; const char *name;
ssize_t offset; ssize_t offset;
enum parse_type_t type; enum parse_type_t type;
int (*func)(const char *path, char *buf, struct ckch_data *d, char **err); int (*func)(void *value, char *buf, struct ckch_data *d, char **err);
char **base; /* ptr to the base path */ char **base; /* ptr to the base path */
}; };

7
include/haproxy/ssl_ckch.h
View File

@ -75,5 +75,12 @@ int __ssl_store_load_locations_file(char *path, int create_if_none, enum cafile_
extern struct cert_exts cert_exts[]; extern struct cert_exts cert_exts[];
extern int (*ssl_commit_crlfile_cb)(const char *path, X509_STORE *ctx, char **err); extern int (*ssl_commit_crlfile_cb)(const char *path, X509_STORE *ctx, char **err);
/* ckch_conf keyword loading */
static inline int ckch_conf_load_pem(void *value, char *buf, struct ckch_data *d, char **err) { return ssl_sock_load_pem_into_ckch(value, buf, d, err); }
static inline int ckch_conf_load_key(void *value, char *buf, struct ckch_data *d, char **err) { return ssl_sock_load_key_into_ckch(value, buf, d, err); }
static inline int ckch_conf_load_ocsp_response(void *value, char *buf, struct ckch_data *d, char **err) { return ssl_sock_load_ocsp_response_from_file(value, buf, d, err); }
static inline int ckch_conf_load_ocsp_issuer(void *value, char *buf, struct ckch_data *d, char **err) { return ssl_sock_load_issuer_file_into_ckch(value, buf, d, err); }
static inline int ckch_conf_load_sctl(void *value, char *buf, struct ckch_data *d, char **err) { return ssl_sock_load_sctl_from_file(value, buf, d, err); }
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
#endif /* _HAPROXY_SSL_CRTLIST_H */ #endif /* _HAPROXY_SSL_CRTLIST_H */

74
src/ssl_ckch.c
View File

@ -4027,11 +4027,11 @@ static int crtstore_load = 0; /* did we already load in this crt-store */
struct ckch_conf_kws ckch_conf_kws[] = { struct ckch_conf_kws ckch_conf_kws[] = {
{ "alias", -1, PARSE_TYPE_NONE, NULL, NULL }, { "alias", -1, PARSE_TYPE_NONE, NULL, NULL },
{ "crt", offsetof(struct ckch_conf, crt), PARSE_TYPE_STR, ssl_sock_load_pem_into_ckch, &current_crtbase }, { "crt", offsetof(struct ckch_conf, crt), PARSE_TYPE_STR, ckch_conf_load_pem, &current_crtbase },
{ "key", offsetof(struct ckch_conf, key), PARSE_TYPE_STR, ssl_sock_load_key_into_ckch, &current_keybase }, { "key", offsetof(struct ckch_conf, key), PARSE_TYPE_STR, ckch_conf_load_key, &current_keybase },
{ "ocsp", offsetof(struct ckch_conf, ocsp), PARSE_TYPE_STR, ssl_sock_load_ocsp_response_from_file, &current_crtbase }, { "ocsp", offsetof(struct ckch_conf, ocsp), PARSE_TYPE_STR, ckch_conf_load_ocsp_response, &current_crtbase },
{ "issuer", offsetof(struct ckch_conf, issuer), PARSE_TYPE_STR, ssl_sock_load_issuer_file_into_ckch, &current_crtbase }, { "issuer", offsetof(struct ckch_conf, issuer), PARSE_TYPE_STR, ckch_conf_load_ocsp_issuer, &current_crtbase },
{ "sctl", offsetof(struct ckch_conf, sctl), PARSE_TYPE_STR, ssl_sock_load_sctl_from_file, &current_crtbase }, { "sctl", offsetof(struct ckch_conf, sctl), PARSE_TYPE_STR, ckch_conf_load_sctl, &current_crtbase },
{ NULL, -1, PARSE_TYPE_STR, NULL, NULL } { NULL, -1, PARSE_TYPE_STR, NULL, NULL }
}; };
@ -4040,7 +4040,7 @@ int ckch_store_load_files(struct ckch_conf *f, struct ckch_store *c, char **err)
{ {
int i; int i;
int err_code = 0; int err_code = 0;
int rc = 0; int rc = 1;
struct ckch_data *d = c->data; struct ckch_data *d = c->data;
/* crt */ /* crt */
@ -4050,40 +4050,66 @@ int ckch_store_load_files(struct ckch_conf *f, struct ckch_store *c, char **err)
} }
for (i = 0; ckch_conf_kws[i].name; i++) { for (i = 0; ckch_conf_kws[i].name; i++) {
char *src = NULL; void *src = NULL;
char **base = ckch_conf_kws[i].base;
if (ckch_conf_kws[i].offset < 0) if (ckch_conf_kws[i].offset < 0)
continue; continue;
src = *(char **)((intptr_t)f + (ptrdiff_t)ckch_conf_kws[i].offset); if (!ckch_conf_kws[i].func)
if (src) { continue;
char *path;
char path_base[PATH_MAX];
if (!ckch_conf_kws[i].func || ckch_conf_kws[i].type != PARSE_TYPE_STR) src = (void *)((intptr_t)f + (ptrdiff_t)ckch_conf_kws[i].offset);
continue;
path = src; switch (ckch_conf_kws[i].type) {
case PARSE_TYPE_STR:
{
char *v;
char *path;
char **base = ckch_conf_kws[i].base;
char path_base[PATH_MAX];
if (base && *base) { v = *(char **)src;
if (*src != '/') { if (!v)
int rv = snprintf(path_base, sizeof(path_base), "%s/%s", *base, src); goto next;
path = v;
if (base && *base && *path != '/') {
int rv = snprintf(path_base, sizeof(path_base), "%s/%s", *base, path);
if (rv >= sizeof(path_base)) { if (rv >= sizeof(path_base)) {
memprintf(err, "'%s/%s' : path too long", *base, src); memprintf(err, "'%s/%s' : path too long", *base, path);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
path = path_base; path = path_base;
} }
rc = ckch_conf_kws[i].func(path, NULL, d, err);
if (rc) {
err_code |= ERR_ALERT | ERR_FATAL;
memprintf(err, "%s '%s' cannot be read or parsed.", err && *err ? *err : "", path);
goto out;
}
break;
} }
rc = ckch_conf_kws[i].func(path, NULL, d, err);
if (rc) { case PARSE_TYPE_INT:
err_code |= ERR_ALERT | ERR_FATAL; case PARSE_TYPE_ONOFF:
memprintf(err, "%s '%s' cannot be read or parsed.", err && *err ? *err : "", path); {
goto out; int v = *(int *)src;
rc = ckch_conf_kws[i].func(&v, NULL, d, err);
if (rc) {
err_code |= ERR_ALERT | ERR_FATAL;
memprintf(err, "%s '%d' cannot be read or parsed.", err && *err ? *err : "", v);
goto out;
}
break;
} }
default:
break;
} }
next:
;
} }
out: out: