summaryrefslogtreecommitdiffstats
path: root/base/server
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2015-11-23 12:01:45 +0100
committerChristian Heimes <cheimes@redhat.com>2016-01-13 16:41:20 +0100
commit2fe50f3098aba9d604a812604cecb75279f445bf (patch)
tree8a0b48a86cf473c40337f9e682618398bf3a03cc /base/server
parent9193fe5191d1bd857b7e1f5a398c6a279b42ec84 (diff)
downloadpki-2fe50f3098aba9d604a812604cecb75279f445bf.tar.gz
pki-2fe50f3098aba9d604a812604cecb75279f445bf.tar.xz
pki-2fe50f3098aba9d604a812604cecb75279f445bf.zip
Fix escaping of password fields to prevent interpolation
Some password and pin fields are missing from the no_interpolation list. One entry is misspelled. A '%' in password field such as pki_clone_pkcs12_password causes an installation error. https://fedorahosted.org/pki/ticket/1703 Signed-off-by: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'base/server')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 09619d557..d2b37d062 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -339,11 +339,15 @@ class PKIConfigParser:
'pki_admin_password',
'pki_backup_password',
'pki_client_database_password',
+ 'pki_client_pin',
'pki_client_pkcs12_password',
+ 'pki_clone_pkcs12_password',
'pki_ds_password',
+ 'pki_one_time_pin',
'pki_pin',
- 'pki_replicationdb_password',
- 'pki_security_domain_password')
+ 'pki_replication_password',
+ 'pki_security_domain_password',
+ 'pki_token_password')
print('Loading deployment configuration from ' +
config.user_deployment_cfg + '.')