Refactor application settings and enhance service functionalities

.gitattributes

@@ -42,4 +42,5 @@
 *.ttf binary
 *.eot binary
 *.otf binary
-*.svg binary
+*.svg binary
+*.bin binary

.vscode/settings.json

@@ -21,5 +21,6 @@
     },
     "chat.instructionsFilesLocations": {
         ".github/instructions": false
-    }
+    },
+    "dotnet.defaultSolution": "src/S7Tools.sln"
 }

benchmarks/S7Tools.Benchmarks/ProfileCrudBenchmarks.cs

@@ -135,9 +135,8 @@ private class MockPathService : IPathService
         public string SerialProfilesPath => Path.Combine(ProfilesDirectory, "Serial", "SerialProfiles.json");
         public string SocatProfilesPath => Path.Combine(ProfilesDirectory, "Socat", "SocatProfiles.json");
         public string PowerSupplyProfilesPath => Path.Combine(ProfilesDirectory, "PowerSupply", "PowerSupplyProfiles.json");
-        public string MemoryRegionProfilesPath => Path.Combine(ProfilesDirectory, "MemoryRegions", "MemoryRegionProfiles.json");
+        public string MemoryRegionProfilesPath => Path.Combine(ProfilesDirectory, "MemoryRegion", "MemoryRegionProfiles.json");
         public string PayloadSetProfilesPath => Path.Combine(ProfilesDirectory, "PayloadSets", "PayloadSetProfiles.json");
-        public string MemoryRegionsDirectory => Path.Combine(ResourcesDirectory, "MemoryRegions");
         public string LogsDirectory => Path.Combine(ResourcesDirectory, "Logs");
         public string MainLogsDirectory => Path.Combine(LogsDirectory, "Main");
         public string ExportedLogsDirectory => Path.Combine(LogsDirectory, "Exported");

bootloader-payloads/payloads/lib/print.c

@@ -14,6 +14,7 @@
 
 #include "print.h"
 #include "stdlib.h"
+#include "read.h"
 
 #define BUF_LEN 16
 
@@ -194,6 +195,13 @@ int UART_protocol_send_many(const char *s, unsigned int len) {
     unsigned int transfer_size;
 
     while(i<len) {
+        // Check for cancellation signal from host (0x03)
+        if (is_data_available()) {
+            if (read_byte_blocking() == 0x03) {
+                break;
+            }
+        }
+
         if(len-i < CHUNK_SIZE) {
             transfer_size = len-i;
         } else {

bootloader-payloads/payloads/lib/read.h

@@ -19,4 +19,7 @@ int UART_protocol_recv_chunk(char *buf, int bufsize);
 */
 int UART_protocol_recv(char *buf, int n);
 
+int is_data_available(void);
+int read_byte_blocking(void);
+
 #endif

bootloader-payloads/payloads_out/README.md

@@ -0,0 +1,31 @@
+# Compiled SiemensS7-Bootloader Payloads
+
+This directory contains the compiled payloads extracted from the Docker build process.
+
+## Payload Descriptions
+
+### dump_mem/
+
+- **dump_mem.bin**: Binary payload for memory dumping
+
+### hello_loop/
+
+- **hello_loop.bin**: Binary payload for hello loop demonstration
+
+### tic_tac_toe/
+
+- **tic_tac_toe.bin**: Binary payload for tic-tac-toe game
+
+### hello_world/
+
+- **hello_world.bin**: Simple hello world binary payload
+
+### stager/
+
+- **stager.bin**: Stager payload binary
+
+## Usage
+
+These compiled payloads can be used with the SiemensS7-Bootloader for exploitation and testing purposes.
+
+Extraction method: Docker volume mount

src/S7Tools.Core/Constants/ColorPalette.cs

@@ -7,7 +7,7 @@ namespace S7Tools.Core.Constants;
 /// These RGB color values ensure consistent visual feedback across all UI components.
 /// Each color is defined with RGB byte values (0-255) for red, green, and blue channels.
 /// </remarks>
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
 public static class ColorPalette
 {
     #region Log Level Colors
@@ -18,8 +18,11 @@ public static class ColorPalette
     /// </summary>
     public static class Trace
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 128;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 128;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 128;
     }
 
@@ -29,8 +32,11 @@ public static class Trace
     /// </summary>
     public static class Debug
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 0;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 122;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 204;
     }
 
@@ -40,8 +46,11 @@ public static class Debug
     /// </summary>
     public static class Information
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 0;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 150;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 0;
     }
 
@@ -51,8 +60,11 @@ public static class Information
     /// </summary>
     public static class Warning
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 255;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 165;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 0;
     }
 
@@ -62,8 +74,11 @@ public static class Warning
     /// </summary>
     public static class WarningLight
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 255;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 152;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 0;
     }
 
@@ -73,8 +88,11 @@ public static class WarningLight
     /// </summary>
     public static class Error
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 220;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 20;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 60;
     }
 
@@ -84,8 +102,11 @@ public static class Error
     /// </summary>
     public static class ErrorRed
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 211;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 47;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 47;
     }
 
@@ -95,8 +116,11 @@ public static class ErrorRed
     /// </summary>
     public static class Critical
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 139;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 0;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 0;
     }
 
@@ -106,8 +130,11 @@ public static class Critical
     /// </summary>
     public static class None
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 64;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 64;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 64;
     }
 
@@ -117,11 +144,14 @@ public static class None
     /// </summary>
     public static class Default
     {
+        /// <summary>Gets the red channel value.</summary>
         public const byte R = 128;
+        /// <summary>Gets the green channel value.</summary>
         public const byte G = 128;
+        /// <summary>Gets the blue channel value.</summary>
         public const byte B = 128;
     }
 
     #endregion
 }
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+

src/S7Tools.Core/Constants/ResourcePathConstants.cs

@@ -58,7 +58,13 @@ public static class ResourcePaths
         /// <summary>
         /// Folder name for memory region profiles
         /// </summary>
-        public const string MemoryRegionsFolder = "MemoryRegions";
+        public const string MemoryRegionFolder = "MemoryRegion";
+
+        /// <summary>
+        /// Legacy folder name for memory region profiles used by previous versions.
+        /// Keep for backward compatibility when probing or migrating existing profiles.
+        /// </summary>
+        public const string LegacyMemoryRegionsFolder = "MemoryRegions";
 
         /// <summary>
         /// File name for memory region profiles JSON file

src/S7Tools.Core/Logging/IStructuredLogger.cs → src/S7Tools.Core/Interfaces/Logging/IStructuredLogger.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
-namespace S7Tools.Core.Logging;
+namespace S7Tools.Core.Interfaces.Logging;
 
 /// <summary>
 /// Defines a structured logger with enhanced logging capabilities.