# 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
+# 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.
#----------------------------------------------------------------------
##
##
# Create a new uuid. Returns the UUID as a string.
+
def create_uuid():
return str(uuid.uuid4().int)
#
# URN is a human readable identifier of form:
# "urn:publicid:IDN+toplevelauthority[:sub-auth.]*[\res. type]\ +object name"
-# For example, urn:publicid:IDN+planetlab:us:arizona+user+bakers
+# For example, urn:publicid:IDN+planetlab:us:arizona+user+bakers
#
# PUBLIC_KEY is the public key of the principal identified by the UUID/HRN.
# It is a Keypair object as defined in the cert.py module.
self.uuid = None
self.hrn = None
self.urn = None
- self.email = None # for adding to the SubjectAltName
+ self.email = None # for adding to the SubjectAltName
Certificate.__init__(self, lifeDays, create, subject, string, filename)
if subject:
def set_urn(self, urn):
self.urn = urn
self.hrn, type = urn_to_hrn(urn)
-
+
def get_urn(self):
if not self.urn:
self.decode()
- return self.urn
+ return self.urn
# Will be stuffed into subjectAltName
def set_email(self, email):
self.decode()
_, t = urn_to_hrn(self.urn)
return t
-
+
##
# Encode the GID fields and package them into the subject-alt-name field
# of the X509 certificate. This must be called prior to signing the
urn = self.urn
else:
urn = hrn_to_urn(self.hrn, None)
-
+
str = "URI:" + urn
if self.uuid:
str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn
-
+
if self.email:
str += ", " + "email:" + self.email
self.set_data(str, 'subjectAltName')
-
##
# Decode the subject-alt-name field of the X509 certificate into the
# fields of the GID. This is automatically called by the various get_*()
# FIXME: Ensure there isn't cruft in that address...
# EG look for email:copy,....
dict['email'] = val[6:]
-
+
self.uuid = dict.get("uuid", None)
self.urn = dict.get("urn", None)
self.hrn = dict.get("hrn", None)
# @param dump_parents If true, also dump the parents of the GID
def dump(self, *args, **kwargs):
- print(self.dump_string(*args,**kwargs))
+ print(self.dump_string(*args, **kwargs))
def dump_string(self, indent=0, dump_parents=False):
- result=" "*(indent-2) + "GID\n"
- result += " "*indent + "hrn:" + str(self.get_hrn()) +"\n"
- result += " "*indent + "urn:" + str(self.get_urn()) +"\n"
- result += " "*indent + "uuid:" + str(self.get_uuid()) + "\n"
+ result = " " * (indent - 2) + "GID\n"
+ result += " " * indent + "hrn:" + str(self.get_hrn()) + "\n"
+ result += " " * indent + "urn:" + str(self.get_urn()) + "\n"
+ result += " " * indent + "uuid:" + str(self.get_uuid()) + "\n"
if self.get_email() is not None:
- result += " "*indent + "email:" + str(self.get_email()) + "\n"
- filename=self.get_filename()
- if filename: result += "Filename %s\n"%filename
+ result += " " * indent + "email:" + str(self.get_email()) + "\n"
+ filename = self.get_filename()
+ if filename:
+ result += "Filename %s\n" % filename
if self.parent and dump_parents:
- result += " "*indent + "parent:\n"
- result += self.parent.dump_string(indent+4, dump_parents)
+ result += " " * indent + "parent:\n"
+ result += self.parent.dump_string(indent + 4, dump_parents)
return result
##
# for a principal that is not a member of that authority. For example,
# planetlab.us.arizona cannot sign a GID for planetlab.us.princeton.foo.
- def verify_chain(self, trusted_certs = None):
+ def verify_chain(self, trusted_certs=None):
logger.debug("GID.verify_chain with {} trusted certs".format(len(trusted_certs)))
# do the normal certificate verification stuff
- trusted_root = Certificate.verify_chain(self, trusted_certs)
-
+ trusted_root = Certificate.verify_chain(self, trusted_certs)
+
if self.parent:
# make sure the parent's hrn is a prefix of the child's hrn
if not hrn_authfor_hrn(self.parent.get_hrn(), self.get_hrn()):
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':
+ # if trusted_type == 'authority':
# trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')]
cur_hrn = self.get_hrn()
if not hrn_authfor_hrn(trusted_hrn, cur_hrn):
git://git.onelab.eu / sfa.git / blobdiff