IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Rename secure_media to secure_uploads (#18376)

Browse Source 
This commit renames all secure_media related settings to secure_uploads_* along with the associated functionality.

This is being done because "media" does not really cover it, we aren't just doing this for images and videos etc. but for all uploads in the site.

Additionally, in future we want to secure more types of uploads, and enable a kind of "mixed mode" where some uploads are secure and some are not, so keeping media in the name is just confusing.

This also keeps compatibility with the `secure-media-uploads` path, and changes new
secure URLs to be `secure-uploads`.

Deprecated settings:

* secure_media -> secure_uploads
* secure_media_allow_embed_images_in_emails -> secure_uploads_allow_embed_images_in_emails
* secure_media_max_email_embed_image_size_kb -> secure_uploads_max_email_embed_image_size_kb
This commit is contained in:
Martin Brennan
2022-09-29 09:24:33 +10:00
committed by GitHub
parent 70b96ac4e7
commit 8ebd5edd1e
67 changed files with 442 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
View File

@@ -525,7 +525,7 @@ export function setup(opts, siteSettings, state) {
getOptions.f = () => opts.discourse;
opts.discourse.limitedSiteSettings = {
secureMedia: siteSettings.secure_media,
secureUploads: siteSettings.secure_uploads,
enableDiffhtmlPreview: siteSettings.enable_diffhtml_preview,
traditionalMarkdownLinebreaks: siteSettings.traditional_markdown_linebreaks,
enableMarkdownLinkify: siteSettings.enable_markdown_linkify,

9
app/assets/javascripts/pretty-text/addon/upload-short-url.js
View File

@@ -112,11 +112,12 @@ function getAttributeBasedUrl(dataAttribute, cachedUpload, siteSettings) {
return cachedUpload.url;
}
// attachments should use the full /secure-media-uploads/ URL
// in this case for permission checks
// attachments should use the full /secure-media-uploads/ or
// /secure-uploads/ URL in this case for permission checks
if (
siteSettings.secure_media &&
cachedUpload.url.includes("secure-media-uploads")
siteSettings.secure_uploads &&
(cachedUpload.url.includes("secure-media-uploads") ||
cachedUpload.url.includes("secure-uploads"))
) {
return cachedUpload.url;
}

7
app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
View File

@@ -136,11 +136,12 @@ function rule(state) {
}
} else if (token.tag === "a") {
if (mapped) {
// when secure media is enabled we want the full /secure-media-uploads/
// when secure uploads is enabled we want the full /secure-media-uploads or /secure-uploads
// url to take advantage of access control security
if (
state.md.options.discourse.limitedSiteSettings.secureMedia &&
mapped.url.includes("secure-media-uploads")
state.md.options.discourse.limitedSiteSettings.secureUploads &&
(mapped.url.includes("secure-media-uploads") ||
mapped.url.includes("secure-uploads"))
) {
token.attrs[srcIndex][1] = mapped.url;
} else {