grpc 1.55.0 → 1.56.0.pre3

data/third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c

@@ -39,23 +39,20 @@
 #include "ares_dns.h"
 #include "ares_private.h"
 
-int ares__parse_into_addrinfo2(const unsigned char *abuf,
-                               int alen,
-                               char **question_hostname,
-                               struct ares_addrinfo *ai)
+int ares__parse_into_addrinfo(const unsigned char *abuf,
+                              int alen, int cname_only_is_enodata,
+                              unsigned short port,
+                              struct ares_addrinfo *ai)
 {
   unsigned int qdcount, ancount;
   int status, i, rr_type, rr_class, rr_len, rr_ttl;
   int got_a = 0, got_aaaa = 0, got_cname = 0;
   long len;
   const unsigned char *aptr;
+  char *question_hostname = NULL;
   char *hostname, *rr_name = NULL, *rr_data;
   struct ares_addrinfo_cname *cname, *cnames = NULL;
-  struct ares_addrinfo_node *node, *nodes = NULL;
-  struct sockaddr_in *sin;
-  struct sockaddr_in6 *sin6;
-
-  *question_hostname = NULL;
+  struct ares_addrinfo_node *nodes = NULL;
 
   /* Give up if abuf doesn't have room for a header. */
   if (alen < HFIXEDSZ)
@@ -70,15 +67,16 @@ int ares__parse_into_addrinfo2(const unsigned char *abuf,
 
   /* Expand the name from the question, and skip past the question. */
   aptr = abuf + HFIXEDSZ;
-  status = ares__expand_name_for_response(aptr, abuf, alen, question_hostname, &len, 0);
+  status = ares__expand_name_for_response(aptr, abuf, alen, &question_hostname, &len, 0);
   if (status != ARES_SUCCESS)
     return status;
   if (aptr + len + QFIXEDSZ > abuf + alen)
     {
-      return ARES_EBADRESP;
+      status = ARES_EBADRESP;
+      goto failed_stat;
     }
 
-  hostname = *question_hostname;
+  hostname = question_hostname;
 
   aptr += len + QFIXEDSZ;
 
@@ -121,30 +119,9 @@ int ares__parse_into_addrinfo2(const unsigned char *abuf,
             goto failed_stat;
           }  /* LCOV_EXCL_STOP */
 
-          node = ares__append_addrinfo_node(&nodes);
-          if (!node)
-            {
-              status = ARES_ENOMEM;
-              goto failed_stat;
-            }
-
-          sin = ares_malloc(sizeof(struct sockaddr_in));
-          if (!sin)
-            {
-              status = ARES_ENOMEM;
-              goto failed_stat;
-            }
-          memset(sin, 0, sizeof(struct sockaddr_in));
-          memcpy(&sin->sin_addr.s_addr, aptr, sizeof(struct in_addr));
-          sin->sin_family = AF_INET;
-
-          node->ai_addr = (struct sockaddr *)sin;
-          node->ai_family = AF_INET;
-          node->ai_addrlen = sizeof(struct sockaddr_in);
-
-          node->ai_ttl = rr_ttl;
-
-          status = ARES_SUCCESS;
+          status = ares_append_ai_node(AF_INET, port, rr_ttl, aptr, &nodes);
+          if (status != ARES_SUCCESS)
+            goto failed_stat;
         }
       else if (rr_class == C_IN && rr_type == T_AAAA
           && rr_len == sizeof(struct ares_in6_addr)
@@ -157,31 +134,9 @@ int ares__parse_into_addrinfo2(const unsigned char *abuf,
             goto failed_stat;
           }  /* LCOV_EXCL_STOP */
 
-          node = ares__append_addrinfo_node(&nodes);
-          if (!node)
-            {
-              status = ARES_ENOMEM;
-              goto failed_stat;
-            }
-
-          sin6 = ares_malloc(sizeof(struct sockaddr_in6));
-          if (!sin6)
-            {
-              status = ARES_ENOMEM;
-              goto failed_stat;
-            }
-
-          memset(sin6, 0, sizeof(struct sockaddr_in6));
-          memcpy(&sin6->sin6_addr.s6_addr, aptr, sizeof(struct ares_in6_addr));
-          sin6->sin6_family = AF_INET6;
-
-          node->ai_addr = (struct sockaddr *)sin6;
-          node->ai_family = AF_INET6;
-          node->ai_addrlen = sizeof(struct sockaddr_in6);
-
-          node->ai_ttl = rr_ttl;
-
-          status = ARES_SUCCESS;
+          status = ares_append_ai_node(AF_INET6, port, rr_ttl, aptr, &nodes);
+          if (status != ARES_SUCCESS)
+            goto failed_stat;
         }
 
       if (rr_class == C_IN && rr_type == T_CNAME)
@@ -208,10 +163,13 @@ int ares__parse_into_addrinfo2(const unsigned char *abuf,
           cname->ttl = rr_ttl;
           cname->alias = rr_name;
           cname->name = rr_data;
+          rr_name = NULL;
         }
       else
         {
+          /* rr_name is only saved for cname */
           ares_free(rr_name);
+          rr_name = NULL;
         }
 
 
@@ -225,36 +183,47 @@ int ares__parse_into_addrinfo2(const unsigned char *abuf,
 
   if (status == ARES_SUCCESS)
     {
-      ares__addrinfo_cat_nodes(&ai->nodes, nodes);
-      if (got_cname)
+      if (!got_a && !got_aaaa)
         {
-          ares__addrinfo_cat_cnames(&ai->cnames, cnames);
-          return status;
+          if (!got_cname || (got_cname && cname_only_is_enodata))
+            {
+              status = ARES_ENODATA;
+              goto failed_stat;
+            }
+        }
+
+      /* save the question hostname as ai->name */
+      if (ai->name == NULL || strcasecmp(ai->name, question_hostname) != 0)
+        {
+          ares_free(ai->name);
+          ai->name = ares_strdup(question_hostname);
+          if (!ai->name)
+            {
+              status = ARES_ENOMEM;
+              goto failed_stat;
+            }
         }
-      else if (got_a == 0 && got_aaaa == 0)
+
+      if (got_a || got_aaaa)
+        {
+          ares__addrinfo_cat_nodes(&ai->nodes, nodes);
+          nodes = NULL;
+        }
+
+      if (got_cname)
         {
-          /* the check for naliases to be zero is to make sure CNAME responses
-             don't get caught here */
-          status = ARES_ENODATA;
+          ares__addrinfo_cat_cnames(&ai->cnames, cnames);
+          cnames = NULL;
         }
     }
 
+  ares_free(question_hostname);
   return status;
 
 failed_stat:
+  ares_free(question_hostname);
   ares_free(rr_name);
   ares__freeaddrinfo_cnames(cnames);
   ares__freeaddrinfo_nodes(nodes);
   return status;
 }
-
-int ares__parse_into_addrinfo(const unsigned char *abuf,
-                              int alen,
-                              struct ares_addrinfo *ai)
-{
-  int status;
-  char *question_hostname;
-  status = ares__parse_into_addrinfo2(abuf, alen, &question_hostname, ai);
-  ares_free(question_hostname);
-  return status;
-}

data/third_party/cares/cares/src/lib/ares__readaddrinfo.c

@@ -42,11 +42,10 @@ int ares__readaddrinfo(FILE *fp,
   char *txtaddr, *txthost, *txtalias;
   char *aliases[MAX_ALIASES];
   unsigned int i, alias_count;
-  int status;
+  int status = ARES_SUCCESS;
   size_t linesize;
-  ares_sockaddr addr;
   struct ares_addrinfo_cname *cname = NULL, *cnames = NULL;
-  struct ares_addrinfo_node *node = NULL, *nodes = NULL;
+  struct ares_addrinfo_node *nodes = NULL;
   int match_with_alias, match_with_canonical;
   int want_cname = hints->ai_flags & ARES_AI_CANONNAME;
 
@@ -60,6 +59,12 @@ int ares__readaddrinfo(FILE *fp,
       return ARES_EBADFAMILY;
   }
 
+  ai->name = ares_strdup(name);
+  if(!ai->name)
+    {
+      status = ARES_ENOMEM;
+      goto fail;
+    }
 
   while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
     {
@@ -163,57 +168,36 @@ int ares__readaddrinfo(FILE *fp,
           continue;
         }
 
-      /* Zero-out 'addr' struct, as there are members that we may not set, especially
-       * for ipv6.  We don't want garbage data */
-      memset(&addr, 0, sizeof(addr));
-
       /*
        * Convert address string to network address for the requested families.
        * Actual address family possible values are AF_INET and AF_INET6 only.
        */
       if ((hints->ai_family == AF_INET) || (hints->ai_family == AF_UNSPEC))
         {
-          addr.sa4.sin_port = htons(port);
-          if (ares_inet_pton(AF_INET, txtaddr, &addr.sa4.sin_addr) > 0)
+          struct in_addr addr4;
+          if (ares_inet_pton(AF_INET, txtaddr, &addr4) == 1)
             {
-              node = ares__append_addrinfo_node(&nodes);
-              if(!node)
+              status = ares_append_ai_node(AF_INET, port, 0, &addr4, &nodes);
+              if (status != ARES_SUCCESS)
                 {
-                  goto enomem;
+                  goto fail;
                 }
-
-              node->ai_family = addr.sa.sa_family = AF_INET;
-              node->ai_addrlen = sizeof(addr.sa4);
-              node->ai_addr = ares_malloc(sizeof(addr.sa4));
-              if (!node->ai_addr)
-                {
-                  goto enomem;
-                }
-              memcpy(node->ai_addr, &addr.sa4, sizeof(addr.sa4));
             }
         }
       if ((hints->ai_family == AF_INET6) || (hints->ai_family == AF_UNSPEC))
         {
-          addr.sa6.sin6_port = htons(port);
-          if (ares_inet_pton(AF_INET6, txtaddr, &addr.sa6.sin6_addr) > 0)
+          struct ares_in6_addr addr6;
+          if (ares_inet_pton(AF_INET6, txtaddr, &addr6) == 1)
             {
-              node = ares__append_addrinfo_node(&nodes);
-              if (!node)
-                {
-                  goto enomem;
-                }
-
-              node->ai_family = addr.sa.sa_family = AF_INET6;
-              node->ai_addrlen = sizeof(addr.sa6);
-              node->ai_addr = ares_malloc(sizeof(addr.sa6));
-              if (!node->ai_addr)
+              status = ares_append_ai_node(AF_INET6, port, 0, &addr6, &nodes);
+              if (status != ARES_SUCCESS)
                 {
-                  goto enomem;
+                  goto fail;
                 }
-              memcpy(node->ai_addr, &addr.sa6, sizeof(addr.sa6));
             }
         }
-      if (!node)
+
+      if (status != ARES_SUCCESS)
         /* Ignore line if invalid address string for the requested family. */
         continue;
 
@@ -224,7 +208,8 @@ int ares__readaddrinfo(FILE *fp,
               cname = ares__append_addrinfo_cname(&cnames);
               if (!cname)
                 {
-                  goto enomem;
+                  status = ARES_ENOMEM;
+                  goto fail;
                 }
               cname->alias = ares_strdup(aliases[i]);
               cname->name = ares_strdup(txthost);
@@ -235,7 +220,8 @@ int ares__readaddrinfo(FILE *fp,
               cname = ares__append_addrinfo_cname(&cnames);
               if (!cname)
                 {
-                  goto enomem;
+                  status = ARES_ENOMEM;
+                  goto fail;
                 }
               cname->name = ares_strdup(txthost);
             }
@@ -245,20 +231,28 @@ int ares__readaddrinfo(FILE *fp,
   /* Last read failed. */
   if (status == ARES_ENOMEM)
     {
-      goto enomem;
+      goto fail;
+    }
+
+  /* If no results, its a failure */
+  if (!nodes)
+    {
+      status = ARES_ENOTFOUND;
+      goto fail;
     }
 
   /* Free line buffer. */
   ares_free(line);
-
   ares__addrinfo_cat_cnames(&ai->cnames, cnames);
   ares__addrinfo_cat_nodes(&ai->nodes, nodes);
 
-  return node ? ARES_SUCCESS : ARES_ENOTFOUND;
+  return ARES_SUCCESS;
 
-enomem:
+fail:
   ares_free(line);
   ares__freeaddrinfo_cnames(cnames);
   ares__freeaddrinfo_nodes(nodes);
-  return ARES_ENOMEM;
+  ares_free(ai->name);
+  ai->name = NULL;
+  return status;
 }

data/third_party/cares/cares/src/lib/ares__sortaddrinfo.c

@@ -301,11 +301,15 @@ static int rfc6724_compare(const void *ptr1, const void *ptr2)
     }
 
   /* Rule 2: Prefer matching scope. */
-  scope_src1 = get_scope(&a1->src_addr.sa);
+  scope_src1 = ARES_IPV6_ADDR_SCOPE_NODELOCAL;
+  if (a1->has_src_addr)
+    scope_src1 = get_scope(&a1->src_addr.sa);
   scope_dst1 = get_scope(a1->ai->ai_addr);
   scope_match1 = (scope_src1 == scope_dst1);
 
-  scope_src2 = get_scope(&a2->src_addr.sa);
+  scope_src2 = ARES_IPV6_ADDR_SCOPE_NODELOCAL;
+  if (a2->has_src_addr)
+    scope_src2 = get_scope(&a2->src_addr.sa);
   scope_dst2 = get_scope(a2->ai->ai_addr);
   scope_match2 = (scope_src2 == scope_dst2);
 
@@ -319,11 +323,15 @@ static int rfc6724_compare(const void *ptr1, const void *ptr2)
   /* Rule 4: Prefer home addresses.  */
 
   /* Rule 5: Prefer matching label. */
-  label_src1 = get_label(&a1->src_addr.sa);
+  label_src1 = 1;
+  if (a1->has_src_addr)
+    label_src1 = get_label(&a1->src_addr.sa);
   label_dst1 = get_label(a1->ai->ai_addr);
   label_match1 = (label_src1 == label_dst1);
 
-  label_src2 = get_label(&a2->src_addr.sa);
+  label_src2 = 1;
+  if (a2->has_src_addr)
+    label_src2 = get_label(&a2->src_addr.sa);
   label_dst2 = get_label(a2->ai->ai_addr);
   label_match2 = (label_src2 == label_dst2);
 

data/third_party/cares/cares/src/lib/ares_data.c

@@ -77,6 +77,14 @@ void ares_free_data(void *dataptr)
             ares_free(ptr->data.srv_reply.host);
           break;
 
+        case ARES_DATATYPE_URI_REPLY:
+
+          if (ptr->data.uri_reply.next)
+            next_data = ptr->data.uri_reply.next;
+          if (ptr->data.uri_reply.uri)
+            ares_free(ptr->data.uri_reply.uri);
+          break;
+
         case ARES_DATATYPE_TXT_REPLY:
         case ARES_DATATYPE_TXT_EXT:
 
@@ -174,6 +182,14 @@ void *ares_malloc_data(ares_datatype type)
         ptr->data.srv_reply.port = 0;
         break;
 
+      case ARES_DATATYPE_URI_REPLY:
+        ptr->data.uri_reply.next = NULL;
+        ptr->data.uri_reply.priority = 0;
+        ptr->data.uri_reply.weight = 0;
+        ptr->data.uri_reply.uri = NULL;
+        ptr->data.uri_reply.ttl = 0;
+        break;
+
       case ARES_DATATYPE_TXT_EXT:
         ptr->data.txt_ext.record_start = 0;
         /* FALLTHROUGH */

data/third_party/cares/cares/src/lib/ares_data.h

@@ -1,3 +1,6 @@
+#ifndef __ARES_DATA_H
+#define __ARES_DATA_H
+
 
 /* Copyright (C) 2009-2013 by Daniel Stenberg
  *
@@ -23,6 +26,7 @@ typedef enum {
   ARES_DATATYPE_MX_REPLY,    /* struct ares_mx_reply   - introduced in 1.7.2 */
   ARES_DATATYPE_NAPTR_REPLY,/* struct ares_naptr_reply - introduced in 1.7.6 */
   ARES_DATATYPE_SOA_REPLY,    /* struct ares_soa_reply - introduced in 1.9.0 */
+  ARES_DATATYPE_URI_REPLY, 	/* struct ares_uri_reply */
 #if 0
   ARES_DATATYPE_ADDR6TTL,     /* struct ares_addrttl   */
   ARES_DATATYPE_ADDRTTL,      /* struct ares_addr6ttl  */
@@ -67,8 +71,11 @@ struct ares_data {
     struct ares_naptr_reply  naptr_reply;
     struct ares_soa_reply    soa_reply;
     struct ares_caa_reply    caa_reply;
+    struct ares_uri_reply    uri_reply;
   } data;
 };
 
 void *ares_malloc_data(ares_datatype type);
 
+
+#endif /* __ARES_DATA_H */

data/third_party/cares/cares/src/lib/ares_destroy.c

@@ -38,6 +38,8 @@ void ares_destroy_options(struct ares_options *options)
     ares_free(options->lookups);
   if(options->resolvconf_path)
     ares_free(options->resolvconf_path);
+  if(options->hosts_path)
+    ares_free(options->hosts_path);
 }
 
 void ares_destroy(ares_channel channel)
@@ -90,6 +92,12 @@ void ares_destroy(ares_channel channel)
   if (channel->resolvconf_path)
     ares_free(channel->resolvconf_path);
 
+  if (channel->hosts_path)
+    ares_free(channel->hosts_path);
+
+  if (channel->rand_state)
+    ares__destroy_rand_state(channel->rand_state);
+
   ares_free(channel);
 }
 

