Merge remote-tracking branch 'origin/candidate-8.12.x' into candidate…

…-9.0.x Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Sep 7, 2023 · 8d99d52 · 8d99d52
2 parents 39536fe + 936b463
commit 8d99d52
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -675,8 +675,21 @@ int CSecureSocket::secure_accept(int logLevel)
         // Since err < 0 we call ERR_get_error() for additional info
         // if ret == SSL_ERROR_SYSCALL and ERR_get_error() == 0 then
         // its most likely a port scan / load balancer check so do not log
-        if ( (logLevel <= SSLogNormal) && (ret == SSL_ERROR_SYSCALL) && (errnum == 0) )
-            return err;
+        // with SSL 1.1.1e and 3.0 if ret == SSL_ERROR_SSL and ERR_get_error reason is EOF
+        // its also most likely a port scan / load balancer check so do not log
+        if (logLevel <= SSLogNormal)
+        {
+            if ( (ret == SSL_ERROR_SYSCALL) && (errnum == 0) )
+                return err;
+            // if ctx option SSL_OP_IGNORE_UNEXPECTED_EOF is set then will get SSL_ERROR_ZERO_RETURN ...
+            if ( (ret == SSL_ERROR_ZERO_RETURN) && (errnum == 0) )
+                return err;
+            // otherwise will get SSL_ERROR_SSL and unexpected eof ...
+#if defined(SSL_R_UNEXPECTED_EOF_WHILE_READING)
+            if ( (ret == SSL_ERROR_SSL) && (ERR_GET_REASON(errnum) == SSL_R_UNEXPECTED_EOF_WHILE_READING) )
+                return err;
+#endif
+        }
         char errbuf[512];
         ERR_error_string_n(errnum, errbuf, 512);
         errbuf[511] = '\0';