diff --git a/http_server.py b/http_server.py index 58d7386..531484d 100644 --- a/http_server.py +++ b/http_server.py @@ -1,6 +1,8 @@ import socket import sys import traceback +import os.path +import mimetypes def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"): """ @@ -19,22 +21,32 @@ def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"): ''' """ - # TODO: Implement response_ok - return b"" + return b"\r\n".join([ + b"HTTP/1.1 200 OK", + b"Content-Type: " + mimetype, + b"", + body + ]) def response_method_not_allowed(): """Returns a 405 Method Not Allowed response""" - # TODO: Implement response_method_not_allowed - return b"" + return b"\r\n".join([ + b"HTTP/1.1 405 Method Not Allowed", + b"", + b"You Can't do that on this server." + ]) def response_not_found(): """Returns a 404 Not Found response""" # TODO: Implement response_not_found - return b"" - + return b"\r\n".join([ + b"HTTP/1.1 404 Not Found", + b"", + b"Path Not Found." + ]) def parse_request(request): """ @@ -44,8 +56,12 @@ def parse_request(request): NotImplementedError if the method of the request is not GET. """ - # TODO: implement parse_request - return "" + method, path, version = request.split("\r\n")[0].split(" ") + + if method != "GET": + raise NotImplementedError + + return path def response_path(path): """ @@ -77,6 +93,10 @@ def response_path(path): # TODO: Raise a NameError if the requested content is not present # under webroot. + file = f"webroot/{path}" + + if not os.path.exists(file): + raise NameError # TODO: Fill in the appropriate content and mime_type give the path. # See the assignment guidelines for help on "mapping mime-types", though @@ -85,9 +105,23 @@ def response_path(path): # If the path is "make_time.py", then you may OPTIONALLY return the # result of executing `make_time.py`. But you need only return the # CONTENTS of `make_time.py`. - - content = b"not implemented" - mime_type = b"not implemented" + + mime_type = b"" + content = b"" + + if os.path.isdir(file): + mime_type = b"text/plain" + + files = os.listdir(file) + + for a_file in files: + content += f"{a_file}\r\n".encode() + + + if os.path.isfile(file): + mime_type = mimetypes.guess_type(file)[0].encode() + with open(file, mode='rb') as f: + content = f.read() return content, mime_type @@ -114,30 +148,31 @@ def server(log_buffer=sys.stderr): if '\r\n\r\n' in request: break - + print("Request received:\n{}\n\n".format(request)) - # TODO: Use parse_request to retrieve the path from the request. + try: + path = parse_request(request) + + - # TODO: Use response_path to retrieve the content and the mimetype, - # based on the request path. + body, mimetype = response_path(path) - # TODO; If parse_request raised a NotImplementedError, then let - # response be a method_not_allowed response. If response_path raised - # a NameError, then let response be a not_found response. Else, - # use the content and mimetype from response_path to build a - # response_ok. - response = response_ok( - body=b"Welcome to my web server", - mimetype=b"text/plain" - ) + response = response_ok( + body=body, + mimetype=mimetype + ) + except NotImplementedError: + response = response_method_not_allowed() + except NameError: + response = response_not_found() conn.sendall(response) except: traceback.print_exc() finally: - conn.close() + conn.close() except KeyboardInterrupt: sock.close()