Merge pull request #11 from cardoe/python3.13

add Python 3.13+ support

keystoneauth_websso/plugin.py

@@ -15,7 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import cgi
 import json
 import os
 import re
@@ -24,6 +23,7 @@
 from datetime import datetime
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
+import multipart
 from keystoneauth1 import _utils as utils
 from keystoneauth1.identity.v3 import federation
 
@@ -75,14 +75,13 @@ def do_POST(self):
 
         if self.headers:
 
-            form = cgi.FieldStorage(
-                fp=self.rfile,
-                headers=self.headers,
-                environ={
-                    "REQUEST_METHOD": "POST",
-                    "CONTENT_TYPE": self.headers["Content-Type"],
-                },
-            )
+            environ = {
+                "REQUEST_METHOD": "POST",
+                "CONTENT_LENGTH": self.headers["Content-Length"],
+                "CONTENT_TYPE": self.headers["Content-Type"],
+                "wsgi.input": self.rfile,
+            }
+            forms, files = multipart.parse_form_data(environ)
 
             self.send_response(200)
             self.send_header("Content-type", "text/html")
@@ -95,11 +94,8 @@ def do_POST(self):
                 b"</body></html>"
             )
 
-            for field in form.keys():
-                field_item = form[field]
-                if not field_item.filename:
-                    # Regular Form Value
-                    postvars[field] = form[field].value
+            for field, value in forms.items():
+                postvars[field] = value
 
             self.server.token = postvars["token"]
         else:

pyproject.toml

@@ -19,10 +19,11 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.8"
 keystoneauth1 = ">=5.0.0"
+multipart = ">=1.0.0"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.plugins."keystoneauth1.plugin"]
-v3websso = "keystoneauth_websso.loading:OpenIDConnect"
+v3websso = "keystoneauth_websso.loading:OpenIDConnect"