Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Escape HTML #359

Merged
merged 6 commits into from
Jan 20, 2024
Merged

fix: Escape HTML #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
285a7ca
fix: Escape HTML
kroese Jan 20, 2024
12a082a
fix: Escape HTML
kroese Jan 20, 2024
1d848ce
fix: Quotes
kroese Jan 20, 2024
5d2d40d
fix: Quotes
kroese Jan 20, 2024
3f5d8bf
fix: Quotes
kroese Jan 20, 2024
b72da1a
fix: Escape HTML
kroese Jan 20, 2024
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
8 changes: 4 additions & 4 deletions src/disk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ getSize() {
local DISK_FILE=$1
local DISK_EXT DISK_FMT

DISK_EXT="$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')"
DISK_FMT="$(ext2fmt "$DISK_EXT")"
DISK_EXT=$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')
DISK_FMT=$(ext2fmt "$DISK_EXT")

case "${DISK_FMT,,}" in
raw)
Expand Down Expand Up @@ -378,7 +378,7 @@ addDisk () {
else
PREV_FMT="qcow2"
fi
PREV_EXT="$(fmt2ext "$PREV_FMT")"
PREV_EXT=$(fmt2ext "$PREV_FMT")

if [ -f "$DISK_BASE.$PREV_EXT" ] ; then
convertDisk "$DISK_BASE.$PREV_EXT" "$PREV_FMT" "$DISK_FILE" "$DISK_FMT" "$DISK_BASE" "$DISK_DESC" "$FS" || exit $?
Expand Down Expand Up @@ -441,7 +441,7 @@ if [ -z "$DISK_FMT" ]; then
fi
fi

DISK_EXT="$(fmt2ext "$DISK_FMT")" || exit $?
DISK_EXT=$(fmt2ext "$DISK_FMT")

if [ -z "$ALLOCATE" ]; then
if [[ "${DISK_FMT,,}" == "raw" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion src/network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ configureNAT() {
update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null

exclude="$(getPorts "$HOST_PORTS")"
exclude=$(getPorts "$HOST_PORTS")

iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE
# shellcheck disable=SC2086
Expand Down
24 changes: 20 additions & 4 deletions src/reset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,27 @@ VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)

# Helper functions

escape () {
local s
s=${1//&/\&}
s=${s//</\&lt;}
s=${s//>/\&gt;}
s=${s//'"'/\&quot;}
printf -- %s "$s"
return 0
}

html()
{
local title="<title>$APP</title>"

local body="$1"
local title
local body
local footer

title=$(escape "$APP")
title="<title>$title</title>"
footer=$(escape "$FOOTER1")

body=$(escape "$1")
if [[ "$body" == *"..." ]]; then
body="<p class=\"loading\">${body/.../}</p>"
fi
Expand All @@ -61,7 +77,7 @@ html()
HTML="${HTML/\[1\]/$title}"
HTML="${HTML/\[2\]/$script}"
HTML="${HTML/\[3\]/$body}"
HTML="${HTML/\[4\]/$FOOTER1}"
HTML="${HTML/\[4\]/$footer}"
HTML="${HTML/\[5\]/$FOOTER2}"

echo "$HTML" > "$PAGE"
Expand Down