Merge pull request #4 from eclipserporg/feature/add_authorization

Add basic authorization

Apis/IServerDiscordApi.cs

@@ -1,4 +1,5 @@
-using Refit;
+using app.Models;
+using Refit;
 
 namespace app.Apis;
 
@@ -29,5 +30,5 @@ public interface IServerDiscordApi
     Task<bool> PostBan(string channel, ulong senderId, string senderName, ulong targetId, string targetName, string reason);
 
     [Post("/login")]
-    Task<(bool, string)> PostLogin(string name, ulong id, string username, string discriminator, string avatarurl, string password);
+    Task<ResponsePairDto> PostLogin(string name, ulong id, string username, string discriminator, string avatarurl, string password);
 }

Controllers/DiscordController.cs

@@ -1,11 +1,13 @@
 using app.Apis;
 using app.Models;
 using app.Services;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace app.Controllers
 {
     [ApiController]
+    [Authorize]
     [Route("[controller]/[action]")]
     public class DiscordController : ControllerBase
     {

Controllers/FeedsController.cs

@@ -1,9 +1,11 @@
 using app.Services;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace app.Controllers
 {
     [ApiController]
+    [Authorize]
     [Route("[controller]/[action]")]
     public class FeedsController : ControllerBase
     {
@@ -14,7 +16,7 @@ public FeedsController(DiscordService discordService)
         }
 
         [HttpPost(Name = "send")]
-        public async Task PostSend(string channel, [FromBody] string message)
+        public async Task PostSend(string channel, string message)
         {
             var discordChannel = channel switch
             {

Controllers/PresenceController.cs

@@ -1,10 +1,12 @@
 using app.Services;
 using DSharpPlus.Entities;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace app.Controllers
 {
     [ApiController]
+    [Authorize]
     [Route("[controller]/[action]")]
     public class PresenceController : ControllerBase
     {

Middlewares/BasicAuthenticationHandler.cs

@@ -0,0 +1,53 @@
+using app.Models;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Options;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+
+namespace app.Middlewares
+{
+    public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+    {
+        private readonly IConfiguration _configuration;
+        private readonly Credentials _credentials;
+
+        public BasicAuthenticationHandler(
+            IOptionsMonitor<AuthenticationSchemeOptions> options,
+            ILoggerFactory logger,
+            UrlEncoder encoder,
+            ISystemClock clock,
+            IOptions<Credentials> credentials,
+            IConfiguration configuration) : base(options, logger, encoder, clock)
+        {
+            _configuration = configuration;
+            _credentials = credentials.Value;
+        }
+
+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            string authHeader = Request.Headers["Authorization"];
+            if (authHeader != null && authHeader.StartsWith("Basic"))
+            {
+
+                var authHeaderValue = authHeader.Replace("Basic ", "");
+                var decodedAuthHeaderValue = Encoding.UTF8.GetString(Convert.FromBase64String(authHeaderValue));
+                var userPassArray = decodedAuthHeaderValue.Split(":");
+                var extractedUsername = userPassArray[0];
+                var extractedPassword = userPassArray[1];
+
+                if (string.Equals(_credentials.Username, extractedUsername) && string.Equals(extractedPassword, _credentials.Password))
+                {
+                    var claims = new[] { new Claim(ClaimTypes.Name, _credentials.Username) };
+                    var identity = new ClaimsIdentity(claims, Scheme.Name);
+                    var principal = new ClaimsPrincipal(identity);
+                    var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+                    return AuthenticateResult.Success(ticket);
+                }
+            }
+            return AuthenticateResult.Fail("Failed to authenticate");
+        }
+    }
+
+}

Models/Credentials.cs

@@ -0,0 +1,8 @@
+namespace app.Models
+{
+    public class Credentials
+    {
+        public string Username { get; set; }
+        public string Password { get; set; }
+    }
+}

Models/ResponsePairDto.cs

@@ -0,0 +1,18 @@
+namespace app.Models
+{
+    public class ResponsePairDto
+    {
+        public ResponsePairDto()
+        {
+        }
+
+        public ResponsePairDto(bool status, string message)
+        {
+            Status = status;
+            Message = message;
+        }
+
+        public bool Status { get; set; }
+        public string Message { get; set; }
+    }
+}

Program.cs

@@ -1,6 +1,14 @@
 using app.Services;
 using app.Settings;
 using app;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.IdentityModel.Tokens;
+using System.Text;
+using Microsoft.OpenApi.Models;
+using app.Models;
+using Microsoft.Extensions.Configuration;
+using app.Middlewares;
+using Microsoft.AspNetCore.Authentication;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -9,6 +17,7 @@
 
 builder.Services.Configure<DiscordSettings>(options => builder.Configuration.GetSection(nameof(DiscordSettings)).Bind(options));
 builder.Services.Configure<ServerApiSettings>(options => builder.Configuration.GetSection(nameof(ServerApiSettings)).Bind(options));
+builder.Services.Configure<Credentials>(options => builder.Configuration.GetSection(nameof(Credentials)).Bind(options));
 
 builder.Services.AddRefitServices(serverApiSettings);
 builder.Services.AddControllers();
@@ -19,6 +28,32 @@
 builder.Services.AddSingleton<RunnerService>();
 builder.Services.AddSingleton<GuildJoinService>();
 builder.Services.AddHostedService(provider => provider.GetService<RunnerService>());
+builder.Services.AddAuthentication("BasicAuthentication")
+        .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("BasicAuthentication", null);
+
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "Your API", Version = "v1" });
+    c.AddSecurityDefinition("Basic", new OpenApiSecurityScheme
+    {
+        Name = "Authorization",
+        Type = SecuritySchemeType.Http,
+        Scheme = "basic",
+        In = ParameterLocation.Header,
+        Description = "Basic Authorization header."
+    });
+    c.AddSecurityRequirement(new OpenApiSecurityRequirement
+    {
+        {
+            new OpenApiSecurityScheme
+            {
+                Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Basic" }
+            },
+            new string[] { }
+        }
+    });
+});
+
 
 var app = builder.Build();
 
@@ -32,9 +67,8 @@
 await app.Services.GetService<DiscordService>().Start();
 
 app.UseHttpsRedirection();
-
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();
-
 app.Run();

Services/LoginService.cs

@@ -38,14 +38,14 @@ private async Task HandleLoginCommand(MessageCreateEventArgs e, string name, str
             return;
         }
 
-        var (status, response) = await _serverDiscordApi.PostLogin(name, discordMember.Id, discordMember.Username, discordMember.Discriminator, discordMember.AvatarUrl, password);
+        var response = await _serverDiscordApi.PostLogin(name, discordMember.Id, discordMember.Username, discordMember.Discriminator, discordMember.AvatarUrl, password);
 
-        if(status)
+        if(response.Status)
         {
             await discordMember.GrantRoleAsync(_discordService.MemberRole);
         }
-        
-        await e.Channel.SendMessageAsync(response);
+
+        await e.Message.RespondAsync(response.Message);
     }
 
     private async Task OnPrivateMessage(MessageCreateEventArgs e)
@@ -62,7 +62,7 @@ private async Task OnPrivateMessage(MessageCreateEventArgs e)
 
             if (index == -1)
             {
-                await e.Channel.SendMessageAsync("Incorrect format! Write **!login USERNAME PASSWORD**");
+                await e.Message.RespondAsync("Incorrect format! Write **!login USERNAME PASSWORD**");
                 return;
             }
 
@@ -71,5 +71,9 @@ private async Task OnPrivateMessage(MessageCreateEventArgs e)
 
             await HandleLoginCommand(e, accountName, password);
         }
