b065a40300
- Issue 6387 - Use make macro in the spec file - Resolves: RHEL-80254 - [RFE] Provide a way to check for leaked passwords - Resolves: RHEL-80257 - [RFE] Should be able to monitor the importing progress via the CLI - Resolves: RHEL-149760 - IPA - segfault with libjemalloc.so.2 - Resolves: RHEL-153098 - [RFE] Enable USDT probes in production builds - Resolves: RHEL-171355 - 389-ds accountpolicy.py attribute name typo in help message - Resolves: RHEL-213991 - repl-agmt create doesn't set some parameters - Resolves: RHEL-243048 - large IdM host group, missing memberof host group, authentication failures, high traffic and contention [rhel-10] - Resolves: RHEL-129204 - Local password policies can be created with unallowed values - Resolves: RHEL-238569 - lib389: join_supplier() sets nsDS5ReplicaBindDNGroup after ensure_agreement(), causing replication auth race [rhel-10] - Resolves: RHEL-182157 - CVE-2026-11610 389-ds-base: 389-ds-base: Heap buffer overflow in sasl_io_recv() via padded SASL UNBIND [rhel-10.3]
172 lines
6.1 KiB
Diff
172 lines
6.1 KiB
Diff
From d8ab66a76a1d1f0811e30d370e88cd761eef5e05 Mon Sep 17 00:00:00 2001
|
|
From: Viktor Ashirov <vashirov@redhat.com>
|
|
Date: Thu, 23 Jul 2026 09:58:40 +0200
|
|
Subject: [PATCH] Issue 7200 - repl-agmt create doesn't set some parameters
|
|
(#7663)
|
|
|
|
Bug Description:
|
|
The `add_agmt()` function in the dsconf CLI silently ignored flow
|
|
and timeout parameters:
|
|
--conn-timeout
|
|
--protocol-timeout
|
|
--wait-async-results
|
|
--busy-wait-time
|
|
--session-pause-time
|
|
--flow-control-window
|
|
--flow-control-pause
|
|
The CLI args and attribute mappings existed, but the properties dict was
|
|
never populated with these values during agreement creation.
|
|
|
|
Fix Description:
|
|
Add the missing args-to-properties assignments.
|
|
|
|
Fixes: https://github.com/389ds/389-ds-base/issues/7200
|
|
|
|
Reviewed by: @mreynolds389 (Thanks!)
|
|
---
|
|
.../clu/dsconf_agmt_timeout_attrs_test.py | 106 ++++++++++++++++++
|
|
src/lib389/lib389/cli_conf/replication.py | 14 +++
|
|
2 files changed, 120 insertions(+)
|
|
create mode 100644 dirsrvtests/tests/suites/clu/dsconf_agmt_timeout_attrs_test.py
|
|
|
|
diff --git a/dirsrvtests/tests/suites/clu/dsconf_agmt_timeout_attrs_test.py b/dirsrvtests/tests/suites/clu/dsconf_agmt_timeout_attrs_test.py
|
|
new file mode 100644
|
|
index 000000000..8c50e3dc2
|
|
--- /dev/null
|
|
+++ b/dirsrvtests/tests/suites/clu/dsconf_agmt_timeout_attrs_test.py
|
|
@@ -0,0 +1,106 @@
|
|
+# --- BEGIN COPYRIGHT BLOCK ---
|
|
+# Copyright (C) 2026 Red Hat, Inc.
|
|
+# All rights reserved.
|
|
+#
|
|
+# License: GPL (version 3 or any later version).
|
|
+# See LICENSE for details.
|
|
+# --- END COPYRIGHT BLOCK ---
|
|
+
|
|
+import os
|
|
+import logging
|
|
+import pytest
|
|
+from test389.topologies import topology_st as topo
|
|
+from lib389.cli_base import FakeArgs
|
|
+from lib389.cli_conf.replication import add_agmt
|
|
+from lib389.replica import Replicas
|
|
+from lib389._constants import DEFAULT_SUFFIX
|
|
+
|
|
+pytestmark = pytest.mark.tier1
|
|
+
|
|
+DEBUGGING = os.getenv("DEBUGGING", default=False)
|
|
+if DEBUGGING:
|
|
+ logging.getLogger(__name__).setLevel(logging.DEBUG)
|
|
+else:
|
|
+ logging.getLogger(__name__).setLevel(logging.INFO)
|
|
+log = logging.getLogger(__name__)
|
|
+
|
|
+
|
|
+def test_agmt_create_timeout_and_flow_control_attrs(topo):
|
|
+ """Verify add_agmt passes timeout and flow-control attributes
|
|
+ through to the agreement entry
|
|
+
|
|
+ :id: 2c95ce33-7f25-480a-b827-c03ee10da650
|
|
+ :setup: Standalone instance
|
|
+ :steps:
|
|
+ 1. Enable replication on the instance as a supplier
|
|
+ 2. Add agreement with all timeout/flow-control arguments set
|
|
+ 3. Read back the agreement and verify each attribute values
|
|
+ :expectedresults:
|
|
+ 1. Success
|
|
+ 2. Success
|
|
+ 3. Success
|
|
+ """
|
|
+ inst = topo.standalone
|
|
+
|
|
+ replicas = Replicas(inst)
|
|
+ replicas.create(properties={
|
|
+ 'cn': 'replica',
|
|
+ 'nsDS5ReplicaRoot': DEFAULT_SUFFIX,
|
|
+ 'nsDS5ReplicaId': '1',
|
|
+ 'nsDS5ReplicaType': '3',
|
|
+ 'nsDS5Flags': '1',
|
|
+ })
|
|
+
|
|
+ EXPECTED = {
|
|
+ 'nsds5replicatimeout': '30',
|
|
+ 'nsds5replicaprotocoltimeout': '120',
|
|
+ 'nsds5replicawaitforasyncresults': '500',
|
|
+ 'nsds5replicabusywaittime': '5',
|
|
+ 'nsds5replicaSessionPauseTime': '3',
|
|
+ 'nsds5replicaflowcontrolwindow': '2000',
|
|
+ 'nsds5replicaflowcontrolpause': '4',
|
|
+ }
|
|
+
|
|
+ args = FakeArgs()
|
|
+ # Required args
|
|
+ args.AGMT_NAME = ['test-timeout-agmt']
|
|
+ args.suffix = DEFAULT_SUFFIX
|
|
+ args.host = 'localhost'
|
|
+ args.port = '33333'
|
|
+ args.conn_protocol = 'LDAP'
|
|
+ args.bind_dn = 'cn=replmgr,cn=config'
|
|
+ args.bind_passwd = 'replmgr'
|
|
+ args.bind_method = 'SIMPLE'
|
|
+ args.init = False
|
|
+
|
|
+ # Optional attributes that we're testing
|
|
+ args.conn_timeout = EXPECTED['nsds5replicatimeout']
|
|
+ args.protocol_timeout = EXPECTED['nsds5replicaprotocoltimeout']
|
|
+ args.wait_async_results = EXPECTED['nsds5replicawaitforasyncresults']
|
|
+ args.busy_wait_time = EXPECTED['nsds5replicabusywaittime']
|
|
+ args.session_pause_time = EXPECTED['nsds5replicaSessionPauseTime']
|
|
+ args.flow_control_window = EXPECTED['nsds5replicaflowcontrolwindow']
|
|
+ args.flow_control_pause = EXPECTED['nsds5replicaflowcontrolpause']
|
|
+
|
|
+ # The rest is None
|
|
+ args.__class__.__getattr__ = lambda self, name: None
|
|
+
|
|
+ # Create new agreement with optional attributes
|
|
+ add_agmt(inst, None, log, args)
|
|
+
|
|
+ # Read it back
|
|
+ replica = replicas.get(DEFAULT_SUFFIX)
|
|
+ agmt = replica.get_agreements().list()[0]
|
|
+
|
|
+ for attr, expected_val in EXPECTED.items():
|
|
+ actual = agmt.get_attr_val_utf8(attr)
|
|
+ log.info(f"Checking {attr}: expected={expected_val}, actual={actual}")
|
|
+ assert actual == expected_val, \
|
|
+ f"Attribute {attr}: expected '{expected_val}', got '{actual}'"
|
|
+
|
|
+ log.info("All timeout and flow-control attributes verified successfully")
|
|
+
|
|
+
|
|
+if __name__ == '__main__':
|
|
+ CURRENT_FILE = os.path.realpath(__file__)
|
|
+ pytest.main(f"-s {CURRENT_FILE}")
|
|
diff --git a/src/lib389/lib389/cli_conf/replication.py b/src/lib389/lib389/cli_conf/replication.py
|
|
index e6bc823c6..f57f34031 100644
|
|
--- a/src/lib389/lib389/cli_conf/replication.py
|
|
+++ b/src/lib389/lib389/cli_conf/replication.py
|
|
@@ -942,6 +942,20 @@ def add_agmt(inst, basedn, log, args):
|
|
properties['nsds5replicatedattributelisttotal'] = frac_total_list
|
|
if args.strip_list is not None:
|
|
properties['nsds5replicastripattrs'] = args.strip_list
|
|
+ if args.conn_timeout is not None:
|
|
+ properties['nsds5replicatimeout'] = args.conn_timeout
|
|
+ if args.protocol_timeout is not None:
|
|
+ properties['nsds5replicaprotocoltimeout'] = args.protocol_timeout
|
|
+ if args.wait_async_results is not None:
|
|
+ properties['nsds5replicawaitforasyncresults'] = args.wait_async_results
|
|
+ if args.busy_wait_time is not None:
|
|
+ properties['nsds5replicabusywaittime'] = args.busy_wait_time
|
|
+ if args.session_pause_time is not None:
|
|
+ properties['nsds5replicaSessionPauseTime'] = args.session_pause_time
|
|
+ if args.flow_control_window is not None:
|
|
+ properties['nsds5replicaflowcontrolwindow'] = args.flow_control_window
|
|
+ if args.flow_control_pause is not None:
|
|
+ properties['nsds5replicaflowcontrolpause'] = args.flow_control_pause
|
|
|
|
# Handle the optional bootstrap settings
|
|
if args.bootstrap_bind_dn is not None:
|
|
--
|
|
2.55.0
|
|
|