Add pyutils.h/c and a check for import when parsing arguments

include/conf.h

@@ -21,6 +21,8 @@
 
 #include <unistd.h>
 #include <getopt.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "config.h"
 /**@defgroup conf_internal PYFCGI configuration handling
@@ -30,6 +32,7 @@
  * @ingroup conf_internal */
 
 #include "logger.h"
+#include "pyutils.h"
 
 /**@defgroup ret_status Function & process return status
  */
@@ -152,6 +155,8 @@ void default_conf();
  * @return 0 if no error */
 int parse_args(int argc, char *argv[]);
 
+int check_entrypoint_import();
+
 int parse_optlog(const char*);
 
 #endif

include/pyutils.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019 Weber Yann
+ * 
+ * This file is part of PyFCGI.
+ * 
+ * PyFCGI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ * 
+ * PyFCGI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with PyFCGI.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _PYUTILS__H__
+#define _PYUTILS__H__
+
+#include "config.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h> /* fcgi library; put it first*/
+
+#define PY_SSIZE_T_CLEAN
+#include <Python.h>
+
+#include "logger.h"
+
+/**@brief Call Py_Initialize & update_python_path
+ */
+void pyinit();
+
+/**@brief Add . to the embed pythonpath
+ */
+void update_python_path();
+
+/**@brief Import & return the python entrypoint callable
+ * from PyFCGI_conf.py_entrymod & PyFCGI_conf.py_entryfun
+ */
+PyObject* import_entrypoint();
+
+void log_expt(int priority);
+
+#endif
+

include/pyworker.h

@@ -79,10 +79,10 @@
 #include <sys/wait.h>
 
 #include "logger.h"
+#include "pyutils.h"
 
 #define EXIT_PYERR 42
 #define WPIPER_SIG 30
-#define PYENTRY_FUNNAME "entrypoint"
 #define PIPER_STACK_SZ (1024 * 1024 * 4)
 
 //extern char **environ;
@@ -138,21 +138,12 @@ void worker_piper_sighandler(int);
  */
 int ctl_get_rep_sz(int, size_t*);
 
-/**@brief Import & return the python entrypoint callable
- * from PyFCGI_conf.py_entrymod & PyFCGI_conf.py_entryfun
- */
-PyObject* import_entrypoint();
-
 /**@brief Fetch stdout & stderr python flush() function
  * @param PyObject* pystdout_flush
  * @param PyObject* pystderr_flush
  */
 void fetch_pyflush(PyObject**, PyObject**);
 
-/**@brief Add . to the embed pythonpath
- */
-void update_python_path();
-
 /**@brief Create two pipes for stdout & stderr
  * @ingroup worker_process
  * @params int[2] pystdout
@@ -170,7 +161,5 @@ void update_python_fd(int[2], int[2]);
  */
 void update_pyenv(PyObject*, char**);
 
-
-void log_expt(int priority);
-
 #endif
+

src/Makefile.am

@@ -1,7 +1,7 @@
 bin_PROGRAMS = pyfcgi
 noinst_LIBRARIES = libpyfcgi.a
 
-libpyfcgi_a_SOURCES = logger.c pyworker.c responder.c conf.c
+libpyfcgi_a_SOURCES = logger.c pyworker.c responder.c conf.c pyutils.c
 libpyfcgi_a_CFLAGS = $(PYTHON_CFLAGS)
 
 

src/conf.c

@@ -123,9 +123,36 @@ int parse_args(int argc, char *argv[])
 	{
 		PyFCGI_conf.py_entryfun = PYENTRY_DEFAULT_FUN;
 	}
+	if(check_entrypoint_import())
+	{
+		usage();
+		exit(3);
+	}
 	return 0;
 }
 
