Merge pull request #45 from zeroday0619/refactoring

feat: refactoring typed programing

base.py

@@ -19,6 +19,7 @@ import importlib
 import subprocess
 import platform
 
+from abc import ABC, abstractmethod
 from datetime import datetime, timezone
 from typing import Union, List
 
@@ -47,14 +48,14 @@ def jsonrpc2_create_id(data):
 def jsonrpc2_encode(method, params=None):
     data = {"jsonrpc": "2.0", "method": method, "params": params}
     id = jsonrpc2_create_id(data)
-    id = data.get('id')
+    id = data.get("id")
     return (id, json.dumps(data))
 
 
 def jsonrpc2_decode(text):
     data = json.loads(text)
-    type = 'error' if 'error' in data else 'result' if 'result' in data else None
-    id = data.get('id')
+    type = "error" if "error" in data else "result" if "result" in data else None
+    id = data.get("id")
     rpcdata = data.get(type) if type else None
     return type, id, rpcdata
 
@@ -68,6 +69,7 @@ def jsonrpc2_error_encode(error, id=""):
     data = {"jsonrpc": "2.0", "error": error, "id": id}
     return json.dumps(data)
 
+
 def find_openssl_binpath():
     system = platform.system()
 
@@ -121,8 +123,19 @@ def find_openssl_binpath():
     return "openssl"
 
 
+class ExtensionType:
+    def __init__(self):
+        self.type: str = None
+        self.method: str = None
+        self.exported_methods: list[str] = []
+        self.connection_type: str = None
+
+
+type extension_type = ExtensionType
+
+
 class Extension:
-    extensions = []
+    extensions: list[extension_type] = []
     protocols = []
     buffer_size = 8192
 

plugins/alwaysonline.py

@@ -15,7 +15,7 @@ import requests
 from decouple import config
 from elasticsearch import Elasticsearch, NotFoundError
 import hashlib
-from datetime import datetime
+from datetime import datetime, UTC
 from base import Extension, Logger
 
 logger = Logger(name="wayback")
@@ -29,11 +29,13 @@ except Exception as e:
 
 es = Elasticsearch([es_host])
 
-def generate_id(url):
-    """Generate a unique ID for a URL by hashing it."""
-    return hashlib.sha256(url.encode('utf-8')).hexdigest()
 
-def get_cached_page_from_google(url):
+def generate_id(url: str):
+    """Generate a unique ID for a URL by hashing it."""
+    return hashlib.sha256(url.encode("utf-8")).hexdigest()
+
+
+def get_cached_page_from_google(url: str):
     status_code, content = (0, b"")
 
     # Google Cache URL
@@ -50,8 +52,9 @@ def get_cached_page_from_google(url):
 
     return status_code, content
 
+
 # API documentation: https://archive.org/help/wayback_api.php
-def get_cached_page_from_wayback(url):
+def get_cached_page_from_wayback(url: str):
     status_code, content = (0, b"")
 
     # Wayback Machine API URL
@@ -89,73 +92,81 @@ def get_cached_page_from_wayback(url):
 
     return status_code, content
 
-def get_cached_page_from_elasticsearch(url):
+
+def get_cached_page_from_elasticsearch(url: str):
     url_id = generate_id(url)
     try:
         result = es.get(index=es_index, id=url_id)
-        logger.info(result['_source'])
-        return 200, result['_source']['content'].encode(client_encoding)
+        logger.info(result["_source"])
+        return 200, result["_source"]["content"].encode(client_encoding)
     except NotFoundError:
         return 404, b""
     except Exception as e:
         logger.error(f"Error fetching from Elasticsearch: {e}")
         return 502, b""
 
-def cache_to_elasticsearch(url, data):
+
+def cache_to_elasticsearch(url: str, data: bytes):
     url_id = generate_id(url)
-    timestamp = datetime.utcnow().isoformat()
+    timestamp = datetime.now(UTC).timestamp()
     try:
