diff options
author | George Joseph <george.joseph@fairview5.com> | 2016-03-06 13:38:41 -0700 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2016-03-07 12:15:58 -0700 |
commit | 530cff5f5f3be4d2f53e84a656f10f2f43638d1c (patch) | |
tree | 8c61022785505b44dc0e9a7c9af3adbce66b39cd /res | |
parent | 6e58f83d8d68045574bcb432c74f38183a559bab (diff) |
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip/config_transport.c | 3 | ||||
-rw-r--r-- | res/res_pjsip/location.c | 11 | ||||
-rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 8 | ||||
-rw-r--r-- | res/res_pjsip/pjsip_options.c | 8 | ||||
-rw-r--r-- | res/res_pjsip_endpoint_identifier_ip.c | 6 | ||||
-rw-r--r-- | res/res_pjsip_mwi.c | 26 | ||||
-rw-r--r-- | res/res_pjsip_notify.c | 2 | ||||
-rw-r--r-- | res/res_pjsip_path.c | 6 | ||||
-rw-r--r-- | res/res_pjsip_pubsub.c | 6 | ||||
-rw-r--r-- | res/res_pjsip_registrar.c | 6 |
10 files changed, 58 insertions, 24 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index 61a979c88..db579bf2f 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -985,8 +985,7 @@ static int transport_tls_cipher_handler(const struct aco_option *opt, struct ast } parse = ast_strdupa(S_OR(var->value, "")); - while ((name = strsep(&parse, ","))) { - name = ast_strip(name); + while ((name = ast_strip(strsep(&parse, ",")))) { if (ast_strlen_zero(name)) { continue; } diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c index 2908f6f70..4284f35f1 100644 --- a/res/res_pjsip/location.c +++ b/res/res_pjsip/location.c @@ -210,7 +210,7 @@ void ast_sip_location_retrieve_contact_and_aor_from_list(const char *aor_list, s *aor = NULL; *contact = NULL; - while ((aor_name = strsep(&rest, ","))) { + while ((aor_name = ast_strip(strsep(&rest, ",")))) { *aor = ast_sip_location_retrieve_aor(aor_name); if (!(*aor)) { @@ -382,12 +382,16 @@ static int permanent_uri_handler(const struct aco_option *opt, struct ast_variab } contacts = ast_strdupa(var->value); - while ((contact_uri = strsep(&contacts, ","))) { + while ((contact_uri = ast_strip(strsep(&contacts, ",")))) { struct ast_sip_contact *contact; struct ast_sip_contact_status *status; char hash[33]; char contact_id[strlen(aor_id) + sizeof(hash) + 2]; + if (ast_strlen_zero(contact_uri)) { + continue; + } + if (!aor->permanent_contacts) { aor->permanent_contacts = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_NOLOCK, AO2_CONTAINER_ALLOC_OPT_DUPS_REJECT, permanent_uri_sort_fn, NULL); @@ -447,7 +451,7 @@ int ast_sip_for_each_aor(const char *aors, ao2_callback_fn on_aor, void *arg) } copy = ast_strdupa(aors); - while ((name = strsep(©, ","))) { + while ((name = ast_strip(strsep(©, ",")))) { RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(name), ao2_cleanup); @@ -459,7 +463,6 @@ int ast_sip_for_each_aor(const char *aors, ao2_callback_fn on_aor, void *arg) return -1; } } - ast_free(copy); return 0; } diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 1eed9284b..ebd621261 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -413,7 +413,7 @@ int ast_sip_auth_vector_init(struct ast_sip_auth_vector *auths, const char *valu return -1; } - while ((val = strsep(&auth_names, ","))) { + while ((val = ast_strip(strsep(&auth_names, ",")))) { if (ast_strlen_zero(val)) { continue; } @@ -480,7 +480,11 @@ static int ident_handler(const struct aco_option *opt, struct ast_variable *var, char *idents = ast_strdupa(var->value); char *val; - while ((val = strsep(&idents, ","))) { + while ((val = ast_strip(strsep(&idents, ",")))) { + if (ast_strlen_zero(val)) { + continue; + } + if (!strcasecmp(val, "username")) { endpoint->ident_method |= AST_SIP_ENDPOINT_IDENTIFY_BY_USERNAME; } else { diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index f3c073704..de551dc0a 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -281,7 +281,7 @@ static int on_endpoint(void *obj, void *arg, int flags) } aors = ast_strdupa(endpoint->aors); - while ((aor_name = strsep(&aors, ","))) { + while ((aor_name = ast_strip(strsep(&aors, ",")))) { struct ast_sip_aor *aor; struct ao2_container *contacts; @@ -806,7 +806,7 @@ static int cli_qualify_contacts(void *data) } aors = ast_strdupa(endpoint->aors); - while ((aor_name = strsep(&aors, ","))) { + while ((aor_name = ast_strip(strsep(&aors, ",")))) { struct ast_sip_aor *aor; struct ao2_container *contacts; @@ -910,7 +910,7 @@ static int ami_sip_qualify(struct mansession *s, const struct message *m) } aors = ast_strdupa(endpoint->aors); - while ((aor_name = strsep(&aors, ","))) { + while ((aor_name = ast_strip(strsep(&aors, ",")))) { struct ast_sip_aor *aor; struct ao2_container *contacts; @@ -1098,7 +1098,7 @@ static int qualify_and_schedule_all_cb(void *obj, void *arg, int flags) } aors = ast_strdupa(endpoint->aors); - while ((aor_name = strsep(&aors, ","))) { + while ((aor_name = ast_strip(strsep(&aors, ",")))) { struct ast_sip_aor *aor; struct ao2_container *contacts; diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c index 11559adf5..7f4858af0 100644 --- a/res/res_pjsip_endpoint_identifier_ip.c +++ b/res/res_pjsip_endpoint_identifier_ip.c @@ -164,11 +164,15 @@ static int ip_identify_match_handler(const struct aco_option *opt, struct ast_va return 0; } - while ((current_string = strsep(&input_string, ","))) { + while ((current_string = ast_strip(strsep(&input_string, ",")))) { struct ast_sockaddr *addrs; int num_addrs = 0, error = 0, i; char *mask = strrchr(current_string, '/'); + if (ast_strlen_zero(current_string)) { + continue; + } + if (mask) { identify->matches = ast_append_ha("d", current_string, identify->matches, &error); diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c index 1bc1adf8b..7bec75819 100644 --- a/res/res_pjsip_mwi.c +++ b/res/res_pjsip_mwi.c @@ -432,7 +432,7 @@ static void send_unsolicited_mwi_notify(struct mwi_subscription *sub, ast_debug(5, "Sending unsolicited MWI NOTIFY to endpoint %s, new messages: %d, old messages: %d\n", sub->id, counter->new_msgs, counter->old_msgs); - while ((aor_name = strsep(&endpoint_aors, ","))) { + while ((aor_name = ast_strip(strsep(&endpoint_aors, ",")))) { RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(aor_name), ao2_cleanup); RAII_VAR(struct ao2_container *, contacts, NULL, ao2_cleanup); struct unsolicited_mwi_data mwi_data = { @@ -598,7 +598,11 @@ static int mwi_validate_for_aor(void *obj, void *arg, int flags) } mailboxes = ast_strdupa(aor->mailboxes); - while ((mailbox = strsep(&mailboxes, ","))) { + while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) { + if (ast_strlen_zero(mailbox)) { + continue; + } + if (endpoint_receives_unsolicited_mwi_for_mailbox(endpoint, mailbox)) { ast_debug(1, "Endpoint '%s' already configured for unsolicited MWI for mailbox '%s'. " "Denying MWI subscription to %s\n", ast_sorcery_object_get_id(endpoint), mailbox, @@ -622,9 +626,13 @@ static int mwi_on_aor(void *obj, void *arg, int flags) } mailboxes = ast_strdupa(aor->mailboxes); - while ((mailbox = strsep(&mailboxes, ","))) { + while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) { struct mwi_stasis_subscription *mwi_stasis_sub; + if (ast_strlen_zero(mailbox)) { + continue; + } + mwi_stasis_sub = mwi_stasis_subscription_alloc(mailbox, sub); if (!mwi_stasis_sub) { continue; @@ -890,7 +898,7 @@ static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags endpoint_aors = ast_strdupa(endpoint->aors); - while ((aor_name = strsep(&endpoint_aors, ","))) { + while ((aor_name = ast_strip(strsep(&endpoint_aors, ",")))) { RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(aor_name), ao2_cleanup); if (!aor) { @@ -921,11 +929,15 @@ static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags } mailboxes = ast_strdupa(endpoint->subscription.mwi.mailboxes); - while ((mailbox = strsep(&mailboxes, ","))) { - struct mwi_subscription *sub = aggregate_sub ?: - mwi_subscription_alloc(endpoint, 0, NULL); + while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) { + struct mwi_subscription *sub; struct mwi_stasis_subscription *mwi_stasis_sub; + if (ast_strlen_zero(mailbox)) { + continue; + } + + sub = aggregate_sub ?: mwi_subscription_alloc(endpoint, 0, NULL); mwi_stasis_sub = mwi_stasis_subscription_alloc(mailbox, sub); if (mwi_stasis_sub) { ao2_link(sub->stasis_subs, mwi_stasis_sub); diff --git a/res/res_pjsip_notify.c b/res/res_pjsip_notify.c index 96367cf61..8258b3857 100644 --- a/res/res_pjsip_notify.c +++ b/res/res_pjsip_notify.c @@ -615,7 +615,7 @@ static int notify_endpoint(void *obj) aors = ast_strdupa(data->endpoint->aors); - while ((aor_name = strsep(&aors, ","))) { + while ((aor_name = ast_strip(strsep(&aors, ",")))) { RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(aor_name), ao2_cleanup); RAII_VAR(struct ao2_container *, contacts, NULL, ao2_cleanup); diff --git a/res/res_pjsip_path.c b/res/res_pjsip_path.c index d0ee5a49a..47d6a7906 100644 --- a/res/res_pjsip_path.c +++ b/res/res_pjsip_path.c @@ -53,9 +53,13 @@ static struct ast_sip_aor *find_aor(struct ast_sip_endpoint *endpoint, pjsip_uri configured_aors = ast_strdupa(endpoint->aors); /* Iterate the configured AORs to see if the user or the user+domain match */ - while ((aor_name = strsep(&configured_aors, ","))) { + while ((aor_name = ast_strip(strsep(&configured_aors, ",")))) { struct ast_sip_domain_alias *alias = NULL; + if (ast_strlen_zero(aor_name)) { + continue; + } + if (!pj_strcmp2(&sip_uri->user, aor_name)) { break; } diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 643ed850f..d859b760a 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -3654,7 +3654,11 @@ static int list_item_handler(const struct aco_option *opt, char *items = ast_strdupa(var->value); char *item; - while ((item = strsep(&items, ","))) { + while ((item = ast_strip(strsep(&items, ",")))) { + if (ast_strlen_zero(item)) { + continue; + } + if (item_in_vector(list, item)) { ast_log(LOG_WARNING, "Ignoring duplicated list item '%s'\n", item); continue; diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c index b0f8d66f3..fb2b9daba 100644 --- a/res/res_pjsip_registrar.c +++ b/res/res_pjsip_registrar.c @@ -651,9 +651,13 @@ static pj_bool_t registrar_on_rx_request(struct pjsip_rx_data *rdata) configured_aors = ast_strdupa(endpoint->aors); /* Iterate the configured AORs to see if the user or the user+domain match */ - while ((aor_name = strsep(&configured_aors, ","))) { + while ((aor_name = ast_strip(strsep(&configured_aors, ",")))) { struct ast_sip_domain_alias *alias = NULL; + if (ast_strlen_zero(aor_name)) { + continue; + } + if (!pj_strcmp2(&uri->user, aor_name)) { break; } |