couchbase 3.5.1 → 3.5.2

data/ext/couchbase/core/utils/url_codec.cxx

@@ -28,165 +28,165 @@ namespace couchbase::core::utils::string_codec
 
 namespace priv
 {
-inline bool
-is_legal_uri_char(char c)
+inline auto
+is_legal_uri_char(char c) -> bool
 {
-    auto uc = static_cast<unsigned char>(c);
-    if ((isalpha(uc) != 0) || (isdigit(uc) != 0)) {
-        return true;
-    }
-    switch (uc) {
-        case '-':
-        case '_':
-        case '.':
-        case '~':
-        case '!':
-        case '*':
-        case '\'':
-        case '(':
-        case ')':
-        case ';':
-        case ':':
-        case '@':
-        case '&':
-        case '=':
-        case '+':
-        case '$':
-        case ',':
-        case '/':
-        case '?':
-        case '#':
-        case '[':
-        case ']':
-            return true;
-        default:
-            break;
-    }
-    return false;
+  auto uc = static_cast<unsigned char>(c);
+  if ((isalpha(uc) != 0) || (isdigit(uc) != 0)) {
+    return true;
+  }
+  switch (uc) {
+    case '-':
+    case '_':
+    case '.':
+    case '~':
+    case '!':
+    case '*':
+    case '\'':
+    case '(':
+    case ')':
+    case ';':
+    case ':':
+    case '@':
+    case '&':
+    case '=':
+    case '+':
+    case '$':
+    case ',':
+    case '/':
+    case '?':
+    case '#':
+    case '[':
+    case ']':
+      return true;
+    default:
+      break;
+  }
+  return false;
 }
 
 template<typename T>
-inline bool
-is_already_escape(T first, T last)
+inline auto
+is_already_escape(T first, T last) -> bool
 {
-    ++first; // ignore '%'
-    std::size_t jj = 0;
-    for (; first != last && jj < 2; ++jj, ++first) {
-        if (!isxdigit(*first)) {
-            return false;
-        }
+  ++first; // ignore '%'
+  std::size_t jj = 0;
+  for (; first != last && jj < 2; ++jj, ++first) {
+    if (!isxdigit(*first)) {
+      return false;
     }
-    return jj == 2;
+  }
+  return jj == 2;
 }
 } // namespace priv
 
 template<typename Ti, typename To>
-bool
-url_encode(Ti first, Ti last, To& o, bool check_encoded = true)
+auto
+url_encode(Ti first, Ti last, To& o, bool check_encoded = true) -> bool
 {
-    // If re-encoding detection is enabled, this flag indicates not to
-    // re-encode
-    bool skip_encoding = false;
-
-    for (; first != last; ++first) {
-        if (!skip_encoding && check_encoded) {
-            if (*first == '%') {
-                skip_encoding = priv::is_already_escape(first, last);
-            } else if (*first == '+') {
-                skip_encoding = true;
-            }
-        }
-        if (skip_encoding || priv::is_legal_uri_char(*first)) {
-            if (skip_encoding && *first != '%' && !priv::is_legal_uri_char(*first)) {
-                return false;
-            }
-
-            o.insert(o.end(), first, first + 1);
-        } else {
-            unsigned int c = static_cast<unsigned char>(*first);
-            std::size_t numbytes = 0;
-
-            if ((c & 0x80) == 0) { /* ASCII character */
-                numbytes = 1;
-            } else if ((c & 0xE0) == 0xC0) { /* 110x xxxx */
-                numbytes = 2;
-            } else if ((c & 0xF0) == 0xE0) { /* 1110 xxxx */
-                numbytes = 3;
-            } else if ((c & 0xF8) == 0xF0) { /* 1111 0xxx */
-                numbytes = 4;
-            } else {
-                return false;
-            }
-
-            do {
-                o.append(fmt::format("%{:x}", static_cast<std::uint8_t>(*first)));
-            } while (--numbytes && ++first != last);
-        }
+  // If re-encoding detection is enabled, this flag indicates not to
+  // re-encode
+  bool skip_encoding = false;
+
+  for (; first != last; ++first) {
+    if (!skip_encoding && check_encoded) {
+      if (*first == '%') {
+        skip_encoding = priv::is_already_escape(first, last);
+      } else if (*first == '+') {
+        skip_encoding = true;
+      }
     }
-    return true;
+    if (skip_encoding || priv::is_legal_uri_char(*first)) {
+      if (skip_encoding && *first != '%' && !priv::is_legal_uri_char(*first)) {
+        return false;
+      }
+
+      o.insert(o.end(), first, first + 1);
+    } else {
+      unsigned int c = static_cast<unsigned char>(*first);
+      std::size_t numbytes = 0;
+
+      if ((c & 0x80) == 0) { /* ASCII character */
+        numbytes = 1;
+      } else if ((c & 0xE0) == 0xC0) { /* 110x xxxx */
+        numbytes = 2;
+      } else if ((c & 0xF0) == 0xE0) { /* 1110 xxxx */
+        numbytes = 3;
+      } else if ((c & 0xF8) == 0xF0) { /* 1111 0xxx */
+        numbytes = 4;
+      } else {
+        return false;
+      }
+
+      do {
+        o.append(fmt::format("%{:x}", static_cast<std::uint8_t>(*first)));
+      } while (--numbytes && ++first != last);
+    }
+  }
+  return true;
 }
 
 template<typename Tin, typename Tout>
-bool
-url_encode(const Tin& in, Tout& out)
+auto
+url_encode(const Tin& in, Tout& out) -> bool
 {
-    return url_encode(in.begin(), in.end(), out);
+  return url_encode(in.begin(), in.end(), out);
 }
 
-std::string
-url_encode(const std::string& src)
+auto
+url_encode(const std::string& src) -> std::string
 {
-    std::string dst{};
-    url_encode(src.begin(), src.end(), dst);
-    return dst;
+  std::string dst{};
+  url_encode(src.begin(), src.end(), dst);
+  return dst;
 }
 
 template<typename Ti, typename To>
-bool
-url_decode(Ti first, Ti last, To out, std::size_t& nout)
+auto
+url_decode(Ti first, Ti last, To out, std::size_t& nout) -> bool
 {
-    for (; first != last && *first != '\0'; ++first) {
-        if (*first == '%') {
-            char nextbuf[3] = { 0 };
-            std::size_t jj = 0;
-            ++first;
-            nextbuf[0] = *first;
-            for (; first != last && jj < 2; ++jj) {
-                nextbuf[jj] = *first;
-                if (jj != 1) {
-                    ++first;
-                }
-            }
-            if (jj != 2) {
-                return false;
-            }
-
-            char* end = nullptr;
-            unsigned long octet = std::strtoul(nextbuf, &end, 16);
-            if (octet == ULONG_MAX || (octet == 0 && end == nextbuf)) {
-                return false;
-            }
-
-            *out = static_cast<char>(octet);
-        } else {
-            *out = *first;
+  for (; first != last && *first != '\0'; ++first) {
+    if (*first == '%') {
+      char nextbuf[3] = { 0 };
+      std::size_t jj = 0;
+      ++first;
+      nextbuf[0] = *first;
+      for (; first != last && jj < 2; ++jj) {
+        nextbuf[jj] = *first;
+        if (jj != 1) {
+          ++first;
         }
+      }
+      if (jj != 2) {
+        return false;
+      }
+
+      char* end = nullptr;
+      unsigned long octet = std::strtoul(nextbuf, &end, 16);
+      if (octet == ULONG_MAX || (octet == 0 && end == nextbuf)) {
+        return false;
+      }
 
-        ++out;
-        nout++;
+      *out = static_cast<char>(octet);
+    } else {
+      *out = *first;
     }
-    return true;
+
+    ++out;
+    nout++;
+  }
+  return true;
 }
 
-std::string
-url_decode(const std::string& src)
+auto
+url_decode(const std::string& src) -> std::string
 {
-    std::string dst(src.size(), '\0');
-    std::size_t n = 0;
-    if (url_decode(src.begin(), src.end(), dst.begin(), n)) {
-        dst.resize(n);
-    }
-    return dst;
+  std::string dst(src.size(), '\0');
+  std::size_t n = 0;
+  if (url_decode(src.begin(), src.end(), dst.begin(), n)) {
+    dst.resize(n);
+  }
+  return dst;
 }
 
 /* See: https://url.spec.whatwg.org/#urlencoded-serializing: */
@@ -206,198 +206,202 @@ template<typename Ti, typename To>
 void
 form_encode(Ti first, Ti last, To& out)
 {
-    for (; first != last; ++first) {
-        auto c = static_cast<unsigned char>(*first);
-        if (isalnum(c)) {
-            out.insert(out.end(), first, first + 1);
-            continue;
-        }
-        if (c == ' ') {
-            char tmp = '+';
-            out.insert(out.end(), &tmp, &tmp + 1);
-        } else if ((c == 0x2A || c == 0x2D || c == 0x2E) || (c >= 0x30 && c <= 0x39) || (c >= 0x41 && c <= 0x5A) || (c == 0x5F) ||
-                   (c >= 0x60 && c <= 0x7A)) {
-            out.insert(out.end(), static_cast<char>(c));
-        } else {
-            out.append(fmt::format("%{:x}", static_cast<std::uint8_t>(*first)));
-        }
+  for (; first != last; ++first) {
+    auto c = static_cast<unsigned char>(*first);
+    if (isalnum(c)) {
+      out.insert(out.end(), first, first + 1);
+      continue;
     }
+    if (c == ' ') {
+      char tmp = '+';
+      out.insert(out.end(), &tmp, &tmp + 1);
+    } else if ((c == 0x2A || c == 0x2D || c == 0x2E) || (c >= 0x30 && c <= 0x39) ||
+               (c >= 0x41 && c <= 0x5A) || (c == 0x5F) || (c >= 0x60 && c <= 0x7A)) {
+      out.insert(out.end(), static_cast<char>(c));
+    } else {
+      out.append(fmt::format("%{:x}", static_cast<std::uint8_t>(*first)));
+    }
+  }
 }
 
-std::string
-form_encode(const std::string& src)
+auto
+form_encode(const std::string& src) -> std::string
 {
-    std::string dst;
-    form_encode(src.begin(), src.end(), dst);
-    return dst;
+  std::string dst;
+  form_encode(src.begin(), src.end(), dst);
+  return dst;
 }
 
 namespace v2
 {
-bool
-should_escape(char c, encoding mode)
+auto
+should_escape(char c, encoding mode) -> bool
 {
-    // §2.3 Unreserved characters (alphanum)
-    if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9')) {
+  // §2.3 Unreserved characters (alphanum)
+  if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9')) {
+    return false;
+  }
+
+  if (mode == encoding::encode_host || mode == encoding::encode_zone) {
+    // §3.2.2 Host allows
+    //	sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+    // as part of reg-name.
+    // We add : because we include :port as part of host.
+    // We add [ ] because we include [ipv6]:port as part of host.
+    // We add < > because they're the only characters left that we could possibly allow, and Parse
+    // will reject them if we escape them (because hosts can't use %-encoding for ASCII bytes).
+    switch (c) {
+      case '!':
+      case '$':
+      case '&':
+      case '\'':
+      case '(':
+      case ')':
+      case '*':
+      case '+':
+      case ',':
+      case ';':
+      case '=':
+      case ':':
+      case '[':
+      case ']':
+      case '<':
+      case '>':
+      case '"':
         return false;
-    }
 
-    if (mode == encoding::encode_host || mode == encoding::encode_zone) {
-        // §3.2.2 Host allows
-        //	sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-        // as part of reg-name.
-        // We add : because we include :port as part of host.
-        // We add [ ] because we include [ipv6]:port as part of host.
-        // We add < > because they're the only characters left that we could possibly allow, and Parse will reject them if we escape them
-        // (because hosts can't use %-encoding for ASCII bytes).
-        switch (c) {
-            case '!':
-            case '$':
-            case '&':
-            case '\'':
-            case '(':
-            case ')':
-            case '*':
-            case '+':
-            case ',':
-            case ';':
-            case '=':
-            case ':':
-            case '[':
-            case ']':
-            case '<':
-            case '>':
-            case '"':
-                return false;
-
-            default:
-                break;
-        }
+      default:
+        break;
     }
-
-    switch (c) {
-        case '-':
-        case '_':
-        case '.':
-        case '~':
-            // §2.3 Unreserved characters (mark)
-            return false;
-
-        case '$':
-        case '&':
-        case '+':
-        case ',':
-        case '/':
-        case ':':
-        case ';':
-        case '=':
-        case '?':
-        case '@':
-            // §2.2 Reserved characters (reserved)
-            // Different sections of the URL allow a few of
-            // the reserved characters to appear unescaped.
-            switch (mode) {
-                case encoding::encode_path: // §3.3
-                    // The RFC allows : @ & = + $ but saves / ; , for assigning meaning to individual path segments. This package only
-                    // manipulates the path as a whole, so we allow those last three as well. That leaves only ? to escape.
-                    return c == '?';
-
-                case encoding::encode_path_segment: // §3.3
-                    // The RFC allows : @ & = + $ but saves / ; , for assigning meaning to individual path segments.
-                    return c == '/' || c == ';' || c == ',' || c == '?';
-
-                case encoding::encode_user_password: // §3.2.1
-                    // The RFC allows ';', ':', '&', '=', '+', '$', and ',' in userinfo, so we must escape only '@', '/', and '?'. The
-                    // parsing of userinfo treats ':' as special so we must escape that too.
-                    return c == '@' || c == '/' || c == '?' || c == ':';
-
-                case encoding::encode_query_component: // §3.4
-                    // The RFC reserves (so we must escape) everything.
-                    return true;
-
-                case encoding::encode_fragment: // §4.1
-                    // The RFC text is silent but the grammar allows everything, so escape nothing.
-                    return false;
-
-                default:
-                    break;
-            }
+  }
+
+  switch (c) {
+    case '-':
+    case '_':
+    case '.':
+    case '~':
+      // §2.3 Unreserved characters (mark)
+      return false;
+
+    case '$':
+    case '&':
+    case '+':
+    case ',':
+    case '/':
+    case ':':
+    case ';':
+    case '=':
+    case '?':
+    case '@':
+      // §2.2 Reserved characters (reserved)
+      // Different sections of the URL allow a few of
+      // the reserved characters to appear unescaped.
+      switch (mode) {
+        case encoding::encode_path: // §3.3
+          // The RFC allows : @ & = + $ but saves / ; , for assigning meaning to individual path
+          // segments. This package only manipulates the path as a whole, so we allow those last
+          // three as well. That leaves only ? to escape.
+          return c == '?';
+
+        case encoding::encode_path_segment: // §3.3
+          // The RFC allows : @ & = + $ but saves / ; , for assigning meaning to individual path
+          // segments.
+          return c == '/' || c == ';' || c == ',' || c == '?';
+
+        case encoding::encode_user_password: // §3.2.1
+          // The RFC allows ';', ':', '&', '=', '+', '$', and ',' in userinfo, so we must escape
+          // only '@', '/', and '?'. The parsing of userinfo treats ':' as special so we must escape
+          // that too.
+          return c == '@' || c == '/' || c == '?' || c == ':';
+
+        case encoding::encode_query_component: // §3.4
+          // The RFC reserves (so we must escape) everything.
+          return true;
+
+        case encoding::encode_fragment: // §4.1
+          // The RFC text is silent but the grammar allows everything, so escape nothing.
+          return false;
 
         default:
-            break;
-    }
+          break;
+      }
+
+    default:
+      break;
+  }
+
+  if (mode == encoding::encode_fragment) {
+    // RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are included in reserved
+    // from RFC 2396 §2.2. The remaining sub-delims do not need to be escaped. To minimize potential
+    // breakage, we apply two restrictions: (1) we always escape sub-delims outside of the fragment,
+    // and (2) we always escape single quote to avoid breaking callers that had previously assumed
+    // that single quotes would be escaped. See issue #19917.
+    switch (c) {
+      case '!':
+      case '(':
+      case ')':
+      case '*':
+        return false;
 
-    if (mode == encoding::encode_fragment) {
-        // RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are included in reserved from RFC 2396 §2.2. The remaining
-        // sub-delims do not need to be escaped. To minimize potential breakage, we apply two restrictions: (1) we always escape sub-delims
-        // outside of the fragment, and (2) we always escape single quote to avoid breaking callers that had previously assumed that single
-        // quotes would be escaped. See issue #19917.
-        switch (c) {
-            case '!':
-            case '(':
-            case ')':
-            case '*':
-                return false;
-
-            default:
-                break;
-        }
+      default:
+        break;
     }
+  }
 
-    // Everything else must be escaped.
-    return true;
+  // Everything else must be escaped.
+  return true;
 }
 
 constexpr auto upper_hex = "0123456789ABCDEF";
 
-std::string
-escape(const std::string& s, encoding mode)
+auto
+escape(const std::string& s, encoding mode) -> std::string
 {
-    std::size_t space_count{ 0 };
-    std::size_t hex_count{ 0 };
-
-    for (const auto& c : s) {
-        if (should_escape(c, mode)) {
-            if (c == ' ' && mode == encoding::encode_query_component) {
-                ++space_count;
-            } else {
-                ++hex_count;
-            }
-        }
-    }
-
-    if (space_count == 0 && hex_count == 0) {
-        return s;
-    }
-
-    std::size_t required = s.size() + 2 * hex_count;
-    std::string t;
-    t.resize(required);
-
-    if (hex_count == 0) {
-        for (std::size_t i = 0; i < s.size(); ++i) {
-            if (s[i] == ' ') {
-                t[i] = '+';
-            } else {
-                t[i] = s[i];
-            }
-        }
-        return t;
+  std::size_t space_count{ 0 };
+  std::size_t hex_count{ 0 };
+
+  for (const auto& c : s) {
+    if (should_escape(c, mode)) {
+      if (c == ' ' && mode == encoding::encode_query_component) {
+        ++space_count;
+      } else {
+        ++hex_count;
+      }
     }
-
-    std::size_t j{ 0 };
-    for (const auto& c : s) {
-        if (c == ' ' && mode == encoding::encode_query_component) {
-            t[j++] = '+';
-        } else if (should_escape(c, mode)) {
-            t[j++] = '%';
-            t[j++] = upper_hex[(c >> 4U) & 0x0f];
-            t[j++] = upper_hex[c & 0x0f];
-        } else {
-            t[j++] = c;
-        }
+  }
+
+  if (space_count == 0 && hex_count == 0) {
+    return s;
+  }
+
+  std::size_t required = s.size() + 2 * hex_count;
+  std::string t;
+  t.resize(required);
+
+  if (hex_count == 0) {
+    for (std::size_t i = 0; i < s.size(); ++i) {
+      if (s[i] == ' ') {
+        t[i] = '+';
+      } else {
+        t[i] = s[i];
+      }
     }
     return t;
+  }
+
+  std::size_t j{ 0 };
+  for (const auto& c : s) {
+    if (c == ' ' && mode == encoding::encode_query_component) {
+      t[j++] = '+';
+    } else if (should_escape(c, mode)) {
+      t[j++] = '%';
+      t[j++] = upper_hex[(c >> 4U) & 0x0f];
+      t[j++] = upper_hex[c & 0x0f];
+    } else {
+      t[j++] = c;
+    }
+  }
+  return t;
 }
 
 } // namespace v2