A platform for community discussion. Free, open, simple.
FIX: Apply s3_cdn_url to chat uploads and resolve getURLWithCDN protocol mismatches (#40419)
Lilly2b0d3f11e88c
diff --git a/frontend/discourse/app/lib/get-url.js b/frontend/discourse/app/lib/get-url.jsindex 65157ac6b19..cdd6a760df6 100644--- a/frontend/discourse/app/lib/get-url.js+++ b/frontend/discourse/app/lib/get-url.js@@ -38,8 +38,14 @@ export function getURLWithCDN(url) {// only relative urlsif (cdn && /^\/[^\/]/.test(url)) {url = cdn + url;- } else if (S3CDN && url.startsWith(S3BaseUrl)) {- url = url.replace(S3BaseUrl, S3CDN);+ } else if (S3CDN && S3BaseUrl) {+ // Strip http: and https: to ensure robust domain comparison+ const normalizedUrl = url.replace(/^https?:/i, "");+ const normalizedBase = S3BaseUrl.replace(/^https?:/i, "");++ if (normalizedUrl.startsWith(normalizedBase)) {+ url = S3CDN + normalizedUrl.substring(normalizedBase.length);+ }}return url;}diff --git a/frontend/discourse/tests/unit/lib/get-url-test.js b/frontend/discourse/tests/unit/lib/get-url-test.jsindex 45a9cd4bc22..13e32ce6f3c 100644--- a/frontend/discourse/tests/unit/lib/get-url-test.js+++ b/frontend/discourse/tests/unit/lib/get-url-test.js@@ -183,4 +183,28 @@ module("Unit | Utility | get-url", function (hooks) {assert.strictEqual(getURLWithCDN(url), url, "at correct path");});++ test("getURLWithCDN ignores protocol mismatch between S3BaseUrl and URL", function (assert) {+ // Case 1: S3 base is protocol-relative, URL is HTTPS+ setupS3CDN(+ "//test.s3-us-west-1.amazonaws.com/site",+ "https://awesome.cdn/site"+ );+ assert.strictEqual(+ getURLWithCDN("https://test.s3-us-west-1.amazonaws.com/site/awesome.png"),+ "https://awesome.cdn/site/awesome.png",+ "applies CDN when URL has https but base is protocol-relative"+ );++ // Case 2: S3 base is HTTPS, URL is protocol-relative+ setupS3CDN(+ "https://test.s3-us-west-1.amazonaws.com/site",+ "https://awesome.cdn/site"+ );+ assert.strictEqual(+ getURLWithCDN("//test.s3-us-west-1.amazonaws.com/site/awesome.png"),+ "https://awesome.cdn/site/awesome.png",+ "applies CDN when URL is protocol-relative but base has https"+ );+ });});diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-upload.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-upload.gjsindex e8b720a760c..19fd0f21b84 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-upload.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-upload.gjs@@ -4,6 +4,7 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import { getURLWithCDN } from "discourse/lib/get-url";import { isAudio, isImage, isVideo } from "discourse/lib/uploads";import { eq } from "discourse/truth-helpers";@@ -54,7 +55,12 @@ export default class ChatUpload extends Component {}get imageUrl() {- return this.args.upload.thumbnail?.url ?? this.args.upload.url;+ const rawUrl = this.args.upload.thumbnail?.url ?? this.args.upload.url;+ return getURLWithCDN(rawUrl);+ }++ get largeImageUrl() {+ return getURLWithCDN(this.args.upload.url);}get imageStyle() {@@ -68,9 +74,19 @@ export default class ChatUpload extends Component {get videoSourceUrl() {const baseUrl =this.args.upload.optimized_video?.url ?? this.args.upload.url;- return this.capabilities.isIOS || this.capabilities.isSafari- ? `${baseUrl}#t=0.001`- : baseUrl;+ const finalUrl =+ this.capabilities.isIOS || this.capabilities.isSafari+ ? `${baseUrl}#t=0.001`+ : baseUrl;+ return getURLWithCDN(finalUrl);+ }++ get audioSourceUrl() {+ return getURLWithCDN(this.args.upload.url);+ }++ get attachmentUrl() {+ return getURLWithCDN(this.args.upload.url);}@action@@ -83,7 +99,7 @@ export default class ChatUpload extends Component {<imgclass="chat-img-upload lightbox"data-orig-src={{@upload.short_url}}- data-large-src={{@upload.url}}+ data-large-src={{this.largeImageUrl}}data-download-href={{@upload.short_path}}height={{this.size.thumb_height}}width={{this.size.thumb_width}}@@ -102,13 +118,13 @@ export default class ChatUpload extends Component {</video>{{else if (eq this.type this.AUDIO_TYPE)}}<audio class="chat-audio-upload" preload="metadata" controls>- <source src={{@upload.url}} />+ <source src={{this.audioSourceUrl}} /></audio>{{else}}<aclass="chat-other-upload"data-orig-href={{@upload.short_url}}- href={{@upload.url}}+ href={{this.attachmentUrl}}>{{@upload.original_filename}}</a>diff --git a/plugins/chat/test/javascripts/components/chat-upload-test.gjs b/plugins/chat/test/javascripts/components/chat-upload-test.gjsindex 0fb715148c7..0450d80e56c 100644--- a/plugins/chat/test/javascripts/components/chat-upload-test.gjs+++ b/plugins/chat/test/javascripts/components/chat-upload-test.gjs@@ -2,6 +2,7 @@ import { tracked } from "@glimmer/tracking";import Service from "@ember/service";import { render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";+import { setupS3CDN } from "discourse/lib/get-url";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import ChatUpload from "discourse/plugins/chat/discourse/components/chat-upload";@@ -66,6 +67,11 @@ const TXT_FIXTURE = {human_filesize: "168 KB",};+class MockCapabilitiesService extends Service {+ @tracked isIOS = false;+ @tracked isSafari = false;+}+module("Component | ChatUpload", function (hooks) {setupRenderingTest(hooks);@@ -139,13 +145,98 @@ module("Component | ChatUpload", function (hooks) {.hasAttribute("href", TXT_FIXTURE.url, "has the correct URL");});+ module("S3 CDN URLs", function (nestedHooks) {+ nestedHooks.beforeEach(function () {+ this.owner.register("service:capabilities", MockCapabilitiesService);++ setupS3CDN(+ "//test.s3-us-west-1.amazonaws.com/site",+ "https://awesome.cdn/site"+ );+ });++ test("uses the CDN for image src and data-large-src", async function (assert) {+ this.set("upload", {+ ...IMAGE_FIXTURE,+ url: "https://test.s3-us-west-1.amazonaws.com/site/original.jpg",+ thumbnail: {+ url: "https://test.s3-us-west-1.amazonaws.com/site/thumbnail.jpg",+ },+ });++ await render(<template><ChatUpload @upload={{this.upload}} /></template>);++ assert+ .dom("img.chat-img-upload")+ .hasAttribute(+ "src",+ "https://awesome.cdn/site/thumbnail.jpg",+ "uses the CDN for image thumbnails"+ );+ assert+ .dom("img.chat-img-upload")+ .hasAttribute(+ "data-large-src",+ "https://awesome.cdn/site/original.jpg",+ "uses the CDN for the full-size image URL"+ );+ });++ test("uses the CDN for video sources", async function (assert) {+ this.set("upload", {+ ...VIDEO_FIXTURE,+ url: "https://test.s3-us-west-1.amazonaws.com/site/video.mp4",+ });++ await render(<template><ChatUpload @upload={{this.upload}} /></template>);++ assert+ .dom("video.chat-video-upload source")+ .hasAttribute(+ "src",+ "https://awesome.cdn/site/video.mp4",+ "uses the CDN for video uploads"+ );+ });++ test("uses the CDN for audio sources", async function (assert) {+ this.set("upload", {+ ...AUDIO_FIXTURE,+ url: "https://test.s3-us-west-1.amazonaws.com/site/song.mp3",+ });++ await render(<template><ChatUpload @upload={{this.upload}} /></template>);++ assert+ .dom("audio.chat-audio-upload source")+ .hasAttribute(+ "src",+ "https://awesome.cdn/site/song.mp3",+ "uses the CDN for audio uploads"+ );+ });++ test("uses the CDN for attachment hrefs", async function (assert) {+ this.set("upload", {+ ...TXT_FIXTURE,+ url: "https://test.s3-us-west-1.amazonaws.com/site/file.txt",+ });++ await render(<template><ChatUpload @upload={{this.upload}} /></template>);++ assert+ .dom("a.chat-other-upload")+ .hasAttribute(+ "href",+ "https://awesome.cdn/site/file.txt",+ "uses the CDN for attachment uploads"+ );+ });+ });+module("video source URL", function (nestedHooks) {let mockCapabilities;- class MockCapabilitiesService extends Service {- @tracked isSafari = false;- }-nestedHooks.beforeEach(function () {// Register and inject the mock servicethis.owner.register("service:capabilities", MockCapabilitiesService);