[Python-checkins] r54898 - in python/branches/bcannon-objcap: BRANCH_NOTES Python/pythonrun.c secure_python.c

Sat Apr 21 02:08:13 CEST 2007

Author: brett.cannon
Date: Sat Apr 21 02:08:10 2007
New Revision: 54898
Modified:
 python/branches/bcannon-objcap/BRANCH_NOTES
 python/branches/bcannon-objcap/Python/pythonrun.c
 python/branches/bcannon-objcap/secure_python.c
Log:
Move changes to Py_Initialize() over to proof-of-concept app wholesale.
Modified: python/branches/bcannon-objcap/BRANCH_NOTES
==============================================================================

--- python/branches/bcannon-objcap/BRANCH_NOTES	(original)
+++ python/branches/bcannon-objcap/BRANCH_NOTES	Sat Apr 21 02:08:10 2007
@@ -6,8 +6,6 @@
 ======
 Status
 ======
-* Create app that embeds Python
- + Move changes in Py_Initialize() to app.
 * Remove dangerous built-ins.
 * Turn on whitelisting.
 * Write tests.
Modified: python/branches/bcannon-objcap/Python/pythonrun.c
==============================================================================
--- python/branches/bcannon-objcap/Python/pythonrun.c	(original)
+++ python/branches/bcannon-objcap/Python/pythonrun.c	Sat Apr 21 02:08:10 2007
@@ -331,94 +331,7 @@
 void
 Py_Initialize(void)
 {
-	PyInterpreterState *interp;
-	Py_ssize_t module_count, x;
-	PyObject *module_names_list;
-	PyObject *hidden_modules;
-	PyObject *import_module;
-	PyObject *import_callable;
-
 	Py_InitializeEx(1);
-
-	interp = PyThreadState_GET()->interp;
-
-	import_module = PyImport_ImportModule("importlib");
-
-	import_callable = PyObject_CallMethod(import_module, "Import", "");
-
-	/* Store import machinery somewhere so that a reference is held as
-	 needed. */
-	PyDict_SetItemString(interp->sysdict, "import_", import_callable);
-	PyDict_SetItemString(interp->builtins, "__import__",
-			PyDict_GetItemString(interp->sysdict,
-				"import_delegate"));
-
-	Py_DECREF(import_module);
-	Py_DECREF(import_callable);
-
-	/* Clear out sys.modules.
-	 Some modules must be kept around in order for Python to function
-	 properly.
-
-	 * __builtin__
-	 Lose this and Python will not run.
-	 * __main__
-	 Current scope of execution.
-	 * exceptions
-	 Safe to keep around.
-	 * encodings
-	 Does dynamic import of encodings which requires globals() to
-	 work; globals() fails when the module has been deleted. Also
-	 fails if you hide module because importing of submodules for
-	 encodings no longer has the parent package.
-	 * codecs
-	 Incremental codecs fail.
-	 * _codecs
-	 Exposed by codecs.
-	 * warnings (cache in C code)
-	 Warnings reset otherwise. Requires 'sys' module to work.
-
-	 All other modules are kept in the '.hidden' dict in sys.modules for
-	 use by importlib.
-	 */
-	/* Get the 'warnings' module cached away at the C level. */
-	PyModule_GetWarningsModule();
-	module_names_list = PyDict_Keys(interp->modules);
-	module_count = PyList_GET_SIZE(module_names_list);
-	hidden_modules = PyDict_New();
-	for (x=0; x < module_count; x+=1) {
-		char *module_name =
-			PyString_AS_STRING(
-					PyList_GET_ITEM(module_names_list, x));
-		/* Modules that *must* stay visible. */
-		if ((strcmp(module_name, "__builtin__") == 0) ||
-				(strcmp(module_name, "__main__") == 0) ||
-				(strcmp(module_name, "exceptions") == 0) ||
-				(strcmp(module_name, "encodings") == 0) ||
-				(strcmp(module_name, "codecs") == 0) ||
-				(strcmp(module_name, "_codecs") == 0)) {
-			continue;
-		}
-		/* All other modules must be stored away for importlib. */
-		else {
-			PyObject *module =
-				PyDict_GetItemString(interp->modules,
-						module_name);
-			PyDict_SetItemString(hidden_modules, module_name,
-					module);
-			PyDict_DelItemString(interp->modules, module_name);
-		}
-	}
-	/* Store away modules that must stick around but should not be exposed;
-	 this is done for importlib's benefit.
-	 */
-	PyDict_SetItemString(interp->modules, ".hidden", hidden_modules);
-
-	PyDict_SetItemString(interp->sysdict, "modules", interp->modules);
-
-	/* Clear out sys.path_importer_cache. */
-	PyDict_Clear(PyDict_GetItemString(interp->sysdict,
-				"path_importer_cache"));
 }
 
 
