Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Both tests passing - mattcasari #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 71 additions & 38 deletions http_server.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import socket
import sys
import traceback
import mimetypes

import os
from pathlib import Path

import subprocess

def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"):
"""
Expand All @@ -10,71 +16,74 @@ def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"):
b"<html><h1>Welcome:</h1></html>",
b"text/html"
) ->

b'''
HTTP/1.1 200 OK\r\n
Content-Type: text/html\r\n
\r\n
<html><h1>Welcome:</h1></html>\r\n
'''
"""

# 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"Not allowed 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"Page not found"
])


def parse_request(request):
"""
Given the content of an HTTP request, returns the path of that request.

This server only handles GET requests, so this method shall raise a
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 not in "GET":
raise NotImplementedError

return path

def response_path(path):
"""
This method should return appropriate content and a mime type.

If the requested path is a directory, then the content should be a
plain-text listing of the contents with mimetype `text/plain`.

If the path is a file, it should return the contents of that file
and its correct mimetype.

If the path does not map to a real location, it should raise an
exception that the server can catch to return a 404 response.

Ex:
response_path('/a_web_page.html') -> (b"<html><h1>North Carolina...",
b"text/html")

response_path('/images/sample_1.png')
-> (b"A12BCF...", # contents of sample_1.png
b"image/png")

response_path('/') -> (b"images/, a_web_page.html, make_type.py,...",
b"text/plain")

response_path('/a_page_that_doesnt_exist.html') -> Raises a NameError

"""

content = b"\r\n"

# TODO: Raise a NameError if the requested content is not present
# under webroot.

Expand All @@ -85,9 +94,25 @@ 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`.
path = Path(f'./webroot{path}')

if not os.path.exists(path):
raise NameError
elif os.path.isdir(path):
mime_type = b"text/plain"
content = "\r\n".join(os.listdir(path)).encode()
elif os.path.isfile(path):
if path.suffix == '.py':
content = subprocess.check_output([sys.executable, path, ""])
mime_type = b'text/plain'
else:
mime_type = mimetypes.guess_type(path)[0].encode()
content = open(path,'rb').read()



content = b"not implemented"
mime_type = b"not implemented"
# content = b"not implemented"
# mime_type = b"not implemented"

return content, mime_type

Expand Down Expand Up @@ -119,19 +144,29 @@ def server(log_buffer=sys.stderr):
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)

# TODO: Use response_path to retrieve the content and the mimetype,
# based on the request path.

content, 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 = content,
mimetype= mimetype
)
except NotImplementedError:
response = response_method_not_allowed()

except NameError:
response = response_not_found()

conn.sendall(response)
except:
Expand All @@ -148,6 +183,4 @@ def server(log_buffer=sys.stderr):

if __name__ == '__main__':
server()
sys.exit(0)


sys.exit(0)