fixes

mackmarton · mackmarton · commit d572888a9bc6 · 2025-05-19T00:36:11.000+02:00
diff --git a/github-monitor/Ahk.GitHub.Monitor/GitHubMonitorFunction.cs b/github-monitor/Ahk.GitHub.Monitor/GitHubMonitorFunction.cs
@@ -6,6 +6,8 @@
 using Ahk.GitHub.Monitor.EventHandlers.BaseAndUtils;
 using Ahk.GitHub.Monitor.Helpers;
 using Ahk.GitHub.Monitor.Services.EventDispatch;
+using Azure.Identity;
+using Azure.Security.KeyVault.Secrets;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Functions.Worker;
@@ -26,6 +28,13 @@ public async Task<IActionResult> Run(
         [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = null)]
         HttpRequestData request)
     {
+        string keyVaultUrl = Environment.GetEnvironmentVariable("KEY_VAULT_URI");
+        if (keyVaultUrl == null)
+        {
+            return new BadRequestObjectResult(new { error = "Please set environment variable KEY_VAULT_URI" });
+        }
+        var secretClient = new SecretClient(new Uri(keyVaultUrl), new DefaultAzureCredential());
+
         request.Headers.TryGetValues("X-GitHub-Event", out IEnumerable<string> eventNameValues);
         var eventName = eventNameValues?.FirstOrDefault();
         request.Headers.TryGetValues("X-GitHub-Delivery", out IEnumerable<string> deliveryIdValues);
@@ -42,6 +51,11 @@ public async Task<IActionResult> Run(
             return new BadRequestObjectResult(new { error = "X-GitHub-Event header missing" });
         }
 
+        if (eventName == "ping")
+        {
+            return new OkObjectResult("pong");
+        }
+
         if (string.IsNullOrEmpty(receivedSignature))
         {
             return new BadRequestObjectResult(new { error = "X-Hub-Signature-256 header missing" });
@@ -56,19 +70,21 @@ public async Task<IActionResult> Run(
 
         var orgName = parsedRequestBody.Repository.Owner.Login;
 
-        var orgConfig = new GitHubMonitorConfig();
-        configuration.GetSection(GitHubMonitorConfig.GetSectionName(orgName)).Bind(orgConfig);
+        var githubAppId = await secretClient.GetSecretAsync($"GitHubMonitorConfig--{orgName}--GitHubAppId");
+        var githubAppPrivateKey = await secretClient.GetSecretAsync($"GitHubMonitorConfig--{orgName}--GitHubAppPrivateKey");
+        var githubWebhookSecret = await secretClient.GetSecretAsync($"GitHubMonitorConfig--{orgName}--GitHubWebhookSecret");
+
 
-        if (string.IsNullOrEmpty(orgConfig.GitHubWebhookSecret))
+        if (string.IsNullOrEmpty(githubWebhookSecret.Value.Value))
         {
             return new ObjectResult(new { error = "GitHub secret not configured" })
             {
                 StatusCode = StatusCodes.Status500InternalServerError
             };
         }
 
-        if (string.IsNullOrEmpty(orgConfig.GitHubAppId) ||
-            string.IsNullOrEmpty(orgConfig.GitHubAppPrivateKey))
+        if (string.IsNullOrEmpty(githubAppId.Value.Value) ||
+            string.IsNullOrEmpty(githubAppPrivateKey.Value.Value))
         {
             return new ObjectResult(new { error = "GitHub App ID/Token not configured" })
             {
@@ -77,7 +93,7 @@ public async Task<IActionResult> Run(
         }
 
         if (!GitHubSignatureValidator.IsSignatureValid(requestBody, receivedSignature,
-                orgConfig.GitHubWebhookSecret))
+                githubWebhookSecret.Value.Value))
         {
             return new BadRequestObjectResult(new { error = "Payload signature not valid" });
         }
diff --git a/grade-management-new/GradeManagement.Bll/Services/AssignmentEventProcessorService.cs b/grade-management-new/GradeManagement.Bll/Services/AssignmentEventProcessorService.cs
@@ -5,6 +5,7 @@
 using GradeManagement.Shared.Dtos.AssignmentEvents;
 using GradeManagement.Shared.Enums;
 
+using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 
 using Assignment = GradeManagement.Shared.Dtos.Assignment;
@@ -38,6 +39,20 @@ public async Task ConsumeAssignmentAcceptedEventAsync(AssignmentAccepted assignm
         await using var transaction = await gradeManagementDbContext.Database.BeginTransactionAsync();
         try
         {
+            var existingAssignment = await gradeManagementDbContext.Assignment.Where(
+                a => a.GithubRepoUrl == assignmentAccepted.GitHubRepositoryUrl).FirstOrDefaultAsync();
+            if (existingAssignment != null)
+            {
+                var assignmentLogForExistingAssingnment = new AssignmentLog()
+                {
+                    EventType = EventType.AssignmentAccepted,
+                    Description = $"Assignment for github repo url {assignmentAccepted.GitHubRepositoryUrl} already exists!",
+                    AssignmentId = existingAssignment.Id
+                };
+                await assignmentLogService.CreateAsync(assignmentLogForExistingAssingnment);
+                return;
+            }
+
             var repositoryName = GetRepositoryNameFromUrl(assignmentAccepted.GitHubRepositoryUrl);
             var exercise = await exerciseService.GetExerciseModelByGitHubRepoNameWithoutQfAsync(repositoryName);
             var studentGitHubId = repositoryName.Remove(0, (exercise.GithubPrefix + "-").Length);
diff --git a/grade-management-new/GradeManagement.Bll/Services/Moodle/MoodleIntegrationService.cs b/grade-management-new/GradeManagement.Bll/Services/Moodle/MoodleIntegrationService.cs
@@ -32,7 +32,7 @@ public async Task UploadScore(Score score)
         var scoreType = score.ScoreType;
         if (student.MoodleId == null) throw new MoodleSyncException("No moodle ID for student");
 
-        var token = tokenGeneratorService.GenerateAccessToken(course);
+        var token = await tokenGeneratorService.GenerateAccessToken(course);
 
         if (token == null) throw new MoodleSyncException("Token was null when trying to register score");
         var client = new HttpClient();
@@ -42,6 +42,7 @@ public async Task UploadScore(Score score)
         {
             Timestamp = DateTimeOffset.Now.ToString("O"),
             ScoreGiven = Convert.ToInt32(score.Value),
+            ScoreMaximum = 100,
             UserId = student.MoodleId,
             ActivityProgress = "Completed",
             GradingProgress = "FullyGraded"
diff --git a/grade-management-new/GradeManagement.Bll/Services/Moodle/TokenGeneratorService.cs b/grade-management-new/GradeManagement.Bll/Services/Moodle/TokenGeneratorService.cs
@@ -1,3 +1,6 @@
+using Azure.Identity;
+using Azure.Security.KeyVault.Secrets;
+
 using GradeManagement.Data.Models;
 using GradeManagement.Shared.Config;
 using GradeManagement.Shared.Exceptions;
@@ -22,9 +25,9 @@ public class TokenGeneratorService(IConfiguration configuration)
     private const string Scope =
         "https://purl.imsglobal.org/spec/lti-ags/scope/lineitem https://purl.imsglobal.org/spec/lti-ags/scope/lineitem.readonly https://purl.imsglobal.org/spec/lti-ags/scope/result.readonly https://purl.imsglobal.org/spec/lti-ags/scope/score";
 
-    public string? GenerateAccessToken(Course course)
+    public async Task<string?> GenerateAccessToken(Course course)
     {
-        var token = MakeClientAssertionToken(course);
+        var token = await MakeClientAssertionToken(course);
 
         var endPoint = "https://edu.vik.bme.hu/mod/lti/token.php";
         var client = new HttpClient();
@@ -43,7 +46,7 @@ public class TokenGeneratorService(IConfiguration configuration)
         return content?.Access_token;
     }
 
-    private string MakeClientAssertionToken(Course course)
+    private async Task<string> MakeClientAssertionToken(Course course)
     {
         var appUrl = configuration["APP_URL"];
         if (string.IsNullOrEmpty(appUrl)) throw new MoodleSyncException("App url was null or empty!");
@@ -56,14 +59,22 @@ private string MakeClientAssertionToken(Course course)
         claims.Add(new Claim("aud", "https://edu.vik.bme.hu/mod/lti/token.php"));
         claims.Add(new Claim("sub", course.MoodleClientId));
 
-        return CreateToken(claims, course);
+        return await CreateToken(claims, course);
     }
 
-    private string CreateToken(List<Claim> claims, Course course)
+    private async Task<string> CreateToken(List<Claim> claims, Course course)
     {
-        var moodleConfig = new MoodleConfig();
-        configuration.GetSection(MoodleConfig.GetSectionName(course.MoodleClientId)).Bind(moodleConfig);
-        var privateRsaKey = moodleConfig.MoodlePrivateKey;
+        string keyVaultUrl = Environment.GetEnvironmentVariable("KEY_VAULT_URI");
+        if (keyVaultUrl == null)
+        {
+            throw new Exception("Please set environment variable KEY_VAULT_URI");
+        }
+
+        var secretClient = new SecretClient(new Uri(keyVaultUrl), new DefaultAzureCredential());
+        var moodlePrivateKey =
+            await secretClient.GetSecretAsync($"{MoodleConfig.Name}--{course.MoodleClientId}--MoodlePrivateKey");
+
+        var privateRsaKey = moodlePrivateKey.Value.Value;
         if (string.IsNullOrEmpty(privateRsaKey)) throw new MoodleSyncException("Private RSA was null or empty!");
 
         privateRsaKey = privateRsaKey.Trim();
diff --git a/grade-management-new/GradeManagement.Bll/Services/Utils/RsaKeyGenerator.cs b/grade-management-new/GradeManagement.Bll/Services/Utils/RsaKeyGenerator.cs
@@ -33,15 +33,14 @@ private string ExportPrivateKey(RSA rsa)
 
     private string ExportPublicKey(RSA rsa)
     {
-        var publicKeyBytes = rsa.ExportRSAPublicKey();
+        var publicKeyBytes = rsa.ExportSubjectPublicKeyInfo();
         var base64PublicKey = Convert.ToBase64String(publicKeyBytes);
         var sb = new StringBuilder();
         sb.AppendLine("-----BEGIN PUBLIC KEY-----");
         for (int i = 0; i < base64PublicKey.Length; i += 64)
         {
             sb.AppendLine(base64PublicKey.Substring(i, Math.Min(64, base64PublicKey.Length - i)));
         }
-
         sb.AppendLine("-----END PUBLIC KEY-----");
         return sb.ToString();
     }
diff --git a/grade-management-new/GradeManagement.Client/Pages/CreationWizard.razor b/grade-management-new/GradeManagement.Client/Pages/CreationWizard.razor
@@ -11,6 +11,7 @@
 @inject LanguageClient LanguageClient
 @inject SemesterClient SemesterClient
 @inject CourseClient CourseClient
+@inject HttpClient Http
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JSRuntime
 @attribute [Authorize(Policy = Policy.RequireTeacher)]
@@ -313,8 +314,9 @@
     {
         try
         {
-            // Create proper manifest with required fields
-            GitHubAppManifest gitHubAppManifest = new();
+            string appUrl = await Http.GetStringAsync("api/config/app-url");
+            string monitorUrl = await Http.GetStringAsync("api/config/monitor-url");
+            GitHubAppManifest gitHubAppManifest = new(appUrl, monitorUrl);
 
             var manifestJson = JsonSerializer.Serialize(gitHubAppManifest);
 
diff --git a/grade-management-new/GradeManagement.Server/Controllers/ConfigController.cs b/grade-management-new/GradeManagement.Server/Controllers/ConfigController.cs
@@ -0,0 +1,38 @@
+﻿using Microsoft.AspNetCore.Mvc;
+
+namespace GradeManagement.Server.Controllers;
+
+[ApiController]
+[Route("api/config")]
+public class ConfigController : ControllerBase
+{
+    [HttpGet("app-url")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public IActionResult GetAppUrl()
+    {
+        var appUrl = Environment.GetEnvironmentVariable("APP_URL");
+
+        if (string.IsNullOrEmpty(appUrl))
+        {
+            return NotFound("APP_URL is not set.");
+        }
+
+        return Ok(appUrl);
+    }
+
+    [HttpGet("monitor-url")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public IActionResult GetMonitorUrl()
+    {
+        var monitorUrl = Environment.GetEnvironmentVariable("MONITOR_URL");
+
+        if (string.IsNullOrEmpty(monitorUrl))
+        {
+            return NotFound("MONITOR_URL is not set.");
+        }
+
+        return Ok(monitorUrl);
+    }
+}
diff --git a/grade-management-new/GradeManagement.Server/Controllers/GitHubAppController.cs b/grade-management-new/GradeManagement.Server/Controllers/GitHubAppController.cs
@@ -1,6 +1,7 @@
 using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
 
+using GradeManagement.Data;
 using GradeManagement.Shared.Dtos.GitHubManifest;
 
 using Microsoft.AspNetCore.Mvc;
@@ -38,7 +39,7 @@ await client.SetSecretAsync($"GitHubMonitorConfig--{gitHubApp.Owner.Login}--GitH
         await client.SetSecretAsync($"GitHubMonitorConfig--{gitHubApp.Owner.Login}--GitHubWebhookSecret",
             gitHubApp.WebhookSecret);
 
-        return Redirect(appUrl);
+        return Redirect($"https://github.com/organizations/ahk-dev-org/settings/apps/{gitHubApp.Slug}/installations");
     }
 
     public static string RemovePemFencing(string pem)
diff --git a/grade-management-new/GradeManagement.Server/GradeManagement.Server.http b/grade-management-new/GradeManagement.Server/GradeManagement.Server.http
@@ -1,4 +1,4 @@
-@GradeManagement.Server_HostAddress = http://localhost:5180
+@GradeManagement.Server_HostAddress = https://app.mm-home.eu
 
 GET {{GradeManagement.Server_HostAddress}}/weatherforecast/
 Accept: application/json
diff --git a/grade-management-new/GradeManagement.Server/Properties/launchSettings.json b/grade-management-new/GradeManagement.Server/Properties/launchSettings.json
@@ -14,25 +14,25 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://10.0.0.176:5180",
+      "applicationUrl": "http://10.0.0.10:5180",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "MONITOR_URL": "https://monitor.mm-home.eu/api/github-webhook",
         "KEY_VAULT_URI": "https://ahkgithubmonitorsecrets.vault.azure.net/",
-        "APP_URL": "app.mm-home.eu"
+        "APP_URL": "https://app.mm-home.eu/"
       }
     },
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": false,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://10.0.0.176:7136;http://10.0.0.176:5180",
+      "applicationUrl": "https://10.0.0.10:7136;http://10.0.0.10:5180",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "MONITOR_URL": "https://monitor.mm-home.eu/api/github-webhook",
         "KEY_VAULT_URI": "https://ahkgithubmonitorsecrets.vault.azure.net/",
-        "APP_URL": "app.mm-home.eu"
+        "APP_URL": "https://app.mm-home.eu/"
       }
     },
     "IIS Express": {
diff --git a/grade-management-new/GradeManagement.Shared/Dtos/GitHubManifest/GitHubAppManifest.cs b/grade-management-new/GradeManagement.Shared/Dtos/GitHubManifest/GitHubAppManifest.cs
@@ -2,23 +2,17 @@
 
 namespace GradeManagement.Shared.Dtos.GitHubManifest;
 
-public class GitHubAppManifest
+public class GitHubAppManifest(string appUrl, string monitorUrl)
 {
-    public GitHubAppManifest()
-    {
-        string appUrl = Environment.GetEnvironmentVariable("APP_URL");
-        RedirectUrl = $"{appUrl}api/github";
-    }
-
     [JsonPropertyName("name")] public string Name { get; set; } = "Ahk GitHub Monitor";
     [JsonPropertyName("url")] public string Url { get; set; } = "https://github.com/bmeaut/ahk-github-automation";
-    [JsonPropertyName("hook_attributes")] public HookAttributes HookAttributes { get; set; } = new();
-    [JsonPropertyName("redirect_url")] public string RedirectUrl { get; set; }
+    [JsonPropertyName("hook_attributes")] public HookAttributes HookAttributes { get; set; } = new(monitorUrl);
+    [JsonPropertyName("redirect_url")] public string RedirectUrl { get; set; } = $"{appUrl}api/github";
+
+    [JsonPropertyName("callback_urls")] public List<string> CallbackUrls { get; set; } = [appUrl];
 
-    [JsonPropertyName("callback_urls")] public List<string> CallbackUrls { get; set; } = new();
+    [JsonPropertyName("setup_url")] public string SetupUrl { get; set; } = appUrl;
 
-    /*[JsonPropertyName("setup_url")]
-    public string SetupUrl { get; set; }*/
     /*[JsonPropertyName("description")]
     public string Description { get; set; }*/
     [JsonPropertyName("public")] public bool Public { get; set; } = false;
diff --git a/grade-management-new/GradeManagement.Shared/Dtos/GitHubManifest/HookAttributes.cs b/grade-management-new/GradeManagement.Shared/Dtos/GitHubManifest/HookAttributes.cs
@@ -4,10 +4,9 @@ namespace GradeManagement.Shared.Dtos.GitHubManifest;
 
 public class HookAttributes
 {
-    public HookAttributes()
+    public HookAttributes(string monitorUrl)
     {
-        string monitorUrl = Environment.GetEnvironmentVariable("MONITOR_URL");
-        Url = $"{monitorUrl}api/github-webhooks";
+        Url = $"{monitorUrl}";
     }
 
     [JsonPropertyName("url")] public string Url { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,14 @@ private string ExportPrivateKey(RSA rsa)`
`33`	`33`
`34`	`34`	`private string ExportPublicKey(RSA rsa)`
`35`	`35`	`{`
`36`		`- var publicKeyBytes = rsa.ExportRSAPublicKey();`
	`36`	`+ var publicKeyBytes = rsa.ExportSubjectPublicKeyInfo();`
`37`	`37`	`var base64PublicKey = Convert.ToBase64String(publicKeyBytes);`
`38`	`38`	`var sb = new StringBuilder();`
`39`	`39`	`sb.AppendLine("-----BEGIN PUBLIC KEY-----");`
`40`	`40`	`for (int i = 0; i < base64PublicKey.Length; i += 64)`
`41`	`41`	`{`
`42`	`42`	`sb.AppendLine(base64PublicKey.Substring(i, Math.Min(64, base64PublicKey.Length - i)));`
`43`	`43`	`}`
`44`		`-`
`45`	`44`	`sb.AppendLine("-----END PUBLIC KEY-----");`
`46`	`45`	`return sb.ToString();`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@GradeManagement.Server_HostAddress = http://localhost:5180`
	`1`	`+@GradeManagement.Server_HostAddress = https://app.mm-home.eu`
`2`	`2`
`3`	`3`	`GET {{GradeManagement.Server_HostAddress}}/weatherforecast/`
`4`	`4`	`Accept: application/json`