From f33925e973cfaa9be4d46abd81f63afe787c6607 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 22 Apr 2025 21:51:47 +0300 Subject: Prevent AD group check using AD Graph API. --- .../Web/Tango.MachineService/Controllers/AccountController.cs | 8 ++++---- .../Tango.MachineService/Controllers/MachineStudioController.cs | 8 ++++---- .../Web/Tango.MachineService/Controllers/PPCController.cs | 8 ++++---- .../Web/Tango.MachineService/Tango.MachineService.csproj | 6 ++++-- 4 files changed, 16 insertions(+), 14 deletions(-) (limited to 'Software/Visual_Studio/Web/Tango.MachineService') diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/AccountController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/AccountController.cs index 0a395b00e..44f3ea445 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/AccountController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/AccountController.cs @@ -37,10 +37,10 @@ namespace Tango.MachineService.Controllers { var authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password); - if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) - { - throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); - } + //if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) + //{ + // throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); + //} FormsAuthentication.SetAuthCookie(request.Email, true); diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs index 7eda111d0..23e7e5ce6 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs @@ -312,10 +312,10 @@ namespace Tango.MachineService.Controllers throw new AuthenticationException(ex.FlattenMessage()); } - if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) - { - throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); - } + //if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) + //{ + // throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); + //} using (ObservablesContext db = ObservablesWebContext.CreateContext()) { diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index 17f6ba324..b60bc77c0 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -1072,10 +1072,10 @@ namespace Tango.MachineService.Controllers { var authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password); - if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) - { - throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); - } + //if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email)) + //{ + // throw new AuthenticationException($"You do not have permissions to access the {MachineServiceConfig.DEPLOYMENT_SLOT.ToDescription()} environment."); + //} BasicHashGenerator hash = new BasicHashGenerator(); String pass = hash.Encrypt(request.Password); diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index a027b9f53..9f8889d60 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -181,7 +181,9 @@ ..\..\packages\Microsoft.SqlServer.SqlManagementObjects.140.17283.0\lib\net40\Microsoft.SqlServer.WmiEnum.dll - + + False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -506,7 +508,7 @@ False - + -- cgit v1.3.1