diff --git a/http_server.py b/http_server.py index 58d7386..b96aa40 100644 --- a/http_server.py +++ b/http_server.py @@ -1,6 +1,11 @@ import socket import sys import traceback +import mimetypes +import os +import contextlib +import io + def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"): """ @@ -19,21 +24,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"That file isn't on this server!" + ]) def parse_request(request): @@ -44,8 +60,13 @@ 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): """ @@ -75,19 +96,23 @@ def response_path(path): """ - # TODO: Raise a NameError if the requested content is not present - # under webroot. - - # TODO: Fill in the appropriate content and mime_type give the path. - # See the assignment guidelines for help on "mapping mime-types", though - # you might need to create a special case for handling make_time.py - # - # 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" + local_path = os.path.join('webroot', *path.split('/')) + if os.path.isfile(local_path): + mime_type = mimetypes.guess_type(local_path)[0].encode() + if mime_type == b'text/x-python': + f = io.StringIO() + with contextlib.redirect_stdout(f): + exec(open(local_path).read()) + content = f.getvalue().encode() + mime_type = b"text/html" + else: + with open(local_path, 'rb') as f: + content = f.read() + elif os.path.isdir(local_path): + content = ', '.join(os.listdir(local_path)).encode() + mime_type = b'text/plain' + else: + raise NameError return content, mime_type @@ -114,24 +139,17 @@ 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. - - # TODO: Use response_path to retrieve the content and the mimetype, - # based on the request 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" - ) + try: + path = parse_request(request) + body, mimetype = response_path(path) + response = response_ok(body,mimetype) + except NotImplementedError: + response = response_method_not_allowed() + except NameError: + response = response_not_found() conn.sendall(response) except: