Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions truewiki/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ async def _scan_folder(folder, notified=None):
notified = set()

for node in glob.glob(f"{singleton.STORAGE.folder}/{folder}/*"):
node = node.replace(os.sep, "/")
if os.path.isdir(node):
folder = node[len(singleton.STORAGE.folder) + 1 :]
pages_seen.update(await _scan_folder(folder, notified))
Expand Down Expand Up @@ -396,6 +397,7 @@ async def load_metadata(self):
for subfolder in ("Page", "Template", "Category", "File"):
# Index all languages (the superset of all folders).
for node in glob.glob(f"{singleton.STORAGE.folder}/{subfolder}/*"):
node = node.replace(os.sep, "/")
if os.path.isdir(node):
language = node.split("/")[-1]
LANGUAGES.add(language)
Expand Down
4 changes: 3 additions & 1 deletion truewiki/storage/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def dir_make(self, dirname: str) -> None:
os.makedirs(f"{self._folder}/{dirname}", exist_ok=True)

def dir_listing(self, dirname: str) -> List[str]:
return [item[len(f"{self._folder}/") :] for item in glob.glob(f"{self._folder}/{dirname}/*")]
return [
item.replace(os.sep, "/")[len(f"{self._folder}/") :] for item in glob.glob(f"{self._folder}/{dirname}/*")
]

@property
def folder(self):
Expand Down
10 changes: 5 additions & 5 deletions truewiki/web_routes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import click
import logging
import os
import posixpath
import urllib

from aiohttp import web
Expand Down Expand Up @@ -46,8 +46,8 @@ def _validate_page(page: str) -> None:
if "/" not in page:
return

filename = os.path.basename(page)
path = os.path.normpath(os.path.dirname(page))
filename = posixpath.basename(page)
path = posixpath.normpath(posixpath.dirname(page))
fullpath = f"{path}/{filename}"

# Don't allow directory traversal
Expand Down Expand Up @@ -205,8 +205,8 @@ async def edit_page_post(request):

# Make sure that page names don't contain /../ or anything silly.
new_page = payload.get("page", page)
filename = os.path.basename(new_page)
path = os.path.normpath(os.path.dirname(new_page))
filename = posixpath.basename(new_page)
path = posixpath.normpath(posixpath.dirname(new_page))
new_page = f"{path}/{filename}"
source_edit_nonce = singleton.STORAGE.get_file_nonce(WikiPage.page_ondisk_name(page))

Expand Down