third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-06-06 18:33:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix SNI/ALPN option parsing (issue 90)

Browse Source
This commit is contained in:
Yves Rutschlé 2016-05-20 07:52:24 +00:00
parent 245fd26459
commit 63a83cf041
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sslh-main.c
View File

@ -235,10 +235,6 @@ static void setup_sni_alpn_list(struct proto *p, config_setting_t* config_items,
const char * config_item; const char * config_item;
char** sni_hostname_list; char** sni_hostname_list;
if(!config_items || !config_setting_is_array(config_items)) {
fprintf(stderr, "%s: no %s specified\n", p->description, name);
return;
}
num_probes = config_setting_length(config_items); num_probes = config_setting_length(config_items);
if (!num_probes) { if (!num_probes) {
fprintf(stderr, "%s: no %s specified\n", p->description, name); fprintf(stderr, "%s: no %s specified\n", p->description, name);
@ -264,12 +260,22 @@ static void setup_sni_alpn_list(struct proto *p, config_setting_t* config_items,
p->data = (void*)tls_data_set_list(p->data, alpn, sni_hostname_list); p->data = (void*)tls_data_set_list(p->data, alpn, sni_hostname_list);
} }
static void setup_sni_alpn(struct proto *p, config_setting_t* sni_hostnames, config_setting_t* alpn_protocols) static void setup_sni_alpn(struct proto *p, config_setting_t* prot)
{ {
config_setting_t *sni_hostnames, *alpn_protocols;
p->data = (void*)new_tls_data(); p->data = (void*)new_tls_data();
sni_hostnames = config_setting_get_member(prot, "sni_hostnames");
alpn_protocols = config_setting_get_member(prot, "alpn_protocols");
if(sni_hostnames && config_setting_is_array(sni_hostnames)) {
p->probe = get_probe("sni_alpn"); p->probe = get_probe("sni_alpn");
setup_sni_alpn_list(p, sni_hostnames, "sni_hostnames", 0); setup_sni_alpn_list(p, sni_hostnames, "sni_hostnames", 0);
}
if(alpn_protocols && config_setting_is_array(alpn_protocols)) {
p->probe = get_probe("sni_alpn");
setup_sni_alpn_list(p, alpn_protocols, "alpn_protocols", 1); setup_sni_alpn_list(p, alpn_protocols, "alpn_protocols", 1);
}
} }
#endif #endif
@ -279,7 +285,7 @@ static void setup_sni_alpn(struct proto *p, config_setting_t* sni_hostnames, con
#ifdef LIBCONFIG #ifdef LIBCONFIG
static int config_protocols(config_t *config, struct proto **prots) static int config_protocols(config_t *config, struct proto **prots)
{ {
config_setting_t *setting, *prot, *patterns, *sni_hostnames, *alpn_protocols; config_setting_t *setting, *prot, *patterns;
const char *hostname, *port, *name; const char *hostname, *port, *name;
int i, num_prots; int i, num_prots;
struct proto *p, *prev = NULL; struct proto *p, *prev = NULL;
@ -324,12 +330,7 @@ static int config_protocols(config_t *config, struct proto **prots)
/* Probe-specific options: SNI/ALPN */ /* Probe-specific options: SNI/ALPN */
if (!strcmp(name, "tls")) { if (!strcmp(name, "tls")) {
sni_hostnames = config_setting_get_member(prot, "sni_hostnames"); setup_sni_alpn(p, prot);
alpn_protocols = config_setting_get_member(prot, "alpn_protocols");
if((sni_hostnames && config_setting_is_array(sni_hostnames)) || (alpn_protocols && config_setting_is_array(alpn_protocols))) {
setup_sni_alpn(p, sni_hostnames, alpn_protocols);
}
} }
} }