samba.git
8 months agoctdb-scripts: Implement failcount handling with thresholds
Martin Schwenke [Fri, 3 Mar 2023 06:49:05 +0000 (17:49 +1100)]
ctdb-scripts: Implement failcount handling with thresholds

This can be used for simple failure counting, without restarts, as
used in the 40.vsftpd event script.  That case will subsequently be
converted and this functionality can also be used elsewhere.

Add documentation to ctdb-script.options(5) to allow parameters that
use this to be more easily described.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
8 months agoctdb-scripts: Avoid errors for uninitialised counters
Martin Schwenke [Wed, 15 Mar 2023 06:56:40 +0000 (17:56 +1100)]
ctdb-scripts: Avoid errors for uninitialised counters

Uninitialised counters are treated as 0, but still produce an error.

The redirect to stderr needs to come before the redirect for a missing
counter file.

The seemingly saner alternative of moving it outside the subshell
works when dash is /bin/sh (e.g. on Debian) but does not work when
bash is /bin/sh (e.g. on Fedora).

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
8 months agoctdb-doc: Add some subsection names in description
Martin Schwenke [Tue, 25 Jul 2023 02:19:07 +0000 (12:19 +1000)]
ctdb-doc: Add some subsection names in description

A subsequent commit will add a new section, which looks out of place
without these new sections.

Best reviewed with "git show -w".

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
8 months agoctdb-doc: Update CTDB manual pages to UTF-8
Martin Schwenke [Tue, 25 Jul 2023 01:42:32 +0000 (11:42 +1000)]
ctdb-doc: Update CTDB manual pages to UTF-8

This will allow Unicode characters to be used, resulting in more
readable source files.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
8 months agotests/krb5: Test that the correct Asserted Identity SID is added when inner FX‐FAST...
Joseph Sutton [Wed, 27 Sep 2023 23:47:49 +0000 (12:47 +1300)]
tests/krb5: Test that the correct Asserted Identity SID is added when inner FX‐FAST padata is used

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Joseph Sutton <jsutton@samba.org>
Autobuild-Date(master): Sun Oct  1 23:46:44 UTC 2023 on atb-devel-224

8 months agos4:kdc: Make use of ‘samba_kdc_entry_pac’ wrapper type
Joseph Sutton [Wed, 27 Sep 2023 22:43:57 +0000 (11:43 +1300)]
s4:kdc: Make use of ‘samba_kdc_entry_pac’ wrapper type

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add function to get device PAC entry from Heimdal request structure
Joseph Sutton [Fri, 29 Sep 2023 00:53:24 +0000 (13:53 +1300)]
s4:kdc: Add function to get device PAC entry from Heimdal request structure

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add function to determine whether a KDC entry represents a trust
Joseph Sutton [Fri, 29 Sep 2023 07:11:52 +0000 (20:11 +1300)]
s4:kdc: Add function to determine whether a KDC entry represents a trust

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Fix indentation
Joseph Sutton [Fri, 29 Sep 2023 02:42:52 +0000 (15:42 +1300)]
s4:kdc: Fix indentation

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove unused declaration
Joseph Sutton [Thu, 28 Sep 2023 23:08:54 +0000 (12:08 +1300)]
s4:kdc: Remove unused declaration

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add ‘samba_kdc_entry_pac’ wrapper type
Joseph Sutton [Wed, 27 Sep 2023 00:15:15 +0000 (13:15 +1300)]
s4:kdc: Add ‘samba_kdc_entry_pac’ wrapper type

With embedded Heimdal, we can mark a PAC as being trusted (i.e. not
issued by an RODC). This is convenient, as it saves us needing to carry
that information in flags, hoping it isn’t inadvertently lost.

