Merge pull request #9973 from Turbo87/rss-escaping

rss: Remove explicit/duplicate XML escaping

Author: Turbo87

Cargo.lock

@@ -95,7 +95,6 @@ parking_lot = "=0.12.3"
 paste = "=1.0.15"
 postgres-native-tls = "=0.5.0"
 prometheus = { version = "=0.13.4", default-features = false }
-quick-xml = "=0.37.0"
 rand = "=0.8.5"
 reqwest = { version = "=0.12.9", features = ["gzip", "json"] }
 rss = { version = "=2.0.10", default-features = false, features = ["atom"] }

Cargo.toml

@@ -21,7 +21,7 @@ snapshot_kind: text
         <item>
             <title>New crate created: baz</title>
             <link>https://crates.io/crates/baz</link>
-            <description><![CDATA[does it handle XML? &lt;item&gt;]]></description>
+            <description><![CDATA[does it handle XML? <item> ]]]]><![CDATA[>]]></description>
             <guid>https://crates.io/crates/baz</guid>
             <pubDate>Fri, 21 Jun 2024 17:01:33 +0000</pubDate>
             <crates:name>baz</crates:name>

src/tests/worker/rss/snapshots/crates_io__tests__worker__rss__sync_crates_feed__sync_crates_feed-2.snap

@@ -1,6 +1,7 @@
 ---
 source: src/tests/worker/rss/sync_updates_feed.rs
 expression: content
+snapshot_kind: text
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:crates="https://crates.io/">
@@ -29,7 +30,7 @@ expression: content
         <item>
             <title>New crate version published: bar v3.0.0-beta.1</title>
             <link>https://crates.io/crates/bar/3.0.0-beta.1</link>
-            <description><![CDATA[let&apos;s try &amp; break this &lt;item&gt;]]></description>
+            <description><![CDATA[let's try & break this <item> ]]]]><![CDATA[>]]></description>
             <guid>https://crates.io/crates/bar/3.0.0-beta.1</guid>
             <pubDate>Fri, 21 Jun 2024 17:03:45 +0000</pubDate>
             <crates:name>bar</crates:name>

src/tests/worker/rss/snapshots/crates_io__tests__worker__rss__sync_updates_feed__sync_updates_feed-2.snap

@@ -15,7 +15,7 @@ async fn test_sync_crates_feed() {
     let description = Some("something something foo");
     create_crate(&mut conn, "foo", description, "2024-06-20T10:13:54Z").await;
     create_crate(&mut conn, "bar", None, "2024-06-20T12:45:12Z").await;
-    let description = Some("does it handle XML? <item>");
+    let description = Some("does it handle XML? <item> ]]>");
     create_crate(&mut conn, "baz", description, "2024-06-21T17:01:33Z").await;
     create_crate(&mut conn, "quux", None, "2024-06-21T17:03:45Z").await;
 

src/tests/worker/rss/sync_crates_feed.rs

@@ -12,7 +12,7 @@ async fn test_sync_updates_feed() {
     let (app, _) = TestApp::full().empty();
     let mut conn = app.async_db_conn().await;
 
-    let d = Some("let's try & break this <item>");
+    let d = Some("let's try & break this <item> ]]>");
 
     create_version(&mut conn, "foo", "0.1.0", None, "2024-06-20T10:13:54Z").await;
     create_version(&mut conn, "foo", "0.1.1", None, "2024-06-20T12:45:12Z").await;

src/tests/worker/rss/sync_updates_feed.rs

@@ -127,7 +127,7 @@ impl NewCrate {
 
         let description = self
             .description
-            .map(|d| quick_xml::escape::escape(&d).to_string());
+            .map(|d| d.replace("]]>", "]]]]><![CDATA[>"));
 
         let name_extension = rss::extension::Extension {
             name: "crates:name".into(),

src/worker/jobs/rss/sync_crates_feed.rs

@@ -134,7 +134,7 @@ impl VersionUpdate {
 
         let description = self
             .description
-            .map(|d| quick_xml::escape::escape(&d).to_string());
+            .map(|d| d.replace("]]>", "]]]]><![CDATA[>"));
 
         let name_extension = rss::extension::Extension {
             name: "crates:name".into(),