mirror of
https://github.com/wekan/wekan.git
synced 2026-11-20 09:45:04 -05:00
On Univention WeKan is served at /wekan. profile.avatarUrl holds /cdn/storage/avatars/<id> - what Change Avatar and the server's own migrations store - and it was rendered as stored, so the browser asked the UCS web server for a path outside WeKan, got 404, and every avatar was an empty circle, while Change Avatar, which builds its own link, showed the picture. models/lib/avatarDisplayUrl.js treats the stored value as the avatar's name: whatever host or old path prefix stood before /cdn/storage/avatars/ or /cfs/files/avatars/ is replaced with the path WeKan is served at now, relative to the page's origin. The avatar, the People page and the report tables draw through it; the default avatar gets the prefix too. External pictures and data: URLs are left alone. The same session, opened through 127.0.0.1:8443/wekan, fetched lazily loaded code from ROOT_URL's host ucs-2275.wekan.intranet, which the browser could not resolve (NS_ERROR_UNKNOWN_HOST, "Cross-Origin Request Blocked"). Meteor's dynamic-import setting useLocationOrigin is now on by default, so that code comes from the page's own origin and ROOT_URL path; an explicit value in METEOR_SETTINGS still wins. Links keep using ROOT_URL as before. tests/avatarDisplayUrl.test.cjs covers every stored shape, (negative) leaves external, data: and query-string URLs alone, checks that no template puts a stored avatar URL in src without avatarSrc, and pins the dynamic-import default and its override. The Playwright spec avatar-sub-path.e2e.js checks the drawn src and the setting in a browser; it was not run here. Thanks to xet7 !
11 lines
518 B
JavaScript
11 lines
518 B
JavaScript
import { Meteor } from 'meteor/meteor';
|
|
|
|
// Lazily loaded code is fetched from the page's own origin, not ROOT_URL's host
|
|
// (models/lib/dynamicImportOrigin.js says why). Meteor.settings.public is the
|
|
// object sent to the browser as PUBLIC_SETTINGS, so setting it here is enough;
|
|
// it runs at load, before any page is served.
|
|
const { applyDynamicImportOrigin } = require('/models/lib/dynamicImportOrigin');
|
|
|
|
if (!Meteor.settings.public) Meteor.settings.public = {};
|
|
applyDynamicImportOrigin(Meteor.settings.public);
|