System Heimdal and MIT Kerberos, however, don’t provide a way to mark a
PAC trusted. So we add a new wrapper type, ‘samba_kdc_entry_pac’, that
contains this extra information if ‘krb5_const_pac’ doesn’t contain it
already. As it also stores a pointer to the client entry, the
structure’s lifetime must therefore be carefully managed. Finally, it
keeps track of whether the PAC came across a trust, to know which is
useful in some circumstances.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agothird_party/heimdal_build: Define HAVE_KRB5_PAC_IS_TRUSTED when using embedded Heimdal
Joseph Sutton [Wed, 27 Sep 2023 00:14:09 +0000 (13:14 +1300)]
third_party/heimdal_build: Define HAVE_KRB5_PAC_IS_TRUSTED when using embedded Heimdal

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Add Device Restriction tests for silos and authentication policies in...
Joseph Sutton [Tue, 2 May 2023 03:42:24 +0000 (15:42 +1200)]
tests/krb5: Add Device Restriction tests for silos and authentication policies in the KDC

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove unused parameters from samba_kdc_verify_pac()
Joseph Sutton [Fri, 29 Sep 2023 00:50:51 +0000 (13:50 +1300)]
s4:kdc: Remove unused parameters from samba_kdc_verify_pac()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove device PAC validation
Joseph Sutton [Thu, 28 Sep 2023 23:44:08 +0000 (12:44 +1300)]
s4:kdc: Remove device PAC validation

In the first place, this check was only applicable to the Heimdal KDC,
the MIT KDC not having support for compounded authentication. Secondly,
it was redundant, because _kdc_fast_check_armor_pac() would have already
been called to verify the armor ticket; a second round of validation
achieved nothing. And finally, the check was flawed: it checked only
*explicitly* armored PACs, and so would have done nothing for an armored
*AS‐REQ*.

In short, this check was useless; remove it.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Add tests performing AS‐REQs armored with unacceptable tickets
Joseph Sutton [Fri, 29 Sep 2023 00:21:01 +0000 (13:21 +1300)]
tests/krb5: Add tests performing AS‐REQs armored with unacceptable tickets

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Add method to perform an armored AS‐REQ
Joseph Sutton [Fri, 29 Sep 2023 00:13:01 +0000 (13:13 +1300)]
tests/krb5: Add method to perform an armored AS‐REQ

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Initialize variable
Joseph Sutton [Fri, 29 Sep 2023 00:27:39 +0000 (13:27 +1300)]
tests/krb5: Initialize variable

This avoids the following exception:

