upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-04-28 17:51:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow single/double quotes around Include dirs

Browse source
This commit is contained in:
James Kasten 2015-09-22 08:15:11 -07:00
parent f16e651794
commit 6e4faac9c0
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
letsencrypt-apache/letsencrypt_apache/parser.py
View file

@ -390,6 +390,9 @@ class ApacheParser(object):
# logger.error("Error: Invalid regexp characters in %s", arg)
# return []
# Remove beginning and ending quotes
arg = arg.strip("'\"")
# Standardize the include argument based on server root
if not arg.startswith("/"):
# Normpath will condense ../

9
letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py
View file

@ -78,7 +78,7 @@ class ComplexParserTest(util.ParserTest):
# This is in an IfDefine
self.assertTrue("ssl_module" in self.parser.modules)
self.assertTrue("mod_ssl.c" in self.parser.modules)
#
def verify_fnmatch(self, arg, hit=True):
"""Test if Include was correctly parsed."""
from letsencrypt_apache import parser
@ -89,6 +89,7 @@ class ComplexParserTest(util.ParserTest):
else:
self.assertFalse(self.parser.find_dir("FNMATCH_DIRECTIVE"))
# NOTE: Only run one test per function otherwise you will have inf recursion
def test_include(self):
self.verify_fnmatch("test_fnmatch.?onf")
@ -101,6 +102,12 @@ class ComplexParserTest(util.ParserTest):
def test_include_fullpath_trailing_slash(self):
self.verify_fnmatch(self.config_path + "//")
def test_include_single_quotes(self):
self.verify_fnmatch("'" + self.config_path + "'")
def test_include_double_quotes(self):
self.verify_fnmatch('"' + self.config_path + '"')
def test_include_variable(self):
self.verify_fnmatch("../complex_parsing/${fnmatch_filename}")