Sudo-JHare/FHIRFLARE-IG-Toolkit
Sudo-JHare/FHIRFLARE-IG-Toolkit
1
0
Fork 0
mirror of https://github.com/Sudo-JHare/FHIRFLARE-IG-Toolkit.git synced 2025-09-17 18:35:02 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

Update app.py

Browse Source
This commit is contained in:
Joshua Hare 2025-08-27 14:16:52 +10:00
parent d37af01b3a
commit 85f980be0a
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app.py
View File

@ -1780,59 +1780,41 @@ def fhir_ui_operations():
# Use a single route to capture everything after /fhir/ # Use a single route to capture everything after /fhir/
# The 'path' converter handles slashes. 'subpath' can be empty. # The 'path' converter handles slashes. 'subpath' can be empty.
@app.route('/fhir', defaults={'subpath': ''}, methods=['GET', 'POST', 'PUT', 'DELETE']) @app.route('/fhir', defaults={'subpath': ''}, methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH'])
@app.route('/fhir/', defaults={'subpath': ''}, methods=['GET', 'POST', 'PUT', 'DELETE']) @app.route('/fhir/', defaults={'subpath': ''}, methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH'])
@app.route('/fhir/<path:subpath>', methods=['GET', 'POST', 'PUT', 'DELETE']) @app.route('/fhir/<path:subpath>', methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH'])
def proxy_hapi(subpath): def proxy_hapi(subpath):
""" """
Proxies FHIR requests to either the local HAPI server or a custom Proxies FHIR requests to either the local HAPI server or a custom
target server specified by the 'X-Target-FHIR-Server' header. target server specified by the 'X-Target-FHIR-Server' header or a query parameter.
Handles requests to /fhir/ (base, subpath='') and /fhir/<subpath>.
The route '/fhir' (no trailing slash) is handled separately for the UI.
""" """
# Clean subpath just in case prefixes were somehow included logger.debug(f"Proxy received request for path: '/fhir/{subpath}'")
clean_subpath = subpath.replace('r4/', '', 1).replace('fhir/', '', 1).strip('/')
logger.debug(f"Proxy received request for path: '/fhir/{subpath}', cleaned subpath: '{clean_subpath}'")
# Determine the target FHIR server base URL # Determine the target FHIR server base URL
# NEW: Check for proxy-target query parameter first
target_server_query = request.args.get('proxy-target') target_server_query = request.args.get('proxy-target')
target_server_header = request.headers.get('X-Target-FHIR-Server') target_server_header = request.headers.get('X-Target-FHIR-Server')
final_base_url = None final_base_url = None
is_custom_target = False is_custom_target = False
if target_server_query: if target_server_query:
try: final_base_url = target_server_query.rstrip('/')
parsed_url = urlparse(target_server_query) is_custom_target = True
if not parsed_url.scheme or not parsed_url.netloc: logger.info(f"Proxy target identified from query parameter: {final_base_url}")
raise ValueError("Invalid URL format in proxy-target query parameter")
final_base_url = target_server_query.rstrip('/')
is_custom_target = True
logger.info(f"Proxy target identified from query parameter: {final_base_url}")
except ValueError as e:
logger.warning(f"Invalid URL in proxy-target query parameter: '{target_server_query}'. Falling back. Error: {e}")
final_base_url = current_app.config['HAPI_FHIR_URL'].rstrip('/')
logger.debug(f"Falling back to default local HAPI due to invalid query: {final_base_url}")
elif target_server_header: elif target_server_header:
try: final_base_url = target_server_header.rstrip('/')
parsed_url = urlparse(target_server_header) is_custom_target = True
if not parsed_url.scheme or not parsed_url.netloc: logger.info(f"Proxy target identified from header: {final_base_url}")
raise ValueError("Invalid URL format in X-Target-FHIR-Server header")
final_base_url = target_server_header.rstrip('/')
is_custom_target = True
logger.info(f"Proxy target identified from header: {final_base_url}")
except ValueError as e:
logger.warning(f"Invalid URL in X-Target-FHIR-Server header: '{target_server_header}'. Falling back. Error: {e}")
final_base_url = current_app.config['HAPI_FHIR_URL'].rstrip('/')
logger.debug(f"Falling back to default local HAPI due to invalid header: {final_base_url}")
else: else:
final_base_url = current_app.config['HAPI_FHIR_URL'].rstrip('/') final_base_url = current_app.config['HAPI_FHIR_URL'].rstrip('/')
logger.debug(f"No target info found, proxying to default local HAPI: {final_base_url}") logger.debug(f"No target info found, proxying to default local HAPI: {final_base_url}")
# Construct the final URL for the target server request # Construct the final URL for the target server request. This is the core logical change.
# Append the cleaned subpath only if it's not empty # The subpath variable now correctly captures the remaining part of the URL after '/fhir/'.
final_url = f"{final_base_url}/{clean_subpath}" if clean_subpath else final_base_url # We construct the final URL by joining the base URL and the subpath.
final_url = f"{final_base_url}/{subpath}" if subpath else final_base_url
logger.debug(f"Final URL for target server: {final_url}")
# Prepare headers to forward # Prepare headers to forward
headers_to_forward = { headers_to_forward = {
k: v for k, v in request.headers.items() k: v for k, v in request.headers.items()