From c537bab3dcfddac968b7db248e83864d4730f7b9 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 9 Jun 2010 18:30:58 +0000 Subject: [PATCH] merge from geni_api branch --- sfa/trust/gid.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py index 99fa0314..9cab1a51 100644 --- a/sfa/trust/gid.py +++ b/sfa/trust/gid.py @@ -1,3 +1,25 @@ +#---------------------------------------------------------------------- +# Copyright (c) 2008 Board of Trustees, Princeton University +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and/or hardware specification (the "Work") to +# deal in the Work without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Work, and to permit persons to whom the Work +# is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Work. +# +# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS +# IN THE WORK. +#---------------------------------------------------------------------- ## # Implements SFA GID. GIDs are based on certificates, and the GID class is a # descendant of the certificate class. @@ -186,7 +208,11 @@ class GID(Certificate): else: # make sure that the trusted root's hrn is a prefix of the child's trusted_gid = GID(string=trusted_root.save_to_string()) + trusted_type = trusted_gid.get_type() trusted_hrn = trusted_gid.get_hrn() + if trusted_type == 'authority': + # Could add a check for type == 'authority' + trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')] cur_hrn = self.get_hrn() if not self.get_hrn().startswith(trusted_hrn): raise GidParentHrn(trusted_hrn + " " + self.get_hrn()) -- 2.43.0