Principis/CN2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Arthur Bols
2021-03-22 02:41:49 +01:00
parent d25d2ef993
commit 42f1661e0a
10 changed files with 172 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
httplib/parser.py
View File

@@ -7,7 +7,7 @@ from httplib.httpsocket import HTTPSocket
def _get_start_line(client: HTTPSocket):
line = client.read_line()
line = client.read_line().strip()
split = list(filter(None, line.split(" ")))
if len(split) < 3:
raise InvalidStatusLine(line) # TODO fix exception
@@ -23,6 +23,8 @@ def _is_valid_http_version(http_version: str):
if name != "HTTP" or not re.match(r"1\.[0|1]", version):
return False
return True
def get_status_line(client: HTTPSocket):
line, (http_version, status, reason) = _get_start_line(client)
@@ -43,17 +45,22 @@ def get_status_line(client: HTTPSocket):
def parse_request_line(client: HTTPSocket):
line, (method, target, version) = _get_start_line(client)
logging.debug("Parsed request-line=%r, method=%r, target=%r, version=%r", line, method, target, version)
if method not in ("CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "POST", "PUT", "TRACE"):
raise BadRequest()
if not _is_valid_http_version(version):
logging.debug("[ABRT] request: invalid http-version=%r", version)
raise BadRequest()
if len(target) == "":
raise BadRequest()
parsed_target = urlparse(target)
if len(parsed_target.path) > 0 and parsed_target.path[0] != "/" and parsed_target.netloc != "":
parsed_target = urlparse(f"//{target}")
return method, parsed_target, version
return method, parsed_target, version.split("/")[1]
def retrieve_headers(client: HTTPSocket):
@@ -85,13 +92,14 @@ def retrieve_headers(client: HTTPSocket):
continue
(header, value) = line.split(":", 1)
result.append((header.lower(), value.lower()))
result.append((header.lower(), value.strip().lower()))
return result
def parse_request_headers(client: HTTPSocket):
raw_headers = retrieve_headers(client)
logging.debug("Received headers: %r", raw_headers)
headers = {}
key: str
@@ -107,7 +115,7 @@ def parse_request_headers(client: HTTPSocket):
logging.error("Invalid content-length value: %r", value)
raise BadRequest()
elif key == "host":
if value != client.host or key in headers:
if value != client.host and value != client.host.split(":")[0] or key in headers:
raise BadRequest()
headers[key] = value