Fix: Bug #170 - "just send 8-bit” messages shown with wrong encoding (#…

…1344)

.dockerignore

@@ -4,6 +4,7 @@
 .gitignore
 .vs
 .vscode
+.idea
 **/bin
 **/obj
 Rnwood.Smtp4dev/ClientApp/node_modules

.gitignore

@@ -8,6 +8,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+.idea
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

.vscode/launch.json

@@ -8,7 +8,7 @@
             "type": "coreclr",
             "request": "launch",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Rnwood.Smtp4dev/bin/Debug/netcoreapp3.1/Rnwood.Smtp4dev.dll",
+            "program": "${workspaceFolder}/Rnwood.Smtp4dev/bin/Debug/net8.0/Rnwood.Smtp4dev.dll",
             "cwd": "${workspaceFolder}/Rnwood.Smtp4dev",
             "args": "--urls http://localhost:5000",
             "stopAtEntry": false,

Rnwood.Smtp4dev/ApiModel/Message.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Rnwood.Smtp4dev.ApiModel
@@ -20,6 +21,8 @@ public Message(DbModel.Message dbMessage)
             ReceivedDate = dbMessage.ReceivedDate;
             Subject = dbMessage.Subject;
             SecureConnection = dbMessage.SecureConnection;
+            SessionEncoding = dbMessage.SessionEncoding;
+            EightBitTransport = dbMessage.EightBitTransport;
 
             Parts = new List<MessageEntitySummary>(1);
             RelayError = dbMessage.RelayError;
@@ -72,6 +75,10 @@ public Message(DbModel.Message dbMessage)
             }
         }
 
+        public string SessionEncoding { get; set; }
+
+        public bool? EightBitTransport { get; set; }
+
 
         private MessageEntitySummary HandleMimeEntity(MimeEntity entity)
         {
@@ -154,23 +161,34 @@ internal static FileStreamResult GetPartContent(Message result, string cid)
         internal static string GetPartContentAsText(Message result, string id)
         {
             var contentEntity = GetPart(result, id);
-
+            
             if (contentEntity is MimePart part)
             {
-                using var reader = new StreamReader(part.Content.Open());
+                var encoding = part.ContentType.CharsetEncoding ?? ApiModel.Message.GetSessionEncodingOrAssumed(result);
+                using var reader = new StreamReader(part.Content.Open(), encoding);
                 return reader.ReadToEnd();
             }
 
             return contentEntity.ToString();
 
         }
 
+        internal static Encoding GetSessionEncodingOrAssumed(Message result)
+        {
+            return !string.IsNullOrEmpty(result.SessionEncoding) ? Encoding.GetEncoding(result.SessionEncoding) : Encoding.Latin1;
+        }
 
 
         internal static string GetPartSource(Message message, string id)
         {
             var contentEntity = GetPart(message, id);
-            return contentEntity.ToString();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                contentEntity.WriteTo(ms, false);
+                var encoding = contentEntity.ContentType.CharsetEncoding ??ApiModel.Message.GetSessionEncodingOrAssumed(message);
+                return encoding.GetString(ms.GetBuffer());
+            }
+
         }
 
 

Rnwood.Smtp4dev/ClientApp/src/components/messagesource.vue

@@ -68,7 +68,7 @@
 
                     } else {
                         this.sourceurl = new MessagesController().getMessageSource_url(this.message.id);
-                        this.source = await new MessagesController().getMessageSourceRaw(this.message.id);
+                        this.source = await new MessagesController().getMessageSource(this.message.id);
 
                     }
                 }