Merge pull request CactuseSecurity#3332 from SolidProgramming/feature_2696

tpurschke · web-flow · commit f85f982f1451 · 2025-06-21T13:21:39.000+02:00
feat(settings): Custom Logo / FWREZNETZ-459 and CSV import should always display result popup
diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql
@@ -2634,6 +2634,8 @@ INSERT INTO txt VALUES ('locked',               'German', 	'Gesperrt');
 INSERT INTO txt VALUES ('locked',               'English', 	'Locked');
 INSERT INTO txt VALUES ('unlock',               'German', 	'Entsperren');
 INSERT INTO txt VALUES ('unlock',               'English', 	'Unlock');
+INSERT INTO txt VALUES ('useCustomLogo',        'German', 	'Benutzerdefiniertes Logo');
+INSERT INTO txt VALUES ('useCustomLogo',        'English', 	'Custom logo');
 
 -- help pages
 INSERT INTO txt VALUES ('report_types',         'German', 	'Report-Typen');
@@ -2926,6 +2928,7 @@ INSERT INTO txt VALUES ('U5501', 'English', 'Are you sure you want to delete sta
 INSERT INTO txt VALUES ('U5502', 'German',  'Sind sie sicher, dass sie folgende Aktion l&ouml;schen wollen: ');
 INSERT INTO txt VALUES ('U5502', 'English', 'Are you sure you want to delete action: ');
 
+
 INSERT INTO txt VALUES ('U7001', 'German',  '&Uuml;berblick der Ereignisse im Firewall Orchestrator');
 INSERT INTO txt VALUES ('U7001', 'English', 'Alerts and events inside Firewall Orchestrator');
 INSERT INTO txt VALUES ('U7002', 'German',  'Daten sind dann verloren. Erw&auml;gen Sie eine Deaktivierung.');
@@ -3236,6 +3239,12 @@ INSERT INTO txt VALUES ('E5422', 'English', 'Entry does not contain all required
 INSERT INTO txt VALUES ('E5423', 'German',  'IP-Adresse/IP-Bereich ist fehlerhaft');
 INSERT INTO txt VALUES ('E5423', 'English', 'IP Address/IP Range malformed');
 
+INSERT INTO txt VALUES ('E5430', 'German',  'Hochgeladener Dateityp ist nicht erlaubt');
+INSERT INTO txt VALUES ('E5430', 'English', 'Uploaded Filetype is not allowed');
+
+INSERT INTO txt VALUES ('E5431', 'German',  'Hochgeladene Dateit überschreitet maximum');
+INSERT INTO txt VALUES ('E5431', 'English', 'Uploaded File exceeds the allowed maximum');
+
 INSERT INTO txt VALUES ('E6001', 'German', 	'Der Re-Login war nicht erfolgreich. Haben Sie ein falsches Passwort eingegeben? Schauen Sie f&uuml;r Details bitte in die Logs.');
 INSERT INTO txt VALUES ('E6001', 'English', 'Re-login failed. Did you enter a wrong password? See log for details.');
 
@@ -3347,6 +3356,9 @@ INSERT INTO txt VALUES ('E9301', 'English', 'Template File not found!');
 INSERT INTO txt VALUES ('E9302', 'German',  'HTML ist nicht valide!');
 INSERT INTO txt VALUES ('E9302', 'English', 'HTML is invalid!');
 
+INSERT INTO txt VALUES ('E9400', 'German',  'Leere Datei hochgeladen/keine Änderungen wurden vorgenommen');
+INSERT INTO txt VALUES ('E9400', 'English', 'Empty file provided/no changes where applied');
+
 -- errors from Api
 INSERT INTO txt VALUES ('A0001', 'German',  'Ung&uuml;ltige Anmeldedaten. Nutzername darf nicht leer sein');
 INSERT INTO txt VALUES ('A0001', 'English', 'Invalid credentials. Username must not be empty');
diff --git a/roles/database/files/upgrade/8.8.4.sql b/roles/database/files/upgrade/8.8.4.sql
@@ -1 +1,3 @@
+insert into config (config_key, config_value, config_user) VALUES ('useCustomLogo', 'False', 0) ON CONFLICT DO NOTHING;
+insert into config (config_key, config_value, config_user) VALUES ('customLogoData', '', 0) ON CONFLICT DO NOTHING;
 insert into stm_action (action_id,action_name) VALUES (30,'ask') ON CONFLICT DO NOTHING; -- cp
diff --git a/roles/lib/files/FWO.Basics/GlobalConstants.cs b/roles/lib/files/FWO.Basics/GlobalConstants.cs
@@ -63,6 +63,8 @@ public struct GlobalConst
         public const string ChromeBinPathLinux = "/usr/local/fworch/bin";
         public const string TestPDFFilePath = "pdffile.pdf";
         public const string TestPDFHtmlTemplate = "<html><body><h1>test</h1><h2>test mit puppteer</h2></body></html>";
+
+        public const int MaxUploadFileSize = 5 * 1024 * 1024; // 5 MB
     }
 
     public struct PageName
diff --git a/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs b/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using FWO.Basics;
@@ -31,7 +31,13 @@ public class ConfigData : ICloneable
 		[JsonProperty("welcomeMessage"), JsonPropertyName("welcomeMessage")]
 		public string WelcomeMessage { get; set; } = "";
 
-		[JsonProperty("maxMessages"), JsonPropertyName("maxMessages"), UserConfigData]
+        [JsonProperty("useCustomLogo"), JsonPropertyName("useCustomLogo")]
+        public bool UseCustomLogo { get; set; }
+
+        [JsonProperty("customLogoData"), JsonPropertyName("customLogoData")]
+        public string CustomLogoData { get; set; }
+
+        [JsonProperty("maxMessages"), JsonPropertyName("maxMessages"), UserConfigData]
 		public int MaxMessages { get; set; } = 3;
 
 		[JsonProperty("elementsPerFetch"), JsonPropertyName("elementsPerFetch"), UserConfigData]
diff --git a/roles/lib/files/FWO.Data/CSVAppServerImportModel.cs b/roles/lib/files/FWO.Data/CSVAppServerImportModel.cs
@@ -1,7 +1,7 @@
 using FWO.Basics;
 using FWO.Data.Modelling;
 
-namespace FWO.Ui.Data
+namespace FWO.Data
 {
     public class CSVAppServerImportModel
     {
diff --git a/roles/lib/files/FWO.Data/CSVFileUploadErrorModel.cs b/roles/lib/files/FWO.Data/CSVFileUploadErrorModel.cs
@@ -1,4 +1,4 @@
-namespace FWO.Ui.Data
+namespace FWO.Data
 {
     /// <summary>
     /// Defines a model for errors that occured on csv file upload
diff --git a/roles/lib/files/FWO.Data/ErrorBaseModel.cs b/roles/lib/files/FWO.Data/ErrorBaseModel.cs
@@ -1,4 +1,4 @@
-namespace FWO.Ui.Data
+namespace FWO.Data
 {
     public class ErrorBaseModel()
     {
diff --git a/roles/lib/files/FWO.Data/MessageType.cs b/roles/lib/files/FWO.Data/MessageType.cs
@@ -1,4 +1,4 @@
-﻿namespace FWO.Ui.Data
+namespace FWO.Data
 {
     public enum MessageType
     {
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/AppServerImportEvent.cs b/roles/lib/files/FWO.Services/EventMediator/Events/AppServerImportEvent.cs
@@ -0,0 +1,15 @@
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class AppServerImportEvent(AppServerImportEventArgs? eventArgs = default) : IEvent
+    {
+        public AppServerImportEventArgs? EventArgs { get; set; } = eventArgs ?? new AppServerImportEventArgs();
+
+        IEventArgs? IEvent.EventArgs
+        {
+            get => EventArgs;
+            set => EventArgs = value as AppServerImportEventArgs;
+        }
+    }
+}
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/AppServerImportEventArgs.cs b/roles/lib/files/FWO.Services/EventMediator/Events/AppServerImportEventArgs.cs
@@ -0,0 +1,12 @@
+using FWO.Data;
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class AppServerImportEventArgs(bool success = false) : IEventArgs
+    {
+        public bool Success { get; set; } = success;
+        public List<CSVFileUploadErrorModel> Errors { get; set; } = [];
+        public List<string> Appserver { get; set; } = [];
+    }
+}
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEvent.cs b/roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEvent.cs
@@ -4,6 +4,6 @@ namespace FWO.Services.EventMediator.Events
 {
     public class CollectionChangedEvent(CollectionChangedEventArgs? eventArgs = default) : IEvent
     {
-        public IEventArgs? EventArgs { get; set; } = eventArgs;
+        IEventArgs? IEvent.EventArgs { get; set; }
     }
 }
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEventArgs.cs b/roles/lib/files/FWO.Services/EventMediator/Events/CollectionChangedEventArgs.cs
@@ -1,9 +1,11 @@
+using FWO.Data;
 using FWO.Services.EventMediator.Interfaces;
 
 namespace FWO.Services.EventMediator.Events
 {
-    public class CollectionChangedEventArgs(IEnumerable<dynamic> collection) : IEventArgs
+    public class CollectionChangedEventArgs(IEnumerable<dynamic>? collection = default, ErrorBaseModel? error = default) : IEventArgs
     {
-        IEnumerable<dynamic> Collection { get; } = collection;
+        public ErrorBaseModel? Error { get; set; } = error ?? new ErrorBaseModel();
+        IEnumerable<dynamic> Collection { get; } = collection ?? [];
     }
 }
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/FileUploadEvent.cs b/roles/lib/files/FWO.Services/EventMediator/Events/FileUploadEvent.cs
@@ -0,0 +1,15 @@
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class FileUploadEvent(FileUploadEventArgs? eventArgs = default) : IEvent
+    {
+        public FileUploadEventArgs? EventArgs { get; set; } = eventArgs ?? new FileUploadEventArgs();
+
+        IEventArgs? IEvent.EventArgs
+        {
+            get => EventArgs;
+            set => EventArgs = value as FileUploadEventArgs;
+        }
+    }
+}
diff --git a/roles/lib/files/FWO.Services/EventMediator/Events/FileUploadEventArgs.cs b/roles/lib/files/FWO.Services/EventMediator/Events/FileUploadEventArgs.cs
@@ -0,0 +1,13 @@
+using FWO.Data;
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class FileUploadEventArgs(bool success = false, string? fileName = null, ErrorBaseModel? error = default) : IEventArgs
+    {
+        public bool Success { get; set; } = success;
+        public string? FileName { get; set; } = fileName;
+        public dynamic? Data { get; set; }
+        public ErrorBaseModel? Error { get; set; } = error ?? new ErrorBaseModel();
+    }
+}
diff --git a/roles/ui/files/FWO.UI/Data/FileUploadCase.cs b/roles/ui/files/FWO.UI/Data/FileUploadCase.cs
@@ -1,8 +1,9 @@
-﻿namespace FWO.Ui.Data
+namespace FWO.Ui.Data
 {
     public enum FileUploadCase
     {
         Undefined,
-        ImportAppServerFromCSV
+        ImportAppServerFromCSV,
+        CustomLogoUpload
     }
 }
diff --git a/roles/ui/files/FWO.UI/Data/UIMessage.cs b/roles/ui/files/FWO.UI/Data/UIMessage.cs
@@ -1,4 +1,6 @@
-﻿namespace FWO.Ui.Data
+using FWO.Data;
+
+namespace FWO.Ui.Data
 {
     public class UIMessage
     {
diff --git a/roles/ui/files/FWO.UI/Pages/Login.razor b/roles/ui/files/FWO.UI/Pages/Login.razor
@@ -21,10 +21,17 @@
 
 @if (showLoginForm)
 {    
-    <div class="row text-center">
-        <div class="col-xl col-lg col-md-3 col-sm-2"></div>
-        <div class="col-xl-2 col-lg-3 col-md-6 col-sm-8 col-xs-12">
-            <img src="images/FWO_logo.png">
+    <div class="row text-center mt-2">
+        <div class="col-xl col-lg col-md col-sm col"></div>
+        <div class="col-xl-3 col-lg-4 col-md-6 col-sm-8 col-10">
+            @if(globalConfig.UseCustomLogo)
+            {
+                <img src="data:image/png;base64, @(globalConfig.CustomLogoData)" class="rounded custom-logo" alt="">
+            }
+            else
+            {
+                <img src="/images/FWO_logo.png">
+            }
             <br><br>            
         @* <h2 class="text-center"> @(userConfig.GetText("login")) </h2> *@
             <div class="shadow-sm card p-3">
@@ -50,8 +57,8 @@
                     }
                 </form>  
             </div>
-        </div> 
-        <div class="col-xl col-lg col-md-3 col-sm-2"></div>       
+        </div>
+        <div class="col-xl col-lg col-md col-sm col"></div>
     </div>
     @if(ShowWelcomeMessage)
     {
diff --git a/roles/ui/files/FWO.UI/Pages/Login.razor.css b/roles/ui/files/FWO.UI/Pages/Login.razor.css
@@ -0,0 +1,29 @@
+.custom-logo {
+    width: 100%;
+    max-width: 180px;
+    height: auto;
+}
+
+@media (min-width: 576px) {
+    .custom-logo {
+        max-width: 220px;
+    }
+}
+
+@media (min-width: 768px) {
+    .custom-logo {
+        max-width: 260px;
+    }
+}
+
+@media (min-width: 992px) {
+    .custom-logo {
+        max-width: 200px;
+    }
+}
+
+@media (min-width: 1200px) {
+    .custom-logo {
+        max-width: 250px;
+    }
+}
diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor
@@ -304,7 +304,6 @@
                 await AppRoleHandler.InitAppRole(newArea);
 
                 EventMediator.Publish<CollectionChangedEvent>(nameof(EditAppRole), OnCollectionChanged);
-
                 workInProgress = false;
             }
         }
diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsDefaults.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsDefaults.razor
diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor
diff --git a/roles/ui/files/FWO.UI/Services/FileUploadService.cs b/roles/ui/files/FWO.UI/Services/FileUploadService.cs
diff --git a/roles/ui/files/FWO.UI/Shared/CSVFileUpload.razor b/roles/ui/files/FWO.UI/Shared/CSVFileUpload.razor
diff --git a/roles/ui/files/FWO.UI/Shared/CustomLogoUpload.razor b/roles/ui/files/FWO.UI/Shared/CustomLogoUpload.razor
diff --git a/roles/ui/files/FWO.UI/Shared/CustomLogoUpload.razor.css b/roles/ui/files/FWO.UI/Shared/CustomLogoUpload.razor.css
diff --git a/roles/ui/files/FWO.UI/Shared/FileUpload.razor b/roles/ui/files/FWO.UI/Shared/FileUpload.razor

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+insert into config (config_key, config_value, config_user) VALUES ('useCustomLogo', 'False', 0) ON CONFLICT DO NOTHING;`
	`2`	`+insert into config (config_key, config_value, config_user) VALUES ('customLogoData', '', 0) ON CONFLICT DO NOTHING;`
`1`	`3`	`insert into stm_action (action_id,action_name) VALUES (30,'ask') ON CONFLICT DO NOTHING; -- cp`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ public struct GlobalConst`
`63`	`63`	`public const string ChromeBinPathLinux = "/usr/local/fworch/bin";`
`64`	`64`	`public const string TestPDFFilePath = "pdffile.pdf";`
`65`	`65`	`public const string TestPDFHtmlTemplate = "<html><body><h1>test</h1><h2>test mit puppteer</h2></body></html>";`
	`66`	`+`
	`67`	`+ public const int MaxUploadFileSize = 5 * 1024 * 1024; // 5 MB`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`public struct PageName`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using FWO.Basics;`
`2`	`2`	`using FWO.Data.Modelling;`
`3`	`3`
`4`		`-namespace FWO.Ui.Data`
	`4`	`+namespace FWO.Data`
`5`	`5`	`{`
`6`	`6`	`public class CSVAppServerImportModel`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace FWO.Ui.Data`
	`1`	`+namespace FWO.Data`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Defines a model for errors that occured on csv file upload`