-        es.index(index=es_index, id=url_id, body={
-            "url": url,
-            "content": data.decode(client_encoding),
-            "timestamp": timestamp
-        })
+        es.index(
+            index=es_index,
+            id=url_id,
+            body={
+                "url": url,
+                "content": data.decode(client_encoding),
+                "timestamp": timestamp,
+            },
+        )
     except Exception as e:
         logger.error(f"Error caching to Elasticsearch: {e}")
 
-def get_page_from_origin_server(url):
+
+def get_page_from_origin_server(url: str):
     try:
         response = requests.get(url)
         return response.status_code, response.content
     except Exception as e:
         return 502, str(e).encode(client_encoding)
 
+
 class AlwaysOnline(Extension):
     def __init__(self):
         self.type = "connector"  # this is a connector
         self.connection_type = "alwaysonline"
         self.buffer_size = 8192
 
-    def connect(self, conn, data, webserver, port, scheme, method, url):
+    def connect(self, conn: socket.socket, data: bytes, webserver: bytes, port: bytes, scheme: bytes, method: bytes, url: bytes):
         logger.info("[*] Connecting... Connecting...")
-    
+
         connected = False
-        
+
         is_ssl = scheme in [b"https", b"tls", b"ssl"]
         cache_hit = 0
         buffered = b""
-        
-        def sendall(sock, conn, data):
+
+        def sendall(_sock: socket.socket, _conn: socket.socket, _data: bytes):
             # send first chuck
-            sock.send(data)
-            if len(data) < self.buffer_size:
+            sock.send(_data)
+            if len(_data) < self.buffer_size:
                 return
 
             # send following chunks
-            conn.settimeout(1)
+            _conn.settimeout(1)
             while True:
                 try:
-                    chunk = conn.recv(self.buffer_size)
+                    chunk = _conn.recv(self.buffer_size)
                     if not chunk:
                         break
-                    sock.send(chunk)
+                    _sock.send(chunk)
                 except:
                     break
-        
+
         target_url = url.decode(client_encoding)
         target_scheme = scheme.decode(client_encoding)
         target_webserver = webserver.decode(client_encoding)
-        
+
         if "://" not in target_url:
             target_url = f"{target_scheme}://{target_webserver}:{port}{target_url}"
 

plugins/bio.py

@@ -9,13 +9,14 @@
 # Updated at: 2024-07-02
 #
 
+from socket import socket
 from Bio.Seq import Seq
 from Bio.SeqUtils import gc_fraction
 
 from base import Extension
 
 
-def _analyze_sequence(sequence) -> dict[str, str]:
+def _analyze_sequence(sequence: str) -> dict[str, str]:
     """
     Analyze a given DNA sequence to provide various nucleotide transformations and translations.
 
@@ -41,7 +42,7 @@ def _analyze_sequence(sequence) -> dict[str, str]:
     )
 
 
-def _gc_content_calculation(sequence) -> dict[str, str]:
+def _gc_content_calculation(sequence: str) -> dict[str, str]:
     """
     Calculate the GC content of a given DNA sequence and return it as a float.
 
@@ -63,7 +64,7 @@ class PyBio(Extension):
     def dispatch(self, type, id, params, conn):
         conn.send(b"Greeting! dispatch")
 
-    def analyze_sequence(self, type, id, params, conn):
+    def analyze_sequence(self, type, id, params, conn: socket):
         """
         Analyze a DNA sequence provided in the params dictionary.
 
@@ -91,7 +92,7 @@ class PyBio(Extension):
         result = _analyze_sequence(params["sequence"])
         return result
 
-    def gc_content_calculation(self, type, id, params, conn):
+    def gc_content_calculation(self, type, id, params, conn: socket):
         """
         Calculate the GC content for a given DNA sequence provided in the params dictionary.
 

plugins/container.py

@@ -11,7 +11,7 @@
 #
 
 import docker
-
+from socket import socket
 from base import Extension, Logger
 
 logger = Logger("Container")
@@ -21,26 +21,36 @@ class Container(Extension):
     def __init__(self):
         self.type = "rpcmethod"
         self.method = "container_init"
