Enable Node ACL based on ECF_PERMISSIONS

Author: marcosbento

Viewer/ecflowUI/src/VTriggerAttr.cpp

@@ -152,7 +152,7 @@ namespace detail {
 
 template <typename STREAM>
 void render_expression(Expression* e, const Node& node, STREAM& stream) {
-    auto ctx = ecf::Context::make_for(PrintStyle::DEFS);
+    auto ctx = ecf::FormatContext::make_for(PrintStyle::DEFS);
 
     ecf::Indent l1(ctx);
 

libs/CMakeLists.txt

@@ -57,7 +57,6 @@ set(srcs
   # Base -- Headers
   base/src/ecflow/base/AbstractClientEnv.hpp
   base/src/ecflow/base/AbstractServer.hpp
-  base/src/ecflow/base/Algorithms.hpp
   base/src/ecflow/base/Authentication.hpp
   base/src/ecflow/base/AuthenticationDetails.hpp
   base/src/ecflow/base/Authorisation.hpp
@@ -340,6 +339,7 @@ set(srcs
   node/src/ecflow/node/ClientSuiteMgr.hpp
   node/src/ecflow/node/ClientSuites.hpp
   node/src/ecflow/node/CmdContext.hpp
+  node/src/ecflow/node/AuthorisationContext.hpp
   node/src/ecflow/node/Defs.hpp
   node/src/ecflow/node/DefsDelta.hpp
   node/src/ecflow/node/DefsTreeVisitor.hpp
@@ -366,11 +366,11 @@ set(srcs
   node/src/ecflow/node/NodeAlgorithms.hpp
   node/src/ecflow/node/NodeContainer.hpp
   node/src/ecflow/node/NodeFwd.hpp
+  node/src/ecflow/node/NodePathAlgorithms.hpp
   node/src/ecflow/node/NodeState.hpp
   node/src/ecflow/node/NodeStats.hpp
   node/src/ecflow/node/NodeTreeVisitor.hpp
   node/src/ecflow/node/Operations.hpp
-  node/src/ecflow/node/Permissions.hpp
   node/src/ecflow/node/ResolveExternsVisitor.hpp
   node/src/ecflow/node/ServerState.hpp
   node/src/ecflow/node/Signal.hpp
@@ -417,6 +417,10 @@ set(srcs
   node/src/ecflow/node/parser/VariableParser.hpp
   node/src/ecflow/node/parser/VerifyParser.hpp
   node/src/ecflow/node/parser/ZombieAttrParser.hpp
+  node/src/ecflow/node/permissions/ActivePermissions.hpp
+  node/src/ecflow/node/permissions/Allowed.hpp
+  node/src/ecflow/node/permissions/Permission.hpp
+  node/src/ecflow/node/permissions/Permissions.hpp
   # Node -- Sources
   node/src/ecflow/node/Alias.cpp
   node/src/ecflow/node/Attr.cpp
@@ -425,6 +429,7 @@ set(srcs
   node/src/ecflow/node/ClientSuiteMgr.cpp
   node/src/ecflow/node/ClientSuites.cpp
   node/src/ecflow/node/CmdContext.cpp
+  node/src/ecflow/node/AuthorisationContext.cpp
   node/src/ecflow/node/Defs.cpp
   node/src/ecflow/node/DefsDelta.cpp
   node/src/ecflow/node/EcfFile.cpp
@@ -456,7 +461,6 @@ set(srcs
   node/src/ecflow/node/NodeStats.cpp
   node/src/ecflow/node/NodeTime.cpp
   node/src/ecflow/node/NodeTreeVisitor.cpp
-  node/src/ecflow/node/Permissions.cpp
   node/src/ecflow/node/ResolveExternsVisitor.cpp
   node/src/ecflow/node/ServerState.cpp
   node/src/ecflow/node/Signal.cpp
@@ -498,6 +502,10 @@ set(srcs
   node/src/ecflow/node/parser/VariableParser.cpp
   node/src/ecflow/node/parser/VerifyParser.cpp
   node/src/ecflow/node/parser/ZombieAttrParser.cpp
+  node/src/ecflow/node/permissions/ActivePermissions.cpp
+  node/src/ecflow/node/permissions/Allowed.cpp
+  node/src/ecflow/node/permissions/Permission.cpp
+  node/src/ecflow/node/permissions/Permissions.cpp
 
   # Server -- Headers
   server/src/ecflow/server/AuthenticationService.hpp

libs/base/CMakeLists.txt

@@ -24,7 +24,6 @@ set(test_srcs
   test/TestInLimitParsing.cpp
   test/TestLogCmd.cpp
   test/TestMeterCmd.cpp
-  test/TestPermissions.cpp
   test/TestProgramOptions.cpp
   test/TestQueryCmd.cpp
   test/TestQueueCmd.cpp
@@ -60,30 +59,6 @@ target_clangformat(u_base
   CONDITION ENABLE_TESTS
 )
 
-set(test_srcs
-  # Sources
-  test/TestAlgorithms.cpp
-)
-
-ecbuild_add_test(
-  TARGET
-    u_base_algorithms
-  LABELS
-    unit nightly
-  SOURCES
-    ${test_srcs}
-  LIBS
-    ecflow_all
-    test_scaffold
-    test_harness.base
-    Threads::Threads
-    $<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
-)
-target_clangformat(u_base_algorithms
-  CONDITION ENABLE_TESTS
-)
-
-
 # The following is not technically a test (as it makes no checks),
 # but a tool to measure the time it takes to generate a job file
 if (ENABLE_ALL_TESTS)

libs/base/src/ecflow/base/AuthenticationDetails.hpp

@@ -73,8 +73,7 @@ inline authentication_t verify_user_authentication_rules(const AbstractServer& s
     }
 
     return authentication_t::failure("Authentication (user command) failed, due to: Incorrect credentials for (" +
-                                     command.identity().username() + " / " + command.identity().password() +
-                                     ") is not authentic");
+                                     command.identity().username().value() + " / <ommitted>) is not authentic");
 }
 
 template <typename COMMAND>
@@ -162,6 +161,14 @@ struct Authenticator<QueueCmd>
     }
 };
 
+template <>
+struct Authenticator<CtsWaitCmd>
+{
+    static authentication_t accept(const CtsWaitCmd& command, AbstractServer& server) {
+        return verify_authentication_rules(command, server);
+    }
+};
+
 // User commands
 
 template <>
@@ -231,14 +238,6 @@ struct Authenticator<CtsNodeCmd>
     }
 };
 
-template <>
-struct Authenticator<CtsWaitCmd>
-{
-    static authentication_t accept(const CtsWaitCmd& command, AbstractServer& server) {
-        return verify_authentication_rules(command, server);
-    }
-};
-
 template <>
 struct Authenticator<DeleteCmd>
 {
@@ -396,8 +395,6 @@ struct Authenticator<ZombieCmd>
     }
 };
 
-// Entry point for the accept() function
-
 } // namespace implementation
 
 } // namespace ecf