git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix NameError
[sfa.git]
/
sfa
/
trust
/
gid.py
diff --git
a/sfa/trust/gid.py
b/sfa/trust/gid.py
index
15ad6bf
..
4f48270
100644
(file)
--- a/
sfa/trust/gid.py
+++ b/
sfa/trust/gid.py
@@
-30,7
+30,7
@@
import uuid
from sfa.trust.certificate import Certificate
from sfa.trust.certificate import Certificate
-from sfa.util.faults import
*
+from sfa.util.faults import
GidInvalidParentHrn, GidParentHrn
from sfa.util.sfalogging import logger
from sfa.util.xrn import hrn_to_urn, urn_to_hrn, hrn_authfor_hrn
from sfa.util.sfalogging import logger
from sfa.util.xrn import hrn_to_urn, urn_to_hrn, hrn_authfor_hrn
@@
-69,6
+69,7
@@
class GID(Certificate):
uuid = None
hrn = None
urn = None
uuid = None
hrn = None
urn = None
+ email = None # for adding to the SubjectAltName
##
# Create a new GID object
##
# Create a new GID object
@@
-121,6
+122,15
@@
class GID(Certificate):
self.decode()
return self.urn
self.decode()
return self.urn
+ # Will be stuffed into subjectAltName
+ def set_email(self, email):
+ self.email = email
+
+ def get_email(self):
+ if not self.email:
+ self.decode()
+ return self.email
+
def get_type(self):
if not self.urn:
self.decode()
def get_type(self):
if not self.urn:
self.decode()
@@
-143,9
+153,10
@@
class GID(Certificate):
if self.uuid:
str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn
if self.uuid:
str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn
- self.set_data(str, 'subjectAltName')
+ if self.email:
+ str += ", " + "email:" + self.email
-
+ self.set_data(str, 'subjectAltName')
##
##
@@
-166,10
+177,15
@@
class GID(Certificate):
dict['uuid'] = uuid.UUID(val[4:]).int
elif val.lower().startswith('uri:urn:publicid:idn+'):
dict['urn'] = val[4:]
dict['uuid'] = uuid.UUID(val[4:]).int
elif val.lower().startswith('uri:urn:publicid:idn+'):
dict['urn'] = val[4:]
+ elif val.lower().startswith('email:'):
+ # 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.uuid = dict.get("uuid", None)
self.urn = dict.get("urn", None)
- self.hrn = dict.get("hrn", None)
+ self.hrn = dict.get("hrn", None)
+ self.email = dict.get("email", None)
if self.urn:
self.hrn = urn_to_hrn(self.urn)[0]
if self.urn:
self.hrn = urn_to_hrn(self.urn)[0]
@@
-187,6
+203,8
@@
class GID(Certificate):
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 + "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
filename=self.get_filename()
if filename: result += "Filename %s\n"%filename
@@
-231,7
+249,7
@@
class GID(Certificate):
# trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')]
cur_hrn = self.get_hrn()
if not hrn_authfor_hrn(trusted_hrn, cur_hrn):
# trusted_hrn = trusted_hrn[:trusted_hrn.rindex('.')]
cur_hrn = self.get_hrn()
if not hrn_authfor_hrn(trusted_hrn, cur_hrn):
- raise GidParentHrn("Trusted root with HRN %s isn't a namespace authority for this cert %s" % (trusted_hrn, cur_hrn))
+ raise GidParentHrn("Trusted root with HRN %s isn't a namespace authority for this cert
:
%s" % (trusted_hrn, cur_hrn))
# There are multiple types of authority - accept them all here
if not trusted_type.find('authority') == 0:
# There are multiple types of authority - accept them all here
if not trusted_type.find('authority') == 0: