fix(render): fix code block rendering and quote escaping
Two issues fixed: 1. Language-less code blocks (``` without lang) were not accumulating text content. The guard `code_block_lang.is_some()` was false for them, so content fell through to regular text rendering. Fix: Add `in_code_block` flag to track code block state separately from language presence. 2. Single quotes in code blocks were being HTML-escaped as ', breaking CSP headers like 'self' in documentation. Fix: Create code_escape/code_escape_into in escape.rs that only escapes <, >, & (required to prevent HTML tag injection) but preserves quotes (safe inside <pre><code> content). Rationale for code_escape: - < and > MUST be escaped to prevent browser interpreting code as HTML - & MUST be escaped to prevent HTML entity interpretation - Quotes are safe inside element content (no attribute context) Also: - Add test for unlabeled code block quote preservation All 71 tests pass.
This commit is contained in:
@@ -8,7 +8,7 @@ use std::collections::HashMap;
|
||||
use std::sync::LazyLock;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::escape::{html_escape, html_escape_into};
|
||||
use crate::escape::{code_escape, code_escape_into};
|
||||
use ropey::RopeSlice;
|
||||
use tree_house::highlighter::{Highlight, HighlightEvent, Highlighter};
|
||||
use tree_house::{
|
||||
@@ -565,14 +565,14 @@ pub fn highlight_code(lang: Language, source: &str) -> String {
|
||||
|
||||
// Check if we have a config for this language
|
||||
if !loader.configs.contains_key(&lang) {
|
||||
return html_escape(source);
|
||||
return code_escape(source);
|
||||
}
|
||||
|
||||
// Parse the syntax tree
|
||||
let rope = RopeSlice::from(source);
|
||||
let syntax = match Syntax::new(rope, lang.to_th_language(), Duration::from_secs(5), loader) {
|
||||
Ok(s) => s,
|
||||
Err(_) => return html_escape(source),
|
||||
Err(_) => return code_escape(source),
|
||||
};
|
||||
|
||||
// Create highlighter and render
|
||||
@@ -595,7 +595,7 @@ fn render_html<'a>(source: &str, mut highlighter: Highlighter<'a, 'a, SukrLoader
|
||||
let end = next_pos as usize;
|
||||
if start < source.len() {
|
||||
let text = &source[start..end.min(source.len())];
|
||||
html_escape_into(&mut html, text);
|
||||
code_escape_into(&mut html, text);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -672,7 +672,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_html_escape() {
|
||||
let escaped = html_escape("<script>alert('xss')</script>");
|
||||
let escaped = code_escape("<script>alert('xss')</script>");
|
||||
assert!(!escaped.contains('<'));
|
||||
assert!(escaped.contains("<"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user