data/third_party/cares/cares/src/lib/ares_expand_name.c

@@ -59,10 +59,21 @@ static int ares__isprint(int ch)
   return 0;
 }
 
-/* Character set allowed by hostnames */
+/* Character set allowed by hostnames.  This is to include the normal
+ * domain name character set plus:
+ *  - underscores which are used in SRV records.
+ *  - Forward slashes such as are used for classless in-addr.arpa 
+ *    delegation (CNAMEs)
+ *  - Asterisks may be used for wildcard domains in CNAMEs as seen in the
+ *    real world.
+ * While RFC 2181 section 11 does state not to do validation,
+ * that applies to servers, not clients.  Vulnerabilities have been
+ * reported when this validation is not performed.  Security is more
+ * important than edge-case compatibility (which is probably invalid
+ * anyhow). */
 static int is_hostnamech(int ch)
 {
-  /* [A-Za-z0-9-.]
+  /* [A-Za-z0-9-*._/]
    * Don't use isalnum() as it is locale-specific
    */
   if (ch >= 'A' && ch <= 'Z')
@@ -71,7 +82,7 @@ static int is_hostnamech(int ch)
     return 1;
   if (ch >= '0' && ch <= '9')
     return 1;
-  if (ch == '-' || ch == '.')
+  if (ch == '-' || ch == '.' || ch == '_' || ch == '/' || ch == '*')
     return 1;
 
   return 0;
@@ -168,9 +179,9 @@ int ares__expand_name_validated(const unsigned char *encoded,
               if (!ares__isprint(*p) && !(name_len == 1 && *p == 0))
                 {
                   *q++ = '\\';
-                  *q++ = '0' + *p / 100;
-                  *q++ = '0' + (*p % 100) / 10;
-                  *q++ = '0' + (*p % 10);
+                  *q++ = (char)('0' + *p / 100);
+                  *q++ = (char)('0' + (*p % 100) / 10);
+                  *q++ = (char)('0' + (*p % 10));
                 }
               else if (is_reservedch(*p))
                 {

data/third_party/cares/cares/src/lib/ares_freeaddrinfo.c

@@ -55,5 +55,6 @@ void ares_freeaddrinfo(struct ares_addrinfo *ai)
     return;
   ares__freeaddrinfo_cnames(ai->cnames);
   ares__freeaddrinfo_nodes(ai->nodes);
+  ares_free(ai->name);
   ares_free(ai);
 }