Skip to content

Fix trust anchor naming #52

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

Open
lionick wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix trust anchor naming #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2df749
replace trust_anchor_id with trust_anchor
lionick Jun 26, 2025
2df5020
add more naming
lionick Jan 9, 2026
415ed72
minor fixes
lionick Jan 9, 2026
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
2 changes: 1 addition & 1 deletion src/fedservice/appclient/oauth2/registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,5 @@ def parse_response(self, info, sformat="", state="", **kwargs):

return resp

def _get_trust_anchor_id(self, entity_statement):
def _get_trust_anchor(self, entity_statement):
return entity_statement.get('trust_anchor')
4 changes: 2 additions & 2 deletions src/fedservice/appclient/oidc/registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def parse_response(self, info, sformat="", state="", **kwargs):

return resp

def _get_trust_anchor_id(self, entity_statement):
def _get_trust_anchor(self, entity_statement):
return entity_statement.get('trust_anchor')

def parse_federation_registration_response(self, resp, **kwargs):
Expand All @@ -102,7 +102,7 @@ def parse_federation_registration_response(self, resp, **kwargs):

# Do I trust the TA the OP chose ?
_trust_anchor = payload['trust_anchor']
logger.debug(f"trust_anchor_id: {_trust_anchor}")
logger.debug(f"trust_anchor: {_trust_anchor}")
if _trust_anchor not in _federation_entity.function.trust_chain_collector.trust_anchors:
raise ValueError("Trust anchor I don't trust")

Expand Down
4 changes: 2 additions & 2 deletions src/fedservice/entity/function/trust_mark_verifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ def __call__(self,
else:
return _mark

def verify_delegation(self, trust_mark, trust_anchor_id):
def verify_delegation(self, trust_mark, trust_anchor):
_federation_entity = get_federation_entity(self)
_collector = _federation_entity.function.trust_chain_collector
# Deal with the delegation
_entity_configuration = _collector.get_verified_self_signed_entity_configuration(trust_anchor_id)
_entity_configuration = _collector.get_verified_self_signed_entity_configuration(trust_anchor)

if trust_mark['trust_mark_id'] not in _entity_configuration['trust_mark_issuers']:
return None
Expand Down
2 changes: 1 addition & 1 deletion tests/xtest_13_explicit_registration_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def test_registration_verification(self):
_payload = _jws.jwt.payload()
assert _payload['iss'] == self.oauth_serv.entity_id
assert _payload['sub'] == self.rp.entity_id
assert _payload['trust_anchor_id'] == self.ta.entity_id
assert _payload['trust_anchor'] == self.ta.entity_id
assert _payload['aud'] == self.rp.entity_id

###########################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/xtest_57_metadata_verification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def test_registration_verification(self):
_payload = _jws.jwt.payload()
assert _payload['iss'] == self.op.entity_id
assert _payload['sub'] == self.rp.entity_id
assert _payload['trust_anchor_id'] == self.ta.entity_id
assert _payload['trust_anchor'] == self.ta.entity_id
assert _payload['aud'] == self.rp.entity_id

###########################################################################
Expand Down
Loading