refactor: remove usage of cgi

fixes #5280
xonsh · Mar 18, 2024 · 88830a4 · 88830a4
1 parent 18fb513
commit 88830a4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/xonsh/webconfig/file_writes.py b/xonsh/webconfig/file_writes.py
@@ -45,7 +45,7 @@ def config_to_xonsh(
 
 
 def insert_into_xonshrc(
-    config,
+    config: dict,
     xonshrc="~/.xonshrc",
     prefix="# XONSH WEBCONFIG START",
     suffix="# XONSH WEBCONFIG END",

diff --git a/xonsh/webconfig/main.py b/xonsh/webconfig/main.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-import cgi
 import contextlib
 import json
 import os
@@ -8,6 +7,7 @@
 import sys
 import typing as tp
 from argparse import ArgumentParser
+from email.message import EmailMessage
 from http import HTTPStatus, server
 from pathlib import Path
 from pprint import pprint
@@ -90,24 +90,26 @@ def do_GET(self) -> None:
         return super().do_GET()
 
     def _read_form(self):
-        ctype, pdict = cgi.parse_header(self.headers.get("content-type"))
-        # if ctype == "multipart/form-data":
-        # postvars = cgi.parse_multipart(self.rfile, pdict)
-        if ctype == "application/x-www-form-urlencoded":
-            return parse.parse_qs(self._read(), keep_blank_values=True)
-        return {}
+        msg = EmailMessage()
+        msg["Content-Type"] = self.headers.get("content-type")
+        if msg.get_content_type() == "application/x-www-form-urlencoded":
+            data = parse.parse_qs(self._read(), keep_blank_values=True)
+            for name, values in data.items():
+                value = None
+                if isinstance(name, bytes):
+                    name = name.decode(encoding="utf-8")
+                if isinstance(values, list) and values:
+                    if isinstance(values[0], bytes):
+                        value = values[0].decode(encoding="utf-8")
+                yield name, value
 
     def do_POST(self):
         """Reads post request body"""
         route = self._get_route("post")
         if route is not None:
             # redirect after form submission
-            data = cgi.FieldStorage(
-                self.rfile,
-                headers=self.headers,
-                environ={"REQUEST_METHOD": "POST"},
-                keep_blank_values=True,
-            )
+            data = dict(self._read_form())
+
             new_route = route.post(data) or route
             return self._send(redirect=new_route.path)
         post_body = self._read()

diff --git a/xonsh/webconfig/routes.py b/xonsh/webconfig/routes.py
@@ -1,4 +1,3 @@
-import cgi
 import sys
 from typing import TYPE_CHECKING
 
@@ -220,9 +219,9 @@ def get(self):
         # rest
         yield from self.get_cols()
 
-    def post(self, data: "cgi.FieldStorage"):
-        if data:
-            prompt = data.getvalue(self.var_name).replace("\r", "")
+    def post(self, data: dict[str, str]):
+        if prompt := data.get(self.var_name):
+            prompt = prompt.replace("\r", "")
             self.env[self.var_name] = prompt
             self.update_rc(prompt=prompt)
 
@@ -267,10 +266,10 @@ def get(self):
             yield t.row()[t.col()[self.xontrib_card(name, data),]]
             yield t.br()
 
-    def post(self, data: "cgi.FieldStorage"):
-        if not data.keys():
+    def post(self, data: dict[str, str]):
+        if not data:
             return
-        name = data.keys()[0]
+        name = list(data)[0]
         if self.is_loaded(name):
             # todo: update rc file
             del sys.modules[self.mod_name(name)]