Remove 2 more locations that logged Plex tokens to console

chrisbenincasa · Jun 10, 2024 · 2dd9a9e · 2dd9a9e
1 parent 805471a
commit 2dd9a9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/src/api/programmingApi.ts b/server/src/api/programmingApi.ts
@@ -141,7 +141,7 @@ export const programmingApi: RouterPluginAsyncCallback = async (fastify) => {
             if (isAxiosError(e) && e.response?.status === 404) {
               logger.error(
                 'Error retrieving thumb from Plex at url: %s. Status: 404',
-                result,
+                result.replaceAll(server.accessToken, 'REDACTED_TOKEN'),
               );
               return res.status(404).send();
             }

diff --git a/server/src/ffmpeg/ffmpeg.ts b/server/src/ffmpeg/ffmpeg.ts
@@ -826,8 +826,10 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
       return;
     }
 
-    // TODO: Redact Plex tokens here
-    this.logger.debug(`Starting ffmpeg with args: "${ffmpegArgs.join(' ')}"`);
+    const argsWithTokenRedacted = ffmpegArgs
+      .join(' ')
+      .replaceAll(/(.*X-Plex-Token=)([A-z0-9_\\-]+)(.*)/g, '$1REDACTED$3');
+    this.logger.debug(`Starting ffmpeg with args: "%s"`, argsWithTokenRedacted);
 
     this.ffmpeg = spawn(this.ffmpegPath, ffmpegArgs, {
       stdio: ['ignore', 'pipe', 'pipe'],