X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fhtml_out.py;h=316e15b41489d833811a731bc4b5a84dc0b07ef5;hp=871d502a2a56f7fcb992a01c15b8b7be28f7bc31;hb=341ac1bac7b115d64a50ec166aa5e6d186b39443;hpb=5792d7d7e1ff32ef0edfc432bd86a8fb348622c3;ds=inline diff --git a/osm_nbi/html_out.py b/osm_nbi/html_out.py index 871d502..316e15b 100644 --- a/osm_nbi/html_out.py +++ b/osm_nbi/html_out.py @@ -26,7 +26,8 @@ html_start = """ -Welcome to OSM + Welcome to OSM +
@@ -46,6 +47,9 @@ html_start = """ VIMs WIMs SDNs + K8s_clusters + K8s_repos + NS_Subs logout
@@ -69,6 +73,7 @@ html_auth2 = """ OSM Login +
@@ -127,6 +132,9 @@ html_nsilcmop_body = """ """ +html_vnfpackage_body = """Artifacts """ +html_nspackage_body = """Artifacts """ + def format(data, request, response, toke_info): """ @@ -145,12 +153,14 @@ def format(data, request, response, toke_info): return html_auth2.format(error=data) if request.path_info in ("/version", "/system"): return "
" + yaml.safe_dump(data, explicit_start=False, indent=4, default_flow_style=False) + "
" - body = html_body.format(item=request.path_info) + body = html_body.format(item=html_escape(request.path_info)) if response.status and response.status > 202: - body += html_body_error.format(yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)) + # input request.path_info (URL) can contain XSS that are translated into output error detail + body += html_body_error.format(html_escape( + yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False))) elif isinstance(data, (list, tuple)): if request.path_info == "/vnfpkgm/v1/vnf_packages": - body += html_upload_body.format(request.path_info, "VNFD") + body += html_upload_body.format(request.path_info + "_content", "VNFD") elif request.path_info == "/nsd/v1/ns_descriptors": body += html_upload_body.format(request.path_info + "_content", "NSD") elif request.path_info == "/nst/v1/nst_templates": @@ -166,16 +176,21 @@ def format(data, request, response, toke_info): if "Location" in response.headers: body += ' show '.format(response.headers["Location"]) else: + _id = request.path_info[request.path_info.rfind("/")+1:] body += ' '\ .format(request.path_info) if request.path_info.startswith("/nslcm/v1/ns_instances_content/") or \ request.path_info.startswith("/nslcm/v1/ns_instances/"): - _id = request.path_info[request.path_info.rfind("/")+1:] body += html_nslcmop_body.format(id=_id) elif request.path_info.startswith("/nsilcm/v1/netslice_instances_content/") or \ request.path_info.startswith("/nsilcm/v1/netslice_instances/"): - _id = request.path_info[request.path_info.rfind("/")+1:] body += html_nsilcmop_body.format(id=_id) + elif request.path_info.startswith("/vnfpkgm/v1/vnf_packages/") or \ + request.path_info.startswith("/vnfpkgm/v1/vnf_packages_content/"): + body += html_vnfpackage_body.format(id=_id) + elif request.path_info.startswith("/nsd/v1/ns_descriptors/") or \ + request.path_info.startswith("/nsd/v1/ns_descriptors_content/"): + body += html_nspackage_body.format(id=_id) body += "
" + html_escape(yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False)) + \
                 "
" elif data is None: