Merge pull request #132 from grisha/python3.12-patch

Python3.12 patch

Author: grisha

NEWS

@@ -1,3 +1,6 @@
+Feb  25 2024 -  3.5.0.2 released. Address the deprecation of the imp module in
+		Python 3.12.
+
 Aug  18 2023 -  3.5.0.1 released. It addresses compatibility issues with 
                 Python 3.11. 
 

lib/python/mod_python/cgihandler.py

@@ -18,7 +18,7 @@
  #
 
 from . import apache
-import imp
+import importlib.util
 import os
 import sys
 
@@ -86,24 +86,35 @@ def handler(req):
             # simulate cgi environment
             env, si, so = apache.setup_cgi(req)
 
+            scriptPath = os.path.join(dir, file)
+
+            if not os.path.exists(scriptPath):
+                raise apache.SERVER_RETURN(apache.HTTP_NOT_FOUND)
+
+            # avoid loading modules outside dir
+            # (e.g. shenaningans like ../../../../etc/passwd)
+            scriptPath = os.path.abspath(scriptPath)
+            if not scriptPath.startswith(dir):
+                raise apache.SERVER_RETURN(apache.HTTP_NOT_FOUND)
+
             try:
                 # we do not search the pythonpath (security reasons)
-                fd, path, desc = imp.find_module(module_name, [dir])
-            except ImportError:
+                spec = importlib.util.spec_from_file_location(module_name, scriptPath)
+            except (ModuleNotFoundError, ValueError):
                 raise apache.SERVER_RETURN(apache.HTTP_NOT_FOUND)
 
-            # this executes the module
-            imp.load_module(module_name, fd, path, desc)
+            if spec is None:
+                raise apache.SERVER_RETURN(apache.HTTP_NOT_FOUND)
+
+            module = importlib.util.module_from_spec(spec)
+            sys.modules[module_name] = module
+            spec.loader.exec_module(module)
 
             return apache.OK
 
         finally:
             # unsimulate the cgi environment
             apache.restore_nocgi(env, si, so)
-            try:
-                fd.close()
-            except: pass
             os.chdir(cwd)
     finally:
         _lock.release()
-

lib/python/mod_python/publisher.py

@@ -34,7 +34,7 @@
 import sys
 import os
 from os.path import exists, isabs, normpath, split, isfile, join, dirname
-import imp
+import importlib.machinery
 import re
 import base64
 
@@ -43,7 +43,7 @@
 import collections
 
 
-imp_suffixes = " ".join([x[0][1:] for x in imp.get_suffixes()])
+imp_suffixes = " ".join(x[1:] for x in importlib.machinery.all_suffixes())
 
 # Python 2/3 compat workaround
 PY2 = sys.version[0] == '2'