+        else
+        {
+            await e.Message.RespondAsync("Incorrect format! Write **!login USERNAME PASSWORD**");
+        }
     }
 }

app.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>de413ddd-1e74-4cb2-80c7-bc2e2469d599</UserSecretsId>
@@ -12,6 +12,7 @@
   <ItemGroup>
     <PackageReference Include="DSharpPlus" Version="4.4.2" />
     <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Refit" Version="7.0.0" />
     <PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />

appsettings.json

@@ -6,36 +6,40 @@
     }
   },
   "AllowedHosts": "*",
+  "Credentials": {
+    "Username": "your_username",
+    "Password": "your_password"
+  },
   "ServerApiSettings": {
     "Url": "http://localhost:9696/api/",
     "Username": "admin",
-    "Password": "test2"
+    "Password": "test"
   },
-    "DiscordSettings": {
-      "Token": "DISCORD_BOT_API",
-      "Guild": 42069,
-      "Channels": {
-        "Commands": 42069,
-        "General": 42069,
-        "Surveilance": 42069,
-        "Cheat": 42069,
-        "LinkedAccounts": 42069,
-        "VerifyLogs": 42069,
-        "DiscordBotLogs": 42069,
-        "Verification": 42069,
-        "HelpVerify": 42069,
-        "LinkedAccountsCompact": 42069,
-        "WeazelFeed": 42069,
-        "QuizUpdates": 42069,
-        "AccountCreation": 42069,
-        "BanNotifications": 42069
-      },
-      "Roles": {
-        "Donator": 42069,
-        "Member": 42069,
-        "Banned": 42069,
-        "ReadOnly": 42069,
-        "Creator": 42069
-      }
+  "DiscordSettings": {
+    "Token": "DISCORD_BOT_API",
+    "Guild": 42069,
+    "Channels": {
+      "Commands": 42069,
+      "General": 42069,
+      "Surveilance": 42069,
+      "Cheat": 42069,
+      "LinkedAccounts": 42069,
+      "VerifyLogs": 42069,
+      "DiscordBotLogs": 42069,
+      "Verification": 42069,
+      "HelpVerify": 42069,
+      "LinkedAccountsCompact": 42069,
+      "WeazelFeed": 42069,
+      "QuizUpdates": 42069,
+      "AccountCreation": 42069,
+      "BanNotifications": 42069
+    },
+    "Roles": {
+      "Donator": 42069,
+      "Member": 42069,
+      "Banned": 42069,
+      "ReadOnly": 42069,
+      "Creator": 42069
     }
   }
+}