-        self.exported_methods = ["container_cteate", "container_start", "container_run", "container_stop", "container_pause", "container_unpause", "container_restart", "container_kill", "container_remove"]
+        self.exported_methods = [
+            "container_cteate",
+            "container_start",
+            "container_run",
+            "container_stop",
+            "container_pause",
+            "container_unpause",
+            "container_restart",
+            "container_kill",
+            "container_remove",
+        ]
 
         # docker
         self.client = docker.from_env()
 
-    def dispatch(self, type, id, params, conn):
+    def dispatch(self, type, id, params, conn: socket):
         logger.info("[*] Greeting! dispatch")
         conn.send(b"Greeting! dispatch")
 
-    def container_cteate(self, type, id, params, conn):
+    def container_cteate(self, type, id, params, conn: socket):
         # todo: -
         return b"[*] Created"
-        
-    def container_start(self, type, id, params, conn):
-        name = params['name']
+
+    def container_start(self, type, id, params, conn: socket):
+        name = params["name"]
 
         container = self.client.containers.get(name)
         container.start()
-        
-    def container_run(self, type, id, params, conn):
+
+    def container_run(self, type, id, params, conn: socket):
         devices = params["devices"]
         image = params["image"]
         devices = params["devices"]
@@ -60,7 +70,7 @@ class Container(Extension):
         logger.info("[*] Running...")
         return b"[*] Running..."
 
-    def container_stop(self, type, id, params, conn):
+    def container_stop(self, type, id, params, conn: socket):
         name = params["name"]
 
         container = self.client.containers.get(name)
@@ -68,35 +78,35 @@ class Container(Extension):
 
         logger.info("[*] Stopped")
         return b"[*] Stopped"
-    
-    def container_pause(self, type, id, params, conn):
-        name = params['name']
+
+    def container_pause(self, type, id, params, conn: socket):
+        name = params["name"]
 
         container = self.client.containers.get(name)
         container.pause()
         return b"[*] Paused"
-        
-    def container_unpause(self, type, id, params, conn):
-        name = params['name']
+
+    def container_unpause(self, type, id, params, conn: socket):
+        name = params["name"]
 
         container = self.client.containers.get(name)
         container.unpause()
         return b"[*] Unpaused"
-        
-    def container_restart(self, type, id, params, conn):
-        name = params['name']
+
+    def container_restart(self, type, id, params, conn: socket):
+        name = params["name"]
 
         container = self.client.containers.get(name)
         container.restart()
         return b"[*] Restarted"
-        
-    def container_kill(self, type, id, params, conn):
+
+    def container_kill(self, type, id, params, conn: socket):
         # TODO: -
         return b"[*] Killed"
-        
-    def container_remove(self, type, id, params, conn): 
-        name = params['name']
+
+    def container_remove(self, type, id, params, conn: socket):
+        name = params["name"]
 
         container = self.client.containers.get(name)
         container.remove()
-        return b"[*] Removed"
+        return b"[*] Removed"

plugins/serial.py

@@ -25,6 +25,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+
 class Serial(Extension):
     def __init__(self):
         self.type = "connector"
@@ -38,7 +39,7 @@ class Serial(Extension):
         connected = False
         ser = None
         try:
-            port_path = url.decode(client_encoding).replace('/', '')
+            port_path = url.decode(client_encoding).replace("/", "")
             if not ser:
                 ser = serial.Serial(port_path, baudrate=9600, timeout=2)
                 connected = True
@@ -49,7 +50,7 @@ class Serial(Extension):
 
             ser_data = ser.read_all()
             logger.debug(f"Data received: {ser_data}")
-          
+
             if ser_data:
                 conn.send(ser_data.decode(client_encoding))
         except serial.SerialException as e:

server.py

@@ -38,6 +38,7 @@ from base import (
     Logger,
 )
 
+
 logger = Logger(name="server")
 
 # initialization
@@ -47,11 +48,11 @@ try:
         config("SERVER_URL", default="")
     )
     server_connection_type = config("SERVER_CONNECTION_TYPE", default="proxy")