Exception: Traceback (most recent call last):
  File "/samba/bin/python/samba/tests/krb5/kdc_tgs_tests.py", line 2500, in test_renew_pac_request_false
    tgt = self._modify_tgt(tgt, renewable=True)
  File "samba/bin/python/samba/tests/krb5/kdc_tgs_tests.py", line 3014, in _modify_tgt
    return self.modified_ticket(
  File "/samba/bin/python/samba/tests/krb5/raw_testcase.py", line 5694, in modified_ticket
    auth_data, new_pac,
UnboundLocalError: local variable 'new_pac' referenced before assignment

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove ‘asserted_identity’ parameter from samba_kdc_get_user_info_dc()
Joseph Sutton [Wed, 27 Sep 2023 03:52:59 +0000 (16:52 +1300)]
s4:kdc: Remove ‘asserted_identity’ parameter from samba_kdc_get_user_info_dc()

It was not used.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Have callers of samba_kdc_get_user_info_dc() themselves add an Asserted Ident...
Joseph Sutton [Wed, 27 Sep 2023 03:38:23 +0000 (16:38 +1300)]
s4:kdc: Have callers of samba_kdc_get_user_info_dc() themselves add an Asserted Identity SID

samba_kdc_get_user_info_dc() does too much. It should be responsible
only for getting account information, not for adding extra SIDs.

By extracting the call to samba_kdc_add_asserted_identity() into the
former function’s callers, we’ll be able to remove the
‘asserted_identity’ parameter in the next commit, reducing the
function’s complexity.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove ‘claims_valid’ parameter from samba_kdc_get_user_info_dc()
Joseph Sutton [Wed, 27 Sep 2023 03:18:56 +0000 (16:18 +1300)]
s4:kdc: Remove ‘claims_valid’ parameter from samba_kdc_get_user_info_dc()

It was not used.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Have callers of samba_kdc_get_user_info_dc() themselves add the Claims Valid SID
Joseph Sutton [Wed, 27 Sep 2023 03:23:33 +0000 (16:23 +1300)]
s4:kdc: Have callers of samba_kdc_get_user_info_dc() themselves add the Claims Valid SID

samba_kdc_get_user_info_dc() does too much. It should be responsible
only for getting account information, not for adding extra SIDs.

By extracting the call to samba_kdc_add_claims_valid() into the former
function’s callers, we’ll be able to remove the ‘claims_valid’ parameter
in the next commit, reducing the function’s complexity.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove ‘compounded_auth’ parameter from samba_kdc_get_user_info_dc()
Joseph Sutton [Wed, 27 Sep 2023 03:12:50 +0000 (16:12 +1300)]
s4:kdc: Remove ‘compounded_auth’ parameter from samba_kdc_get_user_info_dc()

It was never used.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove unused memory context from samba_kdc_lookup_realm()
Joseph Sutton [Wed, 27 Sep 2023 02:58:55 +0000 (15:58 +1300)]
s4:kdc: Remove unused memory context from samba_kdc_lookup_realm()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add parameters for claims and device info to authn_policy_authenticate_to_ser...
Joseph Sutton [Wed, 27 Sep 2023 02:49:59 +0000 (15:49 +1300)]
s4:kdc: Add parameters for claims and device info to authn_policy_authenticate_to_service()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add claims parameter to authn_policy_authenticate_from_device()
Joseph Sutton [Wed, 27 Sep 2023 02:47:06 +0000 (15:47 +1300)]
s4:kdc: Add claims parameter to authn_policy_authenticate_from_device()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Add parameters for claims and device info to authn_policy_access_check()
Joseph Sutton [Wed, 27 Sep 2023 02:44:56 +0000 (15:44 +1300)]
s4:kdc: Add parameters for claims and device info to authn_policy_access_check()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Add parameters for claims and device info to auth_generate_security_token()
Joseph Sutton [Wed, 27 Sep 2023 02:16:21 +0000 (15:16 +1300)]
s4:auth: Add parameters for claims and device info to auth_generate_security_token()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Reformat function call
Joseph Sutton [Wed, 27 Sep 2023 02:20:04 +0000 (15:20 +1300)]
s4:kdc: Reformat function call

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Reformat function calls
Joseph Sutton [Wed, 27 Sep 2023 02:11:20 +0000 (15:11 +1300)]
s4:auth: Reformat function calls

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Rename parameter to match function implementation
Joseph Sutton [Wed, 27 Sep 2023 02:08:26 +0000 (15:08 +1300)]
s4:auth: Rename parameter to match function implementation

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:dsdb: Add session info flag to indicate authentication with a device
Joseph Sutton [Wed, 27 Sep 2023 01:54:06 +0000 (14:54 +1300)]
s4:dsdb: Add session info flag to indicate authentication with a device

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:dsdb: Add parameters for claims and device SIDs to security_token_create()
Joseph Sutton [Wed, 27 Sep 2023 01:51:36 +0000 (14:51 +1300)]
s4:dsdb: Add parameters for claims and device SIDs to security_token_create()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agopidl: Parenthesize expression to be cast
Joseph Sutton [Mon, 10 May 2021 22:27:33 +0000 (10:27 +1200)]
pidl: Parenthesize expression to be cast

We must parenthesize each expression that is to be cast to a specific
type, otherwise the cast will apply to only part of the full expression.

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agondr: Parenthesize expressions to be cast
Joseph Sutton [Tue, 4 May 2021 02:09:44 +0000 (14:09 +1200)]
ndr: Parenthesize expressions to be cast

We must parenthesize each expression that is to be cast to a specific
type, otherwise the cast will apply to only part of the full expression.

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Initialize pointer to NULL
Joseph Sutton [Wed, 27 Sep 2023 01:10:44 +0000 (14:10 +1300)]
s4:kdc: Initialize pointer to NULL

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Remove unnecessary assignments
Joseph Sutton [Wed, 27 Sep 2023 01:00:07 +0000 (14:00 +1300)]
s4:kdc: Remove unnecessary assignments

These structures have been zero‐initialized already.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Check that principal being copied is not NULL
Joseph Sutton [Wed, 27 Sep 2023 00:59:32 +0000 (13:59 +1300)]
s4:kdc: Check that principal being copied is not NULL

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Prefer explicit initialization to ZERO_STRUCTP()
Joseph Sutton [Wed, 27 Sep 2023 00:58:31 +0000 (13:58 +1300)]
s4:kdc: Prefer explicit initialization to ZERO_STRUCTP()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months ago.gitattributes: Mark large data file as binary
Joseph Sutton [Wed, 27 Sep 2023 00:38:36 +0000 (13:38 +1300)]
.gitattributes: Mark large data file as binary

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolib:krb5_wrap: Include missing headers
Joseph Sutton [Wed, 27 Sep 2023 00:13:39 +0000 (13:13 +1300)]
lib:krb5_wrap: Include missing headers

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Ensure that some parameters are not NULL
Joseph Sutton [Tue, 26 Sep 2023 00:34:56 +0000 (13:34 +1300)]
s4:auth: Ensure that some parameters are not NULL

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: Handle new ACE types with sec_ace_object()
Joseph Sutton [Sun, 30 Jul 2023 22:55:42 +0000 (10:55 +1200)]
libcli/security: Handle new ACE types with sec_ace_object()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: Have security_ace_equal() handle callback and resource ACEs
Joseph Sutton [Sun, 30 Jul 2023 22:52:32 +0000 (10:52 +1200)]
libcli/security: Have security_ace_equal() handle callback and resource ACEs

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: Parenthesize macro parameter
Joseph Sutton [Wed, 19 Jul 2023 00:28:11 +0000 (12:28 +1200)]
libcli/security: Parenthesize macro parameter

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: Conform to Samba’s brace style
Joseph Sutton [Wed, 19 Jul 2023 00:15:15 +0000 (12:15 +1200)]
libcli/security: Conform to Samba’s brace style

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:torture: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:51:38 +0000 (16:51 +1300)]
s4:torture: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:ntvfs: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:50:29 +0000 (16:50 +1300)]
s4:ntvfs: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos3:smbd: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:49:56 +0000 (16:49 +1300)]
s3:smbd: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos3:rpc_server: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:49:07 +0000 (16:49 +1300)]
s3:rpc_server: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos3:libads: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:39:47 +0000 (16:39 +1300)]
s3:libads: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos3:libads: Don’t do first loop iteration if ‘attr’ is NULL
Joseph Sutton [Thu, 28 Sep 2023 03:45:19 +0000 (16:45 +1300)]
s3:libads: Don’t do first loop iteration if ‘attr’ is NULL

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolib/util: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:39:07 +0000 (16:39 +1300)]
lib/util: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agoldb: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:36:07 +0000 (16:36 +1300)]
ldb: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolib/ldb-samba: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 28 Sep 2023 03:32:29 +0000 (16:32 +1300)]
lib/ldb-samba: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolib:compression: Fix building with FORTIFY_SOURCE=2
Joseph Sutton [Thu, 15 Dec 2022 03:04:51 +0000 (16:04 +1300)]
lib:compression: Fix building with FORTIFY_SOURCE=2

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agosamba-tool: Fix for gpo restore not working without --tmpdir
Kacper [Wed, 30 Aug 2023 12:33:49 +0000 (14:33 +0200)]
samba-tool: Fix for gpo restore not working without --tmpdir

