sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http.c: Reload TLS even if http.conf hasn't changed 

There is currently no way to indicate to Asterisk that TLS certificates
and/or keys have been updated other than by modifying http.conf or
restarting Asterisk.

There is already code in main/tcptls.c that determines if a reload is
actually necessary based on the hashes of the certicate and dependent
files, so this change merely gives us a way to request a reload without
explicitly modifying http.conf.

Change-Id: Ie795420dcc7eb3d91336820688a29adbcc321276
This commit is contained in:
Sean Bright 2018-10-03 08:56:34 -04:00
parent f066dbc353
commit 2b4752911f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/http.c
View File

@ -2066,7 +2066,15 @@ static int __ast_http_load(int reload)
int http_tls_was_enabled = 0;
cfg = ast_config_load2("http.conf", "http", config_flags);
if (!cfg || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) {
if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) {
return 0;
}
/* Even if the http.conf hasn't been updated, the TLS certs/keys may have been */
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
if (http_tls_cfg.enabled && ast_ssl_setup(https_desc.tls_cfg)) {
ast_tcptls_server_start(&https_desc);
}
return 0;
}