IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-22 08:46:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove Python 2 support from the desktop runtime

Browse Source 
refs #5443
This commit is contained in:
Dave Page 2020-04-30 13:04:09 +05:30 committed by Akshay Joshi
parent 86afec860f
commit 109051e1d5
2 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
runtime/Server.cpp
View File

@ -72,15 +72,11 @@ Server::Server(quint16 port, QString key, QString logFileName)
PGA_APP_NAME_UTF8 = PGA_APP_NAME.toUtf8();
// Python3 requires conversion of char * to wchar_t *, so...
#ifdef PYTHON2
Py_SetProgramName(PGA_APP_NAME_UTF8.data());
#else
char *appName = PGA_APP_NAME_UTF8.data();
const size_t cSize = strlen(appName)+1;
m_wcAppName = new wchar_t[cSize];
mbstowcs (m_wcAppName, appName, cSize);
Py_SetProgramName(m_wcAppName);
#endif
// Setup the search path
QSettings settings;
@ -183,16 +179,12 @@ Server::Server(quint16 port, QString key, QString logFileName)
if (!pythonHome.isEmpty())
{
pythonHome_utf8 = pythonHome.toUtf8();
#ifdef PYTHON2
Py_SetPythonHome(pythonHome_utf8.data());
#else
char *python_home = pythonHome_utf8.data();
const size_t cSize = strlen(python_home) + 1;
m_wcPythonHome = new wchar_t[cSize];
mbstowcs (m_wcPythonHome, python_home, cSize);
Py_SetPythonHome(m_wcPythonHome);
#endif
}
Logger::GetLogger()->Log("Initializing Python...");
@ -207,15 +199,7 @@ Server::Server(quint16 port, QString key, QString logFileName)
Logger::GetLogger()->Log("Adding new additional path elements");
for (i = path_list.size() - 1; i >= 0 ; --i)
{
#ifdef PYTHON2
PyList_Append(sysPath, PyString_FromString(path_list.at(i).toUtf8().data()));
#else
#if PY_MINOR_VERSION > 2
PyList_Append(sysPath, PyUnicode_DecodeFSDefault(path_list.at(i).toUtf8().data()));
#else
PyList_Append(sysPath, PyBytes_FromString(path_list.at(i).toUtf8().data()));
#endif
#endif
}
}
else
@ -227,9 +211,6 @@ Server::Server(quint16 port, QString key, QString logFileName)
if (sys != Q_NULLPTR)
{
PyObject *err = Q_NULLPTR;
#ifdef PYTHON2
err = PyFile_FromString(m_logFileName.toUtf8().data(), (char *)"w");
#else
FILE *log = Q_NULLPTR;
#if defined(Q_OS_WIN)
@ -256,7 +237,6 @@ Server::Server(quint16 port, QString key, QString logFileName)
delete wcLogFileName;
wcLogFileName = NULL;
}
#endif
#endif
QFile(m_logFileName).setPermissions(QFile::ReadOwner|QFile::WriteOwner);
if (err != Q_NULLPTR)
@ -347,25 +327,7 @@ void Server::run()
// Run the app!
QByteArray m_appfile_utf8 = m_appfile.toUtf8();
#ifdef PYTHON2
/*
* Untrusted search path vulnerability in the PySys_SetArgv API function in Python 2.6 and earlier, and possibly later
* versions, prepends an empty string to sys.path when the argv[0] argument does not contain a path separator,
* which might allow local users to execute arbitrary code via a Trojan horse Python file in the current working directory.
* Here we have to set arguments explicitly to python interpreter. Check more details in 'PySys_SetArgv' documentation.
*/
char* n_argv[] = { m_appfile_utf8.data() };
PySys_SetArgv(1, n_argv);
Logger::GetLogger()->Log("PyRun_SimpleFile launching application server...");
PyObject* PyFileObject = PyFile_FromString(m_appfile_utf8.data(), (char *)"r");
int ret = PyRun_SimpleFile(PyFile_AsFile(PyFileObject), m_appfile_utf8.data());
if (ret != 0)
{
Logger::GetLogger()->Log("Failed to launch the application server, server thread exiting.");
setError(tr("Failed to launch the application server, server thread exiting."));
}
#else
/*
* Untrusted search path vulnerability in the PySys_SetArgv API function in Python 2.6 and earlier, and possibly later
* versions, prepends an empty string to sys.path when the argv[0] argument does not contain a path separator,
@ -385,7 +347,6 @@ void Server::run()
Logger::GetLogger()->Log("Failed to launch the application server, server thread exiting.");
setError(tr("Failed to launch the application server, server thread exiting."));
}
#endif
fclose(cp);
}

23
runtime/pgAdmin4.pro
View File

@ -29,6 +29,10 @@ win32 {
PY_HOME = $$(PYTHON_HOME)
PY_VERSION = $$(PYTHON_VERSION)
lessThan(PY_VERSION, 34) {
error(Python 3.4 or later is required.)
}
isEmpty(PY_HOME) {
error(Please define the PYTHON_HOME variable in the system environment.)
}
@ -39,13 +43,6 @@ win32 {
else {
INCLUDEPATH = $$PY_HOME\include
LIBS += -L"$$PY_HOME\libs" -lpython$$PY_VERSION
# Set the PYTHON2 macro if appropriate
PY2_VERSION = $$find(PY_VERSION, "^2")
count( PY2_VERSION, 1) {
message(Python version 2.x detected.)
DEFINES += PYTHON2
}
}
}
}
@ -56,11 +53,6 @@ else {
# Environment setting
PYTHON_CONFIG = $$(PYTHON_CONFIG)
# Python 2?
isEmpty(PYTHON_CONFIG) {
PYTHON_CONFIG = $$system(which python-config)
}
# Maybe Python 3?
isEmpty(PYTHON_CONFIG) {
PYTHON_CONFIG = $$system(which python3-config)
@ -68,7 +60,7 @@ else {
# Argh!
isEmpty(PYTHON_CONFIG) {
error(The python-config executable could not be found. Ensure Python is installed and in the system path.)
error(The python3-config executable could not be found. Ensure Python is installed and in the system path.)
}
message(Using $$PYTHON_CONFIG)
@ -80,10 +72,9 @@ else {
LIBS += $$system($$PYTHON_CONFIG --libs $$PYTHON_EMBED)
contains( LIBS, -lpython2.* ) {
DEFINES += PYTHON2
message(Python2 detected.)
error(Building with Python 2 is not supported.)
} else {
message(Python3 detected.)
message(Building with Python 3.)
}
}