Merge branch 'dev' into LNK-3044-qd-log-forging

lantanagroup · Oct 30, 2024 · 98aeb82 · 98aeb82
2 parents e0030b5 + 938f422
commit 98aeb82
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 22 deletions.
diff --git a/DotNet/Shared/Application/Extensions/Security/BackendAuthenticationServiceExtension.cs b/DotNet/Shared/Application/Extensions/Security/BackendAuthenticationServiceExtension.cs
@@ -24,6 +24,7 @@ public static IServiceCollection AddLinkBearerServiceAuthentication(this IServic
             options?.Invoke(linkBearerServiceOptions);
 
             //add token commands            
+            services.AddOptions<LinkBearerServiceOptions>().Configure(options);
             services.AddTransient<ICreateSystemToken, CreateSystemToken>();
             services.AddTransient<ICreateUserToken, CreateUserToken>();
 

diff --git a/DotNet/Shared/Application/Services/TenantApiService.cs b/DotNet/Shared/Application/Services/TenantApiService.cs
@@ -1,4 +1,5 @@
-using LantanaGroup.Link.Shared.Application.Interfaces.Services.Security.Token;
+using LantanaGroup.Link.Shared.Application.Extensions.Security;
+using LantanaGroup.Link.Shared.Application.Interfaces.Services.Security.Token;
 using LantanaGroup.Link.Shared.Application.Models.Configs;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -15,14 +16,22 @@ public class TenantApiService : ITenantApiService
     private readonly IOptions<ServiceRegistry> _serviceRegistry;
     private readonly IOptions<LinkTokenServiceSettings> _linkTokenServiceConfig;
     private readonly ICreateSystemToken _createSystemToken;
+    private readonly IOptions<BackendAuthenticationServiceExtension.LinkBearerServiceOptions> _linkBearerServiceOptions;
 
-    public TenantApiService(ILogger<TenantApiService> logger, IHttpClientFactory httpClientFactory, IOptions<ServiceRegistry> serviceRegistry, IOptions<LinkTokenServiceSettings> linkTokenServiceConfig, ICreateSystemToken createSystemToken)
+    public TenantApiService(
+        ILogger<TenantApiService> logger, 
+        IHttpClientFactory httpClientFactory, 
+        IOptions<ServiceRegistry> serviceRegistry, 
+        IOptions<LinkTokenServiceSettings> linkTokenServiceConfig, 
+        ICreateSystemToken createSystemToken, 
+        IOptions<BackendAuthenticationServiceExtension.LinkBearerServiceOptions> linkBearerServiceOptions)
     {
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
         _serviceRegistry = serviceRegistry ?? throw new ArgumentNullException(nameof(serviceRegistry));
         _linkTokenServiceConfig = linkTokenServiceConfig ?? throw new ArgumentNullException(nameof(linkTokenServiceConfig));
         _createSystemToken = createSystemToken ?? throw new ArgumentNullException(nameof(createSystemToken));
+        _linkBearerServiceOptions = linkBearerServiceOptions ?? throw new ArgumentNullException(nameof(linkBearerServiceOptions));
     }
 
     public async Task<bool> CheckFacilityExists(string facilityId, CancellationToken cancellationToken = default)
@@ -49,13 +58,16 @@ public async Task<bool> CheckFacilityExists(string facilityId, CancellationToken
         _logger.LogInformation("Checking if facility ({1}) exists in Tenant Service. Endpoint: {2}", sanitizedFacilityId, endpoint);
 
         //TODO: add method to get key that includes looking at redis for future use case
-        if (_linkTokenServiceConfig.Value.SigningKey is null)
+        if (!_linkBearerServiceOptions.Value.AllowAnonymous && _linkTokenServiceConfig.Value.SigningKey is null)
             throw new Exception("Link Token Service Signing Key is missing.");
 
         //get link token
-        var token = await _createSystemToken.ExecuteAsync(_linkTokenServiceConfig.Value.SigningKey, 2);
-        httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-
+        if (!_linkBearerServiceOptions.Value.AllowAnonymous)
+        {
+            var token = await _createSystemToken.ExecuteAsync(_linkTokenServiceConfig.Value.SigningKey, 2);
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+        }
+
         var response = await httpClient.GetAsync(endpoint, cancellationToken);
 
         if (response.IsSuccessStatusCode)

diff --git a/DotNet/Tenant/Services/FacilityConfigurationService.cs b/DotNet/Tenant/Services/FacilityConfigurationService.cs
@@ -1,5 +1,4 @@
-using LantanaGroup.Link.Shared.Application.Interfaces;
-using LantanaGroup.Link.Shared.Application.Enums;
+using LantanaGroup.Link.Shared.Application.Enums;
 using LantanaGroup.Link.Shared.Application.Models;
 using LantanaGroup.Link.Shared.Application.Models.Configs;
 using LantanaGroup.Link.Shared.Application.Models.Kafka;
@@ -17,9 +16,7 @@
 using static LantanaGroup.Link.Tenant.Entities.ScheduledTaskModel;
 using LantanaGroup.Link.Shared.Application.Interfaces.Services.Security.Token;
 using LantanaGroup.Link.Shared.Application.Models.Responses;
-using System.Linq.Expressions;
-using Confluent.Kafka;
-
+using static LantanaGroup.Link.Shared.Application.Extensions.Security.BackendAuthenticationServiceExtension;
 
 namespace LantanaGroup.Link.Tenant.Services
 {
@@ -35,6 +32,7 @@ public class FacilityConfigurationService
         private readonly IOptions<MeasureConfig> _measureConfig;
         private readonly IOptions<LinkTokenServiceSettings> _linkTokenServiceConfig;
         private readonly ICreateSystemToken _createSystemToken;
+        private readonly IOptions<LinkBearerServiceOptions> _linkBearerServiceOptions;
 
         static FacilityConfigurationService()
         {
@@ -43,7 +41,7 @@ static FacilityConfigurationService()
         }
 
 
-        public FacilityConfigurationService(IFacilityConfigurationRepo facilityConfigurationRepo, ILogger<FacilityConfigurationService> logger, CreateAuditEventCommand createAuditEventCommand, IOptions<ServiceRegistry> serviceRegistry, IOptions<MeasureConfig> measureConfig, HttpClient httpClient, IOptions<LinkTokenServiceSettings> linkTokenServiceConfig, ICreateSystemToken createSystemToken)
+        public FacilityConfigurationService(IFacilityConfigurationRepo facilityConfigurationRepo, ILogger<FacilityConfigurationService> logger, CreateAuditEventCommand createAuditEventCommand, IOptions<ServiceRegistry> serviceRegistry, IOptions<MeasureConfig> measureConfig, HttpClient httpClient, IOptions<LinkTokenServiceSettings> linkTokenServiceConfig, ICreateSystemToken createSystemToken, IOptions<LinkBearerServiceOptions> linkBearerServiceOptions)
         {
             _facilityConfigurationRepo = facilityConfigurationRepo;
             _serviceRegistry = serviceRegistry ?? throw new ArgumentNullException(nameof(serviceRegistry));
@@ -53,6 +51,7 @@ public FacilityConfigurationService(IFacilityConfigurationRepo facilityConfigura
             _createAuditEventCommand = createAuditEventCommand;
             _linkTokenServiceConfig = linkTokenServiceConfig ?? throw new ArgumentNullException(nameof(linkTokenServiceConfig));
             _createSystemToken = createSystemToken ?? throw new ArgumentNullException(nameof(createSystemToken));
+            _linkBearerServiceOptions = linkBearerServiceOptions ?? throw new ArgumentNullException(nameof(linkBearerServiceOptions));
         }
 
         public async Task<List<FacilityConfigModel>> GetAllFacilities(CancellationToken cancellationToken = default)
@@ -413,15 +412,16 @@ private async Task checkIfMeasureEvalExists(ReportTypeSchedule reportTypeSchedul
 
                 string requestUrl = _serviceRegistry.Value.MeasureServiceUrl + $"/api/measure-definition/{reportTypeSchedule.ReportType}";
 
-                //TODO: add method to get key that includes looking at redis for future use case
-                if (_linkTokenServiceConfig.Value.SigningKey is null)
-                    throw new Exception("Link Token Service Signing Key is missing.");
-
-
                 //get link token
-                var token = await _createSystemToken.ExecuteAsync(_linkTokenServiceConfig.Value.SigningKey, 2);
+                if (!_linkBearerServiceOptions.Value.AllowAnonymous)
+                {
+                    //TODO: add method to get key that includes looking at redis for future use case
+                    if (_linkTokenServiceConfig.Value.SigningKey is null) throw new Exception("Link Token Service Signing Key is missing.");
+
+                    var token = await _createSystemToken.ExecuteAsync(_linkTokenServiceConfig.Value.SigningKey, 2);
+                    _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                }
 
-                _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
                 var response = _httpClient.GetAsync(requestUrl).Result;
 
                 // check respone status code

diff --git a/DotNet/TenantTests/CreateFacilityConfigurationTests.cs b/DotNet/TenantTests/CreateFacilityConfigurationTests.cs
@@ -13,13 +13,15 @@
 using Moq;
 using Moq.AutoMock;
 using static LantanaGroup.Link.Tenant.Entities.ScheduledTaskModel;
+using static LantanaGroup.Link.Shared.Application.Extensions.Security.BackendAuthenticationServiceExtension;
 
 namespace TenantTests
 {
     public class CreateFacilityConfigurationTests
     {
         private FacilityConfigModel? _model;
         private ServiceRegistry? _serviceRegistry;
+        private LinkBearerServiceOptions _linkBearerServiceOptions;
         private const string facilityId = "TestFacility_002";
         private const string facilityName = "TestFacility_002";
         private static readonly List<ScheduledTaskModel> scheduledTaskModels = new List<ScheduledTaskModel>();
@@ -52,9 +54,17 @@ public async Task TestCreateFacility()
 
             _model.ScheduledTasks.AddRange(scheduledTaskModels);
 
+            _linkBearerServiceOptions = new LinkBearerServiceOptions()
+            {
+                AllowAnonymous = true
+            };
+
             _mocker = new AutoMocker();
 
-           _service = _mocker.CreateInstance<FacilityConfigurationService>();
+            Mock<IOptions<LinkBearerServiceOptions>> _mockLinkBearerServiceOptions = _mocker.GetMock<IOptions<LinkBearerServiceOptions>>();
+            _mockLinkBearerServiceOptions.Setup(p => p.Value).Returns(_linkBearerServiceOptions);
+
+            _service = _mocker.CreateInstance<FacilityConfigurationService>();
 
             _ = _mocker.GetMock<IFacilityConfigurationRepo>()
                 .Setup(p => p.AddAsync(_model, CancellationToken.None)).ReturnsAsync(_model);

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -406,8 +406,8 @@ services:
       Cache__Enabled: true
       EnableIntegrationFeature: true
       ProblemDetails__IncludeExceptionDetails: false
-      LinkTokenService__EnableTokenGenerationEndpoint: true
-      LinkTokenService__Authority:      
+      LinkTokenService__EnableTokenGenerationEndpoint: false
+      LinkTokenService__Authority: placeholder
       LinkTokenService__LinkAdminEmail:      
       LinkTokenService__TokenLifeSpan: 10    
       Authentication__EnableAnonymousAccess: true