From c4296b59a7f9d667d295f9c37b71f7849b818fb3 Mon Sep 17 00:00:00 2001
From: Charlie Root <root@web.ccc.local>
Date: Tue, 28 Jan 2025 22:47:15 +0100
Subject: Big overhaul patch and style changes

---
 app/views/rss/updates.xml.builder | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/views/rss/updates.xml.builder')

diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index c09c9c9f..6afcd566 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -2,13 +2,13 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
-  xml.link(:href => "http://www.ccc.de/")
+  xml.link(:href => "https://www.ccc.de/")
   xml.link(:rel => "self", :href => "#{@host}/rss/updates")
   xml.updated(@items.first.published_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("#{@host}/rss/updates")
+  xml.id("https://www.ccc.de/rss/updates")
   
   @items.each do |item|
     xml.entry do
@@ -21,6 +21,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
       xml.id(content_url(:page_path => item.node.feed_id))
       xml.updated(item.updated_at.xmlschema)
       xml.published(item.published_at.xmlschema)
+      xml.summary(item.abstract)
       xml.content(:type => "xhtml") do
         xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
       end
@@ -28,4 +29,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
-- 
cgit v1.3


From e86897c7c3ce7dea169be7f2c027aae3a7a4edab Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 27 Jun 2026 20:29:25 +0200
Subject: Stop forcing escaped HTML into the database just because XML Builder
 was used wrong

---
 app/views/nodes/edit.html.erb     | 2 +-
 app/views/rss/updates.rdf.builder | 4 ++--
 app/views/rss/updates.xml.builder | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/views/rss/updates.xml.builder')

diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 596f9927..b45c7005 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -76,7 +76,7 @@
   
   <div id="content">
     <div class="node_description">Title</div>
-    <div class="node_content"><%= d.text_field :title, :pattern => "(?:[^<>&amp;]|&amp;amp;|&amp;lt;|&amp;gt;)*", :title => "Warning: Unescaped HTML entities detected! Use &amp;lt;, &amp;gt;, &amp;amp; instead of <, >, &." %></div>
+    <div class="node_content"><%= d.text_field :title %></div>
 
     <div class="node_description">Abstract</div>
     <div class="node_content"><%= d.text_area :abstract %></div>
diff --git a/app/views/rss/updates.rdf.builder b/app/views/rss/updates.rdf.builder
index cc63201e..b02d34ff 100644
--- a/app/views/rss/updates.rdf.builder
+++ b/app/views/rss/updates.rdf.builder
@@ -17,9 +17,9 @@ xml.tag!("rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 
   @items.each do |item|
     xml.item("rdf:about" => content_url(:page_path => item.node.unique_path)) do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(content_url(:page_path => item.node.unique_path))
-      xml.description(item.abstract)
+      xml.description(CGI.escapeHTML(item.abstract.to_s))
       xml.tag!("dc:creator", (item.user ? item.user.login : "CCC"))
       xml.tag!("dc:date", item.published_at.xmlschema)
     end
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index 6afcd566..0ea08faf 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -12,7 +12,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   
   @items.each do |item|
     xml.entry do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(
         :href => content_url(:page_path => item.node.unique_path),
         :rel  => "alternate",
@@ -21,7 +21,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
       xml.id(content_url(:page_path => item.node.feed_id))
       xml.updated(item.updated_at.xmlschema)
       xml.published(item.published_at.xmlschema)
-      xml.summary(item.abstract)
+      xml.summary(CGI.escapeHTML(item.abstract.to_s))
       xml.content(:type => "xhtml") do
         xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
       end
-- 
cgit v1.3


From 1853082fcd8c067390c246f9daa01a9b47387497 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 27 Jun 2026 22:49:21 +0200
Subject: rss: fix self link to include .xml suffix

/rss/updates without format suffix returns HTTP 406 when the client
does not send an appropriate Accept header. The self link in the Atom
feed was pointing to the format-less URL, causing feed readers that
follow the self link to hit the 406. Fixed to /rss/updates.xml.
---
 app/views/rss/updates.xml.builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/rss/updates.xml.builder')

diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index 0ea08faf..4b2e2f72 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -3,7 +3,7 @@ xml.instruct!
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
   xml.link(:href => "https://www.ccc.de/")
-  xml.link(:rel => "self", :href => "#{@host}/rss/updates")
+  xml.link(:rel => "self", :href => "#{@host}/rss/updates.xml")
   xml.updated(@items.first.published_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
-- 
cgit v1.3