-    cakey = config("CA_KEY", default="ca.key")
-    cacert = config("CA_CERT", default="ca.crt")
-    certkey = config("CERT_KEY", default="cert.key")
-    certdir = config("CERT_DIR", default="certs/")
-    openssl_binpath = config("OPENSSL_BINPATH", default=find_openssl_binpath())
+    ca_key = config("CA_KEY", default="ca.key")
+    ca_cert = config("CA_CERT", default="ca.crt")
+    cert_key = config("CERT_KEY", default="cert.key")
+    cert_dir = config("CERT_DIR", default="certs/")
+    openssl_bin_path = config("OPENSSL_BINPATH", default=find_openssl_binpath())
     client_encoding = config("CLIENT_ENCODING", default="utf-8")
     local_domain = config("LOCAL_DOMAIN", default="")
     proxy_pass = config("PROXY_PASS", default="")
@@ -87,7 +88,7 @@ if _username:
     auth = HTTPBasicAuth(_username, _password)
 
 
-def parse_first_data(data):
+def parse_first_data(data: bytes):
     parsed_data = (b"", b"", b"", b"", b"")
 
     try:
@@ -126,13 +127,13 @@ def parse_first_data(data):
     return parsed_data
 
 
-def conn_string(conn, data, addr):
+def conn_string(conn: socket.socket, data: bytes, addr: bytes):
     # JSON-RPC 2.0 request
-    def process_jsonrpc2(data):
-        jsondata = json.loads(data.decode(client_encoding, errors="ignore"))
-        if jsondata["jsonrpc"] == "2.0":
+    def process_jsonrpc2(_data: bytes):
+        json_data = json.loads(_data.decode(client_encoding, errors="ignore"))
+        if json_data["jsonrpc"] == "2.0":
             jsonrpc2_server(
-                conn, jsondata["id"], jsondata["method"], jsondata["params"]
+                conn, json_data["id"], json_data["method"], json_data["params"]
             )
             return True
         return False
@@ -166,42 +167,44 @@ def conn_string(conn, data, addr):
     proxy_server(webserver, port, scheme, method, url, conn, addr, data)
 
 
-def jsonrpc2_server(conn, id, method, params):
+def jsonrpc2_server(
+    conn: socket.socket, _id: str, method: str, params: dict[str, str | int]
+):
     if method == "relay_accept":
-        accepted_relay[id] = conn
+        accepted_relay[_id] = conn
         connection_speed = params["connection_speed"]
-        logger.info("[*] connection speed: %s milliseconds" % (str(connection_speed)))
+        logger.info("[*] connection speed: %s milliseconds" % str(connection_speed))
         while conn.fileno() > -1:
             time.sleep(1)
-        del accepted_relay[id]
-        logger.info("[*] relay destroyed: %s" % id)
+        del accepted_relay[_id]
+        logger.info("[*] relay destroyed: %s" % _id)
     else:
-        Extension.dispatch_rpcmethod(method, "call", id, params, conn)
+        Extension.dispatch_rpcmethod(method, "call", _id, params, conn)
 
     # return in conn_string()
 
 
-def proxy_connect(webserver, conn):
+def proxy_connect(webserver: bytes, conn: socket.socket):
     hostname = webserver.decode(client_encoding)
-    certpath = "%s/%s.crt" % (certdir.rstrip("/"), hostname)
+    cert_path = "%s/%s.crt" % (cert_dir.rstrip("/"), hostname)
 
-    if not os.path.exists(certdir):
-        os.makedirs(certdir)
+    if not os.path.exists(cert_dir):
+        os.makedirs(cert_dir)
 
     # https://stackoverflow.com/questions/24055036/handle-https-request-in-proxy-server-by-c-sharp-connect-tunnel
     conn.send(b"HTTP/1.1 200 Connection Established\r\n\r\n")
 
     # https://github.com/inaz2/proxy2/blob/master/proxy2.py
     try:
