Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

🐛 Fixed Handlebars’ asset helper for SafeString input

Browse source 
closes https://github.com/TryGhost/Ghost/issues/16332

Passing `SafeString` input to `asset` helper was resulting in the
exception being thrown. This meant that we couldn’t combine `asset`
helper with other helpers which produce `SafeString` e.g. `concat`
helper for string concatenation.
This commit is contained in:
monkey sees 2023-02-26 00:16:45 +03:00 • committed by Daniel Lockyer
parent c5a4ee89c9
commit 838516efb0
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ghost/core/core/frontend/meta/asset-url.js
View file

@ -2,6 +2,7 @@ const crypto = require('crypto');
const config = require('../../shared/config');
const {blogIcon} = require('../../server/lib/image');
const urlUtils = require('../../shared/url-utils');
const {SafeString} = require('../services/handlebars');
/**
* Serve either uploaded favicon or default
@ -11,7 +12,15 @@ function getFaviconUrl() {
return blogIcon.getIconUrl();
}
/**
* Prepare URL for an asset
* @param {string|SafeString} path — the asset’s path
* @param {boolean} hasMinFile — flag for the existence of a minified version for the asset
* @returns {string}
*/
function getAssetUrl(path, hasMinFile) {
path = path instanceof SafeString ? path.string : path;
// CASE: favicon - this is special path with its own functionality
if (path.match(/\/?favicon\.(ico|png)$/)) {
// @TODO, resolve this - we should only be resolving subdirectory and extension.

6
ghost/core/test/unit/frontend/meta/asset-url.test.js
View file

@ -1,5 +1,6 @@
const should = require('should');
const sinon = require('sinon');
const {SafeString} = require('../../../../core/frontend/services/handlebars');
const imageLib = require('../../../../core/server/lib/image');
const settingsCache = require('../../../../core/shared/settings-cache');
const configUtils = require('../../../utils/configUtils');
@ -38,6 +39,11 @@ describe('getAssetUrl', function () {
testUrl.should.equal(`/assets/myfile.svg?v=${config.get('assetHash')}#arrow-up`);
});
it('should handle Handlebars’ SafeString', function () {
const testUrl = getAssetUrl(new SafeString('myfile.js'));
testUrl.should.equal('/assets/myfile.js?v=' + config.get('assetHash'));
});
describe('favicon', function () {
it('should not add asset to url if favicon.ico', function () {
const testUrl = getAssetUrl('favicon.ico');