Source responder fixes

diff --git a/extra/webapps/file/file.factor b/extra/webapps/file/file.factor
index 3a8feddbad951cf4d104f7e55c47863ec6fc0903..110b90f84a3075b403e1e4bb482377c0ffd81520 100755 (executable)
--- a/extra/webapps/file/file.factor
+++ b/extra/webapps/file/file.factor
@@ -35,8 +35,9 @@ IN: webapps.file
 SYMBOL: serve-file-hook
 
 [
+    dupd
     file-response
-    stdio get stream-copy
+    <file-reader> stdio get stream-copy
 ] serve-file-hook set-global
 
 : serve-static ( filename mime-type -- )
@@ -46,7 +47,6 @@ SYMBOL: serve-file-hook
         "method" get "head" = [
             file-response
         ] [
-            >r dup <file-reader> swap r>
             serve-file-hook get call
         ] if 
     ] if ;
@@ -118,14 +118,6 @@ SYMBOL: page
     ] if ;
 
 global [
-    ! Serve up our own source code
-    "resources" [
-        [
-            "" resource-path "doc-root" set
-            file-responder
-        ] with-scope
-    ] add-simple-responder
-    
     ! Serves files from a directory stored in the "doc-root"
     ! variable. You can set the variable in the global
     ! namespace, or inside the responder.

diff --git a/extra/webapps/source/source.factor b/extra/webapps/source/source.factor
index efc46c68b718cb62f76314ffdd5cb474f0b8f7ef..c414e0ac70f94c6850f8546484a803ca2bc162ce 100755 (executable)
--- a/extra/webapps/source/source.factor
+++ b/extra/webapps/source/source.factor
@@ -1,20 +1,33 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files namespaces webapps.file http.server.responders
-xmode.code2html kernel html ;
+xmode.code2html kernel html sequences ;
 IN: webapps.source
 
+! This responder is a potential security problem. Make sure you
+! don't have sensitive files stored under vm/, core/, extra/
+! or misc/.
+
+: check-source-path ( path -- ? )
+    { "vm/" "core/" "extra/" "misc/" }
+    [ head? ] curry* contains? ;
+
+: source-responder ( path mime-type -- )
+    drop
+    serving-html
+    [ dup <file-reader> htmlize-stream ] with-html-stream ;
+
 global [
     ! Serve up our own source code
     "source" [
-        [
-            "" resource-path "doc-root" set
+        "argument" get check-source-path [
             [
-                drop
-                serving-html
-                [ swap htmlize-stream ] with-html-stream
-            ] serve-file-hook set
-            file-responder
-        ] with-scope
+                "" resource-path "doc-root" set
+                [ source-responder ] serve-file-hook set
+                file-responder
+            ] with-scope
+        ] [
+            "403 forbidden" httpd-error
+        ] if
     ] add-simple-responder
 ] bind