idp: always prefix idp files with 'idp-', not 'provider-' (#5830)

This commit is contained in:
Frédéric Péters 2014-10-30 15:42:33 +01:00
parent a207827a5c
commit a508510700
1 changed files with 6 additions and 6 deletions

View File

@ -706,18 +706,18 @@ class AdminIDPUI(Directory):
if key_provider_id and new_key_provider_id != key_provider_id:
# provider id changed, remove old files
cfg_idp[new_key_provider_id] = cfg_idp[key_provider_id]
old_metadata_fn = 'provider-%s-metadata.xml' % key_provider_id
old_publickey_fn = 'provider-%s-publickey.pem' % key_provider_id
old_cacertchain_fn = 'provider-%s-cacertchain.pem' % key_provider_id
old_metadata_fn = 'idp-%s-metadata.xml' % key_provider_id
old_publickey_fn = 'idp-%s-publickey.pem' % key_provider_id
old_cacertchain_fn = 'idp-%s-cacertchain.pem' % key_provider_id
old_dict = cfg_idp[key_provider_id]
del cfg_idp[key_provider_id]
key_provider_id = new_key_provider_id
dir = get_publisher().app_dir
metadata_fn = 'provider-%s-metadata.xml' % key_provider_id
publickey_fn = 'provider-%s-publickey.pem' % key_provider_id
cacertchain_fn = 'provider-%s-cacertchain.pem' % key_provider_id
metadata_fn = 'idp-%s-metadata.xml' % key_provider_id
publickey_fn = 'idp-%s-publickey.pem' % key_provider_id
cacertchain_fn = 'idp-%s-cacertchain.pem' % key_provider_id
if old_publickey_fn and os.path.exists(old_publickey_fn):
os.rename(misc.get_abs_path(old_publickey_fn), misc.get_abs_path(publickey_fn))