ipaserver/dcerpc.py: handle indirect topology conflicts #2071
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Note that the original bug https://bugzilla.redhat.com/show_bug.cgi?id=1533803 has some unrelated misconfiguration issue which prevented tests to perform properly. However, its log actually showed this bug which I didn't notice originally due to that unrelated misconfiguration. |
netoarmando
reviewed
Jun 26, 2018
ipaserver/dcerpc.py
Outdated
| for e in dominfo.entries: | ||
| e1 = lsa.ForestTrustRecord() | ||
| e1.type = e.type | ||
| e1.flags = e.flags | ||
| e1.time = e.time | ||
| e1.forest_trust_data = e.forest_trust_data | ||
| try: |
There was a problem hiding this comment.
(nitpicking) my humble suggestion to improve readability:
is_our_record = False # or even is_conflicting = False
# ...
for record in another_domain.ftinfo_records:
if record['rec_name'] == e.forest_trust_data.string:
is_our_record = True
break
if is_our_record:
# ...
When AD forest A has a trust with a forest B that claims ownership of a domain name (TLN) owned by an IPA forest, we need to build exclusion record for that specific TLN, not our domain name. Use realmdomains to find a correct exclusion entry to build. Fixes: https://pagure.io/freeipa/issue/7370
|
@netoarmando thanks, I've updated the code to follow your suggestion and added few more comments. |
tiran
approved these changes
Jun 27, 2018
ipaserver/dcerpc.py
Outdated
| in another_domain.ftinfo_records | ||
| if (x['rec_name'] == | ||
| e.forest_trust_data.string)) | ||
| except StopIteration: |
There was a problem hiding this comment.
This code block is hard to understand. After a couple of minutes, I'm still not sure that I got it right. Is it equivalent to this code?
for record in another_domain.ftinfo_records:
if x['rec_name'] == e.forest_trust_data.string:
our_record = record
e1.type = lsa.LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX
e1.flags = 0
e1.time = trust_timestamp
break
|
master:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When AD forest A has a trust with a forest B that claims ownership of a domain name (TLN) owned by an IPA forest, we need to build exclusion record for that specific TLN, not our domain name.
Use realmdomains to find a correct exclusion entry to build, not just using our own domain name.
Fixes: https://pagure.io/freeipa/issue/7370