Skip to content

Image fix #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2025
Merged

Image fix #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca82d1
Asset fix
TheKrol Mar 14, 2025
0c7a6a8
format update
TheKrol Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ async fn start_server(state: AppState, cli_args: Args) -> Result<()> {
.with_state(state)
// Serve the assets folder from the repo
.nest_service(
&format!("/{asset_path}"),
"/assets",
ServeDir::new(format!("repo/{asset_path}")),
)
// Serve the frontend files
Expand Down
22 changes: 10 additions & 12 deletions frontend/src/lib/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
import { Renderer, marked, type TokensList } from 'marked';
import DOMPurify from 'dompurify';
import { ToastType, addToast, dismissToast } from './toast';
import { dev } from '$app/environment';
import { get } from 'svelte/store';
import { currentFile } from './main';
import { currentFile, apiAddress } from './main';

/**
* When the rendered file is missing a valid frontmatter header, then an error toast is displayed.
Expand All @@ -28,16 +27,15 @@ export async function renderMarkdown(input: string, output: HTMLElement): Promis
const rawTokens: TokensList = marked.lexer(input);
stripFrontMatter(rawTokens);
// rewrite image urls to point to the correct location
if (dev) {
marked.walkTokens(rawTokens, (t) => {
if (t.type !== 'image') {
return;
}
if (t.href.startsWith('/')) {
t.href = 'http://localhost:8080' + t.href;
}
});
}
marked.walkTokens(rawTokens, (t) => {
if (t.type !== 'image') {
return;
}
t.href = t.href.replace(/^(?:\.\.\/)+/, '/');
if (t.href.startsWith('/')) {
t.href = apiAddress + t.href;
}
});
const cleanedOutput: string = DOMPurify.sanitize(await marked.parser(rawTokens));
if (DOMPurify.removed.length > 0) {
console.warn('Possible XSS detected, modified output: ', DOMPurify.removed);
Expand Down