Test server tweaks

tools/testing/dart/http_server.dart

 // Copyright (c) 2012, 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.
 
 library http_server;
 
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:uri';
 import 'test_suite.dart';  // For TestUtils.
 // TODO(efortuna): Rewrite to not use the args library and simply take an
 // expected number of arguments, so test.dart doesn't rely on the args library?
 // See discussion on https://codereview.chromium.org/11931025/.
 import 'vendored_pkg/args/args.dart';
 
 main() {
   /** Convenience method for local testing. */
   var parser = new ArgParser();
   parser.addOption('port', abbr: 'p',
       help: 'The main server port we wish to respond to requests.',
       defaultsTo: '0');
   parser.addOption('crossOriginPort', abbr: 'c',
       help: 'A different port that accepts request from the main server port.',
       defaultsTo: '0');
   parser.addOption('mode', abbr: 'm', help: 'Testing mode.',
       defaultsTo: 'release');
   parser.addOption('arch', abbr: 'a', help: 'Testing architecture.',
       defaultsTo: 'ia32');
   parser.addFlag('help', abbr: 'h', negatable: false,
       help: 'Print this usage information.');
   parser.addOption('package-root', help: 'The package root to use.');
+  parser.addOption('network', help: 'The network interface to use.',
+      defaultsTo: '127.0.0.1');
   var args = parser.parse(new Options().arguments);
   if (args['help']) {
     print(parser.getUsage());
   } else {
     // Pretend we're running test.dart so that TestUtils doesn't get confused
     // about the "current directory." This is only used if we're trying to run
     // this file independently for local testing.
     TestUtils.testScriptPath = new Path(new Options().script)
         .directoryPath
         .join(new Path('../../test.dart'))
         .canonicalize()
         .toNativePath();
     // Note: args['package-root'] is always the build directory. We have the
     // implicit assumption that it contains the 'packages' subdirectory.
     // TODO: We should probably rename 'package-root' to 'build-directory'.
     TestingServerRunner._packageRootDir = new Path(args['package-root']);
     TestingServerRunner._buildDirectory = new Path(args['package-root']);
-    TestingServerRunner.startHttpServer('127.0.0.1',
+    var network = args['network'];
+    TestingServerRunner.startHttpServer(network,
         port: int.parse(args['port']));
     print('Server listening on port '
           '${TestingServerRunner.serverList[0].port}.');
-    TestingServerRunner.startHttpServer('127.0.0.1',
+    TestingServerRunner.startHttpServer(network,
         allowedPort: TestingServerRunner.serverList[0].port, port:
         int.parse(args['crossOriginPort']));
     print(
         'Server listening on port ${TestingServerRunner.serverList[1].port}.');
   }
 }
 /**
  * Runs a set of servers that are initialized specifically for the needs of our
  * test framework, such as dealing with package-root.
  */
@@ skipping 46 matching lines @@
         // Essentially implement the packages path rewriting, so we don't have
         // to pass environment variables to the browsers.
         var requestPathStr = requestPath.toNativePath().substring(
             requestPath.toNativePath().indexOf(packagesDirName));
         path = packageRootDir.append(requestPathStr);
         file = new File(path.toNativePath());
       }
       file.exists().then((exists) {
         if (exists) {
           if (allowedPort != -1) {
-            // Allow loading from localhost:$allowedPort in browsers.
-            resp.headers.set("Access-Control-Allow-Origin",
-                "http://127.0.0.1:$allowedPort");
-            resp.headers.set('Access-Control-Allow-Credentials', 'true');
+            if (request.headers.value('Origin') != null) {
+              var origin = new Uri(request.headers.value('Origin'));
+              // Allow loading from http://*:$allowedPort in browsers.
+              var allowedOrigin =
+                  '${origin.scheme}://${origin.domain}:${allowedPort}';
+              resp.headers.set("Access-Control-Allow-Origin", allowedOrigin);
+              resp.headers.set('Access-Control-Allow-Credentials', 'true');
+            }
           } else {
             // No allowedPort specified. Allow from anywhere (but cross-origin
             // requests *with credentials* will fail because you can't use "*").
             resp.headers.set("Access-Control-Allow-Origin", "*");
           }
           if (path.toNativePath().endsWith('.html')) {
             resp.headers.set('Content-Type', 'text/html');
           } else if (path.toNativePath().endsWith('.js')) {
             resp.headers.set('Content-Type', 'application/javascript');
           } else if (path.toNativePath().endsWith('.dart')) {
             resp.headers.set('Content-Type', 'application/dart');
           }
           file.openInputStream().pipe(resp.outputStream);
         } else {
-          resp.statusCode = HttpStatus.NOT_FOUND;
-          try {
-            resp.outputStream.close();
-          } catch (e) {
-            if (e is StreamException) {
-              print('Test http_server error closing the response stream: $e');
+          var directory = new Directory.fromPath(path);
+          directory.exists().then((exists) {
+            if (!exists) {
+              sendNotFound(resp);
             } else {
-              throw e;
+              sendDirectoryListing(directory, request, resp);
             }
-          }
+          });
         }
       });
     };
 
     // Echos back the contents of the request as the response data.
     httpServer.addRequestHandler((req) => req.path == "/echo", (request, resp) {
       resp.headers.set("Access-Control-Allow-Origin", "*");
 
       request.inputStream.pipe(resp.outputStream);
     });
 
     httpServer.listen(host, port);
     serverList.add(httpServer);
   }
 
