Merge pull request #160 from simonskodt/feat/no-ref/added-message-index

Feat/no ref/added message index

Author: simonskodt

MiniTwit.Core/IRepositories/IMessageRepository.cs

@@ -18,4 +18,5 @@ public interface IMessageRepository
     Task<DBResult<IEnumerable<Message>>> GetAllNonFlaggedByUsernameAsync(string username, CancellationToken ct = default);
     DBResult<IEnumerable<Message>> GetAllFollowedByUserId(string userId, CancellationToken ct = default);
     Task<DBResult<IEnumerable<Message>>> GetAllFollowedByUserIdAsync(string userId, CancellationToken ct = default);
+    Task IndexDB();
 }

MiniTwit.Infrastructure/Repositories/MessageRepository.cs

@@ -4,7 +4,6 @@
 using MiniTwit.Core.IRepositories;
 using MiniTwit.Core.Responses;
 using MongoDB.Driver;
-using System.Linq;
 
 namespace MiniTwit.Infrastructure.Repositories;
 
@@ -83,8 +82,8 @@ public async Task<DBResult<Message>> CreateAsync(string userId, string text)
 
     public DBResult<IEnumerable<Message>> GetAllNonFlagged(CancellationToken ct = default)
     {
-        var messages = _context.Messages.Find(m => m.Flagged == 0).SortByDescending(m => m.PubDate).ToList(ct); 
-        
+        var messages = _context.Messages.Find(m => m.Flagged == 0).SortByDescending(m => m.PubDate).ToList(ct);
+
         return new DBResult<IEnumerable<Message>>
         {
             Model = messages,
@@ -94,8 +93,8 @@ public DBResult<IEnumerable<Message>> GetAllNonFlagged(CancellationToken ct = de
 
     public async Task<DBResult<IEnumerable<Message>>> GetAllNonFlaggedAsync(CancellationToken ct = default)
     {
-        var messages = await _context.Messages.Find(m => m.Flagged == 0).SortByDescending(m => m.PubDate).ToListAsync(ct); 
-        
+        var messages = await _context.Messages.Find(m => m.Flagged == 0).SortByDescending(m => m.PubDate).ToListAsync(ct);
+
         return new DBResult<IEnumerable<Message>>
         {
             Model = messages,
@@ -109,10 +108,10 @@ public async Task<DBResult<IEnumerable<Message>>> GetAllNonFlaggedPageNumberLimi
         var messages = await _context.Messages
             .Find(m => m.Flagged == 0)
             .SortByDescending(m => m.PubDate)
-            .Skip((pageNumber -1) * 50)
+            .Skip((pageNumber - 1) * 50)
             .Limit(50)
             .ToListAsync();
-        
+
         return new DBResult<IEnumerable<Message>>
         {
             Model = messages,
@@ -198,7 +197,7 @@ public async Task<DBResult<IEnumerable<Message>>> GetAllByUsernameAsync(string u
                 ErrorType = ErrorType.INVALID_USERNAME
             };
         }
-        
+
         //All the followers where userName is whoId
         var allFollows = GetAllWhoUserFollows(user);
 
@@ -353,4 +352,12 @@ public async Task<DBResult<IEnumerable<Message>>> GetAllFollowedByUserIdAsync(st
     {
         return await _context.Users.Find(u => u.Username == username).FirstOrDefaultAsync(ct);
     }
+
+    public async Task IndexDB()
+    {
+        var collection = _context.Messages;
+        var indexKeysDefinition = Builders<Message>.IndexKeys.Descending(m => m.PubDate);
+        var indexModel = new CreateIndexModel<Message>(indexKeysDefinition, new CreateIndexOptions { Background = true });
+        await collection.Indexes.CreateOneAsync(indexModel);
+    }
 }

MiniTwit.Server/Controllers/TwitterController.cs

@@ -251,7 +251,7 @@ public async Task<ActionResult> Logout()
         return await Task.FromResult(Ok());
     }
 
-    
+
     /// <summary>
     /// Find out if the given user is followed by the given username.
     /// </summary>
@@ -286,4 +286,10 @@ public ActionResult<UserDTO> GetIDByUsername(string username)
         var response = _serviceManager.UserService.GetByUsername(username);
         return response.ToActionResult();
     }
+
+    [HttpPut("/Messages/IndexDB")]
+    public void IndexDatabase()
+    {
+        _serviceManager.MessageService.IndexDB();
+    }
 }

MiniTwit.Server/IpAddressFilterMiddleware.cs

@@ -0,0 +1,53 @@
+using NetTools;
+using System.Net;
+
+namespace MiniTwit.Server;
+
+public class IpAddressFilterMiddleware
+{
+    private readonly RequestDelegate _next;
+    private readonly IList<IPAddressRange> _allowedIpRanges;
+    private readonly ILogger<IpAddressFilterMiddleware> _logger;
+
+    public IpAddressFilterMiddleware(RequestDelegate next, List<string> allowedIpRanges, ILogger<IpAddressFilterMiddleware> logger)
+    {
+        _next = next;
+        _allowedIpRanges = allowedIpRanges.ConvertAll(x => IPAddressRange.Parse(x));
+        _logger = logger;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        IPAddress clientIpAddress = context.Connection.RemoteIpAddress!;
+
+        if (!IsIpAllowed(clientIpAddress, context))
+        {
+            context.Response.StatusCode = 403; // Forbidden
+            _logger.LogCritical($"Unknown client IP address: {clientIpAddress} is trying to call backend endpoints");
+            await context.Response.WriteAsync("The client IP address is not allowed.");
+            return;
+        }
+
+        await _next.Invoke(context);
+    }
+
+    public bool IsIpAllowed(IPAddress ipAddress, HttpContext context)
+    {
+        if (ipAddress == null)
+        {
+            return true;
+        }
+        bool isAllowed = false;
+
+        foreach (IPAddressRange range in _allowedIpRanges)
+        {
+            if (IPAddress.IsLoopback(context.Connection.LocalIpAddress!) || range.Contains(ipAddress))
+            {
+                isAllowed = true;
+                break;
+            }
+        }
+
+        return isAllowed;
+    }
+}

MiniTwit.Server/MiniTwit.Server.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="IPAddressRange" Version="5.0.0" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
     <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />

MiniTwit.Server/Program.cs

@@ -6,6 +6,7 @@
 using MiniTwit.Infrastructure.Repositories;
 using MiniTwit.Security;
 using MiniTwit.Security.Hashers;
+using MiniTwit.Server;
 using MiniTwit.Server.Authentication;
 using MiniTwit.Server.Extensions;
 using MiniTwit.Service;
@@ -99,6 +100,13 @@
     options.AddCustomLabel("host", context => context.Request.Host.Host);
 });
 