-        if not os.path.isfile(certpath):
+        if not os.path.isfile(cert_path):
             epoch = "%d" % (time.time() * 1000)
             p1 = Popen(
                 [
-                    openssl_binpath,
+                    openssl_bin_path,
                     "req",
                     "-new",
                     "-key",
-                    certkey,
+                    cert_key,
                     "-subj",
                     "/CN=%s" % hostname,
                 ],
@@ -209,19 +212,19 @@ def proxy_connect(webserver, conn):
             )
             p2 = Popen(
                 [
-                    openssl_binpath,
+                    openssl_bin_path,
                     "x509",
                     "-req",
                     "-days",
                     "3650",
                     "-CA",
-                    cacert,
+                    ca_cert,
                     "-CAkey",
-                    cakey,
+                    ca_key,
                     "-set_serial",
                     epoch,
                     "-out",
-                    certpath,
+                    cert_path,
                 ],
                 stdin=p1.stdout,
                 stderr=PIPE,
@@ -232,20 +235,20 @@ def proxy_connect(webserver, conn):
             "[*] OpenSSL distribution not found on this system. Skipping certificate issuance.",
             exc_info=e,
         )
-        certpath = "default.crt"
+        cert_path = "default.crt"
     except Exception as e:
         logger.error("[*] Skipping certificate issuance.", exc_info=e)
-        certpath = "default.crt"
-        
-    logger.info("[*] Certificate file: %s" % (certpath))
-    logger.info("[*] Private key file: %s" % (certkey))
+        cert_path = "default.crt"
+
+    logger.info("[*] Certificate file: %s" % cert_path)
+    logger.info("[*] Private key file: %s" % cert_key)
 
     # https://stackoverflow.com/questions/11255530/python-simple-ssl-socket-server
     # https://docs.python.org/3/library/ssl.html
     context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
     context.check_hostname = False
     context.verify_mode = ssl.CERT_NONE
-    context.load_cert_chain(certfile=certpath, keyfile=certkey)
+    context.load_cert_chain(certfile=cert_path, keyfile=cert_key)
 
     try:
         # https://stackoverflow.com/questions/11255530/python-simple-ssl-socket-server
@@ -256,12 +259,14 @@ def proxy_connect(webserver, conn):
             "[*] SSL negotiation failed.",
             exc_info=e,
         )
-        return (conn, b"")
+        return conn, b""
 
-    return (conn, data)
+    return conn, data
 
 
-def proxy_check_filtered(data, webserver, port, scheme, method, url):
+def proxy_check_filtered(
+    data: bytes, webserver: bytes, port: bytes, scheme: bytes, method: bytes, url: bytes
+):
     filtered = False
 
     filters = Extension.get_filters()
@@ -272,7 +277,16 @@ def proxy_check_filtered(data, webserver, port, scheme, method, url):
     return filtered
 
 
-def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
+def proxy_server(
+    webserver: bytes,
+    port: bytes,
+    scheme: bytes,
+    method: bytes,
+    url: bytes,
+    conn: socket.socket,
+    addr: bytes,
+    data: bytes,
+):
     try:
         logger.info("[*] Started the request. %s" % (str(addr[0])))
 
@@ -296,14 +310,11 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
             _, _, _, method, url = parse_first_data(data)
 
         # https://stackoverflow.com/questions/44343739/python-sockets-ssl-eof-occurred-in-violation-of-protocol
-        def sock_close(sock, is_ssl=False):
-            # if is_ssl:
-            #    sock = sock.unwrap()
-            # sock.shutdown(socket.SHUT_RDWR)
-            sock.close()
+        def sock_close(_sock: socket.socket):
+            _sock.close()
 
         # Wait to see if there is more data to transmit
-        def sendall(sock, conn, data):
+        def sendall(_sock: socket.socket, _conn: socket.socket, _data: bytes):
             # send first chuck
             if proxy_check_filtered(data, webserver, port, scheme, method, url):
                 sock.close()
@@ -324,7 +335,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
                     if proxy_check_filtered(
                         buffered, webserver, port, scheme, method, url
                     ):
