github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'DesAuth' of https://github.com/bkerler/proxmark3 into DesAuth

Browse source
This commit is contained in:
Bjoern Kerler 2020-06-13 16:55:45 +02:00
commit 0b204f5d1d
1 changed files with 70 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

71
client/src/cmdscript.c
View file

@ -19,7 +19,6 @@
#include <wchar.h> #include <wchar.h>
#endif #endif
#include "cmdparser.h" // command_t #include "cmdparser.h" // command_t
#include "scripting.h" #include "scripting.h"
#include "comms.h" #include "comms.h"
@ -33,6 +32,68 @@
#include "ui.h" #include "ui.h"
#include "fileutils.h" #include "fileutils.h"
#ifdef HAVE_PYTHON
// Partly ripped from PyRun_SimpleFileExFlags
// but does not terminate client on sys.exit
// and print exit code only if != 0
static int Pm3PyRun_SimpleFileNoExit(FILE *fp, const char *filename)
{
PyObject *m, *d, *v;
int set_file_name = 0, ret = -1;
m = PyImport_AddModule("__main__");
if (m == NULL)
return -1;
Py_INCREF(m);
d = PyModule_GetDict(m);
if (PyDict_GetItemString(d, "__file__") == NULL) {
PyObject *f;
f = PyUnicode_DecodeFSDefault(filename);
if (f == NULL)
goto done;
if (PyDict_SetItemString(d, "__file__", f) < 0) {
Py_DECREF(f);
goto done;
}
if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
Py_DECREF(f);
goto done;
}
set_file_name = 1;
Py_DECREF(f);
}
v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d, 1, NULL);
if (v == NULL) {
Py_CLEAR(m);
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
// PyErr_Print() exists if SystemExit so we've to handle it ourselves
PyObject *ty = 0, *er = 0, *tr = 0;
PyErr_Fetch(&ty, &er, &tr);
long err = PyLong_AsLong(er);
if (err) {
PrintAndLogEx(WARNING, "\nScript terminated by " _YELLOW_("SystemExit %li"), err);
} else {
ret = 0;
}
Py_DECREF(ty);
Py_DECREF(er);
Py_DECREF(er);
PyErr_Clear();
goto done;
} else {
PyErr_Print();
}
goto done;
}
Py_DECREF(v);
ret = 0;
done:
if (set_file_name && PyDict_DelItemString(d, "__file__"))
PyErr_Clear();
Py_XDECREF(m);
return ret;
}
#endif // HAVE_PYTHON
typedef enum { typedef enum {
PM3_UNSPECIFIED, PM3_UNSPECIFIED,
PM3_LUA, PM3_LUA,
@ -319,14 +380,18 @@ static int CmdScriptRun(const char *Cmd) {
free(script_path); free(script_path);
return PM3_ESOFT; return PM3_ESOFT;
} }
int ret = Pm3PyRun_SimpleFileNoExit(f, preferredName);
PyRun_SimpleFileExFlags(f, preferredName, 1, NULL);
Py_Finalize(); Py_Finalize();
PyMem_RawFree(program); PyMem_RawFree(program);
free(script_path); free(script_path);
if (ret) {
PrintAndLogEx(WARNING, "\nfinished " _YELLOW_("%s") " with exception", preferredName);
return PM3_ESOFT;
} else {
PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName); PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
}
#endif #endif
// file not found, let's search again to display the error messages // file not found, let's search again to display the error messages