commit 98fc8ac7ffc5c311ad85e5fa1ece79eeaa4cc201
author Ben Konyi <bkonyi@google.com> Thu Apr 11 21:27:12 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Thu Apr 11 21:27:12 2019 +0000
tree 3ad87684b1e924b4f9bc162c970410c4c51ce8e8
parent ed280a98a25aa405b9b1ff5b4bf57ce62a2f5aee

[ VM / Service ] Temporarily disable VM service auth codes by default

Change-Id: Ia14e7d4eeb680a02482f700ce06f76bc0edab594
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99187
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ben Konyi <bkonyi@google.com>

runtime/bin/main.cc

diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 2d09c17..d0916b9 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -511,7 +511,7 @@
   // Load embedder specific bits and return.
   if (!VmService::Setup(
           Options::vm_service_server_ip(), Options::vm_service_server_port(),
-          Options::vm_service_dev_mode(), Options::vm_service_auth_disabled(),
+          Options::vm_service_dev_mode(), !Options::vm_service_auth_enabled(),
           Options::trace_loading(), Options::deterministic())) {
     *error = strdup(VmService::GetErrorMessage());
     return NULL;

runtime/bin/main_options.h

diff --git a/runtime/bin/main_options.h b/runtime/bin/main_options.h
index 8513fe3..414f309 100644
--- a/runtime/bin/main_options.h
+++ b/runtime/bin/main_options.h
@@ -34,12 +34,16 @@
 
 // As STRING_OPTIONS_LIST but for boolean valued options. The default value is
 // always false, and the presence of the flag switches the value to true.
+// TODO(bkonyi): enable_service_auth_codes is a temporary flag and will be
+// removed once auth codes are enabled by default. disable_service_auth_codes is
+// a no-op for now.
 #define BOOL_OPTIONS_LIST(V)                                                   \
   V(version, version_option)                                                   \
   V(compile_all, compile_all)                                                  \
   V(disable_service_origin_check, vm_service_dev_mode)                         \
   V(disable_service_auth_codes, vm_service_auth_disabled)                      \
   V(deterministic, deterministic)                                              \
+  V(enable_service_auth_codes, vm_service_auth_enabled)                        \
   V(trace_loading, trace_loading)                                              \
   V(short_socket_read, short_socket_read)                                      \
   V(short_socket_write, short_socket_write)                                    \

runtime/observatory/tests/service/test_helper.dart

diff --git a/runtime/observatory/tests/service/test_helper.dart b/runtime/observatory/tests/service/test_helper.dart
index 05c37a1..f57bf4e 100644
--- a/runtime/observatory/tests/service/test_helper.dart
+++ b/runtime/observatory/tests/service/test_helper.dart
@@ -132,8 +132,8 @@
     if (pause_on_exit) {
       fullArgs.add('--pause-isolates-on-exit');
     }
-    if (!useAuthToken) {
-      fullArgs.add('--disable-service-auth-codes');
+    if (useAuthToken) {
+      fullArgs.add('--enable-service-auth-codes');
     }
     if (pause_on_unhandled_exceptions) {
       fullArgs.add('--pause-isolates-on-unhandled-exceptions');