From 3acd25e6d4c951f6c0fa8747cab9b284bd40e5cf Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 26 Jul 2024 11:25:52 -0400 Subject: [PATCH] Check wrong .dme before .dme exists --- .../Components/Deployment/DreamMaker.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs index 2ae26d48c8..e923f77305 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs @@ -607,12 +607,12 @@ namespace Tgstation.Server.Host.Components.Deployment else { var targetDme = ioManager.ConcatPath(outputDirectory, String.Join('.', job.DmeName, DmeExtension)); + if (!await ioManager.PathIsChildOf(outputDirectory, targetDme, cancellationToken)) + throw new JobException(ErrorCode.DeploymentWrongDme); + var targetDmeExists = await ioManager.FileExists(targetDme, cancellationToken); if (!targetDmeExists) throw new JobException(ErrorCode.DeploymentMissingDme); - - if (!await ioManager.PathIsChildOf(outputDirectory, targetDme, cancellationToken)) - throw new JobException(ErrorCode.DeploymentWrongDme); } logger.LogDebug("Selected \"{dmeName}.dme\" for compilation!", job.DmeName);