mirror of
https://github.com/discourse/discourse.git
synced 2024-12-04 05:23:39 +08:00
62f2e1f971
This fixes an issue where sometimes when composing a post and uploading a video/audio file, _loadCachedShortUrls/the uploads controller would return a full URL with origin, instead of just the URL with the host e.g. http://localhost:3000/some/video.mp4 instead of just //localhost:3000/some/video.mp4. We were prepending window.location.origin onto the URL no matter what, and since http://localhost:3000/some/video.mp4 does not match the host URL regex, we were ending up with something like http://localhost:3000http://localhost:3000/some/video.mp4 which broke composer previews. This was only noticed with a video upload in a secure upload environment.
204 lines
5.2 KiB
JavaScript
204 lines
5.2 KiB
JavaScript
import { debounce } from "@ember/runloop";
|
|
import I18n from "I18n";
|
|
|
|
let _cache = {};
|
|
|
|
export function lookupCachedUploadUrl(shortUrl) {
|
|
return _cache[shortUrl] || {};
|
|
}
|
|
|
|
const MISSING = "missing";
|
|
|
|
export function lookupUncachedUploadUrls(urls, ajax) {
|
|
urls = _.compact(urls);
|
|
if (urls.length === 0) {
|
|
return;
|
|
}
|
|
|
|
return ajax("/uploads/lookup-urls", {
|
|
type: "POST",
|
|
data: { short_urls: urls }
|
|
}).then(uploads => {
|
|
uploads.forEach(upload => {
|
|
cacheShortUploadUrl(upload.short_url, {
|
|
url: upload.url,
|
|
short_path: upload.short_path
|
|
});
|
|
});
|
|
|
|
urls.forEach(url =>
|
|
cacheShortUploadUrl(url, {
|
|
url: lookupCachedUploadUrl(url).url || MISSING,
|
|
short_path: lookupCachedUploadUrl(url).short_path || MISSING
|
|
})
|
|
);
|
|
|
|
return uploads;
|
|
});
|
|
}
|
|
|
|
export function cacheShortUploadUrl(shortUrl, value) {
|
|
_cache[shortUrl] = value;
|
|
}
|
|
|
|
export function resetCache() {
|
|
_cache = {};
|
|
}
|
|
|
|
function retrieveCachedUrl(
|
|
upload,
|
|
siteSettings,
|
|
dataAttribute,
|
|
opts,
|
|
callback
|
|
) {
|
|
const cachedUpload = lookupCachedUploadUrl(
|
|
upload.getAttribute(`data-${dataAttribute}`)
|
|
);
|
|
const url = getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings);
|
|
|
|
if (url) {
|
|
upload.removeAttribute(`data-${dataAttribute}`);
|
|
if (url !== MISSING) {
|
|
callback(url);
|
|
} else if (opts && opts.removeMissing) {
|
|
const style = getComputedStyle(document.body);
|
|
const canvas = document.createElement("canvas");
|
|
canvas.width = upload.width;
|
|
canvas.height = upload.height;
|
|
|
|
const context = canvas.getContext("2d");
|
|
|
|
// Draw background
|
|
context.fillStyle = getComputedStyle(document.body).backgroundColor;
|
|
context.strokeRect(0, 0, canvas.width, canvas.height);
|
|
|
|
// Draw border
|
|
context.lineWidth = 2;
|
|
context.strokeStyle = getComputedStyle(document.body).color;
|
|
context.strokeRect(0, 0, canvas.width, canvas.height);
|
|
|
|
let fontSize = 25;
|
|
const text = I18n.t("image_removed");
|
|
|
|
// Fill text size to fit the canvas
|
|
let textSize;
|
|
do {
|
|
--fontSize;
|
|
context.font = `${fontSize}px ${style.fontFamily}`;
|
|
textSize = context.measureText(text);
|
|
} while (textSize.width > canvas.width);
|
|
|
|
context.fillStyle = getComputedStyle(document.body).color;
|
|
context.fillText(
|
|
text,
|
|
(canvas.width - textSize.width) / 2,
|
|
(canvas.height + fontSize) / 2
|
|
);
|
|
|
|
upload.parentNode.replaceChild(canvas, upload);
|
|
}
|
|
}
|
|
}
|
|
|
|
function getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings) {
|
|
if (!cachedUpload.url) {
|
|
return;
|
|
}
|
|
|
|
// non-attachments always use the full URL
|
|
if (dataAttribute !== "orig-href") {
|
|
return cachedUpload.url;
|
|
}
|
|
|
|
// attachments should use the full /secure-media-uploads/ URL
|
|
// in this case for permission checks
|
|
if (
|
|
siteSettings.secure_media &&
|
|
cachedUpload.url.indexOf("secure-media-uploads") > -1
|
|
) {
|
|
return cachedUpload.url;
|
|
}
|
|
|
|
return cachedUpload.short_path;
|
|
}
|
|
|
|
function _loadCachedShortUrls(uploadElements, siteSettings, opts) {
|
|
uploadElements.forEach(upload => {
|
|
switch (upload.tagName) {
|
|
case "A":
|
|
retrieveCachedUrl(upload, siteSettings, "orig-href", opts, url => {
|
|
upload.href = url;
|
|
});
|
|
|
|
break;
|
|
case "IMG":
|
|
retrieveCachedUrl(upload, siteSettings, "orig-src", opts, url => {
|
|
upload.src = url;
|
|
});
|
|
|
|
break;
|
|
case "SOURCE": // video/audio tag > source tag
|
|
retrieveCachedUrl(upload, siteSettings, "orig-src", opts, url => {
|
|
if (url.startsWith(`//${window.location.host}`)) {
|
|
let hostRegex = new RegExp("//" + window.location.host, "g");
|
|
url = url.replace(hostRegex, "");
|
|
}
|
|
|
|
upload.src = url;
|
|
|
|
// this is necessary, otherwise because of the src change the
|
|
// video/audio just doesn't bother loading!
|
|
upload.parentElement.load();
|
|
|
|
// set the url and text for the <a> tag within the <video/audio> tag
|
|
const link = upload.parentElement.querySelector("a");
|
|
if (link) {
|
|
link.href = url;
|
|
link.textContent = url;
|
|
}
|
|
});
|
|
|
|
break;
|
|
}
|
|
});
|
|
}
|
|
|
|
function _loadShortUrls(uploads, ajax, siteSettings, opts) {
|
|
let urls = [...uploads].map(upload => {
|
|
return (
|
|
upload.getAttribute("data-orig-src") ||
|
|
upload.getAttribute("data-orig-href")
|
|
);
|
|
});
|
|
|
|
return lookupUncachedUploadUrls(urls, ajax).then(() =>
|
|
_loadCachedShortUrls(uploads, siteSettings, opts)
|
|
);
|
|
}
|
|
|
|
export function resolveAllShortUrls(ajax, siteSettings, scope, opts) {
|
|
const attributes =
|
|
"img[data-orig-src], a[data-orig-href], source[data-orig-src]";
|
|
let shortUploadElements = scope.querySelectorAll(attributes);
|
|
|
|
if (shortUploadElements.length > 0) {
|
|
_loadCachedShortUrls(shortUploadElements, siteSettings, opts);
|
|
|
|
shortUploadElements = scope.querySelectorAll(attributes);
|
|
if (shortUploadElements.length > 0) {
|
|
// this is carefully batched so we can do a leading debounce (trigger right away)
|
|
return debounce(
|
|
null,
|
|
_loadShortUrls,
|
|
shortUploadElements,
|
|
ajax,
|
|
siteSettings,
|
|
opts,
|
|
450,
|
|
true
|
|
);
|
|
}
|
|
}
|
|
}
|