Skip to content

Commit 6f4c070

Browse files
committed
enhance create_metadata API
Allow create_metadata_string('/fillename.py') instead of create_metadata_string('/fillename.py', None, valid=None, cert=None, keyfile=None, mid=None, name=None, sign=False)
1 parent e341cdc commit 6f4c070

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/saml2/metadata.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def metadata_tostring_fix(desc, nspair, xmlstring=""):
6666
return xmlstring
6767

6868

69-
def create_metadata_string(configfile, config, valid, cert, keyfile, mid, name,
70-
sign):
69+
def create_metadata_string(configfile, config=None, valid=None, cert=None,
70+
keyfile=None, mid=None, name=None, sign=None):
7171
valid_for = 0
7272
nspair = {"xs": "http://www.w3.org/2001/XMLSchema"}
7373
#paths = [".", "/opt/local/bin"]
@@ -76,17 +76,15 @@ def create_metadata_string(configfile, config, valid, cert, keyfile, mid, name,
7676
valid_for = int(valid) # Hours
7777

7878
eds = []
79-
if config is not None:
80-
eds.append(entity_descriptor(config))
81-
else:
79+
if config is None:
8280
if configfile.endswith(".py"):
8381
configfile = configfile[:-3]
8482
config = Config().load_file(configfile, metadata_construction=True)
85-
eds.append(entity_descriptor(config))
83+
eds.append(entity_descriptor(config))
8684

8785
conf = Config()
88-
conf.key_file = keyfile
89-
conf.cert_file = cert
86+
conf.key_file = config.key_file or keyfile
87+
conf.cert_file = config.cert_file or cert
9088
conf.debug = 1
9189
conf.xmlsec_binary = config.xmlsec_binary
9290
secc = security_context(conf)

0 commit comments

Comments
 (0)