chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

events: Escape HTML reserved characters in plain text reply fallback

Browse Source
This commit is contained in:
Kévin Commaille 2022-06-01 10:44:07 +02:00 committed by Kévin Commaille
parent 806d389e13
commit 34b549f89f
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/ruma-common/src/events/room/message/reply.rs
View File

@ -55,11 +55,28 @@ fn get_quotes(
)
}
fn formatted_or_plain_body<'a>(formatted: Option<&'a FormattedBody>, body: &'a str) -> &'a str {
fn formatted_or_plain_body(formatted: Option<&FormattedBody>, body: &str) -> String {
if let Some(formatted_body) = formatted {
&formatted_body.body
formatted_body.body.clone()
} else {
body
let mut escaped_body = String::with_capacity(body.len());
for c in body.chars() {
let s = match c {
'&' => Some("&amp;"),
'<' => Some("&lt;"),
'>' => Some("&gt;"),
'"' => Some("&quot;"),
'\'' => Some("&apos;"),
'\n' => Some("<br>"),
_ => None,
};
if let Some(s) = s {
escaped_body.push_str(s);
} else {
escaped_body.push(c);
}
}
escaped_body
}
}
@ -113,7 +130,7 @@ mod tests {
<a href=\"https://matrix.to/#/!n8f893n9:example.com/$1598361704261elfgc:localhost\">In reply to</a> \
<a href=\"https://matrix.to/#/@alice:example.com\">@alice:example.com</a>\
<br>\
multi\nline\
multi<br>line\
</blockquote>\
</mx-reply>"
);