Escape text used for mentions and links

bindings/wysiwyg-ffi/Cargo.toml

@@ -21,6 +21,7 @@ crate-type = ["cdylib", "staticlib"]
 # Keep the uniffi version here in sync with the installed version of
 # uniffi-bindgen that is called from
 # ../../examples/example-android/app/build.gradle
+html-escape = "0.2.11"
 matrix_mentions = { path = "../../crates/matrix_mentions" }
 uniffi = { workspace = true }
 uniffi_macros = { workspace = true }

bindings/wysiwyg-ffi/src/ffi_composer_model.rs

@@ -253,7 +253,7 @@ impl ComposerModel {
         attributes: Vec<Attribute>,
     ) -> Arc<ComposerUpdate> {
         let url = Utf16String::from_str(&url);
-        let text = Utf16String::from_str(&text);
+        let text = Utf16String::from_str(&html_escape::encode_safe(&text));
         let attrs = attributes
             .iter()
             .map(|attr| {
@@ -286,7 +286,7 @@ impl ComposerModel {
         _attributes: Vec<Attribute>, // TODO remove attributes
     ) -> Arc<ComposerUpdate> {
         let url = Utf16String::from_str(&url);
-        let text = Utf16String::from_str(&text);
+        let text = Utf16String::from_str(&html_escape::encode_safe(&text));
         let attrs = vec![];
         Arc::new(ComposerUpdate::from(
             self.inner.lock().unwrap().insert_mention(url, text, attrs),
@@ -319,7 +319,7 @@ impl ComposerModel {
         _attributes: Vec<Attribute>, // TODO remove attributes
     ) -> Arc<ComposerUpdate> {
         let url = Utf16String::from_str(&url);
-        let text = Utf16String::from_str(&text);
+        let text = Utf16String::from_str(&html_escape::encode_safe(&text));
         let suggestion = wysiwyg::SuggestionPattern::from(suggestion);
         let attrs = vec![];
         Arc::new(ComposerUpdate::from(

bindings/wysiwyg-ffi/src/ffi_composer_update.rs

@@ -227,6 +227,30 @@ mod test {
         )
     }
 
+    #[test]
+    fn test_replace_text_with_escaped_html_in_mention_ffi() {
+        let mut model = Arc::new(ComposerModel::new());
+        model.replace_text("hello ".into());
+
+        let update = model.replace_text("@alic".into());
+        let MenuAction::Suggestion { suggestion_pattern } =
+            update.menu_action()
+        else {
+            panic!("No suggestion pattern found")
+        };
+        model.insert_mention_at_suggestion(
+            "https://matrix.to/#/@alice:matrix.org".into(),
+            ":D</a> a broken mention!".into(),
+            suggestion_pattern,
+            vec![], // TODO remove argument when function signature changes
+        );
+
+        assert_eq!(
+            model.get_content_as_html(),
+            "hello <a data-mention-type=\"user\" href=\"https://matrix.to/#/@alice:matrix.org\" contenteditable=\"false\">:D&lt;&#x2F;a&gt; a broken mention!</a>\u{a0}",
+        )
+    }
+
     // TODO remove attributes when Rust model can parse url directly
     // https://github.com/matrix-org/matrix-rich-text-editor/issues/709
     fn insert_mention_at_cursor(model: &mut Arc<ComposerModel>) {