Support secure connections to the homeserver in MediaProxy (#508)

* Support secure connections to the homeserver in MediaProxy Fixes GH-507 * changelog
matrix-org · Sep 13, 2024 · a76ce43 · a76ce43
1 parent 647a412
commit a76ce43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/508.bugfix b/changelog.d/508.bugfix
@@ -0,0 +1 @@
+Support secure connections to the homeserver in MediaProxy.
diff --git a/src/components/media-proxy.ts b/src/components/media-proxy.ts
@@ -1,7 +1,8 @@
 import { webcrypto } from 'node:crypto';
 import { Request, Response, default as express, NextFunction, Router } from 'express';
 import { ApiError, IApiError, Logger, ErrCode } from '..';
-import { Server, get } from 'http';
+import { Server, get as httpGet } from 'http';
+import { get as httpsGet } from "https";
 import { MatrixClient } from '@vector-im/matrix-bot-sdk';
 const subtleCrypto = webcrypto.subtle;
 const log = new Logger('MediaProxy');
@@ -153,6 +154,7 @@ export class MediaProxy {
         }
         const [, serverName, mediaId] = mxcMatch;
         const url = `${this.matrixClient.homeserverUrl}/_matrix/client/v1/media/download/${serverName}/${mediaId}`;
+        const get = url.startsWith("https:") ? httpsGet : httpGet;
         return new Promise<void>((resolve, reject) => {
             get(url, {
                 headers: {