Merge branch 'develop' into 'master'

Fix: Minor Middlewares updates See merge request ADAS-Private/HEAppE/heappe-core!93
It4innovations · Jul 25, 2023 · 019ae9d · 019ae9d
2 parents b6ba2e2 + 0831f67
commit 019ae9d
Show file tree

Hide file tree

Showing 18 changed files with 118 additions and 31 deletions.
diff --git a/BusinessLogicTier/Logic/ClusterInformation/ClusterInformationLogic.cs b/BusinessLogicTier/Logic/ClusterInformation/ClusterInformationLogic.cs
@@ -52,8 +52,8 @@ public ClusterNodeUsage GetCurrentClusterNodeUsage(long clusterNodeId, AdaptorUs
             }
 
             var clusterProjectIds = nodeType.Cluster.ClusterProjects.Select(x => x.ProjectId).ToList();
-            var availableProjectIds = loggedUser.Groups.Where(g => clusterProjectIds.Contains(g.ProjectId.Value)).Select(x => x.ProjectId.Value).ToList();
-            if (availableProjectIds.Count == 0)
+            var availableProjectIds = loggedUser.Groups.Where(g => clusterProjectIds.Contains(g.ProjectId.Value)).Select(x => x.ProjectId.Value).Distinct().ToList();
+            if (availableProjectIds.Count() == 0)
             {
                 throw new InvalidRequestException($"User {loggedUser} has no access to ClusterNodeId {clusterNodeId}.");
             }

diff --git a/BusinessLogicTier/Logic/JobReporting/Converts/JobReportingLogicConverts.cs b/BusinessLogicTier/Logic/JobReporting/Converts/JobReportingLogicConverts.cs
@@ -1,5 +1,7 @@
 using HEAppE.DomainObjects.JobManagement.JobInformation;
+using HEAppE.DomainObjects.JobReporting.Enums;
 using System;
+using System.Linq;
 
 namespace HEAppE.BusinessLogicTier.Logic.JobReporting.Converts
 {
@@ -20,8 +22,13 @@ internal static class JobReportingLogicConverts
             {
                 double walltimeInSeconds = task.AllocatedTime ?? 0;
                 int ncpus = task.AllocatedCores ?? task.Specification.MaxCores ?? 0;
-
-                return Math.Round((walltimeInSeconds * ncpus) / 3600, 3);
+                double nNodes = Math.Ceiling((double)ncpus / task.Specification.ClusterNodeType.CoresPerNode);
+                return task.Project.UsageType switch
+                {
+                    UsageType.NodeHours => Math.Round(walltimeInSeconds * nNodes / 3600.0, 3),
+                    UsageType.CoreHours => Math.Round(walltimeInSeconds * ncpus / 3600.0, 3),
+                    _ => null,
+                };
             }
             else
             {

diff --git a/BusinessLogicTier/Logic/JobReporting/JobReportingLogic.cs b/BusinessLogicTier/Logic/JobReporting/JobReportingLogic.cs
@@ -50,7 +50,7 @@ public IEnumerable<UserGroupListReport> UserGroupListReport()
             {
                 AdaptorUserGroup = adaptorUserGroup,
                 Project = GetProjectReport(adaptorUserGroup.Project, DateTime.MinValue, DateTime.UtcNow),
-                UsageType = DomainObjects.JobReporting.Enums.UsageType.CoreHours
+                UsageType = adaptorUserGroup.Project.UsageType
             }).ToList();
             return userGroupReports;
         }

diff --git a/BusinessLogicTier/Logic/Management/ManagementLogic.cs b/BusinessLogicTier/Logic/Management/ManagementLogic.cs
@@ -1,5 +1,6 @@
 using HEAppE.BusinessLogicTier.Logic.Management.Exceptions;
 using HEAppE.CertificateGenerator;
+using HEAppE.CertificateGenerator.Configuration;
 using HEAppE.DataAccessTier.UnitOfWork;
 using HEAppE.DomainObjects.ClusterInformation;
 using HEAppE.DomainObjects.JobManagement;
