Refuse to serve deleted files or images to other sites. Stops bandwidth

theft on Wikis.

Send correct Content-Length header for files and images.

Bumped version for release.

diff --git a/debian/changelog b/debian/changelog
index fbea02e..779693a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.2.2-3) unstable; urgency=low
+cocanwiki (1.2.2-4) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/scripts/file.ml b/scripts/file.ml
index d495f80..f22394b 100644 (file)
--- 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.7 2004/10/04 15:19:56 rich Exp $
+ * $Id: file.ml,v 1.8 2004/10/15 16:03:01 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,20 +42,39 @@ 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 =
+  let data, mime_type, deleted =
     match sth#fetch1 () with
-       [ `Binary data; `String mime_type ] ->
-         data, mime_type
+       [ `Binary data; `String mime_type; `Bool deleted ] ->
+         data, mime_type, deleted
       | _ -> assert false 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
+      failwith "file.ml: bandwidth theft avoided"
+  );
+
   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
 

diff --git a/scripts/image.ml b/scripts/image.ml
index e569d44..87ed9de 100644 (file)
--- a/scripts/image.ml
+++ b/scripts/image.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: image.ml,v 1.7 2004/10/04 15:19:56 rich Exp $
+ * $Id: image.ml,v 1.8 2004/10/15 16:03:01 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 _ _ =
@@ -34,8 +36,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 
   (* Get the image and its MIME type. *)
   let what =
-    if not is_thumbnail then "image, mime_type"
-    else "thumbnail, tn_mime_type" in
+    if not is_thumbnail then "image, mime_type, name is null as deleted"
+    else "thumbnail, tn_mime_type, name is null as deleted" in
   let where, args =
     match version with
        None -> "hostid = ? and name = ?", [`Int hostid; `String image]
@@ -47,16 +49,34 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
              ("select " ^ what ^ " from images where " ^ where) in
   sth#execute args;
 
-  let data, mime_type =
+  let data, mime_type, deleted =
     match sth#fetch1 () with
-       [ `Binary data; `String mime_type ] ->
-         data, mime_type
+       [ `Binary data; `String mime_type; `Bool deleted ] ->
+         data, mime_type, deleted
       | _ -> assert false in
 
+  (* If deleted, refuse to serve this image except if called from the
+   * deleted images page.
+   *)
+  if deleted then (
+    let referer =
+      try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
+    let ok =
+      try String.find referer "/_images?deleted"; true
+      with String.Invalid_string -> false in
+
+    if not ok then
+      failwith "image.ml: bandwidth theft avoided"
+  );
+
   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