cmd_restore depends on cmd_create but the later cleans up
required temp files for cmd_restore to function.

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

RN: Fix for gpo restore not working without --tmpdir

Signed-off-by: Kacper Boström <kacper@kacper.se>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Sep 29 03:15:18 UTC 2023 on atb-devel-224

8 months agolibcli/security: fix talloc context for integer values (CID 1545156)
Douglas Bagnall [Thu, 28 Sep 2023 23:35:10 +0000 (12:35 +1300)]
libcli/security: fix talloc context for integer values (CID 1545156)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: test_run_condtional_ace: va_end() on errors
Douglas Bagnall [Thu, 28 Sep 2023 23:25:21 +0000 (12:25 +1300)]
libcli/security: test_run_condtional_ace: va_end() on errors

CID 1545154, CID 1545155.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibcli/security: conditional ACEs check again for NULL/empty claims
Douglas Bagnall [Thu, 28 Sep 2023 23:24:14 +0000 (12:24 +1300)]
libcli/security: conditional ACEs check again for NULL/empty claims

CID 1545152.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: auth: manpage documentation for conditional ace fields
Rob van der Linde [Wed, 20 Sep 2023 23:41:02 +0000 (11:41 +1200)]
netcmd: auth: manpage documentation for conditional ace fields

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: add some tests for valid and invalid SDDL in cli commands
Rob van der Linde [Thu, 28 Sep 2023 02:33:18 +0000 (15:33 +1300)]
netcmd: tests: add some tests for valid and invalid SDDL in cli commands

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: auth: add new SDDL fields to create and modify auth policy commands
Rob van der Linde [Wed, 20 Sep 2023 01:04:14 +0000 (13:04 +1200)]
netcmd: auth: add new SDDL fields to create and modify auth policy commands

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: models: add SDDL fields to AuthenticationPolicy model
Rob van der Linde [Wed, 20 Sep 2023 01:02:21 +0000 (13:02 +1200)]
netcmd: models: add SDDL fields to AuthenticationPolicy model

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: models: add SDDL model field
Rob van der Linde [Wed, 20 Sep 2023 00:52:31 +0000 (12:52 +1200)]
netcmd: models: add SDDL model field

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: models: add FieldError subclass which stores the field
Rob van der Linde [Thu, 28 Sep 2023 02:22:17 +0000 (15:22 +1300)]
netcmd: models: add FieldError subclass which stores the field