-                        sock_close(sock, is_ssl)
+                        sock_close(sock)
                         raise Exception("Filtered request")
                     sock.send(chunk)
                     if len(buffered) > buffer_size * 2:
@@ -354,7 +365,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
 
             i = 0
             is_http_403 = False
-            buffered = b""
+            _buffered = b""
             while True:
                 chunk = sock.recv(buffer_size)
                 if not chunk:
@@ -362,24 +373,26 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
                 if i == 0 and chunk.find(b"HTTP/1.1 403") == 0:
                     is_http_403 = True
                     break
-                buffered += chunk
-                if proxy_check_filtered(buffered, webserver, port, scheme, method, url):
-                    sock_close(sock, is_ssl)
+                _buffered += chunk
+                if proxy_check_filtered(
+                    _buffered, webserver, port, scheme, method, url
+                ):
+                    sock_close(sock)
                     add_filtered_host(webserver.decode(client_encoding), "127.0.0.1")
                     raise Exception("Filtered response")
                 conn.send(chunk)
-                if len(buffered) > buffer_size * 2:
-                    buffered = buffered[-buffer_size * 2 :]
+                if len(_buffered) > buffer_size * 2:
+                    _buffered = _buffered[-buffer_size * 2 :]
                 i += 1
 
             # when blocked
             if is_http_403:
                 logger.warning(
                     "[*] Blocked the request by remote server: %s"
-                    % (webserver.decode(client_encoding))
+                    % webserver.decode(client_encoding)
                 )
 
-                def bypass_callback(response, *args, **kwargs):
+                def bypass_callback(response: requests.Response):
                     if response.status_code != 200:
                         conn.sendall(b'HTTP/1.1 403 Forbidden\r\n\r\n{"status":403}')
                         return
@@ -420,7 +433,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
                 else:
                     conn.sendall(b'HTTP/1.1 403 Forbidden\r\n\r\n{"status":403}')
 
