1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-08 07:17:02 +03:00

5218 Commits

Author SHA1 Message Date
Douglas Bagnall
d2201e72be samba-tool dns: add --allow-existing to not complain if records exist
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13613

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
2025-06-05 23:06:37 +00:00
Douglas Bagnall
19b63d3c87 samba-tool tests: test dns --allow-existing
This will fail until the next commit.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13613

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
2025-06-05 23:06:37 +00:00
Douglas Bagnall
b5b08780f6 tests/samba-tool: optionally allow exception to be a failure in .run*()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13613

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
2025-06-05 23:06:37 +00:00
Douglas Bagnall
0e5b17adb0 pytests: samba_dnsupdate --use-samba-tool versus existing records
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13613

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
2025-06-05 23:06:37 +00:00
Jennifer Sutton
51b7bc61c6 samba-tool: Fix invalid escape sequences
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

Autobuild-User(master): Jo Sutton <jsutton@samba.org>
Autobuild-Date(master): Mon May 26 03:44:44 UTC 2025 on atb-devel-224
2025-05-26 03:44:44 +00:00
Jennifer Sutton
10a68f5708 python: Fix code spelling
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
c7cfdcd299 python: Make use of OID comparator constants
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
07b4266e5f tests/krb5: Correct comment
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
78c8336fcb samba-tool: Fix code spelling
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
4d15d20884 python:join: Add missing word
Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
ff3be2892b python:tests: Permit expected_count to be zero
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
fda6aef10f python:tests: Decode stdout for greater readability
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:37 +00:00
Jennifer Sutton
b7e7a07050 python:tests: Decode stdout and stderr for greater readability
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
5e0b53542b python: Fix logging call
ERROR(<class AttributeError>): uncaught exception - RootLogger object has no attribute notice
  File "/samba/bin/python/samba/netcmd/__init__.py", line 387, in _run
    return self.run(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/samba/bin/python/samba/netcmd/domain/backup.py", line 698, in run
    logger.notice("back-up has no sysvol data")
    ^^^^^^^^^^^^^

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
be22a49f5d samba-tool: Filter confidential attributes out of backups made with the ‘--no-secrets’ option
Without this change, ‘lab domains’ and backups intended not to contain
secrets will still contain confidential information, such as BitLocker
recovery data and KDS root keys. Add a new class that filters these
attributes out.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
b6fd9e2211 drs_utils: Split process_chunk() out into its own class
This makes it easier to add classes with new functionality without
having to figure out how to slot them into a linear class hierarchy.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
50fb8fc795 python:tests: Test that secret keys and confidential attributes are not included in a --no-secrets backup
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
cf848e35d1 drs_utils: Check for presence of more_flags attribute directly
This more directly indicates what we are trying to achieve.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
3eb65f1a6b python:samdb: Add get_searchFlags_from_lDAPDisplayName() method
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
4443abc74b python:samdb: Add get_must_contain_from_lDAPDisplayName() method
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
3cc42b090e python:samdb: Add get_lDAPDisplayName_by_governsID_id() method
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
e40e7fc6bf python3: Remove Python 2–only call to decode()
AttributeError: 'str' object has no attribute 'decode'

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
44548de57a python: Make set of seen GUIDs a local variable
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
8fc5c78ff6 python: Correct comment
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
6fa5aff846 python: Simplify GetNCChanges call setup
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
ef11923c6b python: Remove unused ‘more_flags’ parameter
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
51e14680b9 python: Tidy up formatting
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
b9e9b5371b python:join: Remove unnecessary local variable
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
25c4ee2337 drs_utils: Make loop exit condition explicit
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Jennifer Sutton
b0828fc3b0 drs_utils: Remove unnecessary qualification
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
2025-05-26 02:41:36 +00:00
Stefan Metzmacher
ae85b9c878 docs-xml/smbdotconf: change 'smb ports' into a synonym for 'server smb transport'
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
2025-04-18 10:17:29 +00:00
Stefan Metzmacher
f143306dd8 python:tests/krb5: let _{get,modify}_tgt() also change the objectsid in UPN_DNS_INFO
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
163a39334c python:tests/krb5: allow set_pac_sids() to take upn_dns_sid
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
7b4b9ae0ea python:tests/krb5: let check_device_info() allow an empty rid array
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
f569dfe16e python:tests/krb5: allow create_account_opts() to take selective_auth_allowed_sid
This will add a GUID_DRS_ALLOWED_TO_AUTHENTICATE ace with CONTROL_ACCESS
to the created account.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
22a66b1a5e python:tests/krb5: allow tgs_exchange_dict() to take expected_[device_]duplicated_groups
This allows us to expect duplicated sids in the PAC.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
82ecf6e31e python:tests/krb5: let check_device_info() handle EXTRA_DOMAIN_SID
device info does not really have RESOURCE_SID,
so we need to map RESOURCE_SID as well as EXTRA_SID (with a S-1-5-21-
prefix) to EXTRA_DOMAIN_SID.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
f7bcaa2377 python:tests/krb5: create_account_opts() can't handle self.AccountType.TRUST
create_trust() is used for that...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Stefan Metzmacher
1af0ccb873 python:tests/krb5: add KDC_ERR_PATH_NOT_ACCEPTED
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-04-03 09:36:31 +00:00
Douglas Bagnall
2bc5f08a33 python:join: do not suppress unexpected DNS enum errors
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 18:05:29 +00:00
Douglas Bagnall
a65a9e2e34 samba-tool backup restore: cope with no sysvol
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15661
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Sat Mar 29 08:25:39 UTC 2025 on atb-devel-224
2025-03-29 08:25:39 +00:00
Douglas Bagnall
6cafe36740 samba-tool testparm: avoid lowering debug level
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:44 +00:00
Douglas Bagnall
000dcc2654 samba-tool testparm: drop unsupported options
These have been useless since 2011.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:44 +00:00
Douglas Bagnall
c14e9e9121 samba-tool gpo: use a real XML parser to check entity validity
The expat parser comes with the Python standard library, so we can use
it to check the entities work, rather than relying on a fragile
regular expression.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:43 +00:00
Douglas Bagnall
ea0c84b18e samba-tool gpo: separate function for dtd header generation
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:43 +00:00
Douglas Bagnall
2f2dac3094 pytest: source_tree_topdir() checks more thoroughly
We are more certain of how many ../ steps we are from top than we are
that the existence of a thing called 'source4' is a definite sign
that this is a full source tree. So we check fewer depths and more
subdirectories.

This also modernises the return type to be a pathlib.Path, which works
without change for current callers.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:43 +00:00
Douglas Bagnall
24fb3bb874 python: make source_tree_topdir() test-only
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:43 +00:00
Douglas Bagnall
38d113a4d3 python: remove unused in_source_tree() function
We don't use it and don't want non-tests changing their behaviour
based on this kind of thing anyway.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Ralph Boehme <slow@samba.org>
2025-03-29 07:23:43 +00:00
Thomas Karlsson
1d39baf1e7 samba-tool domain backup: add --no-sysvol option
In some circumstances sysvol is not wanted in a backup.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15661

Signed-off-by: Thomas Karlsson <thomas.karlsson@relea.se>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
2025-03-26 00:53:37 +00:00
Douglas Bagnall
47ff422320 python:gp_cert_auto_enrol: fix GUID stringification
We were using some broken ad-hoc unpacking to do what the ndr
unpacker does perfectly well.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15839

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Tue Mar 25 05:21:49 UTC 2025 on atb-devel-224
2025-03-25 05:21:49 +00:00