huanld/pygeoapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pathing to work with subpaths behind proxies (#120)

Browse Source
This commit is contained in:
Tom Kralidis
2019-05-14 15:25:40 -04:00
committed by GitHub
parent f5292d02d6
commit c04c7ba71a
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pygeoapi/api.py
+9 -6
View File
@@ -145,7 +145,7 @@ class API(object):
return headers_, 200, json.dumps(fcm)
def api(self, headers, args, request_path, openapi):
def api(self, headers, args, openapi):
"""
Provide OpenAPI document
@@ -159,9 +159,11 @@ class API(object):
headers_ = HEADERS.copy()
format_ = check_format(args, headers)
path = '/'.join([self.config['server']['url'].rstrip('/'), 'api'])
if format_ == 'html':
data = {
'openapi-document-path': request_path
'openapi-document-path': path
}
headers_['Content-Type'] = 'text/html'
content = _render_j2_template(self.config, 'api.html', data)
@@ -528,15 +530,16 @@ class API(object):
content['links'][0]['rel'] = 'alternate'
content['links'][1]['rel'] = 'self'
# For constructing proper URIs to Items
path_info = headers.environ['PATH_INFO']
if path_info.endswith('/'):
path_info = path_info[:-1]
# For constructing proper URIs to items
path_info = '/'.join([
self.config['server']['url'].rstrip('/'),
headers.environ['PATH_INFO'].strip('/')])
content['items_path'] = path_info
content['dataset_path'] = '/'.join(path_info.split('/')[:-1])
content['collections_path'] = '/'.join(path_info.split('/')[:-2])
content['startindex'] = startindex
content = _render_j2_template(self.config, 'items.html',
content)
return headers_, 200, content
pygeoapi/flask_app.py
+1 -1
View File
@@ -68,7 +68,7 @@ def api():
openapi = yaml.load(ff)
headers, status_code, content = api_.api(request.headers, request.args,
request.path, openapi)
openapi)
response = make_response(content, status_code)
if headers:
pygeoapi/templates/api.html
+1
View File
@@ -1,6 +1,7 @@
<!doctype html>
<html>
<head>
<title>{{ config['metadata']['identification']['title'] }} OpenAPI Document</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@3.17.0/swagger-ui.css">
<script src="https://unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js"></script>
<script>
tests/test_api.py
+2 -2
View File
@@ -77,7 +77,7 @@ def test_api(config, api_, openapi):
assert isinstance(api_.config, dict)
req_headers = make_req_headers(HTTP_CONTENT_TYPE='application/json')
rsp_headers, code, response = api_.api(req_headers, {}, '/api', openapi)
rsp_headers, code, response = api_.api(req_headers, {}, openapi)
assert rsp_headers['Content-Type'] ==\
'application/openapi+json;version=3.0'
root = json.loads(response)
@@ -86,7 +86,7 @@ def test_api(config, api_, openapi):
a = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
req_headers = make_req_headers(HTTP_ACCEPT=a)
rsp_headers, code, response = api_.api(req_headers, {}, '/api', openapi)
rsp_headers, code, response = api_.api(req_headers, {}, openapi)
assert rsp_headers['Content-Type'] == 'text/html'