From d002952c32659d9b17925a1e9a6fd513d6c2fcc7 Mon Sep 17 00:00:00 2001
From: mdenko <denkmatt@umich.edu>
Date: Mon, 20 Apr 2020 20:25:49 -0700
Subject: [PATCH] Initial committ for assignment 3

Initial committ for assignment 3
---
 .DS_Store      | Bin 0 -> 8196 bytes
 http_server.py |  79 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..400bbd6af16c848ca5580a89204875e5bac5f8ce
GIT binary patch
literal 8196
zcmeHMU2GIp6h5ad^v(cwic~twPd9C98)#u$Xe&SB_77Wu(6B8nrLfHI3}xbUrtZw{
z0;Q&EG(H%NKZ)`01%0c^6N&QTi@(wM6C3{$eb5&ljYbon^xS)=4Yc%u7nLw~bMLux
z&pC6?`R+G!b7uhnyYglWKs5j`s$6QTsJTJmdR~{5l5nJqB$7XXN53Fb^d~dU66<In
zLLfpQLLfpQLLfrm|9}AP*}Sl2_I;_1+6aLNf!h)R{(gv4<uVz{87al9gBo!JAjyva
zqEMgC0m3I9%48^Kq!g}nPkDO4&=tcY21<9*$GJJlWGH8(l<t7i9Wb03!xIXM*~u?1
z%mI^9Ms0*Zguqe+_~TO!MX(?PxogkwUWPOuXC@un4-$!Qu%xtX#maKVRHm*`Po&Ox
z#Z+JfdB4lZ9p_gAMsOw*_6I%BS?C*?qqbE{YwNl_H!y71$_Z!Nw8&&^*mg~?*yZJ2
z(--$iNd;pHQ_@=X)YOh0txfTkj$PAD@u_=uwl&4u6K&Je3R_>_a&P~siF4<tE=)iC
zqRb4#w*yox%JikBX*zzPJLB*)OJ0~y^V|6}6?K)~|A2Zht*tFk^oJ({+jIS+R?a7x
z)+&6;xIgQ;138Q9hqIoOpK$%OR+%-NY~C>ftJ85(_Ib-639PdL?~VFiF6b79X-&)f
z))9;B?1I%p*8Yf1x8r6SDzmGrHr3v}HPN>FzMi=?cT{MVYgKiWfN=x+v~A^vinbY?
zIcE4-%QbCxe7IoycE+&=U1P$k#NCQAch~yrHF`|nIImjl!n8UzlF!%=<?Y~{m}7H|
zu8x@$$|29>vzXcyrU*@4jjkW(n(mxMt;v`eZfMliL7zu#goaJcsyg@}t*GWx2t4qX
zR#hKzjEv=IrXt<iJ5+tRAd%D#goAtbs`^OQo0y;!{Yq>Khm)PUev;38(C~x9la@<S
zeMHlX>}vG;89T<cou)}q)g>F{stXvDx@00G0RtVj(LT}#W5n}GcnqF`i|{nO46nmw
zxB~COhwv$U4qw2R@ICwlzrb(sJNyBE!r#cS3fE&b>R5~0a62Y&7w*F(c48MEzyUmh
zDICNTm_-Xu<2X*@Sv-$ZcmW^Bi}(yai_hUJIE!!MTX-4Y#&_^4zK8GQXZRJ)$@og<
zNqZ=aHx&2-brwCFL|Xc`CP;hoMx>4P?pOQ%8`6HaS~B&{byb_|8k<`?_I56;=%O{e
zmP~>{k|KgS^VATFcpV@4s_U^0>Zav5Jw(j2&N5CPtz25iW3`MJqY29BvHDm8BU)=E
zLaT0xk)^@3Qfa(hZDB-HZH3hCRNECIvQ{RwyVO05_^Pdx+I?zL;g6aI^142zDD37r
zcnN0VDtrK+5cj@@AK_>C75+lRa;y}*+khK!Gd5r&Zo#eCjP2M#4BU--u^0DaANCUq
z2XP38aRf(+g{EMkjXCr&j|F1mBlswB@d<n~WaIPrDqh0Z7ICkC5%=C$%DqA==Q^G{
zPMUefUhfoL-C78g%5bas`M-Dh@Bg<}Qc<)K0ucf?g#ecIq<Xr@Wx3aS3F+cgPf_KC
t+s#NRT&UqDd|VvINiO_hNd0)IONMerO43mI*FOYA`+v0m3+CP4%|D4Y;luy{

literal 0
HcmV?d00001

diff --git a/http_server.py b/http_server.py
index 58d7386..ac57c6a 100644
--- a/http_server.py
+++ b/http_server.py
@@ -20,20 +20,34 @@ 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 Method Not Found",
+        b"",
+        b"We can't find your method!"
+    ])
 
 
 def parse_request(request):
@@ -45,7 +59,13 @@ def parse_request(request):
     """
 
     # TODO: implement parse_request
-    return ""
+    conn = http.client.HTTPConnection('localhost:10000')
+    if conn.request('GET', url):
+        response = conn.getresponse()
+        conn.close()
+        return response
+
+    return NotImplementedError
 
 def response_path(path):
     """
@@ -74,6 +94,11 @@ def response_path(path):
         response_path('/a_page_that_doesnt_exist.html') -> Raises a NameError
 
     """
+    try:
+        response_ok(path)
+
+    except NameError:
+        reponse_not_fount()
 
     # TODO: Raise a NameError if the requested content is not present
     # under webroot.
@@ -85,7 +110,9 @@ 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"
 
@@ -114,30 +141,42 @@ 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)
+
+                    # 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"
+                    )
+                except NotImplementedError:
+                    response = response_method_not_allowed()
+
+                try:
+                    response_path(response)
+                except NameError:
+                    response = response_method_not_found()
 
                 conn.sendall(response)
+
+
             except:
                 traceback.print_exc()
             finally:
-                conn.close() 
+                conn.close()
 
     except KeyboardInterrupt:
         sock.close()
@@ -149,5 +188,3 @@ def server(log_buffer=sys.stderr):
 if __name__ == '__main__':
     server()
     sys.exit(0)
-
-