This is so that errors on the CLI show the field name

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: models: field to_db_value needs ldb param
Rob van der Linde [Wed, 20 Sep 2023 00:50:15 +0000 (12:50 +1200)]
netcmd: models: field to_db_value needs ldb param

Required by SDDL field type added in next commit

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: modify auth silo cli tests setup their own test data
Rob van der Linde [Thu, 28 Sep 2023 04:26:22 +0000 (17:26 +1300)]
netcmd: tests: modify auth silo cli tests setup their own test data

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: modify auth policy cli tests setup their own test data
Rob van der Linde [Thu, 28 Sep 2023 04:13:15 +0000 (17:13 +1300)]
netcmd: tests: modify auth policy cli tests setup their own test data

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: modify claim cli tests setup their own test data
Rob van der Linde [Thu, 28 Sep 2023 03:41:57 +0000 (16:41 +1300)]
netcmd: tests: modify claim cli tests setup their own test data

Initially the test data was created in setUp, but it was moved to setUpClass.

The problem with this is tests modifying objects, which could affect the next test.

Create all required data in the test itself for clarity (and also is faster)

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: test that create objects make use of addCleanup
Rob van der Linde [Thu, 28 Sep 2023 01:48:09 +0000 (14:48 +1300)]
netcmd: tests: test that create objects make use of addCleanup

Since the samdb connection is on the class and hangs around between tests, we need to clean up what we created.

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: tests tidyup and make use of setUpTestData
Rob van der Linde [Tue, 26 Sep 2023 11:20:49 +0000 (00:20 +1300)]
netcmd: tests: tests tidyup and make use of setUpTestData