+//Ip filtering
+app.UseMiddleware<IpAddressFilterMiddleware>(new List<string>()
+{
+    "164.92.167.188",
+    "104.248.134.203"
+});
+
 // Logging
 app.UseSerilogRequestLogging();
 

MiniTwit.Service/IServices/IMessageService.cs

@@ -20,4 +20,5 @@ public interface IMessageService
     Task<Response<IEnumerable<MessageWithAutherNameDTO>>> GetAllNonFlaggedPageNumberLimitAsync(int pageNumber, CancellationToken ct = default);
     Response<IEnumerable<MessageDTO>> GetAllNonFlaggedByUsername(string username, CancellationToken ct = default);
     Task<Response<IEnumerable<MessageDTO>>> GetAllNonFlaggedByUsernameAsync(string username, CancellationToken ct = default);
+    Task IndexDB();
 }

MiniTwit.Service/Services/MessageService.cs

@@ -197,4 +197,9 @@ public async Task<Response<IEnumerable<MessageDTO>>> GetAllNonFlaggedByUsernameA
 
         return new Response<IEnumerable<MessageDTO>>(Ok, dbResult.ConvertModelTo<IEnumerable<MessageDTO>>());
     }
+
+    public async Task IndexDB()
+    {
+        await _messageRepository.IndexDB();
+    }
 }

MiniTwit.Tests/Server.Integration.Tests/Integrations/TwitterTests.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using System.Net.Http.Json;
 using FluentAssertions;
+using Microsoft.AspNetCore.Http;
 using MiniTwit.Core.DTOs;
 using MiniTwit.Core.Entities;
 using MiniTwit.Core.Error;
@@ -16,11 +17,11 @@ public TwitterTests(CustomWebApplicationFactory factory)
         _factory = factory;
     }
 
+
     [Fact]
     public async Task Timeline_given_valid_userId_returns_all_messages_from_followers_and_OK()
     {
-        var client = _factory.CreateClient();
-        var actual = await client.GetAsync("/?userId=000000000000000000000001");
+        var actual = await _factory.CreateClient().GetAsync("/?userId=000000000000000000000001");
         var content = await actual.Content.ReadFromJsonAsync<IEnumerable<Message>>();
 
         Assert.Equal(HttpStatusCode.OK, actual.StatusCode);