+int check_entrypoint_import()
+{
+	pid_t pid;
+	int status;
+	void *ret;
+
+	pid = fork();
+	if(!pid)
+	{
+		pyinit();
+		ret = (void*)import_entrypoint();
+		if(!ret)
+		{
+			dprintf(2, "Unable to import entrypoint...\n");
+			exit(1);
+		}
+		exit(0);
+	}
+	waitpid(pid, &status, 0);
+	return WEXITSTATUS(status);
+}
+
 int parse_optlog(const char* logspec)
 {
 	return 0;

src/pyutils.c

@@ -0,0 +1,198 @@
+#include "pyutils.h"
+
+void pyinit()
+{
+	update_python_path();
+	Py_Initialize();
+}
+
+void update_python_path()
+{
+	wchar_t *ppath, *wcwd, *wtmp;
+	char *cwd, *ncwd, *err_fmt;
+	size_t wcwd_sz, ppath_sz;
+	int err;
+	
+	// Add a ':' in front of CWD and convert to wchar_t*
+	cwd = get_current_dir_name();
+	if(!cwd)
+	{
+		err = errno;
+		err_fmt = "Unable to fecth CWD : %s";
+		goto update_python_path_err;
+	}
+	ncwd = malloc(sizeof(char) * (strlen(cwd) + 2));
+	if(!ncwd)
+	{
+		err = errno;
+		err_fmt = "Unable to allocate memory for new CWD : %s";
+		goto update_python_path_err_cwd;
+	}
+	ncwd[0] = ':';
+	strcpy(ncwd+1, cwd);
+	free(cwd);
+	cwd = ncwd;
+
+	wcwd_sz = mbstowcs(NULL, cwd, 0);
+	if(wcwd_sz == (size_t)-1)
+	{
+		err = errno;
+		err_fmt = "Unable to convert CWD to wchar : %s";
+		goto update_python_path_err_cwd;
+	}
+	wcwd_sz++;
+	wcwd = malloc(sizeof(wchar_t) * wcwd_sz);
+	if(!wcwd)
+	{
+		err = errno;
+		err_fmt = "Unable to allocate wchar for CWD : %s";
+		goto update_python_path_err_cwd;
+
+	}
+	if(mbstowcs(wcwd, cwd, wcwd_sz) == -1)
+	{
+		err = errno;
+		err_fmt = "Unable to convert CWD to wchar : %s";
+		goto update_python_path_err_wcwd;
+	}
+
+	// Fetch, dup & update the python path
+	ppath = Py_GetPath();
+	if(!ppath)
+	{
+		if(PyErr_Occurred())
+		{
+			log_expt(LOG_ALERT);
+		}
+		else
+		{
+			pyfcgi_log(LOG_ALERT, "Unable to fetch python path, got NULL.");
+		}
+		err_fmt = NULL;
+		err = 0;
+		goto update_python_path_err_wcwd;
+	}
+	ppath = wcsdup(ppath);
+	if(!wcwd)
+	{
+		err = errno;
+		err_fmt = "Unable to dup the python PATH : %s";
+		goto update_python_path_err_wcwd;
+	}
+
+	ppath_sz = wcslen(ppath);
+	wtmp = realloc(ppath, sizeof(wchar_t) * (ppath_sz + wcwd_sz + 1));
+	if(!wtmp)
+	{
+		err = errno;
+		err_fmt = "Unable reallocate new python path : %s";
+		goto update_python_path_err_ppath;
+	}
+	ppath = wtmp;
+	wcsncpy(ppath+ppath_sz, wcwd, wcwd_sz);
+	Py_SetPath(ppath);
+
+	free(ppath);
+	free(wcwd);
+	free(cwd);
+
+	return;
+	
+update_python_path_err_ppath:
+	free(ppath);
+update_python_path_err_wcwd:
+	free(wcwd);
+update_python_path_err_cwd:
+	free(cwd);
+update_python_path_err:
+	if(err_fmt)
+	{
+		pyfcgi_log( LOG_ALERT, err_fmt, strerror(err));
+	}
+	exit(err);
+}
+
+PyObject* import_entrypoint()
+{
+	PyObject *entry_fname, *entry_module, *entry_fun;
+	entry_fname = PyUnicode_DecodeFSDefault(PyFCGI_conf.py_entrymod);
+	entry_module = PyImport_Import(entry_fname);
+	Py_DECREF(entry_fname);
+
+	if(!entry_module)
+	{
+		//TODO syslog python error / traceback
+		pyfcgi_log(	LOG_CRIT,
+			"Unable to import python file '%s'",
+			PyFCGI_conf.py_entrymod);
+		pyfcgi_log( LOG_INFO,
+			"%s", getcwd(NULL, 256));
+		log_expt(LOG_ERR);
+		sleep(1);
+		return NULL;
+	}
+
+	// getting entrypoint function
+	entry_fun = PyObject_GetAttrString(entry_module, PyFCGI_conf.py_entryfun);
+	Py_DECREF(entry_module);
+
+	if(!entry_fun)
+	{
+		//TODO syslog python error / traceback
+		pyfcgi_log(	LOG_CRIT,
+			"Unable to import object '%s' from '%s'",
+			PyFCGI_conf.py_entryfun, PyFCGI_conf.py_entrymod);
+		return NULL;
+	}
+	if(!PyCallable_Check(entry_fun))
+	{
+		pyfcgi_log( LOG_CRIT,
+			"When imported from '%s', '%s' was not a callable",
+			PyFCGI_conf.py_entrymod, PyFCGI_conf.py_entryfun);
+		return NULL;
+	}
+	return entry_fun;
+}
+
+void log_expt(int priority)
+{
+	if(!PyErr_Occurred())
+	{
+		pyfcgi_log(priority, "No exception");
+		return;
+	}
+
+	PyObject *expt, *expt_str, *expt_bytes, *expt_cls,
+		*expt_val, *expt_type, *traceback;
+	char *msg, *type, *val;
+	int msg_sz;
+	char msg_fmt[] = "%s: %s";
+
+	PyErr_Fetch(&expt_cls, &expt, &traceback);
+
+	// Fetching exception message using __str__()
+	expt_str = PyObject_GetAttrString(expt, "__str__");
+	if(!expt_str)
+	{
+		pyfcgi_log(LOG_ERR, "Unable to fetch __str__ from exception");
+	}
+	expt_val = PyObject_CallObject(expt_str, NULL);
+	expt_bytes = PyUnicode_AsUTF8String(expt_val);
+
+	msg = PyBytes_AsString(expt_bytes);
+	val = strndup(msg, 1024); // TODO check out of mem if !val
+
+	// Fetching exception class name
+	expt_type = PyObject_GetAttrString(expt_cls, "__name__");
+	expt_bytes = PyUnicode_AsUTF8String(expt_type);
+	msg = PyBytes_AsString(expt_bytes);
+	type = strndup(msg, 1024); // TODO check out of mem if !type
+
+	msg_sz = snprintf(NULL, 0, msg_fmt, type, val);
+	msg_sz++;
+	msg = malloc(sizeof(char) * msg_sz);
+	snprintf(msg, msg_sz, msg_fmt, type, val);
+
+	pyfcgi_log(priority, msg);
+}
+

src/pyworker.c

@@ -434,48 +434,6 @@ int ctl_get_rep_sz(int ctl_pipe, size_t* rep_sz)
 	return 0;
 }
 
