Don't allow the various ::create() methods to take "/" in the name.

3 files changed, 61 insertions, 0 deletions

diff --git a/core/tests/Album_Helper_Test.php b/core/tests/Album_Helper_Test.php
index d4bfca55..522d58d9 100644
--- a/core/tests/Album_Helper_Test.php
+++ b/core/tests/Album_Helper_Test.php
@@ -58,4 +58,17 @@ class Album_Helper_Test extends Unit_Test_Case {
     $album = album::create($root, $rand, $rand, $rand);
     $this->assert_equal("http://./var/resizes/$rand/.album.jpg", $album->resize_url());
   }
+
+  public function create_album_shouldnt_allow_names_with_slash_test() {
+    $rand = rand();
+    $root = ORM::factory("item", 1);
+    try {
+      $album = album::create($root, $rand . "/", $rand, $rand);
+    } catch (Exception $e) {
+      // pass
+      return;
+    }
+
+    $this->assert_true(false, "Shouldn't create an album with / in the name");
+  }
 }
diff --git a/core/tests/Movie_Helper_Test.php b/core/tests/Movie_Helper_Test.php
new file mode 100644
index 00000000..0899154e
--- /dev/null
+++ b/core/tests/Movie_Helper_Test.php
@@ -0,0 +1,34 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Movie_Helper_Test extends Unit_Test_Case {
+  public function create_movie_shouldnt_allow_names_with_slash_test() {
+    $rand = rand();
+    $root = ORM::factory("item", 1);
+    try {
+      $filename = DOCROOT . "core/tests/test.jpg";
+      $photo = photo::create($root, $filename, "$rand/.jpg", $rand, $rand);
+    } catch (Exception $e) {
+      // pass
+      return;
+    }
+
+    $this->assert_true(false, "Shouldn't create a movie with / in the name");
+  }
+}
diff --git a/core/tests/Photo_Helper_Test.php b/core/tests/Photo_Helper_Test.php
index 45e911b2..81405b79 100644
--- a/core/tests/Photo_Helper_Test.php
+++ b/core/tests/Photo_Helper_Test.php
@@ -80,4 +80,18 @@ class Photo_Helper_Test extends Unit_Test_Case {
 
     $this->assert_equal("http://./var/resizes/{$rand}/{$rand}.jpg", $photo->resize_url());
   }
+
+  public function create_photo_shouldnt_allow_names_with_slash_test() {
+    $rand = rand();
+    $root = ORM::factory("item", 1);
+    try {
+      $filename = DOCROOT . "core/tests/test.jpg";
+      $photo = photo::create($root, $filename, "$rand/.jpg", $rand, $rand);
+    } catch (Exception $e) {
+      // pass
+      return;
+    }
+
+    $this->assert_true(false, "Shouldn't create a photo with / in the name");
+  }
 }