From 1d51371de1d046beac8f0519c6f789490c8033b1 Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Sun, 24 Oct 2004 08:48:38 +0000
Subject: [PATCH] For image/file theft, throw 404 instead of 500 error. Crash
 report shows canonical hostname. Bumped version for release.

---
 debian/changelog | 2 +-
 scripts/crash.ml | 6 ++++--
 scripts/file.ml  | 8 +++++---
 scripts/image.ml | 8 +++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8470276..6ae2f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.3.2-2) unstable; urgency=low
+cocanwiki (1.3.2-3) unstable; urgency=low
 
   * Initial Release.
 
diff --git a/scripts/crash.ml b/scripts/crash.ml
index 0e2e720..07d8839 100644
--- a/scripts/crash.ml
+++ b/scripts/crash.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: crash.ml,v 1.2 2004/10/23 12:00:16 rich Exp $
+ * $Id: crash.ml,v 1.3 2004/10/24 08:48:38 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
@@ -30,7 +30,8 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_server_settings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid
+    { canonical_hostname = canonical_hostname } _ =
   let template = get_template dbh hostid "crash.html" in
   let crash_email = server_settings_crash_email dbh in
 
@@ -53,6 +54,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 	  let subject =
 	    "Crash notify: There was a 500 internal server error" in
 	  let body = "Crash at " ^ time ^ "\n" ^
+		     "Hostname is " ^ canonical_hostname ^ "\n" ^
 		     "Please see the error log for details." in
 	  Sendmail.send_mail ~subject ~body ~to_addr:[email] ();
 
diff --git a/scripts/file.ml b/scripts/file.ml
index c9032aa..eb45b71 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.9 2004/10/23 12:00:16 rich Exp $
+ * $Id: file.ml,v 1.10 2004/10/24 08:48:38 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
@@ -63,8 +63,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
       try String.find referer "/_files?deleted"; true
       with String.Invalid_string -> false in
 
-    if not ok then
-      failwith "file.ml: bandwidth theft avoided"
+    if not ok then (
+      prerr_endline "file.ml: bandwidth theft avoided";
+      raise (HttpError cHTTP_NOT_FOUND)
+    )
   );
 
   if version <> None then
diff --git a/scripts/image.ml b/scripts/image.ml
index bfffbfd..a625d78 100644
--- 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.9 2004/10/23 12:00:23 rich Exp $
+ * $Id: image.ml,v 1.10 2004/10/24 08:48:38 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
@@ -65,8 +65,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
       try String.find referer "/_images?deleted"; true
       with String.Invalid_string -> false in
 
-    if not ok then
-      failwith "image.ml: bandwidth theft avoided"
+    if not ok then (
+      prerr_endline "image.ml: bandwidth theft avoided";
+      raise (HttpError cHTTP_NOT_FOUND)
+    )
   );
 
   if version <> None then
-- 
1.8.3.1