Merge remote-tracking branch 'upstream/master'

Author: fulder

CHANGELOG

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.5] - 2021-03-11
+### Fixed
+- Fixed bugs in parsing lines that contain a semicolon or curly brace inside of quotes
+- Fixed bug in creating new Keys in which the value isn't a string but is still stringable (int)
+
+## [1.5.4] - 2020-08-21
+### Fixed
+- Warn user if successful parsing of a config is impossible due to missing semicolon (thanks @fulder!)
+
 ## [1.5.3] - 2018-12-10
 ### Fixed
 - Fixed bug in parsing Type directives as well as misidentifying certain possible key names (thanks @SGamoff and @fulder!)

README.md

@@ -29,7 +29,7 @@ Create an nginx serverblock and save it to file:
     ...          nginx.Key('allow', 'all'),
     ...          nginx.Key('log_not_found', 'off'),
     ...          nginx.Key('access_log', 'off')
-    ...     )
+    ...     ),
     ...     nginx.Location('~ \.php$',
     ...          nginx.Key('include', 'fastcgi.conf'),
     ...          nginx.Key('fastcgi_intercept_errors', 'on'),

nginx.py

@@ -399,7 +399,7 @@ def as_strings(self):
         """Return key as nginx config string."""
         if self.value == '' or self.value is None:
             return '{0};\n'.format(self.name)
-        if '"' not in self.value and (';' in self.value or '#' in self.value):
+        if type(self.value) == str and '"' not in self.value and (';' in self.value or '#' in self.value):
             return '{0} "{1}";\n'.format(self.name, self.value)
         return '{0} {1};\n'.format(self.name, self.value)
 
@@ -444,43 +444,44 @@ def loads(data, conf=True):
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*location\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        n = re.compile(r'(?!\B"[^"]*);(?![^"]*"\B)')
+        m = re.compile(r'^\s*location\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             l = Location(m.group(1))
             lopen.insert(0, l)
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*if\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        m = re.compile(r'^\s*if\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             ifs = If(m.group(1))
             lopen.insert(0, ifs)
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*upstream\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        m = re.compile(r'^\s*upstream\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             u = Upstream(m.group(1))
             lopen.insert(0, u)
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*geo\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        m = re.compile(r'^\s*geo\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             g = Geo(m.group(1))
             lopen.insert(0, g)
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*map\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        m = re.compile(r'^\s*map\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             g = Map(m.group(1))
             lopen.insert(0, g)
             index += m.end()
             continue
 
-        m = re.compile(r'^\s*limit_except\s*([^;]*?)\s*{', re.S).search(data[index:])
-        if m:
+        m = re.compile(r'^\s*limit_except\s+(.*?)\s*(?!\B"[^"]*){(?![^"]*"\B)', re.S).search(data[index:])
+        if m and not n.search(m.group()):
             l = LimitExcept(m.group(1))
             lopen.insert(0, l)
             index += m.end()

setup.py

@@ -4,14 +4,14 @@
 
 setup(
     name='python-nginx',
-    version='1.5.3',
+    version='1.5.5',
     description='Create and modify nginx serverblock configs in Python',
     author='Jacob Cook',
     author_email='jacob@peakwinter.net',
     url='https://github.com/peakwinter/python-nginx',
     py_modules=['nginx'],
     keywords=['nginx', 'web servers', 'serverblock', 'server block'],
-    download_url='https://github.com/peakwinter/python-nginx/archive/1.5.3.zip',
+    download_url='https://github.com/peakwinter/python-nginx/archive/1.5.4.zip',
     license='GPLv3',
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tests.py

@@ -167,6 +167,10 @@
 location test9 {
     add_header X-XSS-Protection "1;mode-block";
 }
+
+if ( $http_user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)" ) {
+    return 403;
+}
 """
 
 TESTBLOCK_CASE_10 = """
@@ -195,6 +199,21 @@
 """
 
 TESTBLOCK_CASE_12 = """
+server {
+    listen 80;
+    server_name test.example.com;
+
+    location ~ "^/(test|[0-9a-zA-Z]{6})$" {
+        if ($query_string ~ pid=(111)) {
+            return 403;
+        }
+
+        proxy_pass http://127.0.0.1:81;
+    }
+}
+"""
+
+TESTBLOCK_CASE_13 = """
 server{
 }"""
 
@@ -302,6 +321,8 @@ def test_semicolon_in_second_key_value(self):
         self.assertEqual(len(location_children), 1)
         self.assertEqual(location_children[0].name, "add_header")
         self.assertEqual(location_children[0].value, 'X-XSS-Protection "1;mode-block"')
+        self.assertEqual(len(inp_data.filter("If")), 1)
+        self.assertEqual(inp_data.filter("If")[0].value, "( $http_user_agent = \"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)\" )")
 
     def test_types_block(self):
         inp_data = nginx.loads(TESTBLOCK_CASE_10)
@@ -316,8 +337,13 @@ def test_missing_semi_colon(self):
             nginx.loads(TESTBLOCK_CASE_11)
         self.assertEqual(str(e.value), "Config syntax, missing ';' at index: 189")
 
+    def test_brace_inside_block_param(self):
+        inp_data = nginx.loads(TESTBLOCK_CASE_12)
+        self.assertEqual(len(inp_data.server.filter("Location")), 1)
+        self.assertEqual(inp_data.server.filter("Location")[0].value, "~ \"^/(test|[0-9a-zA-Z]{6})$\"")
+
     def test_server_without_last_linebreak(self):
-        self.assertTrue(nginx.loads(TESTBLOCK_CASE_12) is not None)
+        self.assertTrue(nginx.loads(TESTBLOCK_CASE_13) is not None)
 
 
 if __name__ == '__main__':