Ver código fonte

HPCC-25306 Disable Dali's allow list in containerized mode

It was already disabled, but hook was still installed and
spurious misleading warnings were issued per client connect.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
Jake Smith 4 anos atrás
pai
commit
72176e080d
1 arquivos alterados com 1 adições e 3 exclusões
  1. 1 3
      dali/server/daserver.cpp

+ 1 - 3
dali/server/daserver.cpp

@@ -184,8 +184,6 @@ static IPropertyTree *getSecMgrPluginPropTree(const IPropertyTree *configTree)
  */
 static bool populateAllowListFromEnvironment(IAllowListWriter &writer)
 {
-    if (isContainerized())
-        return false;
     Owned<IRemoteConnection> conn = querySDS().connect("/Environment", 0, 0, INFINITE);
     assertex(conn);
     if (!conn->queryRoot()->hasProp("Software/DaliServerProcess"))
@@ -653,10 +651,10 @@ int main(int argc, const char* argv[])
 
         unsigned short myport = epa.item(myrank).port;
         startMPServer(DCR_DaliServer, myport, true, true);
+#ifndef _CONTAINERIZED
         Owned<IMPServer> mpServer = getMPServer();
         Owned<IAllowListHandler> allowListHandler = createAllowListHandler(populateAllowListFromEnvironment, formatDaliRole);
         mpServer->installAllowListCallback(allowListHandler);
-#ifndef _CONTAINERIZED
         setMsgLevel(fileMsgHandler, serverConfig->getPropInt("SDS/@msgLevel", 100));
 #endif
         startLogMsgChildReceiver();