summaryrefslogtreecommitdiffstats
path: root/ipaserver/dcerpc.py
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2012-09-25 17:25:42 +0300
committerMartin Kosek <mkosek@redhat.com>2012-09-27 14:00:40 +0200
commitfbfa3b56fa303056d2d18f1a71f5826e37021906 (patch)
treea692eab4c8a4ff66f1e86d08d3873822b1209681 /ipaserver/dcerpc.py
parent256024db0a1cd2fb39445f9760bc8a49abb7f15c (diff)
downloadfreeipa-fbfa3b56fa303056d2d18f1a71f5826e37021906.tar.gz
freeipa-fbfa3b56fa303056d2d18f1a71f5826e37021906.tar.xz
freeipa-fbfa3b56fa303056d2d18f1a71f5826e37021906.zip
Change the way SID comparison is done for belonging to trusted domain
Fixes trust use on RHEL 6.
Diffstat (limited to 'ipaserver/dcerpc.py')
-rw-r--r--ipaserver/dcerpc.py28
1 files changed, 12 insertions, 16 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 86cf01dba..cbe28753d 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -124,7 +124,8 @@ class DomainValidator(object):
(entries, truncated) = self.ldap.find_entries(filter=filter, base_dn=cn_trust,
attrs_list=[self.ATTR_TRUSTED_SID, 'dn'])
- return entries
+ result = map (lambda entry: security.dom_sid(entry[1][self.ATTR_TRUSTED_SID][0]), entries)
+ return result
except errors.NotFound, e:
return []
@@ -136,17 +137,7 @@ class DomainValidator(object):
# Parse sid string to see if it is really in a SID format
try:
test_sid = security.dom_sid(sid)
- except TypeError:
- return False
- (dom, sid_rid) = test_sid.split()
- sid_dom = str(dom)
- # Now we have domain prefix of the sid as sid_dom string and can
- # analyze it against known prefixes
- if sid_dom.find(security.SID_NT_AUTHORITY) != 0:
- # Ignore any potential SIDs that are not S-1-5-*
- return False
- if sid_dom.find(self.sid) == 0:
- # A SID from our own domain cannot be treated as trusted domain's SID
+ except TypeError, e:
return False
# At this point we have SID_NT_AUTHORITY family SID and really need to
# check it against prefixes of domain SIDs we trust to
@@ -158,8 +149,11 @@ class DomainValidator(object):
return False
# We have non-zero list of trusted domains and have to go through them
# one by one and check their sids as prefixes
- for (dn, domaininfo) in self._domains:
- if sid_dom.find(domaininfo[self.ATTR_TRUSTED_SID][0]) == 0:
+ test_sid_subauths = test_sid.sub_auths
+ for domsid in self._domains:
+ sub_auths = domsid.sub_auths
+ num_auths = min(test_sid.num_auths, domsid.num_auths)
+ if test_sid_subauths[:num_auths] == sub_auths[:num_auths]:
return True
return False
@@ -393,8 +387,10 @@ class TrustDomainInstance(object):
result = retrieve_netlogon_info_2(self,
netlogon.NETLOGON_CONTROL_TC_VERIFY,
another_domain.info['dns_domain'])
- if (unicode(result.trusted_dc_name)[2:] == another_domain.info['dc'] and
- result.tc_connection_status == (0, 'WERR_OK')):
+ if (result and (result.flags and netlogon.NETLOGON_VERIFY_STATUS_RETURNED)):
+ # netr_LogonControl2Ex() returns non-None result only if overall call
+ # result was WERR_OK which means verification was correct.
+ # We only check that it was indeed status for verification process
return True
return False