scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-02 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LFRequest.py: raise ValueError when provided a highly improbable URL/PATH combination.

Browse Source 
This was triggered by a call to admin_up() that was passing self.lfclient_url as an un-named parameter, creating
unanswerable requests formatted like http://localhost:8080/http:/localhost:8080/. There should really only be
one http[s]*:// pattern in a URL, and further instances of colons should be URL encoded to %3A.

Signed-off-by: Jed Reynolds <jed@bitratchet.com>
This commit is contained in:
Jed Reynolds
2022-02-01 16:11:11 -08:00
committed by shivam
parent 554e3f22fc
commit 1d67c30d1a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
py-json/LANforge/LFRequest.py
View File

@@ -62,12 +62,19 @@ class LFRequest:
# print("LFRequest: proxies: ") # print("LFRequest: proxies: ")
# pprint.pprint(self.proxies) # pprint.pprint(self.proxies)
if url and uri and (url.startswith("http:/") or url.startswith("https:/"))\
and (uri.startswith("http:/") or uri.startswith("https:/")):
raise ValueError("URL and PATH are both URLs: url[%s] uri[%s]" % (url, uri))
if url and uri and uri.startswith("http:/"):
raise ValueError("URL is present and PATH is an URL: url[%s] uri[%s]" % (url, uri))
if not url.startswith("http://") and not url.startswith("https://"): if not url.startswith("http://") and not url.startswith("https://"):
self.logger.warning("No http:// or https:// found, prepending http:// to " + url) self.logger.warning("No http:// or https:// found, prepending http:// to " + url)
url = "http://" + url url = "http://" + url
if uri is not None: if uri is not None:
if not url.endswith('/') and not uri.startswith('/'): if not url.endswith('/') and not uri.startswith('/'):
url += '/' url += '/'
if (uri.find("http:")>=0) or (uri.find("https:")>=0):
self.logger.warning("PATH contains an protocol that is not URL encoded: [%s]" % uri)
self.requested_url = url + uri self.requested_url = url + uri
else: else:
self.requested_url = url self.requested_url = url