3 files changed, 60 insertions, 4 deletions

diff --git a/chromium/content/browser/sms/sms_parser.cc b/chromium/content/browser/sms/sms_parser.cc
index 3c7a6efe0bb..e602edbf534 100644
--- a/chromium/content/browser/sms/sms_parser.cc
+++ b/chromium/content/browser/sms/sms_parser.cc
@@ -16,8 +16,8 @@
 namespace content {
 
 // SMS one-time-passcode format:
-// https://github.com/WebKit/explainers/blob/master/sms-one-time-code-format/README.md
-constexpr char kOtpFormatRegex[] = "(?:^|\\s)@([a-zA-Z0-9.-]+) #(.[^#\\s]+)";
+// https://wicg.github.io/sms-one-time-codes/#parsing
+constexpr char kOtpFormatRegex[] = "(?:^|\\s)@([a-zA-Z0-9.-]+) #([^#\\s]+)";
 
 SmsParser::Result::Result(const url::Origin& origin,
                           const std::string& one_time_code)
diff --git a/chromium/content/browser/sms/sms_parser_unittest.cc b/chromium/content/browser/sms/sms_parser_unittest.cc
index 9e7dbe080c0..6be7e0ae0d7 100644
--- a/chromium/content/browser/sms/sms_parser_unittest.cc
+++ b/chromium/content/browser/sms/sms_parser_unittest.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "base/optional.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -43,6 +44,18 @@ TEST(SmsParserTest, NoSpace) {
   ASSERT_FALSE(SmsParser::Parse("@example.com#12345"));
 }
 
+TEST(SmsParserTest, MultipleSpace) {
+  ASSERT_FALSE(SmsParser::Parse("@example.com  #12345"));
+}
+
+TEST(SmsParserTest, WhiteSpaceThatIsNotSpace) {
+  ASSERT_FALSE(SmsParser::Parse("@example.com\t#12345"));
+}
+
+TEST(SmsParserTest, WordInBetween) {
+  ASSERT_FALSE(SmsParser::Parse("@example.com random #12345"));
+}
+
 TEST(SmsParserTest, InvalidUrl) {
   ASSERT_FALSE(SmsParser::Parse("@//example.com #123"));
 }
@@ -102,6 +115,46 @@ TEST(SmsParserTest, Dashes) {
             ParseOrigin("@web-otp-example.com #123"));
 }
 
+TEST(SmsParserTest, CapitalLetters) {
+  EXPECT_EQ(url::Origin::Create(GURL("https://can-contain-CAPITAL.com")),
+            ParseOrigin("@can-contain-CAPITAL.com #123"));
+}
+
+TEST(SmsParserTest, Numbers) {
+  EXPECT_EQ(url::Origin::Create(GURL("https://can-contain-number-9870.com")),
+            ParseOrigin("@can-contain-number-9870.com #123"));
+}
+
+TEST(SmsParserTest, ForbiddenCharacters) {
+  // TODO(majidvp): Domains with unicode characters are valid.
+  // See: https://url.spec.whatwg.org/#concept-domain-to-ascii
+  // EXPECT_EQ(url::Origin::Create(GURL("can-contain-unicode-like-חומוס.com")),
+  //            ParseOrigin("@can-contain-unicode-like-חומוס.com #123"));
+
+  // Forbidden codepoints https://url.spec.whatwg.org/#forbidden-host-code-point
+  const char forbidden_chars[] = {'\x00' /* null */,
+                                  '\x09' /* TAB */,
+                                  '\x0A' /* LF */,
+                                  '\x0D' /* CR */,
+                                  ' ',
+                                  '#',
+                                  '%',
+                                  '/',
+                                  ':',
+                                  '<',
+                                  '>',
+                                  '?',
+                                  '@',
+                                  '[',
+                                  '\\',
+                                  ']',
+                                  '^'};
+  for (char c : forbidden_chars) {
+    ASSERT_FALSE(
+        SmsParser::Parse(base::StringPrintf("@cannot-contain-%c #123456", c)));
+  }
+}
+
 TEST(SmsParserTest, Newlines) {
   EXPECT_EQ(url::Origin::Create(GURL("https://example.com")),
             ParseOrigin("hello world\n@example.com #123\n"));
@@ -149,7 +202,9 @@ TEST(SmsParserTest, OneTimeCodeCharRanges) {
             ParseOTP("@example.com #human-readable-words-like-sillyface"));
   EXPECT_EQ("can-it-be-super-lengthy-like-a-lot",
             ParseOTP("@example.com #can-it-be-super-lengthy-like-a-lot"));
+  EXPECT_EQ("1", ParseOTP("@example.com #1 can be short"));
   EXPECT_EQ("otp", ParseOTP("@example.com #otp with space"));
+  EXPECT_EQ("otp", ParseOTP("@example.com #otp\twith with tab"));
 }
 
 }  // namespace content
diff --git a/chromium/content/browser/sms/sms_service.cc b/chromium/content/browser/sms/sms_service.cc
index f97f207c5ac..f409195b405 100644
--- a/chromium/content/browser/sms/sms_service.cc
+++ b/chromium/content/browser/sms/sms_service.cc
@@ -103,7 +103,8 @@ void SmsService::OnReceive(const std::string& one_time_code) {
   DCHECK(!one_time_code_);
   DCHECK(!start_time_.is_null());
 
-  RecordSmsReceiveTime(base::TimeTicks::Now() - start_time_);
+  auto now = base::TimeTicks::Now();
+  RecordSmsReceiveTime(now - start_time_);
 
   one_time_code_ = one_time_code;
 
@@ -114,7 +115,7 @@ void SmsService::OnReceive(const std::string& one_time_code) {
     return;
   }
 
-  receive_time_ = base::TimeTicks::Now();
+  receive_time_ = now;
   OpenInfoBar(one_time_code);
 }