kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_stir_shaken.c: Fix crash when stir_shaken.conf is invalid

Browse Source 
* If the call to ast_config_load() returns CONFIG_STATUS_FILEINVALID,
check_for_old_config() now returns LOAD_DECLINE instead of continuing
on with a bad pointer.

* If CONFIG_STATUS_FILEMISSING is returned, check_for_old_config()
assumes the config is being loaded from realtime and now returns
LOAD_SUCCESS.  If it's actually not being loaded from realtime,
sorcery will catch that later on.

* Also refactored the error handling in load_module() a bit.

Resolves: #884
This commit is contained in:
George Joseph
2024-09-13 08:23:08 -06:00
committed by Ben Ford
parent 040aedfc0f
commit 2746cb9ff0
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
res/res_stir_shaken.c
View File

@@ -311,13 +311,22 @@ static int check_for_old_config(void)
char *cat = NULL; char *cat = NULL;
cfg = ast_config_load("stir_shaken.conf", config_flags); cfg = ast_config_load("stir_shaken.conf", config_flags);
if (cfg == NULL) { if (cfg == CONFIG_STATUS_FILEMISSING) {
/* /*
* They may be loading from realtime so the fact that there's * They may be loading from realtime so the fact that there's
* no stir-shaken.conf file isn't an issue for this purpose. * no stir-shaken.conf file isn't an issue for this purpose.
*/ */
return AST_MODULE_LOAD_SUCCESS;
} else if (cfg == CONFIG_STATUS_FILEINVALID) {
cfg = NULL;
ast_log(LOG_ERROR, "The stir_shaken.conf file is invalid\n");
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
/* This can never happen but is included for completeness */
cfg = NULL;
return AST_MODULE_LOAD_SUCCESS;
} }
while ((cat = ast_category_browse(cfg, cat))) { while ((cat = ast_category_browse(cfg, cat))) {
const char *val; const char *val;
if (strcasecmp(cat, "general") == 0) { if (strcasecmp(cat, "general") == 0) {
@@ -339,13 +348,14 @@ static int load_module(void)
{ {
int res = 0; int res = 0;
if (check_for_old_config()) { res = check_for_old_config();
return AST_MODULE_LOAD_DECLINE; if (res != AST_MODULE_LOAD_SUCCESS) {
return res;
} }
if (crypto_load()) { res = crypto_load();
unload_module(); if (res != AST_MODULE_LOAD_SUCCESS) {
return AST_MODULE_LOAD_DECLINE; return res;
} }
tn_auth_list_nid = crypto_register_x509_extension(TN_AUTH_LIST_OID, tn_auth_list_nid = crypto_register_x509_extension(TN_AUTH_LIST_OID,
@@ -355,14 +365,19 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
if (common_config_load()) { res = common_config_load();
if (res != AST_MODULE_LOAD_SUCCESS) {
unload_module();
return res;
}
res = ast_custom_function_register(&stir_shaken_function);
if (res != 0) {
unload_module(); unload_module();
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
res |= ast_custom_function_register(&stir_shaken_function); return AST_MODULE_LOAD_SUCCESS;
return res;
} }
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "STIR/SHAKEN Module for Asterisk", AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "STIR/SHAKEN Module for Asterisk",