From 16f64b74b9251a1c26ba1729e0743bf28dee4a1f Mon Sep 17 00:00:00 2001
From: /dev/urandom <dev.urandom@posteo.org>
Date: Wed, 19 Jan 2022 12:20:44 +0300
Subject: [PATCH] better escaping for RSS

---
 Makefile     |  6 +++---
 blogindex.sh | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4ed9a70..e163940 100644
--- a/Makefile
+++ b/Makefile
@@ -40,15 +40,15 @@ all: $(OUTDIR)/blog/index.html $(OUTDIR)/dc/blog/index.html $(OUTDIR)/blog/main.
 upload:
 	./upload.sh
 
-$(OUTDIR)/dc/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/dreamcast.tpl
+$(OUTDIR)/dc/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/dreamcast.tpl blogindex.sh
 	@mkdir -p $(@D)
 	./blogindex.sh | $(THEME) $(DC_THEME_FLAGS) -t $(TPLDIR)/dreamcast.tpl -p blog/index.html -o $@
 
-$(OUTDIR)/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/default.tpl
+$(OUTDIR)/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/default.tpl blogindex.sh
 	@mkdir -p $(@D)
 	./blogindex.sh | $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p blog/index.html -o $@
 
-$(OUTDIR)/blog/main.rss: $(_BLOG_PAGES)
+$(OUTDIR)/blog/main.rss: $(_BLOG_PAGES) blogindex.sh
 	@mkdir -p $(@D)
 	./blogindex.sh -r > $@
 
diff --git a/blogindex.sh b/blogindex.sh
index bd36bcf..d40131a 100755
--- a/blogindex.sh
+++ b/blogindex.sh
@@ -16,6 +16,10 @@ FILES=`ls $DIRECTORY/*.md -1 | sort`
 
 RETURNDATE=""
 
+function rss_escape {
+	echo "$1" | sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/"/\&quot;/g; s/'"'"'/\&#39;/g'
+}
+
 function printcut {
 # argument 1: filename
 
@@ -64,9 +68,9 @@ cat << RSSHEADER
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
 <atom:link href="https://devurandom.xyz/blog/main.rss" rel="self" type="application/rss+xml" />
-<title>rnd's blog</title>
-<link>https://devurandom.xyz/blog</link>
-<description>The RSS feed of articles published on the blog thingy</description>
+<title>$(rss_escape "${RSSTITLE}")</title>
+<link>$(rss_escape "${BASEURL}/blog")</link>
+<description>$(rss_escape "${RSSDESC}")</description>
 RSSHEADER
 else
   cat tpl/blog_header.md
@@ -86,7 +90,7 @@ for f in $FILES; do
 
 	if [ $RSSMODE ]; then
 		echo "<item>"
-		echo "<title>$TITLE</title>"
+		echo "<title>$(rss_escape "$TITLE")</title>"
 		echo "<link>https://devurandom.xyz/blog/$OUTPAGE</link>"
 		echo "<guid>https://devurandom.xyz/blog/$OUTPAGE</guid>"
 		if [ $MTIME -gt 0 ]; then
@@ -96,9 +100,9 @@ for f in $FILES; do
 			fi
 			echo "<pubDate>$RDATE</pubDate>"
 		fi
-		DESCRIPTION="`printcut $f`"
+		DESCRIPTION="$(printcut $f)"
 		if [ $? -eq 0 ]; then
-			echo "<description>$DESCRIPTION</description>"
+			echo "<description>$(rss_escape "$DESCRIPTION")</description>"
 		fi
 		echo "</item>"
 	else