tcptls: Prevent unsupported options from being set
authorKinsey Moore <kmoore@digium.com>
Fri, 15 Mar 2013 12:53:03 +0000 (12:53 +0000)
committerKinsey Moore <kmoore@digium.com>
Fri, 15 Mar 2013 12:53:03 +0000 (12:53 +0000)
AMI, HTTP, and chan_sip all support TLS in some way, but none of them
support all the options that Asterisk's TLS core is capable of
interpreting. This prevents consumers of the TLS/SSL layer from setting
TLS/SSL options that they do not support.

This also gets tlsverifyclient closer to a working state by requesting
the client certificate when tlsverifyclient is set. Currently, there is
no consumer of main/tcptls.c in Asterisk that supports this feature and
so it can not be properly tested.

Review: https://reviewboard.asterisk.org/r/2370/
Reported-by: John Bigelow
Patch-by: Kinsey Moore
(closes issue AST-1093)
........

Merged revisions 383165 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 383166 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383167 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c
main/http.c
main/manager.c
main/tcptls.c

index f3a260a..631c1db 100644 (file)
@@ -31646,8 +31646,11 @@ static int reload_config(enum channelreloadreason reason)
                        continue;
                }
 
                        continue;
                }
 
-               /* handle tls conf */
-               if (!ast_tls_read_conf(&default_tls_cfg, &sip_tls_desc, v->name, v->value)) {
+               /* handle tls conf, don't allow setting of tlsverifyclient as it isn't supported by chan_sip */
+               if (!strcasecmp(v->name, "tlsverifyclient")) {
+                       ast_log(LOG_WARNING, "Ignoring unsupported option 'tlsverifyclient'\n");
+                       continue;
+               } else if (!ast_tls_read_conf(&default_tls_cfg, &sip_tls_desc, v->name, v->value)) {
                        continue;
                }
 
                        continue;
                }
 
index fc29312..73fb8bc 100644 (file)
@@ -1060,8 +1060,17 @@ static int __ast_http_load(int reload)
                v = ast_variable_browse(cfg, "general");
                for (; v; v = v->next) {
 
                v = ast_variable_browse(cfg, "general");
                for (; v; v = v->next) {
 
-                       /* handle tls conf */
-                       if (!ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
+                       /* read tls config options while preventing unsupported options from being set */
+                       if (strcasecmp(v->name, "tlscafile")
+                               && strcasecmp(v->name, "tlscapath")
+                               && strcasecmp(v->name, "tlscadir")
+                               && strcasecmp(v->name, "tlsverifyclient")
+                               && strcasecmp(v->name, "tlsdontverifyserver")
+                               && strcasecmp(v->name, "tlsclientmethod")
+                               && strcasecmp(v->name, "sslclientmethod")
+                               && strcasecmp(v->name, "tlscipher")
+                               && strcasecmp(v->name, "sslcipher")
+                               && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
                                continue;
                        }
 
                                continue;
                        }
 
index 10a3a33..d5d5ccc 100644 (file)
@@ -7795,7 +7795,15 @@ static int __init_manager(int reload, int by_external_config)
        for (var = ast_variable_browse(cfg, "general"); var; var = var->next) {
                val = var->value;
 
        for (var = ast_variable_browse(cfg, "general"); var; var = var->next) {
                val = var->value;
 
-               if (!ast_tls_read_conf(&ami_tls_cfg, &amis_desc, var->name, val)) {
+               /* read tls config options while preventing unsupported options from being set */
+               if (strcasecmp(var->name, "tlscafile")
+                       && strcasecmp(var->name, "tlscapath")
+                       && strcasecmp(var->name, "tlscadir")
+                       && strcasecmp(var->name, "tlsverifyclient")
+                       && strcasecmp(var->name, "tlsdontverifyserver")
+                       && strcasecmp(var->name, "tlsclientmethod")
+                       && strcasecmp(var->name, "sslclientmethod")
+                       && !ast_tls_read_conf(&ami_tls_cfg, &amis_desc, var->name, val)) {
                        continue;
                }
 
                        continue;
                }
 
index dffba1d..2b48426 100644 (file)
@@ -373,6 +373,11 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
                cfg->enabled = 0;
                return 0;
        }
                cfg->enabled = 0;
                return 0;
        }
+
+       SSL_CTX_set_verify(cfg->ssl_ctx,
+               ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
+               NULL);
+
        if (!ast_strlen_zero(cfg->certfile)) {
                char *tmpprivate = ast_strlen_zero(cfg->pvtfile) ? cfg->certfile : cfg->pvtfile;
                if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) {
        if (!ast_strlen_zero(cfg->certfile)) {
                char *tmpprivate = ast_strlen_zero(cfg->pvtfile) ? cfg->certfile : cfg->pvtfile;
                if (SSL_CTX_use_certificate_file(cfg->ssl_ctx, cfg->certfile, SSL_FILETYPE_PEM) == 0) {