Changeset 744:3a967f693570 in hatta-dev

Timestamp:

01/24/10 15:19:13 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

implemet the subdirectory storage, more tests

Files:

• hatta.py (modified) (2 diffs)
• tests/test_repo.py (modified) (2 diffs)

hatta.py

@@ -682 +682 @@
     """
 
-    # XXX Override required methods here.
+    periods_re = re.compile(r'^[.]|(?<=/)[.]')
+    slashes_re = re.compile(r'^[/]|(?<=/)[/]')
+
+    def _title_to_file(self, title):
+        """Modified escaping to allow slashes and spaces."""
+
+        title = unicode(title).strip()
+        escaped = werkzeug.url_quote(title, safe='/ ')
+        path = os.path.join(self.repo_prefix, escaped)
+        path = self.periods_re.sub('%2E', path)
+        path = self.slashes_re.sub('%2F', path)
+        return path
+
+    def save_file(self, title, file_name, author=u'', comment=u'', parent=None):
+        """Make the subdirectories if needed."""
+
+        file_path = self._file_path(title)
+        self._check_path(file_path)
+        dir_path = os.path.dirname(file_path)
+        try:
+            os.makedirs(dir_path)
+        except OSError:
+            pass
+        super(WikiSubdirectoryStorage, self).save_file(title, file_name,
+                                                       author, comment, parent)
 
 
@@ -1933 +1957 @@
             comment = _(u'created')
             rev = -1
-        except werkzeug.exceptions.Forbidden:
+        except werkzeug.exceptions.Forbidden, e:
             yield werkzeug.html.p(
-                werkzeug.html(_(u"Can't edit symbolic links or directories")))
+                werkzeug.html(_(unicode(e))))
             return
         if preview:

tests/test_repo.py

@@ -68 +68 @@
     comment = u'test comment'
 
-    @py.test.mark.xfail
-    def test_filename(self, repo):
+    title_encodings = {
+        u'test title': 'test title',
+        u'.test title': '%2Etest title',
+        u'../test title': '%2E./test title',
+        u'test/./title': 'test/%2E/title',
+        u'test/../title': 'test/%2E./title',
+        u'test//title': 'test/%2Ftitle',
+        u'/test/title': '%2Ftest/title',
+    }
+
+
+    def test_title_to_file(self, subdir_repo):
+        for title, filename in self.title_encodings.iteritems():
+            escaped = subdir_repo._title_to_file(title)
+            assert escaped == filename
+
+    def test_filename(self, subdir_repo):
         """
         Check if the page's file is named properly.
         """
 
-        title = u'some/page.txt'
-        filename = 'some/page.txt'
-        filepath = os.path.join(repo.path, filename)
-        repo.save_text(title, self.text, self.author, self.comment, parent=-1)
-        exists = os.path.exists(filepath)
-        assert exists
-
-    # XXX Put your tests here.
+        for title, filename in self.title_encodings.iteritems():
+            filepath = os.path.join(subdir_repo.path, filename)
+            subdir_repo.save_text(title, self.text, self.author, self.comment,
+                                  parent=-1)
+            exists = os.path.exists(filepath)
+            assert exists
+
 
 class TestMercurialStorage(object):
@@ -105 +119 @@
         exists = os.path.exists(filepath)
         assert exists
+
+    def test_check_path(self, repo):
+        py.test.raises(werkzeug.exceptions.Forbidden, repo._check_path, "/")
+        py.test.raises(werkzeug.exceptions.Forbidden, repo._check_path, "..")
+        py.test.raises(werkzeug.exceptions.Forbidden, repo._check_path,
+                       repo.path+"/..")
+        path = os.path.join(repo.path, 'aaa')
+        os.symlink('/', path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo._check_path, path)
+        path = os.path.join(repo.path, 'bbb')
+        os.mkdir(path)
+        py.test.raises(werkzeug.exceptions.Forbidden, repo._check_path, path)
 
     @py.test.mark.skipif("sys.platform == 'win32'")