From: Paul Hänsch <paul@plutz.net>
Date: Tue, 17 May 2022 21:24:30 +0000 (+0200)
Subject: Disallow newlines in page names
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=0e2b2e5a68f0e5a32bc4e7d869b475b744582643;p=shellwiki

Disallow newlines in page names
---

diff --git a/handlers/10_page.sh b/handlers/10_page.sh
index b34aa1b..334df19 100755
--- a/handlers/10_page.sh
+++ b/handlers/10_page.sh
@@ -7,14 +7,6 @@ export WIKI_THEME=${WIKI_THEME:-default}
 
 . "$_EXEC/themes/${WIKI_THEME}.sh"
 
-if [ "$(which awk)" ]; then
-  md() { awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-elif [ "$(which busybox)" ]; then
-  md() { busybox awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-else
-  md() { cat; }
-fi
-
 wiki() {
   # Print content of a wiki page
   # Get page from data or underlay dir, handle caching
@@ -48,6 +40,11 @@ case "${PATH_INFO}" in
     FILE "${_EXEC}/${PATH_INFO#/\[.\]}"
     return 0
     ;;
+  *${BR}*)
+    export ERROR_MSG='Page names containing newline character are not allowed'
+    theme_error 400
+    return 0
+    ;;
   */\#*)
     export ERROR_MSG='Page names starting with "#" are not allowed'
     theme_error 400