Revert most of the changes

Author: dkwingsmt

common/settings.h

@@ -189,6 +189,10 @@ struct Settings {
   // target indicating the URL at which the VM service can be accessed.
   uint32_t vm_service_port = 0;
 
+  // Determines whether an authentication code is required to communicate with
+  // the VM service.
+  bool disable_service_auth_codes = true;
+
   // Determine whether the vmservice should fallback to automatic port selection
   // after failing to bind to a specified port.
   bool enable_service_port_fallback = false;

runtime/dart_isolate.cc

@@ -805,6 +805,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
           settings.vm_service_port,            // server VM service port
           tonic::DartState::HandleLibraryTag,  // embedder library tag handler
           false,  //  disable websocket origin check
+          settings.disable_service_auth_codes,  // disable VM service auth codes
           settings.enable_service_port_fallback,  // enable fallback to port 0
                                                   // when bind fails.
           error                                   // error (out)

runtime/dart_service_isolate.cc

@@ -130,6 +130,7 @@ bool DartServiceIsolate::Startup(const std::string& server_ip,
                                  intptr_t server_port,
                                  Dart_LibraryTagHandler embedder_tag_handler,
                                  bool disable_origin_check,
+                                 bool disable_service_auth_codes,
                                  bool enable_service_port_fallback,
                                  char** error) {
   Dart_Isolate isolate = Dart_CurrentIsolate();
@@ -181,6 +182,10 @@ bool DartServiceIsolate::Startup(const std::string& server_ip,
       Dart_SetField(library, Dart_NewStringFromCString("_originCheckDisabled"),
                     Dart_NewBoolean(disable_origin_check));
   SHUTDOWN_ON_ERROR(result);
+  result =
+      Dart_SetField(library, Dart_NewStringFromCString("_authCodesDisabled"),
+                    Dart_NewBoolean(disable_service_auth_codes));
+  SHUTDOWN_ON_ERROR(result);
   result = Dart_SetField(
       library, Dart_NewStringFromCString("_enableServicePortFallback"),
       Dart_NewBoolean(enable_service_port_fallback));

runtime/dart_service_isolate.h

@@ -47,6 +47,8 @@ class DartServiceIsolate {
   /// @param[in]  embedder_tag_handler          The library tag handler.
   /// @param[in]  disable_origin_check          If websocket origin checks must
   ///                                           be enabled.
+  /// @param[in]  disable_service_auth_codes    If service auth codes must be
+  ///                                           enabled.
   /// @param[in]  enable_service_port_fallback  If fallback to port 0 must be
   ///                                           enabled when the bind fails.
   /// @param      error                         The error when this method
@@ -61,6 +63,7 @@ class DartServiceIsolate {
                       intptr_t server_port,
                       Dart_LibraryTagHandler embedder_tag_handler,
                       bool disable_origin_check,
+                      bool disable_service_auth_codes,
                       bool enable_service_port_fallback,
                       char** error);
 

shell/common/switches.cc

@@ -293,6 +293,11 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
   command_line.GetOptionValue(FlagForSwitch(Switch::DomainNetworkPolicy),
                               &settings.domain_network_policy);
 
+  // Disable need for authentication codes for VM service communication, if
+  // specified.
+  settings.disable_service_auth_codes =
+      command_line.HasOption(FlagForSwitch(Switch::DisableServiceAuthCodes));
+
   // Allow fallback to automatic port selection if binding to a specified port
   // fails.
   settings.enable_service_port_fallback =

shell/common/switches.h

@@ -146,6 +146,10 @@ DEF_SWITCH(FlutterAssetsDir,
            "Path to the Flutter assets directory.")
 DEF_SWITCH(Help, "help", "Display this help text.")
 DEF_SWITCH(LogTag, "log-tag", "Tag associated with log messages.")
+DEF_SWITCH(DisableServiceAuthCodes,
+           "disable-service-auth-codes",
+           "Disable the requirement for authentication codes for communicating"
+           " with the VM service.")
 DEF_SWITCH(EnableServicePortFallback,
            "enable-service-port-fallback",
            "Allow the VM service to fallback to automatic port selection if"

shell/platform/android/io/flutter/app/FlutterActivityDelegate.java

@@ -293,6 +293,9 @@ private static String[] getArgsFromIntent(Intent intent) {
     if (intent.getBooleanExtra("start-paused", false)) {
       args.add("--start-paused");
     }
+    if (intent.getBooleanExtra("disable-service-auth-codes", false)) {
+      args.add("--disable-service-auth-codes");
+    }
     if (intent.getBooleanExtra("use-test-fonts", false)) {
       args.add("--use-test-fonts");
     }

shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java

@@ -24,6 +24,8 @@ public class FlutterShellArgs {
   public static final String ARG_TRACE_STARTUP = "--trace-startup";
   public static final String ARG_KEY_START_PAUSED = "start-paused";
   public static final String ARG_START_PAUSED = "--start-paused";
+  public static final String ARG_KEY_DISABLE_SERVICE_AUTH_CODES = "disable-service-auth-codes";
+  public static final String ARG_DISABLE_SERVICE_AUTH_CODES = "--disable-service-auth-codes";
   public static final String ARG_KEY_ENDLESS_TRACE_BUFFER = "endless-trace-buffer";
   public static final String ARG_ENDLESS_TRACE_BUFFER = "--endless-trace-buffer";
   public static final String ARG_KEY_USE_TEST_FONTS = "use-test-fonts";
@@ -90,6 +92,9 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) {
         args.add(ARG_VM_SERVICE_PORT + Integer.toString(vmServicePort));
       }
     }
+    if (intent.getBooleanExtra(ARG_KEY_DISABLE_SERVICE_AUTH_CODES, false)) {
+      args.add(ARG_DISABLE_SERVICE_AUTH_CODES);
+    }
     if (intent.getBooleanExtra(ARG_KEY_ENDLESS_TRACE_BUFFER, false)) {
       args.add(ARG_ENDLESS_TRACE_BUFFER);
     }

shell/platform/fuchsia/dart_runner/service_isolate.cc

@@ -186,6 +186,12 @@ Dart_Isolate CreateServiceIsolate(
                     Dart_NewBoolean(false));
   SHUTDOWN_ON_ERROR(result);
 
+  // _authCodesDisabled = false
+  result =
+      Dart_SetField(library, Dart_NewStringFromCString("_authCodesDisabled"),
+                    Dart_NewBoolean(false));
+  SHUTDOWN_ON_ERROR(result);
+
   InitBuiltinLibrariesForIsolate(std::string(uri), nullptr, fileno(stdout),
                                  fileno(stderr), zx::channel(), true);
 

shell/testing/observatory/launcher.dart

@@ -48,6 +48,7 @@ class ShellLauncher {
     '--vm-service-port=0',
     '--non-interactive',
     '--run-forever',
+    '--disable-service-auth-codes',
   ];
   final String shellExecutablePath;
   final String mainDartPath;