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

…9.2.x Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Sep 7, 2023 · 5c0b67f · 5c0b67f
2 parents 91545c5 + 8d99d52
commit 5c0b67f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/common/thorhelper/roxiehelper.cpp b/common/thorhelper/roxiehelper.cpp
@@ -2766,7 +2766,7 @@ StringBuffer & expandLogicalFilename(StringBuffer & logicalName, const char * fn
         CDfsLogicalFileName dlfn;
         dlfn.setAllowWild(true);
         dlfn.setAllowTrailingEmptyScope(true);
-        dlfn.set(fname);
+        dlfn.set(fname+1);
         logicalName.append(dlfn.get(ignoreForeignPrefix));
     }
     else if (resolveLocally)

diff --git a/esp/src/src-react/components/Menu.tsx b/esp/src/src-react/components/Menu.tsx
@@ -218,10 +218,6 @@ export const SubNavigation: React.FunctionComponent<SubNavigationProps> = ({
         return subNavSelectedKey(hashPath);
     }, [hashPath]);
 
-    const altSubNav = React.useMemo(() => {
-        return `/${hashPath?.split("/")[1]}`;
-    }, [hashPath]);
-
     const navStyles = React.useMemo(() => mergeStyleSets({
         wrapper: {
             marginLeft: 4,
@@ -301,9 +297,10 @@ export const SubNavigation: React.FunctionComponent<SubNavigationProps> = ({
                                 href={`#${row.itemKey}`}
                                 className={[
                                     navStyles.link,
-                                    row.itemKey === "/topology/logs" && logsDisabled ? logsDisabledStyle : "",
-                                    row.itemKey === subNav || row.itemKey === altSubNav ? navStyles.active : ""
+                                    row.itemKey === subNav ? navStyles.active : "",
+                                    !subNav && row.itemKey === "/topology/configuration" ? navStyles.active : ""
                                 ].join(" ")}
+                                style={row.itemKey === "/topology/logs" && logsDisabled ? logsDisabledStyle?.style : {}}
                             >
                                 {row.headerText}
                             </Link>;

diff --git a/esp/src/src-react/theme-shims/v9ThemeShim.ts b/esp/src/src-react/theme-shims/v9ThemeShim.ts
@@ -34,7 +34,7 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
     colorNeutralForeground3BrandPressed: palette.themeDarkAlt,
     colorNeutralForeground3BrandSelected: palette.themePrimary,
     colorNeutralForeground4: palette.neutralQuaternary,
-    colorNeutralForegroundDisabled: palette.neutralTertiaryAlt,
+    colorNeutralForegroundDisabled: palette.neutralQuaternaryAlt,
     colorNeutralForegroundInvertedDisabled: whiteAlpha[40],
     colorBrandForegroundLink: palette.themeDarkAlt,
     colorBrandForegroundLinkHover: palette.themeDark,
@@ -110,7 +110,7 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
     colorTransparentBackgroundHover: "transparent",
     colorTransparentBackgroundPressed: "transparent",
     colorTransparentBackgroundSelected: "transparent",
-    colorNeutralBackgroundDisabled: palette.neutralLighter,
+    colorNeutralBackgroundDisabled: palette.neutralLight,
     colorNeutralBackgroundInvertedDisabled: whiteAlpha[10],
     colorNeutralStencil1: palette.neutralLight,
     colorNeutralStencil2: palette.neutralLighterAlt,

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';