Still only load the test data once per test class, but much easier to read.

Made several methods static for creating/deleting claims, policies and silos.

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: make _run a classmethod in SambaToolCmdTest
Rob van der Linde [Tue, 26 Sep 2023 11:01:06 +0000 (00:01 +1300)]
netcmd: tests: make _run a classmethod in SambaToolCmdTest

So that it can be called from setUpClass as well

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agopython: tests: implement setUpTestData overridable class method
Rob van der Linde [Tue, 26 Sep 2023 08:10:33 +0000 (21:10 +1300)]
python: tests: implement setUpTestData overridable class method

On Python 3.6 and 3.7 the addClassCleanup method needs to be implemented, and tearDownClass must be called by setupClass if any exception is raised.

On Python 3.8 and higher, unittest already calls tearDownClass, even if it raises an exception in setUpClass.

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: bugfix: argument -U was already in creds so listed twice
Rob van der Linde [Mon, 25 Sep 2023 00:26:19 +0000 (13:26 +1300)]
netcmd: tests: bugfix: argument -U was already in creds so listed twice

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agonetcmd: tests: avoid the need to create a random command in GetSamDB
Rob van der Linde [Sun, 24 Sep 2023 23:51:19 +0000 (12:51 +1300)]
netcmd: tests: avoid the need to create a random command in GetSamDB

Also the code that looks over kwargs is somewhat confusing and unnecessary.

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Add samba.tests.krb5.conditional_ace_tests
Joseph Sutton [Thu, 28 Sep 2023 01:10:16 +0000 (14:10 +1300)]
tests/krb5: Add samba.tests.krb5.conditional_ace_tests

This is a test using conditional ACEs and claims to confirm that we understand
the full end-to-end network behaviour of these all the way from the PAC to the
application in the access check of the KDC.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Pair-programmed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Sep 28 04:35:05 UTC 2023 on atb-devel-224

8 months agotests/krb5: Add method to replace client or device claims in a PAC
Joseph Sutton [Thu, 28 Sep 2023 03:13:08 +0000 (16:13 +1300)]
tests/krb5: Add method to replace client or device claims in a PAC

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Add method to replace the device SIDs in a PAC
Joseph Sutton [Thu, 28 Sep 2023 03:12:46 +0000 (16:12 +1300)]
tests/krb5: Add method to replace the device SIDs in a PAC

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Have set_pac_sids() accept lone RIDs as well as full SIDs
Joseph Sutton [Thu, 28 Sep 2023 03:09:06 +0000 (16:09 +1300)]
tests/krb5: Have set_pac_sids() accept lone RIDs as well as full SIDs

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Make optional ‘domain_sid’ parameter to set_pac_sids()
Joseph Sutton [Thu, 28 Sep 2023 03:08:25 +0000 (16:08 +1300)]
tests/krb5: Make optional ‘domain_sid’ parameter to set_pac_sids()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Make optional ‘user_rid’ parameter to set_pac_sids()
Joseph Sutton [Thu, 28 Sep 2023 03:07:43 +0000 (16:07 +1300)]
tests/krb5: Make optional ‘user_rid’ parameter to set_pac_sids()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Make set_pac_sids() parameters keyword‐only
Joseph Sutton [Thu, 28 Sep 2023 03:06:01 +0000 (16:06 +1300)]
tests/krb5: Make set_pac_sids() parameters keyword‐only

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Allow passing mapping=None to map_to_sid()
Joseph Sutton [Thu, 28 Sep 2023 03:03:09 +0000 (16:03 +1300)]
tests/krb5: Allow passing mapping=None to map_to_sid()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Don’t bother regenerating the PAC if modify_pac_fn or update_pac_checksum...
Joseph Sutton [Thu, 28 Sep 2023 02:51:35 +0000 (15:51 +1300)]
tests/krb5: Don’t bother regenerating the PAC if modify_pac_fn or update_pac_checksums are false

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Allow multiple ticket modification functions
Joseph Sutton [Thu, 28 Sep 2023 01:52:11 +0000 (14:52 +1300)]
tests/krb5: Allow multiple ticket modification functions

