indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Returning http codes

merge-requests/30/head
Bob Mottram 2019-11-15 14:03:43 +00:00
parent f84c800cb1
commit 5d107acf09
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
daemon.py
View File

@ -295,9 +295,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('X-Robots-Tag','noindex') self.send_header('X-Robots-Tag','noindex')
self.end_headers() self.end_headers()
def _404(self) -> None: def _httpReturnCode(self,httpCode: int,httpDescription: str) -> None
msg="<html><head></head><body><h1>404 Not Found</h1></body></html>".encode('utf-8') msg="<html><head></head><body><h1>"+str(httpCode)+" "+httpDescription+"</h1></body></html>"
self.send_response(404) msg=msg.encode('utf-8')
self.send_response(httpCode)
self.send_header('Content-Type', 'text/html; charset=utf-8') self.send_header('Content-Type', 'text/html; charset=utf-8')
self.send_header('Content-Length', str(len(msg))) self.send_header('Content-Length', str(len(msg)))
self.send_header('X-Robots-Tag','noindex') self.send_header('X-Robots-Tag','noindex')
@ -305,9 +306,15 @@ class PubServer(BaseHTTPRequestHandler):
try: try:
self.wfile.write(msg) self.wfile.write(msg)
except Exception as e: except Exception as e:
print('Error when showing 404') print('Error when showing '+str(httpCode))
print(e) print(e)
def _404(self) -> None:
self._httpReturnCode(404,'Not Found')
def _400(self) -> None:
self._httpReturnCode(400,'Bad Request')
def _write(self,msg) -> None: def _write(self,msg) -> None:
tries=0 tries=0
while tries<5: while tries<5:
@ -879,6 +886,7 @@ class PubServer(BaseHTTPRequestHandler):
if self._requestHTTP(): if self._requestHTTP():
htmlGET=True htmlGET=True
else: else:
self._400()
return return
# treat shared inbox paths consistently # treat shared inbox paths consistently
@ -1010,6 +1018,7 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/css',len(msg),cookie) self._set_headers('text/css',len(msg),cookie)
self._write(msg) self._write(msg)
return return
self._404()
# image on login screen # image on login screen
if self.path=='/login.png' or \ if self.path=='/login.png' or \