diff --git a/src/Tgstation.Server.Api/Models/ErrorCode.cs b/src/Tgstation.Server.Api/Models/ErrorCode.cs index 808790fa81..a99191395c 100644 --- a/src/Tgstation.Server.Api/Models/ErrorCode.cs +++ b/src/Tgstation.Server.Api/Models/ErrorCode.cs @@ -1,11 +1,12 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; namespace Tgstation.Server.Api.Models { /// /// Types of s that the API may return. /// - /// Entries marked with the are no longer in use but kept for reference. + /// Entries marked with the are no longer in use but kept for reference. public enum ErrorCode : uint { /// @@ -257,7 +258,8 @@ namespace Tgstation.Server.Api.Models /// /// was used where it is not supported. /// - [Description("This version of TGS does not support the ultrasafe DreamDaemon configuration!")] + [Description("Deprecated error code.")] + [Obsolete("With DMAPI-5.0.0, ultrasafe security is now supported.", true)] InvalidSecurityLevel, /// diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs index 37cfe70a11..e46a0b1901 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs @@ -471,9 +471,6 @@ namespace Tgstation.Server.Host.Components.Deployment if (progressReporter == null) throw new ArgumentNullException(nameof(progressReporter)); - if (dreamMakerSettings.ApiValidationSecurityLevel == DreamDaemonSecurity.Ultrasafe) - throw new ArgumentOutOfRangeException(nameof(dreamMakerSettings), dreamMakerSettings, "Cannot compile with ultrasafe security!"); - logger.LogTrace("Begin Compile"); lock (this) diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs index e7bea85742..491ba433d0 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs @@ -186,9 +186,6 @@ namespace Tgstation.Server.Host.Controllers if (model.SecondaryPort == 0) throw new InvalidOperationException("Secondary port cannot be 0!"); - if (model.SecurityLevel == DreamDaemonSecurity.Ultrasafe) - return BadRequest(new ErrorMessage(ErrorCode.InvalidSecurityLevel)); - // alias for changing DD settings var current = await DatabaseContext.Instances.Where(x => x.Id == Instance.Id).Select(x => x.DreamDaemonSettings).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false); diff --git a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs index 19c16de2f9..2c4b619b56 100644 --- a/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs +++ b/src/Tgstation.Server.Host/Controllers/DreamMakerController.cs @@ -153,9 +153,6 @@ namespace Tgstation.Server.Host.Controllers if (model.ApiValidationPort == 0) throw new InvalidOperationException("ApiValidationPort cannot be 0!"); - if (model.ApiValidationSecurityLevel == DreamDaemonSecurity.Ultrasafe) - return BadRequest(new ErrorMessage(ErrorCode.InvalidSecurityLevel)); - var hostModel = await DatabaseContext.DreamMakerSettings.Where(x => x.InstanceId == Instance.Id).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false); if (hostModel == null) return StatusCode((int)HttpStatusCode.Gone); diff --git a/src/Tgstation.Server.Host/Controllers/InstanceController.cs b/src/Tgstation.Server.Host/Controllers/InstanceController.cs index 41dfc88889..aa300e6367 100644 --- a/src/Tgstation.Server.Host/Controllers/InstanceController.cs +++ b/src/Tgstation.Server.Host/Controllers/InstanceController.cs @@ -230,7 +230,7 @@ namespace Tgstation.Server.Host.Controllers AutoStart = false, PrimaryPort = 1337, SecondaryPort = 1338, - SecurityLevel = DreamDaemonSecurity.Safe, + SecurityLevel = DreamDaemonSecurity.Ultrasafe, SoftRestart = false, SoftShutdown = false, StartupTimeout = 20 @@ -238,7 +238,7 @@ namespace Tgstation.Server.Host.Controllers DreamMakerSettings = new DreamMakerSettings { ApiValidationPort = 1339, - ApiValidationSecurityLevel = DreamDaemonSecurity.Safe + ApiValidationSecurityLevel = DreamDaemonSecurity.Ultrasafe }, Name = model.Name, Online = false,