diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2021-04-17 20:20:33 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2021-05-11 21:06:22 +0200 |
| commit | e07221d7c54d55e8df37b19f205a27ebbd24d318 (patch) | |
| tree | 67e8c91965d3e24d81f6f6ceda59e253a87b3703 /src | |
| parent | 39b629550b588c73077d304a40f09e017ce8e1dc (diff) | |
| download | weechat-e07221d7c54d55e8df37b19f205a27ebbd24d318.zip | |
relay: evaluate option relay.network.ssl_cert_key (issue #1285)
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/relay/relay-config.c | 4 | ||||
| -rw-r--r-- | src/plugins/relay/relay-network.c | 53 |
2 files changed, 26 insertions, 31 deletions
diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index 1c92c45da..153c96e7e 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -1140,7 +1140,9 @@ relay_config_init () relay_config_file, ptr_section, "ssl_cert_key", "string", N_("file with SSL certificate and private key (for serving clients " - "with SSL)"), + "with SSL) " + "(path is evaluated, see function string_eval_path_home in " + "plugin API reference)"), NULL, 0, 0, "%h/ssl/relay.pem", NULL, 0, NULL, NULL, NULL, &relay_config_change_network_ssl_cert_key, NULL, NULL, diff --git a/src/plugins/relay/relay-network.c b/src/plugins/relay/relay-network.c index 4fc161261..cc0cc83b9 100644 --- a/src/plugins/relay/relay-network.c +++ b/src/plugins/relay/relay-network.c @@ -47,7 +47,7 @@ gnutls_dh_params_t *relay_gnutls_dh_params = NULL; void relay_network_set_ssl_cert_key (int verbose) { - char *certkey_path, *certkey_path2, *weechat_dir; + char *certkey_path; int ret; gnutls_certificate_free_credentials (relay_gnutls_x509_cred); @@ -55,42 +55,35 @@ relay_network_set_ssl_cert_key (int verbose) relay_network_init_ssl_cert_key_ok = 0; - certkey_path = weechat_string_expand_home (weechat_config_string (relay_config_network_ssl_cert_key)); + certkey_path = weechat_string_eval_path_home ( + weechat_config_string (relay_config_network_ssl_cert_key), + NULL, NULL, NULL); if (certkey_path) { - weechat_dir = weechat_info_get ("weechat_dir", NULL); - certkey_path2 = weechat_string_replace (certkey_path, "%h", - weechat_dir); - if (weechat_dir) - free (weechat_dir); - if (certkey_path2) + ret = gnutls_certificate_set_x509_key_file (relay_gnutls_x509_cred, + certkey_path, + certkey_path, + GNUTLS_X509_FMT_PEM); + if (ret >= 0) { - ret = gnutls_certificate_set_x509_key_file (relay_gnutls_x509_cred, - certkey_path2, - certkey_path2, - GNUTLS_X509_FMT_PEM); - if (ret >= 0) + relay_network_init_ssl_cert_key_ok = 1; + if (verbose) { - relay_network_init_ssl_cert_key_ok = 1; - if (verbose) - { - weechat_printf (NULL, - _("%s: SSL certificate and key have been " - "set"), - RELAY_PLUGIN_NAME); - } + weechat_printf (NULL, + _("%s: SSL certificate and key have been " + "set"), + RELAY_PLUGIN_NAME); } - else + } + else + { + if (verbose) { - if (verbose) - { - weechat_printf (NULL, - _("%s%s: warning: no SSL certificate/key " - "found (option relay.network.ssl_cert_key)"), - weechat_prefix ("error"), RELAY_PLUGIN_NAME); - } + weechat_printf (NULL, + _("%s%s: warning: no SSL certificate/key " + "found (option relay.network.ssl_cert_key)"), + weechat_prefix ("error"), RELAY_PLUGIN_NAME); } - free (certkey_path2); } free (certkey_path); } |