diff options
| author | Malfurious <m@lfurio.us> | 2023-11-16 23:54:11 -0500 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2023-11-18 00:45:27 -0500 |
| commit | a85783ed0b1ae567574f5f9986a235ce747b8af0 (patch) | |
| tree | cede6dd18e0f8eade48992b7867540f9d11bec7a | |
| parent | b71993fcc0da84e8f168baa6f0518de2eb1bc3c7 (diff) | |
| download | cychedelic-a85783ed0b1ae567574f5f9986a235ce747b8af0.tar.gz cychedelic-a85783ed0b1ae567574f5f9986a235ce747b8af0.zip | |
dmt: Escape unintended HTML entities
Signed-off-by: Malfurious <m@lfurio.us>
| -rwxr-xr-x | dmt/dmt | 8 | ||||
| -rw-r--r-- | dmt/html/master.html | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -23,7 +23,11 @@ integer() { [ "$1" -eq "$1" ] >/dev/null 2>&1 } -escape() { +escape_html() { + sed 's/&/\&/g; s/</\</g; s/>/\>/g; s/"/\"/g; s/'"'"'/\'/g' +} + +escape_json() { sed 's/\\/\\\\/g; s/\r/\\r/g; s/\t/\\t/g; s/"/\\"/g' \ | awk '{printf "%s\\n", $0}' } @@ -76,7 +80,7 @@ api_job() { printf '"service":"%s",' "$(cat "$jobdir/service")" printf '"time":%i,' "$(cat "$jobdir/time")" printf '"result":"%s",' "$result" - printf '"log":"%s"}' "$(log_tail "$job" | escape)" + printf '"log":"%s"}' "$(log_tail "$job" | escape_json)" fi } diff --git a/dmt/html/master.html b/dmt/html/master.html index 8118ca0..570c511 100644 --- a/dmt/html/master.html +++ b/dmt/html/master.html @@ -2,7 +2,7 @@ <html> <head> - <title>%($CYCHE_SITE_NAME%)</title> + <title>%{ echo -n "$CYCHE_SITE_NAME" | escape_html %}</title> <link rel="stylesheet" type="text/css" href="/style.css" /> </head> @@ -12,7 +12,7 @@ | etc... <span class="right"> - %($CYCHE_SITE_NAME%) + %{ echo -n "$CYCHE_SITE_NAME" | escape_html %} <span id="nav_progress"></span> </span> </nav> |