Skip to content

Commit 7384d0b

Browse files
author
Kevin Turner
committed
[project @ etxrd.getCanonicalID: case-insensitive comparsions, patch from =wil]
1. There should only be a single CanonicalID in each XRD (in the latest XRI resolution spec), so I made it use the first CID found instead of the last. 2. Use case-insensitive comparison when comparing CanonicalIDs.
1 parent 6ea3dc7 commit 7384d0b

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

‎openid/yadis/etxrd.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,19 +172,18 @@ def getCanonicalID(iname, xrd_tree):
172172
xrd_list.reverse()
173173

174174
try:
175-
canonicalID = xri.XRI(xrd_list[0].findall(canonicalID_tag)[-1].text)
175+
canonicalID = xri.XRI(xrd_list[0].findall(canonicalID_tag)[0].text)
176176
except IndexError:
177177
return None
178178

179-
childID = canonicalID
179+
childID = canonicalID.lower()
180180

181181
for xrd in xrd_list[1:]:
182182
# XXX: can't use rsplit until we require python >= 2.4.
183183
parent_sought = childID[:childID.rindex('!')]
184-
parent_list = [xri.XRI(c.text) for c in xrd.findall(canonicalID_tag)]
185-
if parent_sought not in parent_list:
186-
raise XRDSFraud("%r can not come from any of %s" % (parent_sought,
187-
parent_list))
184+
parent = xri.XRI(xrd.findtext(canonicalID_tag))
185+
if parent_sought != parent.lower():
186+
raise XRDSFraud("%r can not come from %s" % (childID, parent))
188187

189188
childID = parent_sought
190189

0 commit comments

Comments
 (0)