From f2cee505f5a04917acbf9063baa8cdf9ac302fdd Mon Sep 17 00:00:00 2001 From: James Kasten Date: Thu, 17 Sep 2015 02:14:53 -0700 Subject: [PATCH 1/2] fix 781 --- letsencrypt-apache/letsencrypt_apache/parser.py | 2 ++ .../letsencrypt_apache/tests/complex_parsing_test.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/letsencrypt-apache/letsencrypt_apache/parser.py b/letsencrypt-apache/letsencrypt_apache/parser.py index d7dc3c422..823d9794b 100644 --- a/letsencrypt-apache/letsencrypt_apache/parser.py +++ b/letsencrypt-apache/letsencrypt_apache/parser.py @@ -394,6 +394,8 @@ class ApacheParser(object): if not arg.startswith("/"): # Normpath will condense ../ arg = os.path.normpath(os.path.join(self.root, arg)) + else: + arg = os.path.normpath(arg) # Attempts to add a transform to the file if one does not already exist if os.path.isdir(arg): diff --git a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py b/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py index e7bd03cc5..6ee7e1eb9 100644 --- a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py +++ b/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py @@ -98,6 +98,9 @@ class ComplexParserTest(util.ParserTest): def test_include_fullpath(self): self.verify_fnmatch(os.path.join(self.config_path, "test_fnmatch.conf")) + def test_include_fullpath_trailing_slash(self): + self.verify_fnmatch(self.config_path + "//") + def test_include_variable(self): self.verify_fnmatch("../complex_parsing/${fnmatch_filename}") @@ -106,5 +109,6 @@ class ComplexParserTest(util.ParserTest): self.verify_fnmatch("test_*.onf", False) + if __name__ == "__main__": unittest.main() # pragma: no cover From b5c8da21889b89b1da612b3bd09952b2f8e8e75a Mon Sep 17 00:00:00 2001 From: James Kasten Date: Thu, 17 Sep 2015 02:20:15 -0700 Subject: [PATCH 2/2] remove space --- .../letsencrypt_apache/tests/complex_parsing_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py b/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py index 6ee7e1eb9..64ecaa321 100644 --- a/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py +++ b/letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py @@ -109,6 +109,5 @@ class ComplexParserTest(util.ParserTest): self.verify_fnmatch("test_*.onf", False) - if __name__ == "__main__": unittest.main() # pragma: no cover