Skip to content

Commit ec2b2b2

Browse files
committed
Enable Node ACL based on ECF_PERMISSIONS
1 parent 4005a1a commit ec2b2b2

81 files changed

Lines changed: 2120 additions & 693 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Viewer/ecflowUI/src/VTriggerAttr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ namespace detail {
152152

153153
template <typename STREAM>
154154
void render_expression(Expression* e, const Node& node, STREAM& stream) {
155-
auto ctx = ecf::Context::make_for(PrintStyle::DEFS);
155+
auto ctx = ecf::FormatContext::make_for(PrintStyle::DEFS);
156156

157157
ecf::Indent l1(ctx);
158158

libs/CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ set(srcs
5757
# Base -- Headers
5858
base/src/ecflow/base/AbstractClientEnv.hpp
5959
base/src/ecflow/base/AbstractServer.hpp
60-
base/src/ecflow/base/Algorithms.hpp
6160
base/src/ecflow/base/Authentication.hpp
6261
base/src/ecflow/base/AuthenticationDetails.hpp
6362
base/src/ecflow/base/Authorisation.hpp
@@ -341,6 +340,7 @@ set(srcs
341340
node/src/ecflow/node/ClientSuiteMgr.hpp
342341
node/src/ecflow/node/ClientSuites.hpp
343342
node/src/ecflow/node/CmdContext.hpp
343+
node/src/ecflow/node/AuthorisationContext.hpp
344344
node/src/ecflow/node/Defs.hpp
345345
node/src/ecflow/node/DefsDelta.hpp
346346
node/src/ecflow/node/DefsTreeVisitor.hpp
@@ -367,11 +367,11 @@ set(srcs
367367
node/src/ecflow/node/NodeAlgorithms.hpp
368368
node/src/ecflow/node/NodeContainer.hpp
369369
node/src/ecflow/node/NodeFwd.hpp
370+
node/src/ecflow/node/NodePathAlgorithms.hpp
370371
node/src/ecflow/node/NodeState.hpp
371372
node/src/ecflow/node/NodeStats.hpp
372373
node/src/ecflow/node/NodeTreeVisitor.hpp
373374
node/src/ecflow/node/Operations.hpp
374-
node/src/ecflow/node/Permissions.hpp
375375
node/src/ecflow/node/ResolveExternsVisitor.hpp
376376
node/src/ecflow/node/ServerState.hpp
377377
node/src/ecflow/node/Signal.hpp
@@ -418,6 +418,10 @@ set(srcs
418418
node/src/ecflow/node/parser/VariableParser.hpp
419419
node/src/ecflow/node/parser/VerifyParser.hpp
420420
node/src/ecflow/node/parser/ZombieAttrParser.hpp
421+
node/src/ecflow/node/permissions/ActivePermissions.hpp
422+
node/src/ecflow/node/permissions/Allowed.hpp
423+
node/src/ecflow/node/permissions/Permission.hpp
424+
node/src/ecflow/node/permissions/Permissions.hpp
421425
# Node -- Sources
422426
node/src/ecflow/node/Alias.cpp
423427
node/src/ecflow/node/Attr.cpp
@@ -426,6 +430,7 @@ set(srcs
426430
node/src/ecflow/node/ClientSuiteMgr.cpp
427431
node/src/ecflow/node/ClientSuites.cpp
428432
node/src/ecflow/node/CmdContext.cpp
433+
node/src/ecflow/node/AuthorisationContext.cpp
429434
node/src/ecflow/node/Defs.cpp
430435
node/src/ecflow/node/DefsDelta.cpp
431436
node/src/ecflow/node/EcfFile.cpp
@@ -457,7 +462,6 @@ set(srcs
457462
node/src/ecflow/node/NodeStats.cpp
458463
node/src/ecflow/node/NodeTime.cpp
459464
node/src/ecflow/node/NodeTreeVisitor.cpp
460-
node/src/ecflow/node/Permissions.cpp
461465
node/src/ecflow/node/ResolveExternsVisitor.cpp
462466
node/src/ecflow/node/ServerState.cpp
463467
node/src/ecflow/node/Signal.cpp
@@ -499,6 +503,10 @@ set(srcs
499503
node/src/ecflow/node/parser/VariableParser.cpp
500504
node/src/ecflow/node/parser/VerifyParser.cpp
501505
node/src/ecflow/node/parser/ZombieAttrParser.cpp
506+
node/src/ecflow/node/permissions/ActivePermissions.cpp
507+
node/src/ecflow/node/permissions/Allowed.cpp
508+
node/src/ecflow/node/permissions/Permission.cpp
509+
node/src/ecflow/node/permissions/Permissions.cpp
502510

503511
# Server -- Headers
504512
server/src/ecflow/server/AuthenticationService.hpp

libs/base/CMakeLists.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(test_srcs
2525
test/TestInLimitParsing.cpp
2626
test/TestLogCmd.cpp
2727
test/TestMeterCmd.cpp
28-
test/TestPermissions.cpp
2928
test/TestProgramOptions.cpp
3029
test/TestQueryCmd.cpp
3130
test/TestQueueCmd.cpp
@@ -61,30 +60,6 @@ target_clangformat(u_base
6160
CONDITION ENABLE_TESTS
6261
)
6362

64-
set(test_srcs
65-
# Sources
66-
test/TestAlgorithms.cpp
67-
)
68-
69-
ecbuild_add_test(
70-
TARGET
71-
u_base_algorithms
72-
LABELS
73-
unit nightly fast
74-
SOURCES
75-
${test_srcs}
76-
LIBS
77-
ecflow_all
78-
test_scaffold
79-
test_harness.base
80-
Threads::Threads
81-
$<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
82-
)
83-
target_clangformat(u_base_algorithms
84-
CONDITION ENABLE_TESTS
85-
)
86-
87-
8863
# The following is not technically a test (as it makes no checks),
8964
# but a tool to measure the time it takes to generate a job file
9065
if (ENABLE_ALL_TESTS)

0 commit comments

Comments
 (0)