@@ -243,6 +244,7 @@ private ClusterAuthenticationCredentials CreateClusterAuthenticationCredentials(
                 PrivateKeyFile = keyPath,
                 PrivateKeyPassword = passphrase,
                 AuthenticationType = ClusterAuthenticationCredentialsAuthType.PrivateKey,
+                CipherType = CipherGeneratorConfiguration.Type,
                 PublicKeyFingerprint = publicKeyFingerprint,
                 ClusterProjectCredentials = new List<ClusterProjectCredentials>(),
                 IsGenerated = true
@@ -290,6 +292,7 @@ public SecureShellKey RecreateSecureShellKey(string username, string publicKey)
 
                 credentials.PrivateKeyPassword = passphrase;
                 credentials.PublicKeyFingerprint = secureShellKey.PublicKeyFingerprint;
+                credentials.CipherType = secureShellKey.CipherType;
 
                 _unitOfWork.ClusterAuthenticationCredentialsRepository.Update(credentials);
             }
@@ -320,7 +323,8 @@ public string RemoveSecureShellKey(string publicKey)
             foreach (var credentials in clusterAuthenticationCredentials)
             {
                 File.Delete(credentials.PrivateKeyFile);
-                _unitOfWork.ClusterAuthenticationCredentialsRepository.Delete(credentials);
+                credentials.IsDeleted = true;
+                _unitOfWork.ClusterAuthenticationCredentialsRepository.Update(credentials);
             }
             _unitOfWork.Save();
             return "SecureShellKey revoked";

diff --git a/DataAccessTier/DataAccessTier.csproj b/DataAccessTier/DataAccessTier.csproj
@@ -14,22 +14,23 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\CertificateGenerator\CertificateGenerator.csproj" />
     <ProjectReference Include="..\DomainObjects\DomainObjects.csproj" />
     <ProjectReference Include="..\Utils\Utils.csproj" />
   </ItemGroup>

diff --git a/DataAccessTier/MiddlewareContext.cs b/DataAccessTier/MiddlewareContext.cs
@@ -212,7 +212,9 @@ private void EnsureDatabaseSeeded()
                 Username = cc.Username,
                 Password = cc.Password,
                 PrivateKeyFile = cc.PrivateKeyFile,
-                PrivateKeyPassword = cc.PrivateKeyPassword
+                PrivateKeyPassword = cc.PrivateKeyPassword,
+                CipherType = cc.CipherType,
+                IsDeleted = cc.IsDeleted
             }));
 
             InsertOrUpdateSeedData(MiddlewareContextSettings.FileTransferMethods);
@@ -245,8 +247,16 @@ private void EnsureDatabaseSeeded()
             entries.ToList().ForEach(e => e.State = EntityState.Detached);
 
             //Update Authentication type
-            ClusterProjects.ToList().ForEach(cp => cp.ClusterProjectCredentials
-                                    .ForEach(cpc => cpc.ClusterAuthenticationCredentials.AuthenticationType = GetCredentialsAuthenticationType(cpc.ClusterAuthenticationCredentials, cp.Cluster)));
+            ClusterAuthenticationCredentials.ToList().ForEach(clusterAuthenticationCredential =>
+            {
+                var clusters = clusterAuthenticationCredential.ClusterProjectCredentials
+                                                                .Select(x => x.ClusterProject.Cluster)
+                                                                .ToList();
+                if (clusters.Count() >= 1)
+                {
+                    clusterAuthenticationCredential.AuthenticationType = GetCredentialsAuthenticationType(clusterAuthenticationCredential, clusters.First());
+                }
+            });
 
             SaveChanges();
             _log.Info("Seed data into the database completed.");
@@ -256,9 +266,29 @@ private void ValidateSeed()
         {
             _log.Info("Seed validation has started.");
             ValidateCommandTemplateToProjectReference(MiddlewareContextSettings.CommandTemplates, MiddlewareContextSettings.ClusterProjects);
+            ValidateClusterAuthenticationCredentialsClusterReference(MiddlewareContextSettings.ClusterAuthenticationCredentials);
             _log.Info("Seed validation completed.");
         }
 
+        /// <summary>
+        /// Validate ClusterAuthenticationCredentials to used clusters same proxy connection
+        /// </summary>
+        /// <param name="clusterAuthenticationCredentials"></param>
+        /// <exception cref="ApplicationException"></exception>
+        private void ValidateClusterAuthenticationCredentialsClusterReference(List<ClusterAuthenticationCredentials> clusterAuthenticationCredentials)
+        {
+            foreach (var clusterAuthenticationCredential in clusterAuthenticationCredentials)
+            {
+                var clusters = clusterAuthenticationCredential.ClusterProjectCredentials.Select(x => x.ClusterProject.Cluster).ToList();
+                if (clusters.Count() >= 1 && clusters.Any(c => c.ProxyConnection != clusters.First().ProxyConnection))
+                {
+                    string message = $"ClusterAuthenticationCredential with id {clusterAuthenticationCredential.Id} has ClusterProjectCredentials with different ProxyConnection.";
+                    _log.Error(message);
+                    throw new ApplicationException(message);
+                }
+            }
+        }
+
         /// <summary>
         /// Validate CommandTemplate to Projectcross reference to ClusterProject mapping
         /// </summary>

