mirror of
https://github.com/getzola/zola
synced 2024-12-12 21:32:29 +00:00
parent
6a39253e29
commit
8b43667a94
2 changed files with 20 additions and 1 deletions
|
@ -3,6 +3,10 @@
|
||||||
## 0.14.1 (unreleased)
|
## 0.14.1 (unreleased)
|
||||||
|
|
||||||
- HTML minification now respects HTML spec (it still worked before because browsers can handle invalid HTML well and minifiers take advantage of it)
|
- HTML minification now respects HTML spec (it still worked before because browsers can handle invalid HTML well and minifiers take advantage of it)
|
||||||
|
- Show all errors on `zola serve`
|
||||||
|
- `zola serve` now properly returns a 404
|
||||||
|
- Fix `zola serve` having issues with config files in separate dir
|
||||||
|
- Fix code blocks content not being escaped when not using syntax highlighting
|
||||||
|
|
||||||
## 0.14.0 (2021-07-19)
|
## 0.14.0 (2021-07-19)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
use std::fmt::Write;
|
use std::fmt::Write;
|
||||||
|
|
||||||
use config::highlighting::{SyntaxAndTheme, CLASS_STYLE};
|
use config::highlighting::{SyntaxAndTheme, CLASS_STYLE};
|
||||||
|
use tera::escape_html;
|
||||||
use syntect::easy::HighlightLines;
|
use syntect::easy::HighlightLines;
|
||||||
use syntect::highlighting::{Color, Theme};
|
use syntect::highlighting::{Color, Theme};
|
||||||
use syntect::html::{
|
use syntect::html::{
|
||||||
|
@ -113,7 +114,7 @@ impl<'config> SyntaxHighlighter<'config> {
|
||||||
match self {
|
match self {
|
||||||
Inlined(h) => h.highlight_line(line),
|
Inlined(h) => h.highlight_line(line),
|
||||||
Classed(h) => h.highlight_line(line),
|
Classed(h) => h.highlight_line(line),
|
||||||
NoHighlight => line.to_owned(),
|
NoHighlight => escape_html(line),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,4 +224,18 @@ mod tests {
|
||||||
assert!(out.starts_with(r#"<span style="color"#));
|
assert!(out.starts_with(r#"<span style="color"#));
|
||||||
assert!(out.ends_with("</span>"));
|
assert!(out.ends_with("</span>"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn no_highlight_escapes_html() {
|
||||||
|
let mut config = Config::default();
|
||||||
|
config.markdown.highlight_code = false;
|
||||||
|
let code = "<script>alert('hello')</script>";
|
||||||
|
let syntax_and_theme = resolve_syntax_and_theme(Some("py"), &config);
|
||||||
|
let mut highlighter = SyntaxHighlighter::new(false, syntax_and_theme);
|
||||||
|
let mut out = String::new();
|
||||||
|
for line in LinesWithEndings::from(&code) {
|
||||||
|
out.push_str(&highlighter.highlight_line(line));
|
||||||
|
}
|
||||||
|
assert!(!out.contains("<script>"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue