Make VirtualDirectory redirect if the directory-path does not end with a tailing slash.

pkg/http_server/lib/src/virtual_directory.dart

Index: pkg/http_server/lib/src/virtual_directory.dart
diff --git a/pkg/http_server/lib/src/virtual_directory.dart b/pkg/http_server/lib/src/virtual_directory.dart
index 7665a71e7cb40dec5f1b6793a54a273e9af19c97..a8107d9dad15c8b9bcaaf48d2ff7cc84c735893d 100644
--- a/pkg/http_server/lib/src/virtual_directory.dart
+++ b/pkg/http_server/lib/src/virtual_directory.dart
@@ -4,6 +4,12 @@
 
 part of http_server;
 
+
+// Used for signal a directory redirecting, where a tailing slash is missing.
+class _DirectoryRedirect {
+  const _DirectoryRedirect();
+}
+
 /**
  * A [VirtualDirectory] can serve files and directory-listing from a root path,
  * to [HttpRequest]s.
@@ -66,7 +72,14 @@ class VirtualDirectory {
           if (entity is File) {
             serveFile(entity, request);
           } else if (entity is Directory) {
-            _serveDirectory(entity, request);
+            if (allowDirectoryListing) {
+              _serveDirectory(entity, request);
+            } else {
+              _serveErrorPage(HttpStatus.NOT_FOUND, request);
+            }
+          } else if (entity is _DirectoryRedirect) {
+            request.response.redirect(Uri.parse('${request.requestedUri}/'),

[Søren Gjesse, 2014/01/09 10:19:47]

As requestedUri was just added to dart:io we need to update the SDK dependency
to 1.2, unless we get it merged into 1.1.

Perhaps copy the implementation here and remove it when 1.2 is out.

[Anders Johnsen, 2014/01/09 10:24:09]

Using relative Uri for now, added TODO.

+                                      status: HttpStatus.MOVED_PERMANENTLY);
           } else {
             _serveErrorPage(HttpStatus.NOT_FOUND, request);
           }
@@ -90,18 +103,13 @@ class VirtualDirectory {
     _errorCallback = callback;
   }
 
-  Future<FileSystemEntity> _locateResource(String path,
-                                           Iterator<String> segments) {
+  Future _locateResource(String path, Iterator<String> segments) {
     // Don't allow navigating up paths.
     if (segments.current == "..") return new Future.value(null);
     path = normalize(path);
     // If we jail to root, the relative path can never go up.
     if (jailRoot && split(path).first == "..") return new Future.value(null);
-    String fullPath({bool endSlash: false}) {
-      var p = join(root, path);
-      if (endSlash && path != ".") p = "$p$separator";
-      return p;
-    }
+    String fullPath() => join(root, path);
     return FileSystemEntity.type(fullPath(), followLinks: false)
         .then((type) {
           switch (type) {
@@ -112,14 +120,18 @@ class VirtualDirectory {
               break;
 
             case FileSystemEntityType.DIRECTORY:
-              if (segments.current == null) {
-                if (allowDirectoryListing) {
-                  return new Directory(fullPath(endSlash: true));
-                }
+              String dirFullPath() => '${fullPath()}$separator';
+              var current = segments.current;
+              if (current == null) {
+                if (path == '.') return new Directory(dirFullPath());
+                return const _DirectoryRedirect();
+              }
+              bool hasNext = segments.moveNext();
+              if (!hasNext && current == "") {
+                return new Directory(dirFullPath());
               } else {
-                if (_invalidPathRegExp.hasMatch(segments.current)) break;
-                return _locateResource(join(path, segments.current),
-                                       segments..moveNext());
+                if (_invalidPathRegExp.hasMatch(current)) break;
+                return _locateResource(join(path, current), segments);
               }
               break;