Update HTTPS parsing to draft-ietf-dnsop-svcb-https-02

Only significant change is to ignore any params received with alias
records.

Bug: 1138620
Change-Id: I5d30127b07a5347c6215077ebfb49d0dc8f19b1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515560
Auto-Submit: Eric Orth <ericorth@chromium.org>
Commit-Queue: Dan McArdle <dmcardle@chromium.org>
Reviewed-by: Dan McArdle <dmcardle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823542}

net/dns/https_record_rdata.cc

@@ -195,8 +195,15 @@ std::unique_ptr<AliasFormHttpsRecordRdata> AliasFormHttpsRecordRdata::Parse(
   if (!alias_name.has_value())
     return nullptr;
 
-  if (reader.remaining() != 0)
-    return nullptr;
+  // Ignore any params.
+  base::Optional<uint16_t> last_param_key;
+  while (reader.remaining() > 0) {
+    uint16_t param_key;
+    base::StringPiece param_value;
+    if (!ReadNextServiceParam(last_param_key, reader, &param_key, &param_value))
+      return nullptr;
+    last_param_key = param_key;
+  }
 
   return std::make_unique<AliasFormHttpsRecordRdata>(
       std::move(alias_name).value());

net/dns/https_record_rdata_unittest.cc

@@ -37,6 +37,28 @@ TEST(HttpsRecordRdataTest, ParsesAlias) {
   EXPECT_EQ(alias_rdata->alias_name(), "chromium.org");
 }
 
+TEST(HttpsRecordRdataTest, IgnoreAliasParams) {
+  const char kRdata[] =
+      // Priority: 0 for alias record
+      "\000\000"
+      // Alias name: chromium.org
+      "\010chromium\003org\000"
+      // no-default-alpn
+      "\000\002\000\000";
+
+  std::unique_ptr<HttpsRecordRdata> rdata =
+      HttpsRecordRdata::Parse(base::StringPiece(kRdata, sizeof(kRdata) - 1));
+  ASSERT_TRUE(rdata);
+
+  AliasFormHttpsRecordRdata expected("chromium.org");
+  EXPECT_TRUE(rdata->IsEqual(&expected));
+
+  EXPECT_TRUE(rdata->IsAlias());
+  AliasFormHttpsRecordRdata* alias_rdata = rdata->AsAliasForm();
+  ASSERT_TRUE(alias_rdata);
+  EXPECT_EQ(alias_rdata->alias_name(), "chromium.org");
+}
+
 TEST(HttpsRecordRdataTest, ParsesService) {
   const char kRdata[] =
       // Priority: 1

net/dns/public/dns_protocol.h

@@ -189,7 +189,7 @@ static const uint16_t kFlagTC = 0x200;  // Truncated - server flag.
 
 // SVCB/HTTPS ServiceParamKey
 //
-// IANA registration pending. Values from draft-ietf-dnsop-svcb-https-01.
+// IANA registration pending. Values from draft-ietf-dnsop-svcb-https-02.
 static constexpr uint16_t kHttpsServiceParamKeyMandatory = 0;
 static constexpr uint16_t kHttpsServiceParamKeyAlpn = 1;
 static constexpr uint16_t kHttpsServiceParamKeyNoDefaultAlpn = 2;