Tests: more $request_uri variable tests

Author: andrey-zelenkov

test/test_python_application.py

@@ -10,6 +10,7 @@
 from packaging import version
 
 from unit.applications.lang.python import ApplicationPython
+from unit.option import option
 
 prerequisites = {'modules': {'python': 'all'}}
 
@@ -64,6 +65,45 @@ def test_python_application_variables(date_to_sec_epoch, sec_epoch):
     }, 'headers'
     assert resp['body'] == body, 'body'
 
+    # REQUEST_URI unchanged
+
+    path = f'{option.test_dir}/python/variables'
+    assert 'success' in client.conf(
+        {
+            "listeners": {"*:8080": {"pass": "routes"}},
+            "routes": [
+                {
+                    "action": {
+                        "rewrite": "/foo",
+                        "pass": "applications/variables",
+                    }
+                }
+            ],
+            "applications": {
+                "variables": {
+                    "type": client.get_application_type(),
+                    "processes": {'spare': 0},
+                    "path": path,
+                    "working_directory": path,
+                    "module": "wsgi",
+                }
+            },
+        }
+    )
+
+    resp = client.http(
+        f"""POST /bar HTTP/1.1
+Host: localhost
+Content-Length: 1
+Custom-Header: blah
+Content-Type: text/html
+Connection: close
+
+a""".encode(),
+        raw=True,
+    )
+    assert resp['headers']['Request-Uri'] == '/bar', 'REQUEST_URI unchanged'
+
 
 def test_python_application_query_string():
     client.load('query_string')

test/test_variables.py

@@ -93,7 +93,7 @@ def test_variables_method(search_in_file, wait_for_record):
     assert wait_for_record(reg, 'access.log') is not None, 'method POST'
 
 
-def test_variables_request_uri(search_in_file, wait_for_record):
+def test_variables_request_uri(search_in_file, temp_dir, wait_for_record):
     set_format('$request_uri')
 
     def check_request_uri(req_uri):
@@ -108,6 +108,48 @@ def check_request_uri(req_uri):
     check_request_uri('/4%2A')
     check_request_uri('/9?q#a')
 
+    # $request_uri should not be changed by rewrite
+
+    assert 'success' in client.conf(
+        {
+            "listeners": {
+                "*:8080": {"pass": "routes/a"},
+                "*:8081": {"pass": "routes/b"},
+            },
+            "routes": {
+                "a": [
+                    {
+                        "action": {
+                            "rewrite": "/foo",
+                            "proxy": "http://127.0.0.1:8081",
+                        }
+                    }
+                ],
+                "b": [
+                    {
+                        "action": {
+                            "rewrite": "/bar",
+                            "return": 200,
+                        }
+                    }
+                ],
+            },
+            "access_log": {
+                "path": f'{temp_dir}/access.log',
+                "format": "$uri $request_uri",
+            },
+        }
+    )
+
+    assert search_in_file(r'/foo', 'access.log') is None
+
+    assert client.get()['status'] == 200
+
+    assert wait_for_record(fr'^/foo /$', 'access.log') is not None, 'req 8080'
+    assert (
+        search_in_file(fr'^/bar /foo$', 'access.log') is not None
+    ), 'req 8081 (proxy)'
+
 
 def test_variables_uri(search_in_file, wait_for_record):
     set_format('$uri')