test (and correctly handle) shelf_static under non-empty scriptName
diff --git a/lib/shelf_static.dart b/lib/shelf_static.dart
index da47d7c..ee90ced 100644
--- a/lib/shelf_static.dart
+++ b/lib/shelf_static.dart
@@ -22,7 +22,7 @@
return new Response.forbidden('The requested path is invalid.');
}
- var segs = [fileSystemPath]..addAll(request.requestedUri.pathSegments);
+ var segs = [fileSystemPath]..addAll(request.url.pathSegments);
var requestedPath = p.joinAll(segs);
var file = new File(requestedPath);
@@ -35,7 +35,8 @@
// Do not serve a file outside of the original fileSystemPath
if (!p.isWithin(fileSystemPath, resolvedPath)) {
- throw 'Requested path ${request.requestedUri} resolved to $resolvedPath '
+ // TODO(kevmoo) throw a real error here. Perhaps a new error type?
+ throw 'Requested path ${request.url.path} resolved to $resolvedPath '
'is not under $fileSystemPath.';
}
diff --git a/pubspec.yaml b/pubspec.yaml
index af55f7f..a8a506e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: shelf_static
-version: 0.1.0
+version: 0.1.0+1
author: Kevin Moore <github@j832.com>
description: Static file server support for Shelf
homepage: https://github.com/kevmoo/shelf_static.dart
@@ -8,4 +8,5 @@
dependencies:
shelf: '>=0.5.0 <0.6.0'
dev_dependencies:
+ path: '>=1.1.0 <2.0.0'
scheduled_test: '>=0.11.0 <0.12.0'
diff --git a/test/alternative_root_test.dart b/test/alternative_root_test.dart
new file mode 100644
index 0000000..9de8c85
--- /dev/null
+++ b/test/alternative_root_test.dart
@@ -0,0 +1,92 @@
+library shelf_static.basic_file_test;
+
+import 'dart:io';
+import 'package:scheduled_test/descriptor.dart' as d;
+import 'package:scheduled_test/scheduled_test.dart';
+
+import 'package:shelf_static/shelf_static.dart';
+import 'test_util.dart';
+
+void main() {
+ setUp(() {
+ var tempDir;
+ schedule(() {
+ return Directory.systemTemp.createTemp('shelf_static-test-').then((dir) {
+ tempDir = dir;
+ d.defaultRoot = tempDir.path;
+ });
+ });
+
+ d.file('root.txt', 'root txt').create();
+ d.dir('files', [
+ d.file('test.txt', 'test txt content'),
+ d.file('with space.txt', 'with space content')
+ ]).create();
+
+ currentSchedule.onComplete.schedule(() {
+ d.defaultRoot = null;
+ return tempDir.delete(recursive: true);
+ });
+ });
+
+ test('access root file', () {
+ schedule(() {
+ var handler = getHandler(d.defaultRoot);
+
+ return makeRequest(handler, '/static/root.txt', scriptName: '/static')
+ .then((response) {
+ expect(response.statusCode, HttpStatus.OK);
+ expect(response.headers[HttpHeaders.CONTENT_LENGTH], '8');
+ expect(response.readAsString(), completion('root txt'));
+ });
+ });
+ });
+
+ test('access root file with space', () {
+ schedule(() {
+ var handler = getHandler(d.defaultRoot);
+
+ return makeRequest(handler, '/static/files/with%20space.txt',
+ scriptName: '/static').then((response) {
+ expect(response.statusCode, HttpStatus.OK);
+ expect(response.headers[HttpHeaders.CONTENT_LENGTH], '18');
+ expect(response.readAsString(), completion('with space content'));
+ });
+ });
+ });
+
+ test('access root file with unencoded space', () {
+ schedule(() {
+ var handler = getHandler(d.defaultRoot);
+
+ return makeRequest(handler, '/static/files/with space.txt',
+ scriptName: '/static').then((response) {
+ expect(response.statusCode, HttpStatus.FORBIDDEN);
+ });
+ });
+ });
+
+ test('access file under directory', () {
+ schedule(() {
+ var handler = getHandler(d.defaultRoot);
+
+ return makeRequest(handler, '/static/files/test.txt',
+ scriptName: '/static').then((response) {
+ expect(response.statusCode, HttpStatus.OK);
+ expect(response.headers[HttpHeaders.CONTENT_LENGTH], '16');
+ expect(response.readAsString(), completion('test txt content'));
+ });
+ });
+ });
+
+ test('file not found', () {
+ schedule(() {
+ var handler = getHandler(d.defaultRoot);
+
+ return makeRequest(handler, '/static/not_here.txt',
+ scriptName: '/static').then((response) {
+ expect(response.statusCode, HttpStatus.NOT_FOUND);
+ });
+ });
+ });
+}
diff --git a/test/basic_file_test.dart b/test/basic_file_test.dart
index a74741e..1eca959 100644
--- a/test/basic_file_test.dart
+++ b/test/basic_file_test.dart
@@ -85,6 +85,8 @@
});
});
+ // getHandler for non-existant directory
+
// evil URL fixes
// hosted via other path: success, fail
diff --git a/test/test_util.dart b/test/test_util.dart
index def6bcb..01238c2 100644
--- a/test/test_util.dart
+++ b/test/test_util.dart
@@ -6,12 +6,55 @@
import 'dart:async';
+import 'package:path/path.dart' as p;
import 'package:shelf/shelf.dart';
import 'package:shelf_static/src/util.dart';
+final p.Context _ctx = p.url;
+
/// Makes a simple GET request to [handler] and returns the result.
-Future<Response> makeRequest(Handler handler, String path) =>
- syncFuture(() => handler(_fromPath(path)));
+Future<Response> makeRequest(Handler handler, String path,
+ {String scriptName}) {
+ var rootedHandler = _rootHandler(scriptName, handler);
+ return syncFuture(() => rootedHandler(_fromPath(path)));
+}
Request _fromPath(String path) =>
new Request('GET', Uri.parse('http://localhost' + path));
+
+Handler _rootHandler(String scriptName, Handler handler) {
+ if (scriptName == null || scriptName.isEmpty) {
+ return handler;
+ }
+
+ if (!scriptName.startsWith('/')) {
+ throw new ArgumentError('scriptName must start with "/" or be empty');
+ }
+
+ return (Request request) {
+ if (!_ctx.isWithin(scriptName, request.requestedUri.path)) {
+ return new Response.notFound('not found');
+ }
+ assert(request.scriptName.isEmpty);
+
+ var relativePath = _ctx.relative(request.requestedUri.path,
+ from: scriptName);
+
+ assert(!relativePath.startsWith('/'));
+
+ relativePath = '/' + relativePath;
+
+ var url = new Uri(path: relativePath, query: request.url.query,
+ fragment: request.url.fragment);
+ var relativeRequest = _copy(request, scriptName, url);
+
+ return handler(relativeRequest);
+ };
+}
+
+// TODO: until we have on https://code.google.com/p/dart/issues/detail?id=18453
+Request _copy(Request r, String scriptName, Uri url) {
+ return new Request(r.method, r.requestedUri,
+ protocolVersion: r.protocolVersion, headers: r.headers, url: url,
+ scriptName: scriptName, body: r.read(), context: r.context);
+}
