Merge pull request #1624 from cloudflare/dominik/python-disallow-file…

…xtless Disallow file extension-less Python modules.
cloudflare · Feb 7, 2024 · 9e1cf65 · 9e1cf65
2 parents 061a15a + 1f7e57c
commit 9e1cf65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/pyodide/python-entrypoint-helper.js b/src/pyodide/python-entrypoint-helper.js
@@ -146,6 +146,8 @@ async function setupPackages(pyodide) {
   let mainModuleName = MetadataReader.getMainModule();
   if (mainModuleName.endsWith(".py")) {
     mainModuleName = mainModuleName.slice(0, -3);
+  } else {
+    throw new Error("Main module needs to end with a .py file extension");
   }
   return pyodide.pyimport(mainModuleName);
 }

diff --git a/src/workerd/api/pyodide/pyodide.c++ b/src/workerd/api/pyodide/pyodide.c++
@@ -81,7 +81,6 @@ jsg::Ref<PyodideMetadataReader> makePyodideMetadataReader(Worker::Reader conf) {
   auto contents = kj::heapArrayBuilder<kj::Array<kj::byte>>(numFiles);
   auto requirements = kj::heapArrayBuilder<kj::String>(numRequirements);
   for (auto module : modules) {
-    bool pymodule = false;
     switch (module.which()) {
     case Worker::Module::TEXT:
       contents.add(kj::heapArray(module.getText().asBytes()));
@@ -93,7 +92,7 @@ jsg::Ref<PyodideMetadataReader> makePyodideMetadataReader(Worker::Reader conf) {
       contents.add(kj::heapArray(module.getJson().asBytes()));
       break;
     case Worker::Module::PYTHON_MODULE:
-      pymodule = true;
+      KJ_REQUIRE(module.getName().endsWith(".py"));
       contents.add(kj::heapArray(module.getPythonModule().asBytes()));
       break;
     case Worker::Module::PYTHON_REQUIREMENT:
@@ -102,12 +101,7 @@ jsg::Ref<PyodideMetadataReader> makePyodideMetadataReader(Worker::Reader conf) {
     default:
       continue;
     }
-    auto name = module.getName();
-    if (pymodule && !name.endsWith(".py")) {
-      names.add(kj::str(name, ".py"));
-    } else {
-      names.add(kj::str(name));
-    }
+    names.add(kj::str(module.getName()));
   }
   return jsg::alloc<PyodideMetadataReader>(kj::mv(mainModule), names.finish(), contents.finish(),
                                            requirements.finish(), true);