-PyObject* import_entrypoint()
-{
-	PyObject *entry_fname, *entry_module, *entry_fun;
-	entry_fname = PyUnicode_DecodeFSDefault(PyFCGI_conf.py_entrymod);
-	entry_module = PyImport_Import(entry_fname);
-	Py_DECREF(entry_fname);
-
-	if(!entry_module)
-	{
-		//TODO syslog python error / traceback
-		pyfcgi_log(	LOG_CRIT,
-			"Unable to import python file '%s'",
-			PyFCGI_conf.py_entrymod);
-		pyfcgi_log( LOG_INFO,
-			"%s", getcwd(NULL, 256));
-		log_expt(LOG_ERR);
-		sleep(1);
-		return NULL;
-	}
-
-	// getting entrypoint function
-	entry_fun = PyObject_GetAttrString(entry_module, PyFCGI_conf.py_entryfun);
-	Py_DECREF(entry_module);
-
-	if(!entry_fun)
-	{
-		//TODO syslog python error / traceback
-		pyfcgi_log(	LOG_CRIT,
-			"Unable to import object '%s' from '%s'",
-			PyFCGI_conf.py_entryfun, PyFCGI_conf.py_entrymod);
-		return NULL;
-	}
-	if(!PyCallable_Check(entry_fun))
-	{
-		pyfcgi_log( LOG_CRIT,
-			"When imported from '%s', '%s' was not a callable",
-			PyFCGI_conf.py_entrymod, PyFCGI_conf.py_entryfun);
-		return NULL;
-	}
-	return entry_fun;
-}
-
 static PyObject* _fetch_pyflush(const char *fdname)
 {
 	PyObject *pyfd, *pyflush;
@@ -510,112 +468,6 @@ void fetch_pyflush(PyObject** pystdout_flush, PyObject** pystderr_flush)
 	*pystderr_flush = _fetch_pyflush("stderr");
 }
 
