From ffbbb6f93bd7f4561e5c7264c1e84d5803e6383a Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Tue, 20 Jul 2021 12:50:52 -0500
Subject: [PATCH] clean up the code, enforce 63 character limit

---
 esgd.py | 56 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/esgd.py b/esgd.py
index 9c0545d..9669ad7 100644
--- a/esgd.py
+++ b/esgd.py
@@ -1,4 +1,5 @@
-import socketserver
+from socketserver import TCPServer
+from socketserver import BaseRequestHandler
 import subprocess
 import argparse
 import os
@@ -18,6 +19,7 @@ class GopherLine:
         self.port = "0"
         self.line = line
         self.parse()
+
     def parse(self):
         split = self.line.rstrip().split('\t')
         location = False
@@ -57,24 +59,30 @@ class Logger:
     def __init__(self, file=None):
         if file != None: self.fd = open(file, "a+")
         else: self.fd = False
+
     def time(self):
         return int(time.time())
+
     def write(self, msg):
         if self.fd: self.fd.write("{}\n")
+
     def log(self, msg):
         ct = self.time()
         self.write("[{}] {}".format(str(ct), msg))
         print("[{}] {}".format(str(ct), msg))
+
     def warn(self, msg):
         ct = self.time()
         self.write("! [{}] {}".format(str(ct), msg))
         print("! [{}] {}".format(str(ct), msg))
+
     def error(self, msg):
         ct = self.time()
         self.write("!! [{}] {}".format(str(ct), msg))
         print("!! [{}] {}".format(str(ct), msg))
         self.close()
         raise SystemExit
+
     def close(self):
         if self.fd: self.fd.close()
 
@@ -107,16 +115,19 @@ class GopherServerLogic:
         else: raise RequestError("unreachable state")
         return (ret, gph)
 
-    def fileSendable(self, file): return os.access(file, os.F_OK|os.R_OK)
+    def fileSendable(self, file):
+        return os.access(file, os.F_OK|os.R_OK)
 
     def fileCGI(self, file):
         return os.access(file, os.F_OK|os.R_OK|os.X_OK)
 
     def notFound(self):
-        self.request.sendall(b"3error: file not found!\r\n.\r\n")
+        self.request.sendall(
+            b"3error: file not found!\r\n.\r\n")
 
     def invalid(self):
-        self.request.sendall(b"3error: selector contains '..'!\r\n.\r\n")
+        self.request.sendall(
+            b"3error: selector contains '..'!\r\n.\r\n")
 
     def fileToFileArray(self, file):
         fd = open(file, "r")
@@ -147,7 +158,9 @@ class GopherServerLogic:
             proc.kill()
             out, err = proc.communicate()
 
-        return out.decode("utf-8").replace("\r", "").split("\n")
+        return out.decode("utf-8")\
+            .replace("\r", "")\
+            .split("\n")
 
     def gopherRenderer(self, fileArray):
         gopherlines = []
@@ -160,7 +173,8 @@ class GopherServerLogic:
 
     def serveFile(self, file, query, gph):
         if self.fileCGI(file): fa = self.cgi(file, query)
-        elif self.fileSendable(file): fa = self.fileToFileArray(file)
+        elif self.fileSendable(file):
+            fa = self.fileToFileArray(file)
         else:
             log.log("selector not found")
             self.notFound()
@@ -168,9 +182,11 @@ class GopherServerLogic:
         if gph: fa = self.gopherRenderer(fa)
         self.sendFileArray(fa)
 
-class GopherHandler(socketserver.BaseRequestHandler, GopherServerLogic):
+class GopherHandler(BaseRequestHandler,
+    GopherServerLogic):
     def handle(self):
-        log.log("request from {}".format(self.client_address[0]))
+        log.log("request from {}".format(
+            self.client_address[0]))
         decoded = self.recieveRequest()
         try: parsed = self.requestParser(decoded)
         except RequestError:
@@ -190,14 +206,18 @@ log = Logger()
 
 def parseArgs():
     parse = argparse.ArgumentParser()
-    parse.add_argument("-u", "--user", default="nobody", help="user to change to on startup")
-    parse.add_argument("-g", "--group", default="nobody", help="group to change to on startup")
-    parse.add_argument("-s", "--host", default="localhost", help="host to host on")
-    parse.add_argument("-p", "--port", default=70, type=int, help="port to host on")
-    parse.add_argument("-d", "--dir", default="/var/gopher", help="directory to host from")
+    parse.add_argument("-u", "--user", default="nobody",
+        help="user to change to on startup")
+    parse.add_argument("-g", "--group", default="nobody",
+        help="group to change to on startup")
+    parse.add_argument("-s", "--host", default="localhost",
+        help="host to host on")
+    parse.add_argument("-p", "--port", default=70, type=int,
+        help="port to host on")
+    parse.add_argument("-d", "--dir", default="/var/gopher",
+        help="directory to host from")
     return parse.parse_args()
 
-
 if __name__ == "__main__":
     args = parseArgs()
     log.log("arguments parsed")
@@ -209,14 +229,12 @@ if __name__ == "__main__":
     location = args.dir
     log.log("arguments good")
     try:
-        with socketserver.TCPServer((host, port), GopherHandler) as server:
+        with TCPServer((host, port), GopherHandler) as server:
             os.setgid(switchgrp)
             os.seteuid(switchusr)
             log.log("switch user successful")
             os.chdir(location)
             log.log("change directory successful")
             server.serve_forever()
-    except PermissionError:
-        log.error("invalid permissions")
-    except OSError:
-        log.error("address already in use")
+    except PermissionError: log.error("invalid permissions")
+    except OSError: log.error("address already in use")