Use absolute paths so proxying can work

Author: PeterJCLaw

code_submitter/server.py

@@ -111,7 +111,7 @@ async def upload(request: Request) -> Response:
         )
 
     return RedirectResponse(
-        app.url_path_for('homepage'),
+        request.url_for('homepage'),
         # 302 so that the browser switches to GET
         status_code=302,
     )

templates/index.html

@@ -34,7 +34,7 @@ <h1>Virtual Competition Code Submission</h1>
         {% if request.user.team %}
         <form
           class="col-sm-6"
-          action="{{ request.app.url_path_for('upload') }}"
+          action="{{ url_for('upload') }}"
           enctype="multipart/form-data"
           method="POST"
         >

tests/tests_app.py

@@ -43,26 +43,32 @@ def setUp(self) -> None:
         # App import must happen after TESTING environment setup
         from code_submitter.server import app, database
 
+        def url_for(name: str) -> str:
+            # While it makes for uglier tests, we do need to use more absolute
+            # paths here so that the urls emitted contain the root_path from the
+            # ASGI server and in turn work correctly under proxy.
+            return 'http://testserver{}'.format(app.url_path_for(name))
+
         test_client = TestClient(app)
         self.session = test_client.__enter__()
         self.session.auth = ('test_user', 'test_pass')
-        self.url_path_for = app.url_path_for
+        self.url_for = url_for
         self.database = database
 
     def tearDown(self) -> None:
         self.session.__exit__(None, None, None)
         super().tearDown()
 
     def test_app(self) -> None:
-        response = self.session.get(self.url_path_for('homepage'))
+        response = self.session.get(self.url_for('homepage'))
         self.assertEqual(200, response.status_code)
 
         html = response.text
         self.assertIn("Upload a new submission", html)
 
     def test_app_requires_auth(self) -> None:
         self.session.auth = None
-        response = self.session.get(self.url_path_for('homepage'))
+        response = self.session.get(self.url_for('homepage'))
         self.assertEqual(401, response.status_code)
         self.assertIn('WWW-Authenticate', response.headers)
         self.assertIn(' realm=', response.headers['WWW-Authenticate'])
@@ -97,7 +103,7 @@ def test_shows_own_and_own_team_uploads(self) -> None:
             ),
         ))
 
-        response = self.session.get(self.url_path_for('homepage'))
+        response = self.session.get(self.url_for('homepage'))
         self.assertEqual(200, response.status_code)
 
         html = response.text
@@ -159,7 +165,7 @@ def test_shows_chosen_archive(self) -> None:
             ),
         ))
 
-        response = self.session.get(self.url_path_for('homepage'))
+        response = self.session.get(self.url_for('homepage'))
         self.assertEqual(200, response.status_code)
 
         html = response.text
@@ -185,12 +191,12 @@ def test_upload_file(self) -> None:
             zip_file.writestr('robot.py', 'print("I am a robot")')
 
         response = self.session.post(
-            self.url_path_for('upload'),
+            self.url_for('upload'),
             files={'archive': ('whatever.zip', contents.getvalue(), 'application/zip')},
         )
         self.assertEqual(302, response.status_code)
         self.assertEqual(
-            self.url_path_for('homepage'),
+            self.url_for('homepage'),
             response.headers['location'],
         )
 
@@ -227,13 +233,13 @@ def test_upload_and_choose_file(self) -> None:
             zip_file.writestr('robot.py', 'print("I am a robot")')
 
         response = self.session.post(
-            self.url_path_for('upload'),
+            self.url_for('upload'),
             data={'choose': 'on'},
             files={'archive': ('whatever.zip', contents.getvalue(), 'application/zip')},
         )
         self.assertEqual(302, response.status_code)
         self.assertEqual(
-            self.url_path_for('homepage'),
+            self.url_for('homepage'),
             response.headers['location'],
         )
 
@@ -263,7 +269,7 @@ def test_upload_and_choose_file(self) -> None:
 
     def test_upload_bad_file(self) -> None:
         response = self.session.post(
-            self.url_path_for('upload'),
+            self.url_for('upload'),
             files={'archive': ('whatever.zip', b'should-be-a-zip', 'application/zip')},
         )
         self.assertEqual(400, response.status_code)
@@ -284,7 +290,7 @@ def test_upload_archive_without_robot_py(self) -> None:
             zip_file.writestr('main.py', 'print("I am a robot")')
 
         response = self.session.post(
-            self.url_path_for('upload'),
+            self.url_for('upload'),
             files={'archive': ('whatever.zip', contents.getvalue(), 'application/zip')},
         )
         self.assertEqual(400, response.status_code)