Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added option to mention custom LDAP server IP #209

Open
wants to merge 2 commits into
base: bloodhound-ce
Choose a base branch
from
Open

Added option to mention custom LDAP server IP #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbf81dd
Added option to mention custom LDAP server IP
Lune1234 Jan 15, 2025
a20cd4c
remove some debug logs
Lune1234 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bloodhound/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ def main():
metavar='HOST',
action='store',
help='Override which DC to query (hostname)')
coopts.add_argument('-dc-ip',
'--domain-ip',
action='store',
help='Override which DC/LDAP server to query (IP)')
coopts.add_argument('-gc',
'--global-catalog',
metavar='HOST',
Expand Down Expand Up @@ -303,7 +307,7 @@ def main():
args.auth_method = 'kerberos'
auth = ADAuthentication(username=args.username, password=args.password, domain=args.domain, auth_method=args.auth_method, ldap_channel_binding=args.ldap_channel_binding)

ad = AD(auth=auth, domain=args.domain, nameserver=args.nameserver, dns_tcp=args.dns_tcp, dns_timeout=args.dns_timeout, use_ldaps=args.use_ldaps)
ad = AD(auth=auth, domain=args.domain, nameserver=args.nameserver, dns_tcp=args.dns_tcp, dns_timeout=args.dns_timeout, use_ldaps=args.use_ldaps, dc_ip=args.domain_ip)
# Resolve collection methods
collect = resolve_collection_methods(args.collectionmethod)
if not collect:
Expand Down
22 changes: 16 additions & 6 deletions bloodhound/ad/domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,19 @@ def ldap_connect(self, protocol=None, resolver=False):
logging.info('Connecting to LDAP server: %s' % self.hostname)
logging.debug('Using protocol %s' % protocol)

# Convert the hostname to an IP, this prevents ldap3 from doing it
# which doesn't use our custom nameservers
q = self.ad.dnsresolver.query(self.hostname, tcp=self.ad.dns_tcp)
for r in q:
ip = r.address

if (self.ad.dc_ip):
logging.info('LDAP server IP provied')
logging.info('LDAP server IP: %s' % self.ad.dc_ip)
ip = self.ad.dc_ip
else:
# Convert the hostname to an IP, this prevents ldap3 from doing it
# which doesn't use our custom nameservers
logging.info('Resolving LDAP ip from nameserver')
q = self.ad.dnsresolver.query(self.hostname, tcp=self.ad.dns_tcp)
for r in q:
ip = r.address
logging.info('LDAP server IP: %s' % ip)

ldap = self.ad.auth.getLDAPConnection(hostname=self.hostname, ip=ip,
baseDN=self.ad.baseDN, protocol=protocol)
Expand Down Expand Up @@ -588,7 +596,7 @@ def get_root_domain(self):
"""
class AD(object):

def __init__(self, domain=None, auth=None, nameserver=None, dns_tcp=False, dns_timeout=3.0, use_ldaps=False):
def __init__(self, domain=None, auth=None, nameserver=None, dns_tcp=False, dns_timeout=3.0, use_ldaps=False,dc_ip=None):
self.domain = domain
# Object of type ADDomain, added later
self.domain_object = None
Expand All @@ -614,6 +622,8 @@ def __init__(self, domain=None, auth=None, nameserver=None, dns_tcp=False, dns_t
self.dnsresolver.nameservers = [nameserver]
# Resolve DNS over TCP?
self.dns_tcp = dns_tcp
# ldap ip to query
self.dc_ip = dc_ip
# Give it a cache to prevent duplicate lookups
self.dnsresolver.cache = resolver.Cache()
# Default timeout after 3 seconds if the DNS servers
Expand Down