-void update_python_path()
-{
-	wchar_t *ppath, *wcwd, *wtmp;
-	char *cwd, *ncwd, *err_fmt;
-	size_t wcwd_sz, ppath_sz;
-	int err;
-	
-	// Add a ':' in front of CWD and convert to wchar_t*
-	cwd = get_current_dir_name();
-	if(!cwd)
-	{
-		err = errno;
-		err_fmt = "Unable to fecth CWD : %s";
-		goto update_python_path_err;
-	}
-	ncwd = malloc(sizeof(char) * (strlen(cwd) + 2));
-	if(!ncwd)
-	{
-		err = errno;
-		err_fmt = "Unable to allocate memory for new CWD : %s";
-		goto update_python_path_err_cwd;
-	}
-	ncwd[0] = ':';
-	strcpy(ncwd+1, cwd);
-	free(cwd);
-	cwd = ncwd;
-
-	wcwd_sz = mbstowcs(NULL, cwd, 0);
-	if(wcwd_sz == (size_t)-1)
-	{
-		err = errno;
-		err_fmt = "Unable to convert CWD to wchar : %s";
-		goto update_python_path_err_cwd;
-	}
-	wcwd_sz++;
-	wcwd = malloc(sizeof(wchar_t) * wcwd_sz);
-	if(!wcwd)
-	{
-		err = errno;
-		err_fmt = "Unable to allocate wchar for CWD : %s";
-		goto update_python_path_err_cwd;
-
-	}
-	if(mbstowcs(wcwd, cwd, wcwd_sz) == -1)
-	{
-		err = errno;
-		err_fmt = "Unable to convert CWD to wchar : %s";
-		goto update_python_path_err_wcwd;
-	}
-
-	// Fetch, dup & update the python path
-	ppath = Py_GetPath();
-	if(!ppath)
-	{
-		if(PyErr_Occurred())
-		{
-			log_expt(LOG_ALERT);
-		}
-		else
-		{
-			pyfcgi_log(LOG_ALERT, "Unable to fetch python path, got NULL.");
-		}
-		err_fmt = NULL;
-		err = 0;
-		goto update_python_path_err_wcwd;
-	}
-	ppath = wcsdup(ppath);
-	if(!wcwd)
-	{
-		err = errno;
-		err_fmt = "Unable to dup the python PATH : %s";
-		goto update_python_path_err_wcwd;
-	}
-
-	ppath_sz = wcslen(ppath);
-	wtmp = realloc(ppath, sizeof(wchar_t) * (ppath_sz + wcwd_sz + 1));
-	if(!wtmp)
-	{
-		err = errno;
-		err_fmt = "Unable reallocate new python path : %s";
-		goto update_python_path_err_ppath;
-	}
-	ppath = wtmp;
-	wcsncpy(ppath+ppath_sz, wcwd, wcwd_sz);
-	Py_SetPath(ppath);
-
-	free(ppath);
-	free(wcwd);
-	free(cwd);
-
-	return;
-	
-update_python_path_err_ppath:
-	free(ppath);
-update_python_path_err_wcwd:
-	free(wcwd);
-update_python_path_err_cwd:
-	free(cwd);
-update_python_path_err:
-	if(err_fmt)
-	{
-		pyfcgi_log( LOG_ALERT, err_fmt, strerror(err));
-	}
-	exit(err);
-}
-
 void update_python_fd(int pipe_out[2], int pipe_err[2])
 {
 	int pri, err;
@@ -816,44 +668,3 @@ void update_pyenv(PyObject *py_osmod, char **environ)
 
 }
 
-void log_expt(int priority)
-{
-	if(!PyErr_Occurred())
-	{
-		pyfcgi_log(priority, "No exception");
-		return;
-	}
-
-	PyObject *expt, *expt_str, *expt_bytes, *expt_cls,
-		*expt_val, *expt_type, *traceback;
-	char *msg, *type, *val;
-	int msg_sz;
-	char msg_fmt[] = "%s: %s";
-
-	PyErr_Fetch(&expt_cls, &expt, &traceback);
-
-	// Fetching exception message using __str__()
-	expt_str = PyObject_GetAttrString(expt, "__str__");
-	if(!expt_str)
-	{
-		pyfcgi_log(LOG_ERR, "Unable to fetch __str__ from exception");
-	}
-	expt_val = PyObject_CallObject(expt_str, NULL);
-	expt_bytes = PyUnicode_AsUTF8String(expt_val);
-
-	msg = PyBytes_AsString(expt_bytes);
-	val = strndup(msg, 1024); // TODO check out of mem if !val
-
-	// Fetching exception class name
-	expt_type = PyObject_GetAttrString(expt_cls, "__name__");
-	expt_bytes = PyUnicode_AsUTF8String(expt_type);
-	msg = PyBytes_AsString(expt_bytes);
-	type = strndup(msg, 1024); // TODO check out of mem if !type
-
-	msg_sz = snprintf(NULL, 0, msg_fmt, type, val);
-	msg_sz++;
-	msg = malloc(sizeof(char) * msg_sz);
-	snprintf(msg, msg_sz, msg_fmt, type, val);
-
-	pyfcgi_log(priority, msg);
-}