From 85bd2ff4da1d9bf15bd0792233444d630ef283cf Mon Sep 17 00:00:00 2001 From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com> Date: Sun, 20 Feb 2022 03:55:40 +0100 Subject: [PATCH] Patch files to prevent fetching urls even if file exists, adjust mime types for server --- files.sh | 10 +++++----- server.go | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/files.sh b/files.sh index a4a3bfd81..f0d152f9c 100755 --- a/files.sh +++ b/files.sh @@ -34,10 +34,6 @@ fetchFileURL() { } fetchFile () { - uri=$(fetchFileURL "${1}") - if [[ "${uri}" == "" ]]; then - return 1 - fi RESULT_PATH="${PAGE_PATH}${1}.${3}" if [[ -f "${RESULT_PATH}" ]]; then @@ -47,7 +43,11 @@ fetchFile () { fi fi - echo "${uri}" >&2 + uri=$(fetchFileURL "${1}") + if [[ "${uri}" == "" ]]; then + return 1 + fi + doFullRequest "${uri}" > .files.tmp if [[ $(isValidPageResult .files.tmp) == "yes" ]]; then mv .files.tmp "${RESULT_PATH}" diff --git a/server.go b/server.go index 8b3542579..ea16d0a09 100644 --- a/server.go +++ b/server.go @@ -1023,7 +1023,11 @@ func main() { byteEntries, _ := json.Marshal(dirEntries) writer.Write(byteEntries) } else { - writer.Header().Set("Content-Type", "text/plain") + if path.Ext(filePath) == ".wiki" { + writer.Header().Set("Content-Type", "text/plain") + } else if path.Ext(filePath) == ".md" { + writer.Header().Set("Content-Type", "text/markdown") + } http.ServeFile(writer, request, filePath) } }