mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Generate a database password by default in all cases.
If the password passed in when creating a NSS certificate database is None
then a random password is generated. If it is empty ('') then an empty
password is set.
Because of this the HTTP instance on replicas were created with an empty
password.
https://fedorahosted.org/freeipa/ticket/1407
This commit is contained in:
@@ -914,7 +914,7 @@ class CertDB(object):
|
|||||||
self.export_ca_cert(self.cacert_name, True)
|
self.export_ca_cert(self.cacert_name, True)
|
||||||
self.create_pin_file()
|
self.create_pin_file()
|
||||||
|
|
||||||
def create_from_cacert(self, cacert_fname, passwd=""):
|
def create_from_cacert(self, cacert_fname, passwd=None):
|
||||||
if ipautil.file_exists(self.certdb_fname):
|
if ipautil.file_exists(self.certdb_fname):
|
||||||
# We already have a cert db, see if it is for the same CA.
|
# We already have a cert db, see if it is for the same CA.
|
||||||
# If it is we leave things as they are.
|
# If it is we leave things as they are.
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ class HTTPInstance(service.Service):
|
|||||||
|
|
||||||
db = certs.CertDB(self.realm, subject_base=self.subject_base)
|
db = certs.CertDB(self.realm, subject_base=self.subject_base)
|
||||||
if self.pkcs12_info:
|
if self.pkcs12_info:
|
||||||
db.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1], passwd="")
|
db.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1], passwd=None)
|
||||||
server_certs = db.find_server_certs()
|
server_certs = db.find_server_certs()
|
||||||
if len(server_certs) == 0:
|
if len(server_certs) == 0:
|
||||||
raise RuntimeError("Could not find a suitable server cert in import in %s" % self.pkcs12_info[0])
|
raise RuntimeError("Could not find a suitable server cert in import in %s" % self.pkcs12_info[0])
|
||||||
|
|||||||
Reference in New Issue
Block a user