Merge pull request CactuseSecurity#3216 from tpurschke/develop

improve exception handling

Author: tpurschke

roles/middleware/files/FWO.Middleware.Server/AppDataImport.cs

@@ -51,7 +51,7 @@ public async Task<bool> Run()
 			try
 			{
 				NamingConvention = JsonSerializer.Deserialize<ModellingNamingConvention>(globalConfig.ModNamingConvention) ?? new();
-				List<string> importfilePathAndNames = JsonSerializer.Deserialize<List<string>>(globalConfig.ImportAppDataPath) ?? throw new Exception("Config Data could not be deserialized.");
+				List<string> importfilePathAndNames = JsonSerializer.Deserialize<List<string>>(globalConfig.ImportAppDataPath) ?? throw new JsonException("Config Data could not be deserialized.");
 				userConfig = new(globalConfig);
 				userConfig.User.Name = Roles.MiddlewareServer;
                 userConfig.AutoReplaceAppServer = globalConfig.AutoReplaceAppServer;
@@ -76,8 +76,8 @@ public async Task<bool> Run()
 		private async Task InitLdap()
 		{
 			connectedLdaps = await apiConnection.SendQueryAsync<List<Ldap>>(AuthQueries.getLdapConnections);
-			internalLdap = connectedLdaps.FirstOrDefault(x => x.IsInternal() && x.HasGroupHandling()) ?? throw new Exception("No internal Ldap with group handling found.");
-			ownerGroupLdap = connectedLdaps.FirstOrDefault(x => x.Id == globalConfig.OwnerLdapId) ?? throw new Exception("Ldap with group handling not found.");
+			internalLdap = connectedLdaps.FirstOrDefault(x => x.IsInternal() && x.HasGroupHandling()) ?? throw new KeyNotFoundException("No internal Ldap with group handling found.");
+			ownerGroupLdap = connectedLdaps.FirstOrDefault(x => x.Id == globalConfig.OwnerLdapId) ?? throw new KeyNotFoundException("Ldap with group handling not found.");
 			modellerRoleDn = $"cn=modeller,{internalLdap.RoleSearchPath}";
 			requesterRoleDn = $"cn=requester,{internalLdap.RoleSearchPath}";
 			implementerRoleDn = $"cn=implementer,{internalLdap.RoleSearchPath}";
@@ -102,7 +102,7 @@ private async Task<bool> ImportSingleSource(string importfileName)
 			try
 			{
 				ReadFile(importfileName);
-				ModellingImportOwnerData? importedOwnerData = JsonSerializer.Deserialize<ModellingImportOwnerData>(importFile) ?? throw new Exception("File could not be parsed.");
+				ModellingImportOwnerData? importedOwnerData = JsonSerializer.Deserialize<ModellingImportOwnerData>(importFile) ?? throw new JsonException("File could not be parsed.");
 				if (importedOwnerData != null && importedOwnerData.Owners != null)
 				{
 					importedApps = importedOwnerData.Owners;
@@ -301,7 +301,7 @@ private string GetGroupDn(string extAppIdString)
 		{
             if (ownerGroupLdapPath == null)
             {
-                throw new Exception("Owner group LDAP path is not set.");
+				throw new ArgumentNullException(nameof(ownerGroupLdapPath));
             }
 			return $"cn={GetGroupName(extAppIdString)},{ownerGroupLdapPath}";
 		}
@@ -425,7 +425,7 @@ private async Task<string> CreateUserGroup(ModellingImportAppData incomingApp)
 
 		private async Task<string> UpdateUserGroup(ModellingImportAppData incomingApp, string groupDn)
 		{
-			List<string> existingMembers = (allGroups.FirstOrDefault(x => x.GroupDn == groupDn) ?? throw new Exception("Group could not be found.")).Members;
+			List<string> existingMembers = (allGroups.FirstOrDefault(x => x.GroupDn == groupDn) ?? throw new KeyNotFoundException($"Group with DN '{groupDn}' could not be found.")).Members;
 			if (incomingApp.Modellers != null)
 			{
 				foreach (var modeller in incomingApp.Modellers)