Misc updates. Enabled possibility to log clear text passwords via scr…

…ipts. (may be removed again later)
SorenRR · Sep 24, 2024 · 439661c · 439661c
1 parent 8b68d64
commit 439661c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/hmailserver/installation/hMailServer.iss b/hmailserver/installation/hMailServer.iss
@@ -1,11 +1,11 @@
 [Setup]
 AppName=hMailServer
-AppVerName=hMailServer 5.6.9-B2644.95 (x86)
+AppVerName=hMailServer 5.6.9-B2644.97 (x86)
 AppCopyright=Copyright (C) 2024
 DefaultDirName={pf}\hMailServer
 DefaultGroupName=hMailServer
 PrivilegesRequired=admin
-OutputBaseFilename=hMailServer-5.6.9-B2644.95-(x86)
+OutputBaseFilename=hMailServer-5.6.9-B2644.97-(x86)
 SolidCompression=yes
 WizardImageFile=setup.bmp
 LicenseFile=license.rtf

diff --git a/hmailserver/source/Server/Common/AntiSpam/DKIM/DKIMParameters.cpp b/hmailserver/source/Server/Common/AntiSpam/DKIM/DKIMParameters.cpp
@@ -33,7 +33,9 @@ namespace HM
          paramName.Trim();
          paramValue.Trim();
 
-         if (paramName == "h")
+         if (paramName == "p")
+            paramValue.Replace(" ", "");
+         else if (paramName == "h")
             paramValue.Replace(" ", "");
          else if (paramName == "i")
             paramValue = DKIMQPDecode_(paramValue);

diff --git a/hmailserver/source/Server/Common/Application/Version.h b/hmailserver/source/Server/Common/Application/Version.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define HMAILSERVER_VERSION "5.6.9"
-#define HMAILSERVER_BUILD "2644.95 (x86)"
+#define HMAILSERVER_BUILD "2644.97 (x86)"
 
 /*
 [list=1]
@@ -90,5 +90,8 @@
 [*]Update: Replacement for the old SA "winsock error 2" workaround/fix and eliminates (all) EOF errors/warnings (and forced disconnects, possible related to HM5136?) altogether
 [*]Update: OpenSSL 3.0.14
 [*]Fix: Improved AUTH PLAIN base64 encoded username and password masking, retain client command format for troubleshooting purposes
+[*]Fix: SURBL modification to check full URI's and trimmed down URI's
+[*]Fix: Strip possible spaces in DKIM 'p' parameter, there shouldn't be any spaces but it's a common mistake so we act lenient and strip any spaces found
+[*]Update: remove password blocking.
 [/list]
 */
diff --git a/hmailserver/source/Server/IMAP/IMAPCommandLogin.cpp b/hmailserver/source/Server/IMAP/IMAPCommandLogin.cpp
@@ -67,7 +67,7 @@ namespace HM
       } 
 
       const bool isAuthenticated = pAccount != nullptr;
-      String sPasswordCopy = !isAuthenticated ? sPassword : "***";
+      String sPasswordCopy = !isAuthenticated ? sPassword : sPassword; // replace last with "***" for privacy.
 
       if (Configuration::Instance()->GetUseScriptServer())
       {

diff --git a/hmailserver/source/Server/POP3/POP3Connection.cpp b/hmailserver/source/Server/POP3/POP3Connection.cpp
@@ -459,7 +459,7 @@ namespace HM
       }
 
       const bool isAuthenticated = account_ != nullptr;
-      String sPasswordCopy = !isAuthenticated ? password_ : "***";
+      String sPasswordCopy = !isAuthenticated ? password_ : password_; // replace last with "***" for privacy.
 
       if (Configuration::Instance()->GetUseScriptServer())
       {

diff --git a/hmailserver/source/Server/SMTP/SMTPConnection.cpp b/hmailserver/source/Server/SMTP/SMTPConnection.cpp
@@ -1856,7 +1856,7 @@ namespace HM
          return;
       }  
 
-      String sPasswordCopy = !isAuthenticated_ ? password_ : "***";
+      String sPasswordCopy = !isAuthenticated_ ? password_ : password_; // replace last with "***" for privacy.
 
       // Let's add an event call on DATA so we can act on reception during SMTP conversation..
       if (Configuration::Instance()->GetUseScriptServer())
@@ -2221,7 +2221,7 @@ namespace HM
       }
 
       isAuthenticated_ = pAccount != nullptr;
-      String sPasswordCopy = !isAuthenticated_ ? password_ : "***";
+      String sPasswordCopy = !isAuthenticated_ ? password_ : password_; // replace last with "***" for privacy.
 
       if (Configuration::Instance()->GetUseScriptServer())
       {