This means that callers can specify a stack of possible modifications.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Allow filter for tests that crash Windows
Joseph Sutton [Thu, 28 Sep 2023 01:50:39 +0000 (14:50 +1300)]
tests/krb5: Allow filter for tests that crash Windows

Set CRASH_WINDOWS=0 when running against a Windows DC.  These crashes are
only possible because we can modify the PAC, but having these tests allows
us to lock down Samba behaviour, so we include them.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Allow variation in PADATA_PW_SALT
Joseph Sutton [Thu, 28 Sep 2023 01:49:11 +0000 (14:49 +1300)]
tests/krb5: Allow variation in PADATA_PW_SALT

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotests/krb5: Sort imports
Joseph Sutton [Wed, 27 Sep 2023 00:43:53 +0000 (13:43 +1300)]
tests/krb5: Sort imports

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agostreams_depot: Goto done if FSETXATTR SAMBA_XATTR_MARKER failed
MikeLiu [Wed, 27 Sep 2023 05:46:36 +0000 (13:46 +0800)]
streams_depot: Goto done if FSETXATTR SAMBA_XATTR_MARKER failed

Goto done if FSETXATTR SAMBA_XATTR_MARKER failed

Signed-off-by: MikeLiu <mikeliu@qnap.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Sep 27 08:42:25 UTC 2023 on atb-devel-224

8 months agolibrpc: Fix typos in error messages
Joseph Sutton [Tue, 4 May 2021 03:08:53 +0000 (15:08 +1200)]
librpc: Fix typos in error messages

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep 27 03:38:00 UTC 2023 on atb-devel-224

8 months agopidl: Use INT_MAX as enum constant for portability
Joseph Sutton [Fri, 23 Apr 2021 04:37:01 +0000 (16:37 +1200)]
pidl: Use INT_MAX as enum constant for portability

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibrpc: Use portable format specifiers
Joseph Sutton [Mon, 10 May 2021 22:29:31 +0000 (10:29 +1200)]
librpc: Use portable format specifiers

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agolibrpc/ndr: Use portable format specifiers
Joseph Sutton [Mon, 10 May 2021 22:28:07 +0000 (10:28 +1200)]
librpc/ndr: Use portable format specifiers

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agopidl: Use portable format specifiers
Joseph Sutton [Mon, 10 May 2021 22:27:33 +0000 (10:27 +1200)]
pidl: Use portable format specifiers

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agondr: Display values for failed range checks
Joseph Sutton [Tue, 4 May 2021 02:09:44 +0000 (14:09 +1200)]
ndr: Display values for failed range checks

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agotestdata: Mark compression test data as binary
Joseph Sutton [Fri, 22 Sep 2023 00:16:06 +0000 (12:16 +1200)]
testdata: Mark compression test data as binary

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Add functions to convert between different claims formats
Joseph Sutton [Thu, 21 Sep 2023 03:13:20 +0000 (15:13 +1200)]
s4:auth: Add functions to convert between different claims formats

The new ‘claims_data’ structure can store claims in three different
representations — as an encoded blob, as a CLAIMS_SET structure, or as a
series of CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 claims. Given a set of
claims, the accompanying functions provide a way to convert them into
the desired format.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:auth: Include missing headers
Joseph Sutton [Thu, 21 Sep 2023 03:14:55 +0000 (15:14 +1200)]
s4:auth: Include missing headers

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 months agos4:kdc: Move encode_claims_set() into the auth_session subsystem
Joseph Sutton [Thu, 21 Sep 2023 02:48:02 +0000 (14:48 +1200)]
s4:kdc: Move encode_claims_set() into the auth_session subsystem

Some functions in the auth_session subsystem will need to be able to
call encode_claims_set(). Moving said function lets them do that whilst
avoiding circular dependencies and additional public dependencies.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>