Provide an API to dart:developer to control the web server hosting the Service Protocol

runtime/bin/vmservice/server.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of vmservice_io;
 
 class WebSocketClient extends Client {
   static const int PARSE_ERROR_CODE = 4000;
   static const int BINARY_MESSAGE_ERROR_CODE = 4001;
   static const int NOT_MAP_ERROR_CODE = 4002;
@@ skipping 108 matching lines @@
 class Server {
   static const WEBSOCKET_PATH = '/ws';
   static const ROOT_REDIRECT_PATH = '/index.html';
 
   final VMService _service;
   final String _ip;
   final int _port;
   final bool _originCheckDisabled;
   HttpServer _server;
   bool get running => _server != null;
-  bool _displayMessages = false;
 
-  Server(this._service, this._ip, this._port, this._originCheckDisabled) {
-    _displayMessages = (_ip != '127.0.0.1' || _port != 8181);
+  /// Returns the server address including the auth token.
+  Uri get serverAddress {
+    if (!running) {
+      return null;
+    }
+    var ip = _server.address.address;
+    var port = _server.port;
+    return Uri.parse('http://$ip:$port/$serviceAuthToken/');
   }
 
+  Server(this._service, this._ip, this._port, this._originCheckDisabled);
+
   bool _isAllowedOrigin(String origin) {
     Uri uri;
     try {
       uri = Uri.parse(origin);
     } catch (_) {
       return false;
     }
 
     // Explicitly add localhost and 127.0.0.1 on any port (necessary for
     // adb port forwarding).
     if ((uri.host == 'localhost') ||
         (uri.host == '127.0.0.1')) {
       return true;
     }
 
     if ((uri.port == _server.port) &&
         ((uri.host == _server.address.address) ||
          (uri.host == _server.address.host))) {
       return true;
     }
 
     return false;
   }
 
   bool _originCheck(HttpRequest request) {

[rmacnak, 2016/10/20 17:12:31]

Not in this CL, but perhaps we can remove this browser compensation now.

[Cutch, 2016/10/20 23:31:51]

Acknowledged.

     if (_originCheckDisabled) {
       // Always allow.
       return true;
     }
     // First check the web-socket specific origin.
     List<String> origins = request.headers["Sec-WebSocket-Origin"];
     if (origins == null) {
       // Fall back to the general Origin field.
       origins = request.headers["Origin"];
     }
@@ skipping 54 matching lines @@
       }
       request.response.close();
       return;
     }
     if (request.method != 'GET') {
       // Not a GET request. Do nothing.
       request.response.close();
       return;
     }
 
+    final List<String> requestPathSegments = request.uri.pathSegments;
+    if (requestPathSegments.length < 2) {
+      // Malformed.
+      request.response.close();
+      return;
+    }
+    // Check that we were given the auth token.
+    final String authToken = requestPathSegments[0];
+    if (authToken != serviceAuthToken) {
+      // Malformed.
+      request.response.close();
+      return;
+    }
+    // Construct the actual request path by chopping off the auth token.
     final String path =
-          request.uri.path == '/' ? ROOT_REDIRECT_PATH : request.uri.path;
+        (requestPathSegments[1] == '') ?
+            ROOT_REDIRECT_PATH : '/${requestPathSegments.sublist(1).join('/')}';
 
     if (path == WEBSOCKET_PATH) {
       WebSocketTransformer.upgrade(request).then(
                                    (WebSocket webSocket) {
         new WebSocketClient(webSocket, _service);
       });
       return;
     }
 
     Asset asset = assets[path];
@@ skipping 21 matching lines @@
     if (_server != null) {
       // Already running.
       return new Future.value(this);
     }
 
     var address = new InternetAddress(_ip);
     // Startup HTTP server.
     return HttpServer.bind(address, _port).then((s) {
       _server = s;
       _server.listen(_requestHandler, cancelOnError: true);
-      var ip = _server.address.address;
-      var port = _server.port;
-      if (_displayMessages) {
-        print('Observatory listening on http://$ip:$port');
-      }
+      print('Observatory listening on $serverAddress');
       // Server is up and running.
-      _notifyServerState(ip, _server.port);
-      onServerAddressChange('http://$ip:$port');
+      _notifyServerState(serverAddress.toString());
+      onServerAddressChange('$serverAddress');
       return this;
     }).catchError((e, st) {
       print('Could not start Observatory HTTP server:\n$e\n$st\n');
-      _notifyServerState("", 0);
+      _notifyServerState("");
       onServerAddressChange(null);
       return this;
     });
   }
 
   Future cleanup(bool force) {
     if (_server == null) {
       return new Future.value(null);
     }
     return _server.close(force: force);
   }
 
   Future shutdown(bool forced) {
     if (_server == null) {
       // Not started.
       return new Future.value(this);
     }
 
-    // Force displaying of status messages if we are forcibly shutdown.
-    _displayMessages = _displayMessages || forced;
-
     // Shutdown HTTP server and subscription.
-    var ip = _server.address.address.toString();
-    var port = _server.port.toString();
+    String oldServerAddress = serverAddress;
     return cleanup(forced).then((_) {
-      if (_displayMessages) {
-        print('Observatory no longer listening on http://$ip:$port');
-      }
+      print('Observatory no longer listening on $oldServerAddress');
       _server = null;
-      _notifyServerState("", 0);
+      _notifyServerState("");
       onServerAddressChange(null);
       return this;
     }).catchError((e, st) {
       _server = null;
       print('Could not shutdown Observatory HTTP server:\n$e\n$st\n');
-      _notifyServerState("", 0);
+      _notifyServerState("");
       onServerAddressChange(null);
       return this;
     });
   }
 
 }
 
-void _notifyServerState(String ip, int port)
+void _notifyServerState(String uri)
     native "VMServiceIO_NotifyServerState";