Add intermediate step student_1 after exo 3.2.
This commit is contained in:
parent
687f83ff8d
commit
7700413031
|
@ -26,6 +26,21 @@ def parse_request(buf: bytes) -> dict[str, dict]:
|
|||
- params: dict[str, str]
|
||||
List of the HTTP parameters (i.e. the following lines);
|
||||
output of `parse_request_params`.
|
||||
|
||||
An example of return:
|
||||
```
|
||||
{
|
||||
'head': { 'verb': 'GET', 'resource': '//index.html'},
|
||||
'params': {
|
||||
'Host': 'localhost:8000',
|
||||
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0',
|
||||
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
|
||||
'Accept-Language': 'en-GB,en;q=0.5',
|
||||
'Accept-Encoding': 'gzip, deflate, br',
|
||||
[SNIP]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Parameters
|
||||
----------
|
||||
|
|
|
@ -106,7 +106,6 @@ def handle_client(c: socket.socket, addr: tuple[str, int], root:str):
|
|||
c.close()
|
||||
|
||||
|
||||
|
||||
def prepare_resource(root: str, req: dict):
|
||||
"""
|
||||
Retrieves the content of the resource and sets the status code.
|
||||
|
|
|
@ -121,9 +121,9 @@ def prepare_resource(root: str, req: dict):
|
|||
- code: int
|
||||
The status code for the reply.
|
||||
"""
|
||||
code = 1234
|
||||
content = b""
|
||||
content_type = ""
|
||||
code = 200
|
||||
content = b"Hello World!"
|
||||
content_type = "text/html"
|
||||
|
||||
# Call resolve_location().
|
||||
# If an empty string is returned, the resource is not found.
|
||||
|
|
|
@ -14,7 +14,6 @@ A package for learning network programming in Python.
|
|||
This module (file) manages the parsing of HTTP requests.
|
||||
"""
|
||||
|
||||
# TODO: Gestion de la casse des paramètres ?
|
||||
|
||||
def parse_request(buf: bytes) -> dict[str, dict]:
|
||||
"""Parses a full HTTP request bytes buffer into a dict.
|
||||
|
@ -26,6 +25,21 @@ def parse_request(buf: bytes) -> dict[str, dict]:
|
|||
- params: dict[str, str]
|
||||
List of the HTTP parameters (i.e. the following lines);
|
||||
output of `parse_request_params`.
|
||||
|
||||
An example of return:
|
||||
```
|
||||
{
|
||||
'head': { 'verb': 'GET', 'resource': '//index.html'},
|
||||
'params': {
|
||||
'Host': 'localhost:8000',
|
||||
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0',
|
||||
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
|
||||
'Accept-Language': 'en-GB,en;q=0.5',
|
||||
'Accept-Encoding': 'gzip, deflate, br',
|
||||
[SNIP]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Parameters
|
||||
----------
|
||||
|
@ -42,14 +56,8 @@ def parse_request(buf: bytes) -> dict[str, dict]:
|
|||
ValueError
|
||||
The request is not valid HTTP.
|
||||
"""
|
||||
if buf == b'':
|
||||
raise ValueError("Received empty request")
|
||||
lines = buf.decode('utf-8').strip().splitlines()
|
||||
|
||||
req_head = parse_request_head(lines[0])
|
||||
req_head = dict()
|
||||
req_params = dict()
|
||||
if len(lines) > 1:
|
||||
req_params = parse_request_params(lines[1:])
|
||||
|
||||
return dict(
|
||||
head=req_head,
|
||||
|
@ -82,13 +90,12 @@ def parse_request_head(line: str) -> dict[str, str]:
|
|||
ValueError
|
||||
The request header is not valid HTTP.
|
||||
"""
|
||||
fields = line.split(' ')
|
||||
if len(fields) != 3:
|
||||
raise ValueError(f"Request header is invalid: {line}")
|
||||
|
||||
pass
|
||||
|
||||
return dict(
|
||||
verb=fields[0].upper(),
|
||||
resource=fields[1]
|
||||
verb=None,
|
||||
resource=None
|
||||
)
|
||||
|
||||
def parse_request_params(lines: list[str]) -> dict[str, str]:
|
||||
|
@ -117,13 +124,7 @@ def parse_request_params(lines: list[str]) -> dict[str, str]:
|
|||
The provided lines are not valid HTTP.
|
||||
"""
|
||||
params = dict()
|
||||
for l in lines:
|
||||
kv = l.strip().split(': ')
|
||||
|
||||
if len(kv) != 2 or len(kv[0]) == 0 or len(kv[1]) == 0:
|
||||
raise ValueError(f"Request line is not a valid key/value pair: {l}")
|
||||
|
||||
params[kv[0]] = kv[1]
|
||||
return params
|
||||
|
||||
|
||||
|
|
|
@ -70,8 +70,9 @@ def handle_client(c: socket.socket, addr: tuple[str, int], root:str):
|
|||
In details, we:
|
||||
* read data from the socket provided,
|
||||
* parse this data to build the request and headers,
|
||||
* call the handle_request() function,
|
||||
[* optionally write something in the log,]
|
||||
* call the prepare_resource() or prepare_reply() function accordingly,
|
||||
* send the reply back.
|
||||
* optionally write something in the log,
|
||||
* close the connection.
|
||||
|
||||
Parameters
|
||||
|
@ -84,21 +85,17 @@ def handle_client(c: socket.socket, addr: tuple[str, int], root:str):
|
|||
The path to the local directory to serve.
|
||||
|
||||
"""
|
||||
buf = c.recv(_BUF_SIZE)
|
||||
req = parse_request(buf)
|
||||
|
||||
buf = c.recv(_BUF_SIZE)
|
||||
req = dict()
|
||||
|
||||
# Prepare our reply.
|
||||
if req['head']['verb'] == 'GET':
|
||||
reply, code = prepare_resource(root, req)
|
||||
else:
|
||||
# Not implemented: we treat only GET calls for now.
|
||||
reply, code = prepare_reply(b"", "", 501)
|
||||
reply, code = prepare_resource(root, req)
|
||||
|
||||
# Send the reply back.
|
||||
c.send(reply)
|
||||
|
||||
# Trace the action in the logs.
|
||||
log_reply(addr, req, code)
|
||||
# Optionally trace the action in the logs.
|
||||
|
||||
# Close the connection.
|
||||
c.close()
|
||||
|
@ -125,15 +122,8 @@ def prepare_resource(root: str, req: dict):
|
|||
The status code for the reply.
|
||||
"""
|
||||
code = 200
|
||||
content = b""
|
||||
content_type = ""
|
||||
|
||||
res_path, res_extension = resolve_location(req['head']['resource'], root)
|
||||
if res_path == "":
|
||||
code = 404
|
||||
else:
|
||||
content_type = get_http_content_type(res_extension)
|
||||
content, code = get_resource(res_path)
|
||||
content = b"Hello World!"
|
||||
content_type = "text/html"
|
||||
|
||||
return prepare_reply(content, content_type, code)
|
||||
|
||||
|
|
Loading…
Reference in a new issue