Modified: python/branches/bcannon-objcap/secure_python.c
==============================================================================
--- python/branches/bcannon-objcap/secure_python.c	(original)
+++ python/branches/bcannon-objcap/secure_python.c	Sat Apr 21 02:08:10 2007
@@ -9,9 +9,103 @@
 int
 main(int argc, char *argv[])
 {
+ int return_val;
+ PyInterpreterState *interp;
+ Py_ssize_t module_count, x;
+ PyObject *module_names_list;
+ PyObject *hidden_modules;
+ PyObject *import_module;
+ PyObject *import_callable;
+
+ /* Initialize interpreter. */
 Py_Initialize();
- Py_Main(argc, argv);
+
+
+ /* Secure it. */
+ interp = PyThreadState_GET()->interp;
+
+ import_module = PyImport_ImportModule("importlib");
+
+ import_callable = PyObject_CallMethod(import_module, "Import", "");
+
+ /* Store import machinery somewhere so that a reference is held as
+ needed. */
+ PyDict_SetItemString(interp->sysdict, "import_", import_callable);
+ PyDict_SetItemString(interp->builtins, "__import__",
+		 PyDict_GetItemString(interp->sysdict,
+			 "import_delegate"));
+
+ Py_DECREF(import_module);
+ Py_DECREF(import_callable);
+
+ /* Clear out sys.modules.
+ Some modules must be kept around in order for Python to function
+ properly.
+
+ * __builtin__
+	 Lose this and Python will not run.
+ * __main__
+	 Current scope of execution.
+ * exceptions
+	 Safe to keep around.
+ * encodings
+	 Does dynamic import of encodings which requires globals() to
+	 work; globals() fails when the module has been deleted. Also
+	 fails if you hide module because importing of submodules for
+	 encodings no longer has the parent package.
+ * codecs
+	 Incremental codecs fail.
+ * _codecs
+	 Exposed by codecs.
+ * warnings (cache in C code)
+	 Warnings reset otherwise. Requires 'sys' module to work.
+
+ All other modules are kept in the '.hidden' dict in sys.modules for
+ use by importlib.
+ */
+ /* Get the 'warnings' module cached away at the C level. */
+ PyModule_GetWarningsModule();
+ module_names_list = PyDict_Keys(interp->modules);
+ module_count = PyList_GET_SIZE(module_names_list);
+ hidden_modules = PyDict_New();
+ for (x=0; x < module_count; x+=1) {
+	 char *module_name =
+		 PyString_AS_STRING(
+				 PyList_GET_ITEM(module_names_list, x));
+	 /* Modules that *must* stay visible. */
+	 if ((strcmp(module_name, "__builtin__") == 0) ||
+			 (strcmp(module_name, "__main__") == 0) ||
+			 (strcmp(module_name, "exceptions") == 0) ||
+			 (strcmp(module_name, "encodings") == 0) ||
+			 (strcmp(module_name, "codecs") == 0) ||
+			 (strcmp(module_name, "_codecs") == 0)) {
+		 continue;
+	 }
+	 /* All other modules must be stored away for importlib. */
+	 else {
+		 PyObject *module =
+			 PyDict_GetItemString(interp->modules,
+					 module_name);
+		 PyDict_SetItemString(hidden_modules, module_name,
+				 module);
+		 PyDict_DelItemString(interp->modules, module_name);
+	 }
+ }
+ /* Store away modules that must stick around but should not be exposed;
+ this is done for importlib's benefit.
+ */
+ PyDict_SetItemString(interp->modules, ".hidden", hidden_modules);
+
+ PyDict_SetItemString(interp->sysdict, "modules", interp->modules);
+
+ /* Clear out sys.path_importer_cache. */
+ PyDict_Clear(PyDict_GetItemString(interp->sysdict,
+			 "path_importer_cache"));
+
+ /* Use interpreter. */
+ return_val = Py_Main(argc, argv);
+ /* Tear down interpreter. */
 Py_Finalize();
 
- return 0;
+ return return_val;
 }
