Changeset 739:11bdf1dc2e4b in hatta-dev

Timestamp:

01/24/10 13:16:02 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

add more tests for directories and symlinks, fix some related errors in Hatta

Files:

• hatta.py (modified) (4 diffs)
• tests/test_repo.py (modified) (1 diff)

hatta.py

@@ -410 +410 @@
         repo_file = self._title_to_file(title)
         file_path = self._file_path(title)
-        if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links"))
+        if os.path.islink(file_path) or os.path.isdir(file_path):
+            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links or directories"))
         mercurial.util.rename(file_name, file_path)
         changectx = self._changectx()
@@ -481 +481 @@
         repo_file = self._title_to_file(title)
         file_path = self._file_path(title)
-        if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links"))
+        if os.path.islink(file_path) or os.path.isdir(file_path):
+            raise werkzeug.exceptions.Forbidden(_(u"Can't edit symbolic links or directories"))
         try:
             os.unlink(file_path)
@@ -494 +494 @@
 
         file_path = self._file_path(title)
-        if os.path.islink(file_path):
-            raise werkzeug.exceptions.Forbidden(_(u"Can't read symbolic links"))
+        if os.path.islink(file_path) or os.path.isdir(file_path):
+            raise werkzeug.exceptions.Forbidden(_(u"Can't read symbolic links or directories"))
         try:
             return open(file_path, "rb")
@@ -1913 +1913 @@
         except werkzeug.exceptions.Forbidden:
             yield werkzeug.html.p(
-                werkzeug.html(_(u"Can't edit symbolic links")))
+                werkzeug.html(_(u"Can't edit symbolic links or directories")))
             return
         if preview:

tests/test_repo.py

@@ -101 +101 @@
         assert self.title not in repo
 
+    def test_directory_read(self, repo):
+        """
+        What happens when you try to read a directory as page.
+        """
+
+        path = os.path.join(repo.path, self.filename)
+        os.mkdir(path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo.open_page,
+                       self.title)
+
+    def test_directory_write(self, repo):
+        """
+        What happens when you try to write a directory as page.
+        """
+
+        path = os.path.join(repo.path, self.filename)
+        os.mkdir(path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo.save_text,
+                       self.title, self.text, self.author, self.comment,
+                       parent=-1)
+
+    def test_directory_delete(self, repo):
+        """
+        What happens when you try to delete a directory as page.
+        """
+
+        path = os.path.join(repo.path, self.filename)
+        os.mkdir(path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo.delete_page,
+                       self.title, self.author, self.comment)
+
+    def test_symlink_delete(self, repo):
+        """
+        What happens when you try to delete a symlink as page.
+        """
+
+        path = os.path.join(repo.path, self.filename)
+        os.symlink('/', path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo.delete_page,
+                       self.title, self.author, self.comment)
+
 class TestStorage(object):
     """