Skip to content

Fix: allow serving assets from theme public directories #845

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

Open
starry-osean wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix: allow serving assets from theme public directories #845

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1db8b
Fix: allow loading assets from theme public directory in imageProcessor
starry-osean Dec 5, 2025
d990c98
allow serving assets from current theme public directories
starry-osean Dec 18, 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
30 changes: 19 additions & 11 deletions packages/evershop/src/modules/cms/services/imageProcessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import path from 'path';
import sharp from 'sharp';
import { CONSTANTS } from '../../../lib/helpers.js';
import { debug } from '../../../lib/log/logger.js';
import { getEnabledTheme } from '../../../lib/util/getEnabledTheme.js';

const hasTransparency = async (imageBuffer: Buffer): Promise<boolean> => {
try {
Expand Down Expand Up @@ -75,6 +76,9 @@ export const imageProcessor = async (
const isExternalUrl = src.startsWith('http://') || src.startsWith('https://');

if (!isExternalUrl) {
// Get the currently enabled theme (if any)
const enabledTheme = getEnabledTheme();

// Special case: Handle assets path format like "/assets/media/image.png" or "/assets/image.png"
if (src.startsWith('/assets/')) {
// Extract the filename after '/assets/'
Expand All @@ -88,10 +92,13 @@ export const imageProcessor = async (
const possiblePaths = [
`media/${assetPath}`,
`public/${assetPath}`
// For themes, we need to check each theme's public directory
// This is more complex and would require listing themes
];

// Add currently enabled theme public directory (if any) to possible paths
if (enabledTheme) {
possiblePaths.push(`themes/${enabledTheme.name}/public/${assetPath}`);
}

let fileExists = false;
for (const possiblePath of possiblePaths) {
try {
Expand Down Expand Up @@ -133,16 +140,17 @@ export const imageProcessor = async (
}

// Only allow specific directories from project root
const allowedPaths = ['media/', 'public/', 'themes/'];
const allowedPaths = ['media/', 'public/'];

const isAllowedPath = allowedPaths.some((allowedPath) => {
if (allowedPath === 'themes/') {
// Special handling for themes: must be themes/<themename>/public/
const themePattern = /^themes\/[^\/]+\/public\//;
return themePattern.test(normalizedPath);
}
return normalizedPath.startsWith(allowedPath);
});
// Only allow the currently enabled theme's public directory (if any),
// not all existing theme folders.
if (enabledTheme) {
allowedPaths.push(`themes/${enabledTheme.name}/public/`);
}

const isAllowedPath = allowedPaths.some((allowedPath) =>
normalizedPath.startsWith(allowedPath)
);

if (!isAllowedPath) {
throw new Error(
Expand Down