From db8e82ff03c3cb249129c72fd6e374de23e0311d Mon Sep 17 00:00:00 2001 From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> Date: Wed, 17 May 2023 09:42:08 -0500 Subject: [PATCH] Remove checking the EE_TESTING_ENV flag for SM (#2922) --- .../Controllers/OrganizationsController.cs | 2 -- .../Controllers/AccessPoliciesController.cs | 3 ++- .../Controllers/ProjectsController.cs | 3 ++- .../Controllers/SecretsController.cs | 3 ++- .../SecretsManagerPortingController.cs | 3 ++- .../Controllers/SecretsTrashController.cs | 3 ++- .../Controllers/ServiceAccountsController.cs | 3 ++- .../SecretsManager/SecretsManagerAttribute.cs | 21 ------------------- 8 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 src/Api/SecretsManager/SecretsManagerAttribute.cs diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index ace46d4389..70084a66b6 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -7,7 +7,6 @@ using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Request.Organizations; using Bit.Api.Models.Response; using Bit.Api.Models.Response.Organizations; -using Bit.Api.SecretsManager; using Bit.Core; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Repositories; @@ -706,7 +705,6 @@ public class OrganizationsController : Controller } // This is a temporary endpoint to self-enroll in secrets manager - [SecretsManager] [SelfHosted(NotSelfHostedOnly = true)] [HttpPost("{id}/enroll-secrets-manager")] public async Task EnrollSecretsManager(Guid id, [FromBody] OrganizationEnrollSecretsManagerRequestModel model) diff --git a/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs b/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs index dd4db2bfa9..c07cf3a37f 100644 --- a/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs +++ b/src/Api/SecretsManager/Controllers/AccessPoliciesController.cs @@ -9,13 +9,14 @@ using Bit.Core.SecretsManager.Commands.AccessPolicies.Interfaces; using Bit.Core.SecretsManager.Entities; using Bit.Core.SecretsManager.Repositories; using Bit.Core.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] [Route("access-policies")] public class AccessPoliciesController : Controller { diff --git a/src/Api/SecretsManager/Controllers/ProjectsController.cs b/src/Api/SecretsManager/Controllers/ProjectsController.cs index 960f750952..7ee58e0d3e 100644 --- a/src/Api/SecretsManager/Controllers/ProjectsController.cs +++ b/src/Api/SecretsManager/Controllers/ProjectsController.cs @@ -8,13 +8,14 @@ using Bit.Core.SecretsManager.AuthorizationRequirements; using Bit.Core.SecretsManager.Commands.Projects.Interfaces; using Bit.Core.SecretsManager.Repositories; using Bit.Core.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] public class ProjectsController : Controller { private readonly ICurrentContext _currentContext; diff --git a/src/Api/SecretsManager/Controllers/SecretsController.cs b/src/Api/SecretsManager/Controllers/SecretsController.cs index 549f8fe04a..53a3a8b802 100644 --- a/src/Api/SecretsManager/Controllers/SecretsController.cs +++ b/src/Api/SecretsManager/Controllers/SecretsController.cs @@ -12,13 +12,14 @@ using Bit.Core.Services; using Bit.Core.Tools.Enums; using Bit.Core.Tools.Models.Business; using Bit.Core.Tools.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] public class SecretsController : Controller { private readonly ICurrentContext _currentContext; diff --git a/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs b/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs index 172a1b5c62..2e29af1f52 100644 --- a/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs +++ b/src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs @@ -6,13 +6,14 @@ using Bit.Core.Exceptions; using Bit.Core.SecretsManager.Commands.Porting.Interfaces; using Bit.Core.SecretsManager.Repositories; using Bit.Core.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] public class SecretsManagerPortingController : Controller { private readonly ISecretRepository _secretRepository; diff --git a/src/Api/SecretsManager/Controllers/SecretsTrashController.cs b/src/Api/SecretsManager/Controllers/SecretsTrashController.cs index 6f0b65d458..aaaebf5fe4 100644 --- a/src/Api/SecretsManager/Controllers/SecretsTrashController.cs +++ b/src/Api/SecretsManager/Controllers/SecretsTrashController.cs @@ -3,13 +3,14 @@ using Bit.Core.Context; using Bit.Core.Exceptions; using Bit.Core.SecretsManager.Commands.Trash.Interfaces; using Bit.Core.SecretsManager.Repositories; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] public class TrashController : Controller { private readonly ICurrentContext _currentContext; diff --git a/src/Api/SecretsManager/Controllers/ServiceAccountsController.cs b/src/Api/SecretsManager/Controllers/ServiceAccountsController.cs index d610f27521..6202310523 100644 --- a/src/Api/SecretsManager/Controllers/ServiceAccountsController.cs +++ b/src/Api/SecretsManager/Controllers/ServiceAccountsController.cs @@ -8,13 +8,14 @@ using Bit.Core.SecretsManager.Commands.AccessTokens.Interfaces; using Bit.Core.SecretsManager.Commands.ServiceAccounts.Interfaces; using Bit.Core.SecretsManager.Repositories; using Bit.Core.Services; +using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace Bit.Api.SecretsManager.Controllers; -[SecretsManager] [Authorize("secrets")] +[SelfHosted(NotSelfHostedOnly = true)] [Route("service-accounts")] public class ServiceAccountsController : Controller { diff --git a/src/Api/SecretsManager/SecretsManagerAttribute.cs b/src/Api/SecretsManager/SecretsManagerAttribute.cs deleted file mode 100644 index 780e79867b..0000000000 --- a/src/Api/SecretsManager/SecretsManagerAttribute.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; - -namespace Bit.Api.SecretsManager; - -[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] -public class SecretsManagerAttribute : Attribute, IResourceFilter -{ - public void OnResourceExecuting(ResourceExecutingContext context) - { - var isDev = context.HttpContext.RequestServices.GetService().IsDevelopment(); - var isEE = Environment.GetEnvironmentVariable("EE_TESTING_ENV") != null; - if (!isDev && !isEE) - { - context.Result = new NotFoundResult(); - } - } - - public void OnResourceExecuted(ResourceExecutedContext context) { } -} -