diff --git a/...230630110823_SshKeyGeneration.Designer.cs → ...230718105847_SshKeyGeneration.Designer.cs b/...230630110823_SshKeyGeneration.Designer.cs → ...230718105847_SshKeyGeneration.Designer.cs
diff --git a/...ations/20230630110823_SshKeyGeneration.cs → ...ations/20230718105847_SshKeyGeneration.cs b/...ations/20230630110823_SshKeyGeneration.cs → ...ations/20230718105847_SshKeyGeneration.cs
@@ -9,6 +9,13 @@ public partial class SshKeyGeneration : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.AddColumn<int>(
+                name: "UsageType",
+                table: "Project",
+                type: "int",
+                nullable: false,
+                defaultValue: 1);
+
             migrationBuilder.AlterColumn<string>(
                 name: "PreparationScript",
                 table: "CommandTemplate",
@@ -57,6 +64,13 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 nullable: false,
                 defaultValue: 0);
 
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDeleted",
+                table: "ClusterAuthenticationCredentials",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
             migrationBuilder.AddColumn<bool>(
                 name: "IsGenerated",
                 table: "ClusterAuthenticationCredentials",
@@ -75,10 +89,18 @@ protected override void Up(MigrationBuilder migrationBuilder)
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropColumn(
+                name: "UsageType",
+                table: "Project");
+
             migrationBuilder.DropColumn(
                 name: "CipherType",
                 table: "ClusterAuthenticationCredentials");
 
+            migrationBuilder.DropColumn(
+                name: "IsDeleted",
+                table: "ClusterAuthenticationCredentials");
+
             migrationBuilder.DropColumn(
                 name: "IsGenerated",
                 table: "ClusterAuthenticationCredentials");

diff --git a/DataAccessTier/Migrations/MiddlewareContextModelSnapshot.cs b/DataAccessTier/Migrations/MiddlewareContextModelSnapshot.cs
@@ -92,6 +92,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("CipherType")
                         .HasColumnType("int");
 
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsGenerated")
                         .HasColumnType("bit");
 
@@ -776,6 +779,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("StartDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<int>("UsageType")
+                        .HasColumnType("int");
+
                     b.HasKey("Id");
 
                     b.HasIndex("AccountingString")

diff --git a/...Tier/Repository/UserAndLimitationManagement/ClusterAuthenticationCredentialsRepository.cs b/...Tier/Repository/UserAndLimitationManagement/ClusterAuthenticationCredentialsRepository.cs
@@ -20,21 +20,21 @@ public IEnumerable<ClusterAuthenticationCredentials> GetAuthenticationCredential
         {
             var clusterProject = _context.ClusterProjects.FirstOrDefault(cp => cp.ClusterId == clusterId && cp.ProjectId == projectId);
             var clusterProjectCredentials = clusterProject?.ClusterProjectCredentials.FindAll(cpc => !cpc.IsServiceAccount);
-            var credentials = clusterProjectCredentials?.Select(c => c.ClusterAuthenticationCredentials);
+            var credentials = clusterProjectCredentials?.Select(c => c.ClusterAuthenticationCredentials).Where(x => !x.IsDeleted);
             return credentials?.ToList() ?? new List<ClusterAuthenticationCredentials>();
         }
 
         public ClusterAuthenticationCredentials GetServiceAccountCredentials(long clusterId, long projectId)
         {
             var clusterProject = _context.ClusterProjects.FirstOrDefault(cp => cp.ClusterId == clusterId && cp.ProjectId == projectId);
             var clusterProjectCredentials = clusterProject?.ClusterProjectCredentials.FindAll(cpc => cpc.IsServiceAccount);
-            var credentials = clusterProjectCredentials?.Select(c => c.ClusterAuthenticationCredentials);
+            var credentials = clusterProjectCredentials?.Select(c => c.ClusterAuthenticationCredentials).Where(x => !x.IsDeleted);
             return credentials?.FirstOrDefault();
         }
 
         public IEnumerable<ClusterAuthenticationCredentials> GetAllGeneratedWithFingerprint(string fingerprint)
         {
-            var credentials = _context.ClusterAuthenticationCredentials.Where(x => x.IsGenerated && x.PublicKeyFingerprint == fingerprint);
+            var credentials = _context.ClusterAuthenticationCredentials.Where(x => x.IsGenerated && !x.IsDeleted && x.PublicKeyFingerprint == fingerprint);
             return credentials?.ToList() ?? new List<ClusterAuthenticationCredentials>();
         }
         #endregion

diff --git a/DomainObjects/ClusterInformation/ClusterAuthenticationCredentials.cs b/DomainObjects/ClusterInformation/ClusterAuthenticationCredentials.cs
@@ -27,14 +27,17 @@ public class ClusterAuthenticationCredentials : IdentifiableDbEntity
         public ClusterAuthenticationCredentialsAuthType AuthenticationType { get; set; }
 
         [Required]
-        public FileTransferCipherType CipherType { get; set; } = FileTransferCipherType.RSA4096;
+        public FileTransferCipherType CipherType { get; set; } = FileTransferCipherType.Unknown;
 
         [StringLength(200)]
         public string PublicKeyFingerprint { get; set; }
 
         [Required]
         public bool IsGenerated { get; set; } = false;
 
+        [Required]
+        public bool IsDeleted { get; set; } = false;
+
         public virtual List<ClusterProjectCredentials> ClusterProjectCredentials { get; set; } = new List<ClusterProjectCredentials>();
         #endregion
         #region Override Methods

diff --git a/DomainObjects/JobManagement/Project.cs b/DomainObjects/JobManagement/Project.cs
@@ -1,4 +1,5 @@
-using System;
+using HEAppE.DomainObjects.JobReporting.Enums;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -33,6 +34,9 @@ public class Project : IdentifiableDbEntity
         [Required]
         public bool IsDeleted { get; set; } = false;
 
+        [Required]
+        public UsageType UsageType { get; set; } = UsageType.NodeHours;
+
         public virtual List<ClusterProject> ClusterProjects { get; set; } = new List<ClusterProject>();
         public virtual List<CommandTemplate> CommandTemplates { get; set; } = new List<CommandTemplate>();
 

diff --git a/DomainObjects/JobReporting/Enums/UsageType.cs b/DomainObjects/JobReporting/Enums/UsageType.cs
@@ -2,7 +2,7 @@
 {
     public enum UsageType
     {
-        CoreHours = 1,
-        NodeHours
+        NodeHours = 1,
+        CoreHours = 2
     }
 }
diff --git a/ExtModels/ExtModels.csproj b/ExtModels/ExtModels.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.5.2" />
+    <PackageReference Include="FluentValidation" Version="11.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExternalAuthentication/ExternalAuthentication.csproj b/ExternalAuthentication/ExternalAuthentication.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.31.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RestApi/seed.example.localcomputing.njson b/RestApi/seed.example.localcomputing.njson
@@ -92,14 +92,16 @@
         "Username": "heappeclient",
         "Password": "pass",
         "PrivateKeyFile": "{PrivateKeyFile}",
-        "PrivateKeyPassword": "{PrivateKeyPassword}"
+        "PrivateKeyPassword": "{PrivateKeyPassword}",
+        "CipherType": 1
       },
       {
         "Id": 2,
         "Username": "heappeclient",
         "Password": "pass",
         "PrivateKeyFile": "{PrivateKeyFile}",
-        "PrivateKeyPassword": "{PrivateKeyPassword}"
+        "PrivateKeyPassword": "{PrivateKeyPassword}",
+        "CipherType": 1
       }
     ],
     "Projects": [

diff --git a/RestApi/seed.example.njson b/RestApi/seed.example.njson
@@ -92,14 +92,16 @@
         "Username": "{UserName}",
         "Password": null,
         "PrivateKeyFile": "{PrivateKeyFile}",
-        "PrivateKeyPassword": "{PrivateKeyPassword}"
+        "PrivateKeyPassword": "{PrivateKeyPassword}",
+        "CipherType": 1
       },
       {
         "Id": 2,
         "Username": "{UserName}",
         "Password": null,
         "PrivateKeyFile": "{PrivateKeyFile}",
-        "PrivateKeyPassword": "{PrivateKeyPassword}"
+        "PrivateKeyPassword": "{PrivateKeyPassword}",
+        "CipherType": 1
       }
     ],
     "Projects": [

diff --git a/RestApiModels/RestApiModels.csproj b/RestApiModels/RestApiModels.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.5.2" />
+    <PackageReference Include="FluentValidation" Version="11.6.0" />
   </ItemGroup>
 
   <ItemGroup>