openstack/deb-python-pysaml2
Code Issues Proposed changes

Allow for defining where the public key are

Browse Source
This commit is contained in:
Roland Hedberg
2011-04-08 13:51:51 +02:00
parent 5a59fb9f04
commit 7a975e4180
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/make_metadata.py
View File

@@ -29,7 +29,7 @@ class Usage(Exception):
def main(args): def main(args):
try: try:
opts, args = getopt.getopt(args, "hi:k:sv:x:", opts, args = getopt.getopt(args, "c:hi:k:sv:x:",
["help", "name", "id", "keyfile", "sign", ["help", "name", "id", "keyfile", "sign",
"valid", "xmlsec"]) "valid", "xmlsec"])
except getopt.GetoptError, err: except getopt.GetoptError, err:
@@ -44,6 +44,7 @@ def main(args):
sign = False sign = False
xmlsec = "" xmlsec = ""
keyfile = "" keyfile = ""
pubkeyfile = ""
try: try:
for o, a in opts: for o, a in opts:
@@ -61,6 +62,8 @@ def main(args):
xmlsec = a xmlsec = a
elif o in ("-k", "--keyfile"): elif o in ("-k", "--keyfile"):
keyfile = a keyfile = a
elif o in ("-c", "--certfile"):
pubkeyfile = a
else: else:
assert False, "unhandled option %s" % o assert False, "unhandled option %s" % o
except Usage, err: except Usage, err:
@@ -77,8 +80,8 @@ def main(args):
fil = fil[:-3] fil = fil[:-3]
cnf = Config().load_file(fil, metadata_construction=True) cnf = Config().load_file(fil, metadata_construction=True)
eds.append(entity_descriptor(cnf, valid_for)) eds.append(entity_descriptor(cnf, valid_for))
secc = SecurityContext(xmlsec, keyfile) secc = SecurityContext(xmlsec, keyfile, cert_file=pubkeyfile)
desc = entities_descriptor(eds, valid_for, name, id, sign, secc) desc = entities_descriptor(eds, valid_for, name, id, sign, secc)
valid_instance(desc) valid_instance(desc)
print desc print desc