X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Ffile.ml;h=28685df244c559e1c3e17ddceffe5dae5903fa04;hb=3f0bcc30ff112dc38e882f4f08b8c37d693799ef;hp=0084d12278b43e97e2b86e2090ed1a2e4cc63030;hpb=232d52d33fe530971f81b57bbc8b024fb259c4fd;p=cocanwiki.git

diff --git a/scripts/file.ml b/scripts/file.ml
index 0084d12..28685df 100644
--- a/scripts/file.ml
+++ b/scripts/file.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: file.ml,v 1.6 2004/09/27 12:37:54 rich Exp $
+ * $Id: file.ml,v 1.11 2004/10/24 11:34:37 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@ open Registry
 open Cgi
 open Printf
 
+open ExtString
+
 open Cocanwiki
 
 let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
@@ -40,22 +42,46 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 	  [`Int hostid; `String name; `String name; `Int version] in
 
   let sth =
-    dbh#prepare_cached ("select content, mime_type from files
+    dbh#prepare_cached ("select content, mime_type, name is null as deleted
+                           from files
                           where " ^ where) in
   sth#execute args;
 
-  let data, mime_type =
-    match sth#fetch1 () with
-	[ `Binary data; `String mime_type ] ->
-	  data, mime_type
-      | _ -> assert false in
+  let data, mime_type, deleted =
+    try
+      (match sth#fetch1 () with
+	   [ `Binary data; `String mime_type; `Bool deleted ] ->
+	     data, mime_type, deleted
+	 | _ -> assert false)
+    with
+	Not_found -> raise (HttpError cHTTP_NOT_FOUND) in
+
+  (* If deleted, refuse to serve this file except if called from the
+   * deleted files page.
+   *)
+  if deleted then (
+    let referer =
+      try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
+    let ok =
+      try String.find referer "/_files?deleted"; true
+      with String.Invalid_string -> false in
+
+    if not ok then (
+      prerr_endline "file.ml: bandwidth theft avoided";
+      raise (HttpError cHTTP_NOT_FOUND)
+    )
+  );
 
   if version <> None then
     (* Set a medium-length expiry time on this resource. *)
     Table.set (Request.headers_out r) "Expires" (Expires.medium ());
 
+  (* Content-length header. *)
+  Table.set (Request.headers_out r) "Content-Length"
+    (string_of_int (String.length data));
+
   q#header ~content_type:mime_type ();
-  print_string r data
+  ignore (print_string r data)
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run