+  static void sendNotFound(HttpResponse response) {
+    response.statusCode = HttpStatus.NOT_FOUND;
+    try {
+      response.outputStream.close();
+    } catch (e) {
+      if (e is StreamException) {
+        print('Test http_server error closing the response stream: $e');
+      } else {
+        throw e;
+      }
+    }
+  }
+
+  /**
+   * Sends a simple listing of all the files and sub-directories within
+   * directory.
+   *
+   * This is intended to make it easier to browse tests when manually running
+   * tests against this test server.
+   */
+  static void sendDirectoryListing(Directory directory, HttpRequest request,
+      HttpResponse response) {
+    response.headers.set('Content-Type', 'text/html');
+    var os = response.outputStream;

[ricow1, 2013/02/13 13:31:20]

could we have a more describing variable name here, os seems ambiguous 

[blois, 2013/02/13 22:27:02]

Removed it completely, it's old habit of mine to use os for OutputStreams and is
for InputStreams. Doesn't work so well for Dart though.

+    var header = '''<!DOCTYPE html>
+    <html>
+    <head>
+      <title>${request.path}</title>
+    </head>
+    <body>
+      <code>
+        <div>${request.path}</div>
+        <hr/>
+        <ul>''';
+    var footer = '''
+        </ul>
+      </code>
+    </body>
+    </html>''';
+
+    os.writeString(header);

[ricow1, 2013/02/13 13:31:20]

move this down in the onDone, then we have all the writing done in the same
place

[blois, 2013/02/13 22:27:02]

Done. I had been hoping that I could write them out sequentially from the
DirectoryLister, but unfortunately that isn't alphabetized.

[ricow1, 2013/02/14 07:15:57]

Yeah, I already had a big comment asking why the beep you where doing all this
extra Entries work when I saw your .sort :-)

+
+    var entries = [];
+
+    directory.list()
+      ..onFile = (filepath) {
+        var filename = new Path(filepath).filename;
+        entries.add(new _Entry(filename, filename));
+      }
+      ..onDir = (dirpath) {
+        var filename = new Path(dirpath).filename;
+        entries.add(new _Entry(filename, '$filename/'));
+      }
+      ..onDone = (_) {
+        var requestPath = new Path.raw(request.path);
+        entries.sort();
+        for (var entry in entries) {
+          os.writeString(
+              '<li><a href="${requestPath.append(entry.name)}">'
+              '${entry.displayName}</a></li>');
+        }
+        os.writeString(footer);
+        os.close();
+      };
+  }
+
   static terminateHttpServers() {
     for (var server in serverList) server.close();
   }
 }
+
+// Helper class for displaying directory listings.
+class _Entry {
+  final String name;
+  final String displayName;
+
+  _Entry(this.name, this.displayName);
+
+  int compareTo(_Entry other) {
+    return name.compareTo(other.name);
+  }
+}