-            sock_close(sock, is_ssl)
+            sock_close(sock)
 
             logger.info(
                 "[*] Received %s chunks. (%s bytes per chunk)"
@@ -509,27 +522,27 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
             else:
                 resolved_address_list.remove(resolved_address_list[0])
                 logger.info("[*] the relay is gone. %s" % id)
-                sock_close(sock, is_ssl)
+                sock_close(sock)
                 return
 
             # get response
             i = 0
             buffered = b""
             while True:
-                chunk = sock.recv(buffer_size)
-                if not chunk:
+                _chunk = sock.recv(buffer_size)
+                if not _chunk:
                     break
-                buffered += chunk
+                buffered += _chunk
                 if proxy_check_filtered(buffered, webserver, port, scheme, method, url):
-                    sock_close(sock, is_ssl)
+                    sock_close(sock)
                     add_filtered_host(webserver.decode(client_encoding), "127.0.0.1")
                     raise Exception("Filtered response")
-                conn.send(chunk)
+                conn.send(_chunk)
                 if len(buffered) > buffer_size * 2:
                     buffered = buffered[-buffer_size * 2 :]
                 i += 1
 
-            sock_close(sock, is_ssl)
+            sock_close(sock)
 
             logger.info(
                 "[*] Received %s chunks. (%s bytes per chunk)"
@@ -604,7 +617,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
 
 
 # journaling a filtered hosts
-def add_filtered_host(domain, ip_address):
+def add_filtered_host(domain: str, ip_address: str):
     hosts_path = "./filtered.hosts"
     with open(hosts_path, "r") as file:
         lines = file.readlines()
@@ -619,6 +632,7 @@ def add_filtered_host(domain, ip_address):
 def start():  # Main Program
     try:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
         sock.bind(("", listening_port))
         sock.listen(max_connection)
         logger.info("[*] Server started successfully [ %d ]" % listening_port)

smtp.py

@@ -20,7 +20,7 @@ from requests.auth import HTTPBasicAuth
 from base import (
     extract_credentials,
     jsonrpc2_encode,
-    Logger,
+    Logger, jsonrpc2_decode,
 )
 
 logger = Logger(name="smtp")
@@ -40,21 +40,22 @@ auth = None
 if _username:
     auth = HTTPBasicAuth(_username, _password)
 
+
 class CaterpillarSMTPHandler:
     def __init__(self):
         self.smtpd_hostname = "CaterpillarSMTPServer"
         self.smtp_version = "0.1.6"
 
     async def handle_DATA(self, server, session, envelope):
-        mailfrom = envelope.mail_from
-        rcpttos = envelope.rcpt_tos
+        mail_from = envelope.mail_from
+        rcpt_tos = envelope.rcpt_tos
         data = envelope.content
 
         message = EmailMessage()
         message.set_content(data)
 
-        subject = message.get('Subject', '')
-        to = message.get('To', '')
+        subject = message.get("Subject", "")
+        to = message.get("To", "")
 
         proxy_data = {
             "headers": {
@@ -64,7 +65,7 @@ class CaterpillarSMTPHandler:
             },
             "data": {
                 "to": to,
-                "from": mailfrom,
+                "from": mail_from,
                 "subject": subject,
                 "message": data.decode("utf-8"),
             },
@@ -75,23 +76,23 @@ class CaterpillarSMTPHandler:
             response = await asyncio.to_thread(
                 requests.post,
                 server_url,
-                headers=proxy_data['headers'],
+                headers=proxy_data["headers"],
                 data=raw_data,
-                auth=auth
+                auth=auth,
             )
             if response.status_code == 200:
-                type, id, rpcdata = jsonrpc2_decode(response.text)
-                if rpcdata['success']:
+                _type, _id, rpc_data = jsonrpc2_decode(response.text)
+                if rpc_data["success"]:
                     logger.info("[*] Email sent successfully.")
                 else:
-                    raise Exception(f"({rpcdata['code']}) {rpcdata['message']}")
+                    raise Exception(f"({rpc_data['code']}) {rpc_data['message']}")
             else:
                 raise Exception(f"Status {response.status_code}")
         except Exception as e:
             logger.error("[*] Failed to send email", exc_info=e)
-            return '500 Could not process your message. ' + str(e)
+            return "500 Could not process your message. " + str(e)
 
-        return '250 OK'
+        return "250 OK"
 
 
 # https://aiosmtpd-pepoluan.readthedocs.io/en/latest/migrating.html
@@ -101,11 +102,12 @@ def main():
     # Run the event loop in a separate thread.
     controller.start()
     # Wait for the user to press Return.
-    input('SMTP server running. Press Return to stop server and exit.')
+    input("SMTP server running. Press Return to stop server and exit.")
     controller.stop()
     logger.warning("[*] User has requested an interrupt")
     logger.warning("[*] Application Exiting.....")
     sys.exit()
 
+
 if __name__ == "__main__":
     main()

web.py

@@ -49,18 +49,18 @@ def process_jsonrpc2():
     conn = Connection(request)
 
     # JSON-RPC 2.0 request
-    jsondata = request.get_json(silent=True)
-    if jsondata["jsonrpc"] == "2.0":
+    json_data = request.get_json(silent=True)
+    if json_data["jsonrpc"] == "2.0":
         return Extension.dispatch_rpcmethod(
-            jsondata["method"], "call", jsondata["id"], jsondata["params"], conn
+            json_data["method"], "call", json_data["id"], json_data["params"], conn
         )
 
     # when error
-    return jsonrpc2_error_encode({"message": "Not vaild JSON-RPC 2.0 request"})
+    return jsonrpc2_error_encode({"message": "Not valid JSON-RPC 2.0 request"})
 
 
-def jsonrpc2_server(conn, id, method, params):
-    return Extension.dispatch_rpcmethod(method, "call", id, params, conn)
+def jsonrpc2_server(conn, _id, method, params):
+    return Extension.dispatch_rpcmethod(method, "call", _id, params, conn)
 
 
 class Connection: