starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 19:31:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Basic attempt at fixing #2368

Browse Source 
Changing the method of updating and rewriting renewal config files
to use the same ConfigObj instance rather than a new one, and change
individual renewalparams items individually rather than replacing
the entire renewalparams dict with a new dict (which may also cause
a loss of associated comment data).
This commit is contained in:
Seth Schoen
2016-03-30 16:59:13 -07:00
parent 86e5832a8a
commit b13ce26eb3
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/storage.py
+17 -10
View File
@@ -50,10 +50,11 @@ def add_time_interval(base_time, interval, textparser=parsedatetime.Calendar()):
return textparser.parseDT(interval, base_time, tzinfo=tzinfo)[0] return textparser.parseDT(interval, base_time, tzinfo=tzinfo)[0]
def write_renewal_config(filename, target, relevant_data): def write_renewal_config(o_filename, n_filename, target, relevant_data):
"""Writes a renewal config file with the specified name and values. """Writes a renewal config file with the specified name and values.
:param str filename: Absolute path to the config file :param str o_filename: Absolute path to the previous version of config file
:param str n_filename: Absolute path to the new destination of config file
:param dict target: Maps ALL_FOUR to their symlink paths :param dict target: Maps ALL_FOUR to their symlink paths
:param dict relevant_data: Renewal configuration options to save :param dict relevant_data: Renewal configuration options to save
@@ -61,21 +62,27 @@ def write_renewal_config(filename, target, relevant_data):
:rtype: configobj.ConfigObj :rtype: configobj.ConfigObj
""" """
# create_empty creates a new config file if filename does not exist config = configobj.ConfigObj(o_filename)
config = configobj.ConfigObj(filename, create_empty=True)
for kind in ALL_FOUR: for kind in ALL_FOUR:
config[kind] = target[kind] config[kind] = target[kind]
if relevant_data: if "renewalparams" not in config:
config["renewalparams"] = relevant_data config["renewalparams"] = {}
config.comments["renewalparams"] = ["", config.comments["renewalparams"] = ["",
"Options used in " "Options used in "
"the renewal process"] "the renewal process"]
config["renewalparams"].update(relevant_data)
for k in config["renewalparams"].keys():
if k not in relevant_data:
del config["renewalparams"][k]
# TODO: add human-readable comments explaining other available # TODO: add human-readable comments explaining other available
# parameters # parameters
logger.debug("Writing new config %s.", filename) logger.debug("Writing new config %s.", n_filename)
config.write() with open(n_filename, "w") as f:
config.write(outfile=f)
return config return config
@@ -101,7 +108,7 @@ def update_configuration(lineagename, target, cli_config):
# Save only the config items that are relevant to renewal # Save only the config items that are relevant to renewal
values = relevant_values(vars(cli_config.namespace)) values = relevant_values(vars(cli_config.namespace))
write_renewal_config(temp_filename, target, values) write_renewal_config(config_filename, temp_filename, target, values)
os.rename(temp_filename, config_filename) os.rename(temp_filename, config_filename)
return configobj.ConfigObj(config_filename) return configobj.ConfigObj(config_filename)
@@ -798,7 +805,7 @@ class RenewableCert(object): # pylint: disable=too-many-instance-attributes
# Save only the config items that are relevant to renewal # Save only the config items that are relevant to renewal
values = relevant_values(vars(cli_config.namespace)) values = relevant_values(vars(cli_config.namespace))
new_config = write_renewal_config(config_filename, target, values) new_config = write_renewal_config(config_filename, config_filename, target, values)
return cls(new_config.filename, cli_config) return cls(new_config.filename, cli_config)
def save_successor(self, prior_version, new_cert, def save_successor(self, prior_version, new_cert,