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

wrap with escapes

Browse Source
This commit is contained in:
Noah Swartz
2016-07-08 15:04:44 -07:00
parent b64da855a2
commit d4a8820bdc
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-apache/certbot_apache/configurator.py
+12 -8
View File
@@ -529,7 +529,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
if addr.get_port() == "443": if addr.get_port() == "443":
is_ssl = True is_ssl = True
filename = self._unescape(get_file_path(path)) filename = get_file_path(self.aug.get("/augeas/files%s/file" % get_file_path(path)))
if self.conf("handle-sites"): if self.conf("handle-sites"):
is_enabled = self.is_site_enabled(filename) is_enabled = self.is_site_enabled(filename)
else: else:
@@ -770,7 +770,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
""" """
avail_fp = nonssl_vhost.filep avail_fp = nonssl_vhost.filep
ssl_fp = self._escape(self._get_ssl_vhost_path(avail_fp)) ssl_fp = self._get_ssl_vhost_path(avail_fp)
self._copy_create_ssl_vhost_skeleton(avail_fp, ssl_fp) self._copy_create_ssl_vhost_skeleton(avail_fp, ssl_fp)
@@ -778,7 +778,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.aug.load() self.aug.load()
# Get Vhost augeas path for new vhost # Get Vhost augeas path for new vhost
vh_p = self.aug.match("/files%s//* [label()=~regexp('%s')]" % vh_p = self.aug.match("/files%s//* [label()=~regexp('%s')]" %
(ssl_fp, parser.case_i("VirtualHost"))) (_escape(ssl_fp), parser.case_i("VirtualHost")))
if len(vh_p) != 1: if len(vh_p) != 1:
logger.error("Error: should only be one vhost in %s", avail_fp) logger.error("Error: should only be one vhost in %s", avail_fp)
raise errors.PluginError("Currently, we only support " raise errors.PluginError("Currently, we only support "
@@ -997,11 +997,15 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
if need_to_save: if need_to_save:
self.save() self.save()
def _unescape(self, fp):
return fp.replace("\\", "")
def _escape(self, fp): def _escape(self, fp):
return fp.replace(",", "\\,") fp = fp.replace(",", "\\,")
fp = fp.replace("[", "\\[")
fp = fp.replace("]", "\\]")
fp = fp.replace("|", "\\|")
fp = fp.replace("=", "\\=")
fp = fp.replace("(", "\\(")
fp = fp.replace(")", "\\)")
fp = fp.replace("!", "\\!")
###################################################################### ######################################################################
# Enhancements # Enhancements
@@ -1332,7 +1336,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.aug.load() self.aug.load()
# Make a new vhost data structure and add it to the lists # Make a new vhost data structure and add it to the lists
new_vhost = self._create_vhost(parser.get_aug_path(redirect_filepath)) new_vhost = self._create_vhost(parser.get_aug_path(self._escape(redirect_filepath)))
self.vhosts.append(new_vhost) self.vhosts.append(new_vhost)
self._enhanced_vhosts["redirect"].add(new_vhost) self._enhanced_vhosts["redirect"].add(new_vhost)