[DevTools] Implemented timezone id verification for Emulation

setTimezoneOverride API.

Previously Emulation.SetTimezoneOverride API if provided with invalid
timezone id, would quietly set ICU's predefined unknown timezone id
"Etc/Unknown". Apparently this is not what most users want, so the API
implementation was changed to detect this situation and return negative
condition, leaving currently selected timezone intact.


Bug: 1007380
Change-Id: Idbec5e2f630c409a25bb7a059b8729ff320640a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1822557
Commit-Queue: Peter Kvitek <kvitekp@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699545}

third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc

@@ -463,8 +463,11 @@ Response InspectorEmulationAgent::setTimezoneOverride(
   timezone_override_.reset();
   if (!timezone_id.IsEmpty()) {
     timezone_override_ = TimeZoneController::SetTimeZoneOverride(timezone_id);
-    if (!timezone_override_)
-      return Response::Error("Timezone override is already in effect");
+    if (!timezone_override_) {
+      return TimeZoneController::HasTimeZoneOverride()
+                 ? Response::Error("Timezone override is already in effect")
+                 : Response::InvalidParams("Invalid timezone id");
+    }
   }
 
   timezone_id_override_.Set(timezone_id);

third_party/blink/renderer/core/timezone/timezone_controller.cc

@@ -35,31 +35,41 @@ void NotifyTimezoneChangeOnWorkerThread(WorkerThread* worker_thread) {
   NotifyTimezoneChangeToV8(worker_thread->GlobalScope()->GetIsolate());
 }
 
-void SetIcuTimeZoneAndNotifyV8(const String& timezone_id) {
+String GetTimezoneId(const icu::TimeZone& timezone) {
+  icu::UnicodeString unicode_timezone_id;
+  timezone.getID(unicode_timezone_id);
+  return String(icu::toUCharPtr(unicode_timezone_id.getBuffer()),
+                static_cast<unsigned>(unicode_timezone_id.length()));
+}
+
+String GetCurrentTimezoneId() {
+  std::unique_ptr<icu::TimeZone> timezone(icu::TimeZone::createDefault());
+  CHECK(timezone);
+  return GetTimezoneId(*timezone.get());
+}
+
+bool SetIcuTimeZoneAndNotifyV8(const String& timezone_id) {
   DCHECK(!timezone_id.IsEmpty());
-  DCHECK(timezone_id.ContainsOnlyASCIIOrEmpty());
-  icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
-      icu::UnicodeString(timezone_id.Ascii().data(), -1, US_INV));
-  icu::TimeZone::adoptDefault(timezone);
+  std::unique_ptr<icu::TimeZone> timezone(icu::TimeZone::createTimeZone(
+      icu::UnicodeString(timezone_id.Ascii().data(), -1, US_INV)));
+  CHECK(timezone);
+
+  if (*timezone == icu::TimeZone::getUnknown())
+    return false;
+
+  icu::TimeZone::adoptDefault(timezone.release());
 
   NotifyTimezoneChangeToV8(V8PerIsolateData::MainThreadIsolate());
   WorkerThread::CallOnAllWorkerThreads(&NotifyTimezoneChangeOnWorkerThread,
                                        TaskType::kInternalDefault);
-}
-
-String GetCurrentTimezone() {
-  std::unique_ptr<icu::TimeZone> timezone(icu::TimeZone::createDefault());
-  icu::UnicodeString unicode_timezone_id;
-  timezone->getID(unicode_timezone_id);
-  return String(icu::toUCharPtr(unicode_timezone_id.getBuffer()),
-                static_cast<unsigned>(unicode_timezone_id.length()));
+  return true;
 }
 
 }  // namespace
 
 TimeZoneController::TimeZoneController() {
   DCHECK(IsMainThread());
-  host_timezone_id_ = GetCurrentTimezone();
+  host_timezone_id_ = GetCurrentTimezoneId();
 }
 
 TimeZoneController::~TimeZoneController() = default;
@@ -93,13 +103,21 @@ TimeZoneController::SetTimeZoneOverride(const String& timezone_id) {
     return nullptr;
   }
 
-  SetIcuTimeZoneAndNotifyV8(timezone_id);
+  if (!SetIcuTimeZoneAndNotifyV8(timezone_id)) {
+    VLOG(1) << "Invalid override timezone id: " << timezone_id;
+    return nullptr;
+  }
 
   instance().has_timezone_id_override_ = true;
 
   return std::unique_ptr<TimeZoneOverride>(new TimeZoneOverride());
 }
 
+// static
+bool TimeZoneController::HasTimeZoneOverride() {
+  return instance().has_timezone_id_override_;
+}
+
 // static
 void TimeZoneController::ClearTimeZoneOverride() {
   DCHECK(instance().has_timezone_id_override_);

third_party/blink/renderer/core/timezone/timezone_controller.h

@@ -41,6 +41,8 @@ class CORE_EXPORT TimeZoneController final
   static std::unique_ptr<TimeZoneOverride> SetTimeZoneOverride(
       const String& timezone_id);
 
+  static bool HasTimeZoneOverride();
+
  private:
   TimeZoneController();
   static TimeZoneController& instance();

third_party/blink/web_tests/inspector-protocol/emulation/set-invalid-timezone-override-expected.txt

+Tests invalid timezone override handling.
+{
+    code : -32602
+    message : Invalid timezone id
+}
+

third_party/blink/web_tests/inspector-protocol/emulation/set-invalid-timezone-override.js

+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      'Tests invalid timezone override handling.');
+
+  async function setTimezoneOverride(timezoneId) {
+    const result = await dp.Emulation.setTimezoneOverride({ timezoneId });
+    return result.error;
+  }
+
+  testRunner.log(await setTimezoneOverride(`Foo/Bar`));
+
+  testRunner.completeTest();
+})