robin/bin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redirect on invalid UTF-8 in /p/

Browse source 
Previously, uploading a paste with invalid UTF-8 and then viewing it
with the pretty URL would cause a panic.
With this change, it simply redirects to the raw URL.
This commit is contained in:
Leonora Tindall 2022-01-31 20:49:05 -06:00 • committed by Leonora Tindall
commit 5aafe2500a
5 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/models/pretty.rs
View file

@ -10,16 +10,16 @@ static SYNTAXES: &[u8] =
static THEMES: &[u8] =
include_bytes!("../../resources/themes/ayu_dark.tmTheme");
pub fn get_pretty_body(path: &Path, ext: &str) -> String {
pub fn get_pretty_body(path: &Path, ext: &str) -> std::io::Result<String> {
let ss: SyntaxSet = syntect::dumps::from_binary(SYNTAXES);
let mut theme_cursor = std::io::Cursor::new(THEMES);
let theme = ThemeSet::load_from_reader(&mut theme_cursor).unwrap();
let content = fs::read_to_string(path).unwrap();
let content = fs::read_to_string(path)?;
let syntax = ss
.find_syntax_by_token(ext)
.unwrap_or_else(|| ss.find_syntax_plain_text());
highlighted_html_for_string(&content, &ss, syntax, &theme)
Ok(highlighted_html_for_string(&content, &ss, syntax, &theme))
}