Merge pull request #156 from lendingblock/master

1.2.1

openapi/__init__.py

@@ -1,4 +1,4 @@
 """Minimal OpenAPI asynchronous server application
 """
 
-__version__ = '1.2.0'
+__version__ = '1.2.1'

openapi/db/path.py

@@ -94,7 +94,7 @@ async def get_list(
         async with self.db.ensure_connection(conn) as conn:
             total = await conn.fetchrow(sql_count, *args_count)
             values = await conn.fetch(sql, *args)
-        pagination = Pagination(self.request.url)
+        pagination = Pagination(self.full_url())
         data = self.dump(dump_schema, values)
         return pagination.paginated(
             data, total['tbl_row_count'], offset, limit

openapi/spec/hdrs.py

@@ -0,0 +1,5 @@
+from multidict import istr
+
+X_FORWARDED_PROTO = istr('X-Forwarded-Proto')
+X_FORWARDED_HOST = istr('X-Forwarded-Host')
+X_FORWARDED_PORT = istr('X-Forwarded-Port')

openapi/spec/path.py

@@ -2,11 +2,15 @@
 
 from multidict import MultiDict
 
+from yarl import URL
+
 from openapi.json import loads, dumps
+
 from ..data.dump import dump, dump_list
 from ..data.validate import validate
 from ..data.exc import ValidationErrors
 from ..utils import compact, as_list
+from . import hdrs
 
 
 class ApiPath(web.View):
@@ -98,6 +102,16 @@ def raiseValidationError(self, message=None, errors=None):
         data = self.dump(ValidationErrors, raw)
         raise web.HTTPUnprocessableEntity(**self.api_response_data(data))
 
+    def full_url(self):
+        headers = self.request.headers
+        proto = headers.get(hdrs.X_FORWARDED_PROTO)
+        host = headers.get(hdrs.X_FORWARDED_HOST)
+        if proto and host:
+            url = URL.build(scheme=proto, host=host)
+            return url.join(self.request.rel_url)
+        else:
+            return self.request.url
+
     @classmethod
     def api_response_data(cls, data):
         return dict(

tests/test_pagination.py

@@ -84,3 +84,25 @@ async def test_invalid_limit_offset(cli):
         params={'offset': -10}
     )
     await jsonBody(response, 422)
+
+
+async def test_pagination_with_forwarded_host(cli):
+    response = await cli.post('/tasks', json=dict(title='bla'))
+    await jsonBody(response, 201)
+    response = await cli.post('/tasks', json=dict(title='foo'))
+    await jsonBody(response, 201)
+    response = await cli.get(
+        '/tasks',
+        headers={
+            'X-Forwarded-Proto': 'https',
+            'X-Forwarded-Host': 'whenbeer.pub'
+        },
+        params={'limit': 10, 'offset': 20}
+    )
+    data = await jsonBody(response)
+    assert len(data) == 0
+    link = response.headers['Link']
+    assert link == (
+        f'<https://whenbeer.pub/tasks?limit=10&offset=0> rel="first", '
+        f'<https://whenbeer.pub/tasks?limit=10&offset=10> rel="prev"'
+    )