1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

CVE-2022-37966 selftest: Allow krb5 tests to run against an IP by using the target_hostname binding string

This makes it easier to test against a server that is not accessible via DNS.

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit c7cd6889177e8c705bb637172a60a5cf26734a3f)
This commit is contained in:
Andrew Bartlett 2022-11-01 12:34:57 +13:00 committed by Stefan Metzmacher
parent 91b74c701a
commit 2408d405d3
2 changed files with 12 additions and 3 deletions

View File

@ -41,12 +41,13 @@ class drsException(Exception):
return "drsException: " + self.value
def drsuapi_connect(server, lp, creds):
def drsuapi_connect(server, lp, creds, ip=None):
"""Make a DRSUAPI connection to the server.
:param server: the name of the server to connect to
:param lp: a samba line parameter object
:param creds: credential used for the connection
:param ip: Forced target server name
:return: A tuple with the drsuapi bind object, the drsuapi handle
and the supported extensions.
:raise drsException: if the connection fails
@ -55,7 +56,14 @@ def drsuapi_connect(server, lp, creds):
binding_options = "seal"
if lp.log_level() >= 9:
binding_options += ",print"
binding_string = "ncacn_ip_tcp:%s[%s]" % (server, binding_options)
# Allow forcing the IP
if ip is not None:
binding_options += f",target_hostname={server}"
binding_string = f"ncacn_ip_tcp:{ip}[{binding_options}]"
else:
binding_string = "ncacn_ip_tcp:%s[%s]" % (server, binding_options)
try:
drsuapiBind = drsuapi.drsuapi(binding_string, lp, creds)
(drsuapiHandle, bindSupportedExtensions) = drs_DsBind(drsuapiBind)

View File

@ -487,7 +487,8 @@ class KDCBaseTest(RawKerberosTest):
dns_hostname = samdb.host_dns_name()
(bind, handle, _) = drsuapi_connect(dns_hostname,
self.get_lp(),
admin_creds)
admin_creds,
ip=self.dc_host)
req = drsuapi.DsGetNCChangesRequest8()