Sanitize HTML from API inputs

Cargo.lock

@@ -389,6 +389,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ammonia"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89eac85170f4b3fb3dc5e442c1cfb036cb8eecf9dbbd431a161ffad15d90ea3b"
+dependencies = [
+ "html5ever",
+ "lazy_static",
+ "maplit",
+ "markup5ever_rcdom",
+ "matches",
+ "tendril",
+ "url",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -1325,6 +1340,16 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
+[[package]]
+name = "futf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
 [[package]]
 name = "futures"
 version = "0.3.5"
@@ -1539,6 +1564,20 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "html5ever"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "http"
 version = "0.2.1"
@@ -1835,6 +1874,7 @@ dependencies = [
  "actix-rt",
  "actix-web",
  "actix-web-actors",
+ "ammonia",
  "anyhow",
  "async-trait",
  "awc",
@@ -2026,12 +2066,47 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
 
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
 [[package]]
 name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
+[[package]]
+name = "markup5ever"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae38d669396ca9b707bfc3db254bc382ddb94f57cc5c235f34623a669a01dab"
+dependencies = [
+ "log",
+ "phf",
+ "phf_codegen",
+ "serde 1.0.116",
+ "serde_derive",
+ "serde_json",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever_rcdom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
+dependencies = [
+ "html5ever",
+ "markup5ever",
+ "tendril",
+ "xml5ever",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2183,6 +2258,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
 [[package]]
 name = "nom"
 version = "4.2.3"
@@ -2417,6 +2498,44 @@ dependencies = [
  "sha-1 0.8.2",
 ]
 
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project"
 version = "0.4.23"
@@ -2482,6 +2601,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.18"
@@ -2576,7 +2701,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg",
+ "rand_pcg 0.1.2",
  "rand_xorshift",
  "winapi 0.3.9",
 ]
@@ -2592,6 +2717,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -2700,6 +2826,15 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -3095,6 +3230,12 @@ dependencies = [
  "num-traits 0.2.12",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -3189,6 +3330,31 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
+[[package]]
+name = "string_cache"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
+dependencies = [
+ "lazy_static",
+ "new_debug_unreachable",
+ "phf_shared",
+ "precomputed-hash",
+ "serde 1.0.116",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -3244,6 +3410,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tendril"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.0"
@@ -3576,6 +3753,12 @@ dependencies = [
  "serde 1.0.116",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
+
 [[package]]
 name = "uuid"
 version = "0.7.4"
@@ -3842,3 +4025,15 @@ name = "xdg"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
+
+[[package]]
+name = "xml5ever"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "time 0.1.44",
+]

Cargo.toml

@@ -59,6 +59,7 @@ anyhow = "1.0"
 thiserror = "1.0"
 background-jobs = " 0.8"
 reqwest = { version = "0.10", features = ["json"] }
+ammonia = "3.1.0"
 
 [dev-dependencies.cargo-husky]
 version = "1"

lemmy_utils/src/utils.rs

@@ -4,6 +4,7 @@ use chrono::{DateTime, FixedOffset, Local, NaiveDateTime};
 use itertools::Itertools;
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use regex::{Regex, RegexBuilder};
+use url::Url;
 
 lazy_static! {
 static ref EMAIL_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap();
@@ -128,3 +129,14 @@ pub fn get_ip(conn_info: &ConnectionInfo) -> String {
     .unwrap_or("127.0.0.1")
     .to_string()
 }
+
+pub fn is_valid_url_opt(value: &Option<String>) -> Result<(), APIError> {
+  if let Some(v) = value {
+    match Url::parse(v) {
+      Ok(_t) => Ok(()),
+      Err(_e) => Err(APIError::err("invalid_url")),
+    }
+  } else {
+    Ok(())
+  }
+}

src/api/comment.rs

@@ -11,6 +11,7 @@ use crate::{
   LemmyContext,
 };
 use actix_web::web::Data;
+use ammonia::clean_text;
 use lemmy_db::{
   comment::*,
   comment_view::*,
@@ -54,7 +55,7 @@ impl Perform for CreateComment {
     let content_slurs_removed = remove_slurs(&data.content.to_owned());
 
     let comment_form = CommentForm {
-      content: content_slurs_removed,
+      content: clean_text(&content_slurs_removed),
       parent_id: data.parent_id.to_owned(),
       post_id: data.post_id,
       creator_id: user.id,
@@ -364,7 +365,7 @@ impl Perform for RemoveComment {
       mod_user_id: user.id,
       comment_id: data.edit_id,
       removed: Some(removed),
-      reason: data.reason.to_owned(),
+      reason: data.reason.as_ref().map(|r| clean_text(r)),
     };
     blocking(context.pool(), move |conn| {
       ModRemoveComment::create(conn, &form)

src/api/community.rs

@@ -4,6 +4,7 @@ use crate::{
   LemmyContext,
 };
 use actix_web::web::Data;
+use ammonia::clean_text;
 use anyhow::Context;
 use lemmy_db::{
   comment::Comment,
@@ -35,7 +36,13 @@ use lemmy_structs::{
 use lemmy_utils::{
   apub::{generate_actor_keypair, make_apub_endpoint, EndpointType},
   location_info,
-  utils::{check_slurs, check_slurs_opt, is_valid_community_name, naive_from_unix},
+  utils::{
+    check_slurs,
+    check_slurs_opt,
+    is_valid_community_name,
+    is_valid_url_opt,
+    naive_from_unix,
+  },
   APIError,
   ConnectionId,
   LemmyError,
@@ -139,10 +146,13 @@ impl Perform for CreateCommunity {
     // When you create a community, make sure the user becomes a moderator and a follower
     let keypair = generate_actor_keypair()?;
 
+    is_valid_url_opt(&data.icon)?;
+    is_valid_url_opt(&data.banner)?;
+
     let community_form = CommunityForm {
-      name: data.name.to_owned(),
-      title: data.title.to_owned(),
-      description: data.description.to_owned(),
+      name: clean_text(&data.name),
+      title: clean_text(&data.title),
+      description: data.description.as_ref().map(|d| clean_text(d)),
       icon: Some(data.icon.to_owned()),
       banner: Some(data.banner.to_owned()),
       category_id: data.category_id,
@@ -233,10 +243,13 @@ impl Perform for EditCommunity {
     let icon = diesel_option_overwrite(&data.icon);
     let banner = diesel_option_overwrite(&data.banner);
 
+    is_valid_url_opt(&data.icon)?;
+    is_valid_url_opt(&data.banner)?;
+
     let community_form = CommunityForm {
-      name: read_community.name,
-      title: data.title.to_owned(),
-      description: data.description.to_owned(),
+      name: clean_text(&read_community.name),
+      title: clean_text(&data.title),
+      description: data.description.as_ref().map(|d| clean_text(d)),
       icon,
       banner,
       category_id: data.category_id.to_owned(),
@@ -375,7 +388,7 @@ impl Perform for RemoveCommunity {
       mod_user_id: user.id,
       community_id: data.edit_id,
       removed: Some(removed),
-      reason: data.reason.to_owned(),
+      reason: data.reason.as_ref().map(|r| clean_text(r)),
       expires,
     };
     blocking(context.pool(), move |conn| {
@@ -611,7 +624,7 @@ impl Perform for BanFromCommunity {
       mod_user_id: user.id,
       other_user_id: data.user_id,
       community_id: data.community_id,
-      reason: data.reason.to_owned(),
+      reason: data.reason.as_ref().map(|r| clean_text(r)),
       banned: Some(data.ban),
       expires,
     };

src/api/post.rs

@@ -5,6 +5,7 @@ use crate::{
   LemmyContext,
 };
 use actix_web::web::Data;
+use ammonia::clean_text;
 use lemmy_db::{
   comment_view::*,
   community_view::*,
@@ -67,9 +68,9 @@ impl Perform for CreatePost {
       fetch_iframely_and_pictrs_data(context.client(), data.url.to_owned()).await;
 
     let post_form = PostForm {
-      name: data.name.trim().to_owned(),
+      name: clean_text(&data.name.trim()),
       url: data.url.to_owned(),
-      body: data.body.to_owned(),
+      body: data.body.as_ref().map(|b| clean_text(&b)),
       community_id: data.community_id,
       creator_id: user.id,
       removed: None,
@@ -379,9 +380,9 @@ impl Perform for EditPost {
       fetch_iframely_and_pictrs_data(context.client(), data.url.to_owned()).await;
 
     let post_form = PostForm {
-      name: data.name.trim().to_owned(),
+      name: clean_text(&data.name.trim()),
       url: data.url.to_owned(),
-      body: data.body.to_owned(),
+      body: data.body.as_ref().map(|b| clean_text(b)),
       nsfw: data.nsfw,
       creator_id: orig_post.creator_id.to_owned(),
       community_id: orig_post.community_id,
@@ -527,7 +528,7 @@ impl Perform for RemovePost {
       mod_user_id: user.id,
       post_id: data.edit_id,
       removed: Some(removed),
-      reason: data.reason.to_owned(),
+      reason: data.reason.as_ref().map(|r| clean_text(r)),
     };
     blocking(context.pool(), move |conn| {
       ModRemovePost::create(conn, &form)

src/api/site.rs

@@ -5,6 +5,7 @@ use crate::{
   LemmyContext,
 };
 use actix_web::web::Data;
+use ammonia::clean_text;
 use anyhow::Context;
 use lemmy_db::{
   category::*,
@@ -31,7 +32,7 @@ use lemmy_structs::{
 use lemmy_utils::{
   location_info,
   settings::Settings,
-  utils::{check_slurs, check_slurs_opt},
+  utils::{check_slurs, check_slurs_opt, is_valid_url_opt},
   APIError,
   ConnectionId,
   LemmyError,
@@ -155,9 +156,12 @@ impl Perform for CreateSite {
     // Make sure user is an admin
     is_admin(context.pool(), user.id).await?;
 
+    is_valid_url_opt(&data.icon)?;
+    is_valid_url_opt(&data.banner)?;
+
     let site_form = SiteForm {
-      name: data.name.to_owned(),
-      description: data.description.to_owned(),
+      name: clean_text(&data.name),
+      description: data.description.as_ref().map(|d| clean_text(d)),
       icon: Some(data.icon.to_owned()),
       banner: Some(data.banner.to_owned()),
       creator_id: user.id,
@@ -197,12 +201,15 @@ impl Perform for EditSite {
 
     let found_site = blocking(context.pool(), move |conn| Site::read(conn, 1)).await??;
 
+    is_valid_url_opt(&data.icon)?;
+    is_valid_url_opt(&data.banner)?;
+
     let icon = diesel_option_overwrite(&data.icon);
     let banner = diesel_option_overwrite(&data.banner);
 
     let site_form = SiteForm {
-      name: data.name.to_owned(),
-      description: data.description.to_owned(),
+      name: clean_text(&data.name.to_owned()),
+      description: data.description.as_ref().map(|d| clean_text(d)),
       icon,
       banner,
       creator_id: found_site.creator_id,

src/api/user.rs

@@ -5,6 +5,7 @@ use crate::{
   LemmyContext,
 };
 use actix_web::web::Data;
+use ammonia::clean_text;
 use anyhow::Context;
 use bcrypt::verify;
 use captcha::{gen, Difficulty};
@@ -55,6 +56,7 @@ use lemmy_utils::{
     check_slurs,
     generate_random_string,
     is_valid_preferred_username,
+    is_valid_url_opt,
     is_valid_username,
     naive_from_unix,
     remove_slurs,
@@ -160,11 +162,12 @@ impl Perform for Register {
     if !is_valid_username(&data.username) {
       return Err(APIError::err("invalid_username").into());
     }
+    let email = data.email.as_ref().map(|e| clean_text(e));
 
     // Register the new user
     let user_form = UserForm {
-      name: data.username.to_owned(),
-      email: Some(data.email.to_owned()),
+      name: clean_text(&data.username),
+      email: Some(email),
       matrix_user_id: None,
       avatar: None,
       banner: None,
@@ -217,7 +220,7 @@ impl Perform for Register {
         Err(_e) => {
           let default_community_name = "main";
           let community_form = CommunityForm {
-            name: default_community_name.to_string(),
+            name: clean_text(default_community_name),
             title: "The Default Community".to_string(),
             description: Some("The Default Community".to_string()),
             category_id: 1,
@@ -340,7 +343,7 @@ impl Perform for SaveUserSettings {
     let bio = match &data.bio {
       Some(bio) => {
         if bio.chars().count() <= 300 {
-          Some(bio.to_owned())
+          Some(clean_text(&bio.to_owned()))
         } else {
           return Err(APIError::err("bio_length_overflow").into());
         }
@@ -350,7 +353,11 @@ impl Perform for SaveUserSettings {
 
     let avatar = diesel_option_overwrite(&data.avatar);
     let banner = diesel_option_overwrite(&data.banner);
-    let email = diesel_option_overwrite(&data.email);
+    let email = data.email.as_ref().map(|e| clean_text(e));
+    let email = diesel_option_overwrite(&email);
+
+    is_valid_url_opt(&data.avatar)?;
+    is_valid_url_opt(&data.banner)?;
 
     // The DB constraint should stop too many characters
     let preferred_username = match &data.preferred_username {
@@ -397,9 +404,9 @@ impl Perform for SaveUserSettings {
     };
 
     let user_form = UserForm {
-      name: read_user.name,
+      name: clean_text(&read_user.name),
       email,
-      matrix_user_id: data.matrix_user_id.to_owned(),
+      matrix_user_id: data.matrix_user_id.as_ref().map(|m| clean_text(m)),
       avatar,
       banner,
       password_encrypted,
@@ -654,7 +661,7 @@ impl Perform for BanUser {
     let form = ModBanForm {
       mod_user_id: user.id,
       other_user_id: data.user_id,
-      reason: data.reason.to_owned(),
+      reason: data.reason.as_ref().map(|r| clean_text(r)),
       banned: Some(data.ban),
       expires,
     };
@@ -983,7 +990,7 @@ impl Perform for CreatePrivateMessage {
     let content_slurs_removed = remove_slurs(&data.content.to_owned());
 
     let private_message_form = PrivateMessageForm {
-      content: content_slurs_removed.to_owned(),
+      content: clean_text(&content_slurs_removed),
       creator_id: user.id,
       recipient_id: data.recipient_id,
       deleted: None,

src/apub/comment.rs

@@ -38,6 +38,7 @@ use activitystreams::{
   public,
 };
 use actix_web::{body::Body, web, web::Path, HttpResponse};
+use ammonia::clean_text;
 use anyhow::Context;
 use itertools::Itertools;
 use lemmy_db::{
@@ -183,7 +184,7 @@ impl FromApub for CommentForm {
       creator_id: creator.id,
       post_id: post.id,
       parent_id,
-      content: content_slurs_removed,
+      content: clean_text(&content_slurs_removed),
       removed: None,
       read: None,
       published: note.published().map(|u| u.to_owned().naive_local()),

src/apub/community.rs

@@ -36,6 +36,7 @@ use activitystreams::{
 };
 use activitystreams_ext::Ext2;
 use actix_web::{body::Body, web, HttpResponse};
+use ammonia::clean_text;
 use anyhow::Context;
 use itertools::Itertools;
 use lemmy_db::{
@@ -376,7 +377,7 @@ impl FromApub for CommunityForm {
       .content()
       .map(|s| s.as_single_xsd_string())
       .flatten()
-      .map(|s| s.to_string());
+      .map(|s| clean_text(s));
     check_slurs(&name)?;
     check_slurs(&title)?;
     check_slurs_opt(&description)?;
@@ -408,8 +409,8 @@ impl FromApub for CommunityForm {
     };
 
     Ok(CommunityForm {
-      name,
-      title,
+      name: clean_text(&name),
+      title: clean_text(&title),
       description,
       category_id: group.ext_one.category.identifier.parse::<i32>()?,
       creator_id: creator.id,

src/apub/post.rs

@@ -34,6 +34,7 @@ use activitystreams::{
 };
 use activitystreams_ext::Ext1;
 use actix_web::{body::Body, web, HttpResponse};
+use ammonia::{clean, clean_text};
 use anyhow::Context;
 use lemmy_db::{
   community::Community,
@@ -168,17 +169,17 @@ fn extract_embed_from_apub(
         .flatten()
         .map(|s| s.as_xsd_string())
         .flatten()
-        .map(|s| s.to_string());
+        .map(|s| clean_text(s));
       let description = preview_page
         .summary()
         .map(|s| s.as_single_xsd_string())
         .flatten()
-        .map(|s| s.to_string());
+        .map(|s| clean_text(s));
       let html = preview_page
         .content()
         .map(|c| c.as_single_xsd_string())
         .flatten()
-        .map(|s| s.to_string());
+        .map(|s| clean(s));
       Ok(EmbedType {
         title,
         description,
@@ -262,11 +263,11 @@ impl FromApub for PostForm {
       .as_ref()
       .map(|c| c.as_single_xsd_string())
       .flatten()
-      .map(|s| s.to_string());
+      .map(|s| clean_text(s));
     check_slurs(&name)?;
     let body_slurs_removed = body.map(|b| remove_slurs(&b));
     Ok(PostForm {
-      name,
+      name: clean_text(&name),
       url,
       body: body_slurs_removed,
       creator_id: creator.id,

src/apub/private_message.rs

@@ -26,6 +26,7 @@ use activitystreams::{
   object::{kind::NoteType, Note, Tombstone},
   prelude::*,
 };
+use ammonia::clean_text;
 use anyhow::Context;
 use lemmy_db::{
   private_message::{PrivateMessage, PrivateMessageForm},
@@ -96,16 +97,17 @@ impl FromApub for PrivateMessageForm {
     let recipient = get_or_fetch_and_upsert_user(&recipient_actor_id, context).await?;
     let ap_id = note.id_unchecked().context(location_info!())?.to_string();
     check_is_apub_id_valid(&Url::parse(&ap_id)?)?;
+    let content = note
+      .content()
+      .context(location_info!())?
+      .as_single_xsd_string()
+      .context(location_info!())?
+      .to_string();
 
     Ok(PrivateMessageForm {
       creator_id: creator.id,
       recipient_id: recipient.id,
-      content: note
-        .content()
-        .context(location_info!())?
-        .as_single_xsd_string()
-        .context(location_info!())?
-        .to_string(),
+      content: clean_text(&content),
       published: note.published().map(|u| u.to_owned().naive_local()),
       updated: note.updated().map(|u| u.to_owned().naive_local()),
       deleted: None,

src/apub/user.rs

@@ -26,6 +26,7 @@ use activitystreams::{
 };
 use activitystreams_ext::Ext1;
 use actix_web::{body::Body, web, HttpResponse};
+use ammonia::clean_text;
 use anyhow::Context;
 use lemmy_db::{
   naive_now,
@@ -242,19 +243,19 @@ impl FromApub for UserForm {
       .as_xsd_string()
       .context(location_info!())?
       .to_string();
-    let preferred_username = person.inner.preferred_username().map(|u| u.to_string());
+    let preferred_username = person.inner.preferred_username().map(|u| clean_text(u));
     let bio = person
       .inner
       .summary()
       .map(|s| s.as_single_xsd_string())
       .flatten()
-      .map(|s| s.to_string());
+      .map(|s| clean_text(s));
     check_slurs(&name)?;
     check_slurs_opt(&preferred_username)?;
     check_slurs_opt(&bio)?;
 
     Ok(UserForm {
-      name,
+      name: clean_text(&name),
       preferred_username,
       password_encrypted: "".to_string(),
       admin: false,