#include "config.h"
#ifdef WITH_PYTHON /* just disable this file if python doesnt exist */
+#ifndef WITH_PROTOCOL_P10
+#error mod-python is only supported with p10 protocol enabled
+#endif /* WITH_PROTOCOL_P10 */
-#include "Python.h"
+#include <Python.h>
#include "chanserv.h"
#include "conf.h"
#include "modcmd.h"
#include "nickserv.h"
#include "opserv.h"
#include "saxdb.h"
-#include "sendmail.h"
+#include "mail.h"
#include "timeq.h"
+#include "compat.h"
/* TODO notes
*
- * - Impliment most of proto-p10 irc_* commands for calling from scripts
- * - Impliment functions to look up whois, channel, account, and reg-channel info for scripts
- * - Impliment x3.conf settings for python variables like include path, etc.
+ * - Implement most of proto-p10 irc_* commands for calling from scripts
+ * - Implement functions to look up whois, channel, account, and reg-channel info for scripts
+ * - Implement x3.conf settings for python variables like include path, etc.
* - modpython.py calls for everything you can reg_ a handler for in x3
* - Some kind of system for getting needed binds bound automagicaly to make it easier
- * to run peoples scripts and mod-python in general.
+ * to run peoples' scripts and mod-python in general.
+ * - An interface to reading/writing data to x3.db. Maybe generic, or attached to account or channel reg records?
*/
static const struct message_entry msgtab[] = {
{ "PYMSG_RELOAD_SUCCESS", "Reloaded Python scripts successfully." },
{ "PYMSG_RELOAD_FAILED", "Error reloading Python scripts." },
- { NULL, NULL } /* sentenal */
+ { "PYMSG_RUN_UNKNOWN_EXCEPTION", "Error running python: unknown exception." },
+ { "PYMSG_RUN_EXCEPTION", "Error running python: %s: %s." },
+ { NULL, NULL } /* sentinel */
};
+#define MODPYTHON_CONF_NAME "modules/python"
+
+static
+struct {
+ char const* scripts_dir;
+ char const* main_module;
+} modpython_conf;
+
static struct log_type *PY_LOG;
const char *python_module_deps[] = { NULL };
static struct module *python_module;
PyObject *base_module = NULL; /* Base python handling library */
-PyObject *handler_object = NULL; /* instanciation of handler class */
+PyObject *handler_object = NULL; /* instance of handler class */
-/* ---------------------------------------------------------------------- *
- Some hooks you can call from modpython.py to interact with the
- service, and IRC. These emb_* functions are available as svc.*
- in python.
- */
+extern struct userNode *global, *chanserv, *opserv, *nickserv, *spamserv;
+
+/*
+Some hooks you can call from modpython.py to interact with the
+service. These emb_* functions are available as _svc.* in python. */
+
+struct _tuple_dict_extra {
+ PyObject* data;
+ size_t* extra;
+};
+
+static int _dict_iter_get_users(char const* key, UNUSED_ARG(void* data), void* extra) {
+ PyObject* tmp;
+ struct _tuple_dict_extra* real_extra = (struct _tuple_dict_extra*)extra;
+
+ if ((tmp = PyString_FromString(key)) == NULL)
+ return 1;
+
+ if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp))
+ return 1;
+
+ *real_extra->extra = *real_extra->extra + 1;
+
+ return 0;
+}
+
+static int _dict_iter_get_channels(char const* key, UNUSED_ARG(void* data), void* extra) {
+ PyObject* tmp;
+ struct _tuple_dict_extra* real_extra = (struct _tuple_dict_extra*)extra;
+
+ if ((tmp = PyString_FromString(key)) == NULL)
+ return 1;
+
+ if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp))
+ return 1;
+
+ *real_extra->extra = *real_extra->extra + 1;
+ return 0;
+}
+
+static int _dict_iter_get_servers(char const* key, UNUSED_ARG(void* data), void* extra) {
+ struct _tuple_dict_extra* real_extra = (struct _tuple_dict_extra*)extra;
+
+ PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra,
+ PyString_FromString(key));
+ *real_extra->extra = *real_extra->extra + 1;
+ return 0;
+}
+
+/* get a tuple with all users in it */
+static PyObject*
+emb_get_users(UNUSED_ARG(PyObject *self), PyObject *args) {
+ PyObject* retval;
+ PyObject* tmp;
+ size_t num_clients, n = 0, i;
+ struct _tuple_dict_extra extra;
+
+ if (!PyArg_ParseTuple(args, ""))
+ return NULL;
+
+ num_clients = dict_size(clients);
+ retval = PyTuple_New(num_clients);
+ if (retval == NULL)
+ return NULL;
+
+ extra.extra = &n;
+ extra.data = retval;
+
+ if (dict_foreach(clients, _dict_iter_get_users, (void*)&extra) != NULL) {
+ for (i = 0; i < n; ++i) {
+ tmp = PyTuple_GetItem(retval, i);
+ PyTuple_SET_ITEM(retval, i, NULL);
+ Py_DECREF(tmp);
+ }
+ Py_DECREF(retval);
+ return NULL;
+ }
+
+ return retval;
+}
+
+/* get a tuple with all channels in it */
+static PyObject*
+emb_get_channels(UNUSED_ARG(PyObject* self), PyObject* args) {
+ PyObject* retval;
+ PyObject* tmp;
+ size_t num_channels, n = 0, i;
+ struct _tuple_dict_extra extra;
+
+ if (!PyArg_ParseTuple(args, ""))
+ return NULL;
+
+ num_channels = dict_size(channels);
+ retval = PyTuple_New(num_channels);
+ if (retval == NULL)
+ return NULL;
+
+ extra.extra = &n;
+ extra.data = retval;
+
+ if (dict_foreach(channels, _dict_iter_get_channels, (void*)&extra) != NULL) {
+ for (i = 0; i < n; ++i) {
+ tmp = PyTuple_GetItem(retval, i);
+ PyTuple_SET_ITEM(retval, i, NULL);
+ Py_DECREF(tmp);
+ }
+ Py_DECREF(retval);
+ return NULL;
+ }
+
+ return retval;
+}
static PyObject*
-emb_dump(PyObject *self, PyObject *args)
+emb_get_servers(UNUSED_ARG(PyObject* self), PyObject* args) {
+ PyObject* retval;
+ size_t n = 0;
+ struct _tuple_dict_extra extra;
+
+ if (!PyArg_ParseTuple(args, ""))
+ return NULL;
+
+ retval = PyTuple_New(dict_size(servers));
+
+ extra.extra = &n;
+ extra.data = retval;
+
+ dict_foreach(servers, _dict_iter_get_servers, (void*)&extra);
+
+ return retval;
+}
+
+static PyObject*
+emb_dump(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* Dump a raw string into the socket
- usage: svc.dump(<P10 string>)
+ usage:
_svc.dump(<P10 string>)
*/
char *buf;
int ret = 0;
char linedup[MAXLEN];
+
if(!PyArg_ParseTuple(args, "s:dump", &buf ))
return NULL;
+
safestrncpy(linedup, buf, sizeof(linedup));
+
if(parse_line(linedup, 1)) {
irc_raw(buf);
ret = 1;
+ } else {
+ PyErr_SetString(PyExc_Exception, "invalid protocol message");
+ return NULL;
}
+
return Py_BuildValue("i", ret);
}
static PyObject*
-emb_send_target_privmsg(PyObject *self, PyObject *args)
+emb_send_target_privmsg(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* Send a privmsg
- usage: svc.send_target_privmsg(<servicenick_from>, <nick_to>, <message>)
+ usage: _svc.send_target_privmsg(<servicenick_from>, <nick_to>, <message>)
*/
int ret = 0;
char *servicenick;
struct service *service;
+
if(!PyArg_ParseTuple(args, "sss:reply", &servicenick, &channel, &buf ))
return NULL;
+
+ if (buf == NULL || strlen(buf) == 0) {
+ PyErr_SetString(PyExc_Exception, "invalid empty message");
+ return NULL;
+ }
+
if(!(service = service_find(servicenick))) {
- /* TODO: generate python exception here */
+ PyErr_SetString(PyExc_Exception, "no such service nick");
return NULL;
}
- send_target_message(5, channel, service->bot, "%s", buf);
+
+ ret = send_target_message(5, channel, service->bot, "%s", buf);
return Py_BuildValue("i", ret);
}
static PyObject*
-emb_send_target_notice(PyObject *self, PyObject *args)
+emb_send_target_notice(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* send a notice
- usage: svc.send_target_notice(<servicenick_from>, <nick_to>, <message>)
+ usage: _svc.send_target_notice(<servicenick_from>, <nick_to>, <message>)
*/
int ret = 0;
char *servicenick;
if(!PyArg_ParseTuple(args, "sss:reply", &servicenick, &target, &buf ))
return NULL;
+
+ if (buf == NULL || strlen(buf) == 0) {
+ PyErr_SetString(PyExc_Exception, "invalid empty message");
+ return NULL;
+ }
+
if(!(service = service_find(servicenick))) {
- /* TODO: generate python exception here */
+ PyErr_SetString(PyExc_Exception, "no such service nick");
return NULL;
}
- send_target_message(4, target, service->bot, "%s", buf);
+
+ ret = send_target_message(4, target, service->bot, "%s", buf);
+
return Py_BuildValue("i", ret);
}
static PyObject*
-emb_get_user(PyObject *self, PyObject *args)
+pyobj_from_usernode(struct userNode* user) {
+ unsigned int n;
+ struct modeNode *mn;
+ PyObject* pChanList = PyTuple_New(user->channels.used);
+
+ for (n=0; n < user->channels.used; n++) {
+ mn = user->channels.list[n];
+ PyTuple_SetItem(pChanList, n, Py_BuildValue("s", mn->channel->name));
+ }
+
+ return Py_BuildValue("{"
+ "s: s, " /* nick */
+ "s: s, " /* ident */
+ "s: s, " /* info */
+ "s: s, " /* hostname */
+ "s: s, " /* ip */
+ "s: s, " /* fakehost */
+ "s: s, " /* sethost */
+ "s: s, " /* crypthost */
+ "s: s, " /* cryptip */
+ "s: s, " /* numeric */
+ "s: i, " /* loc */
+ "s: i, " /* no_notice */
+ "s: s, " /* mark */
+ "s: s, " /* version_reply */
+ "s: s, " /* account */
+ "s: O}", /* channels */
+ "nick", user->nick,
+ "ident", user->ident,
+ "info", user->info,
+ "hostname", user->hostname,
+ "ip", irc_ntoa(&user->ip),
+ "fakehost", user->fakehost,
+ "sethost", user->sethost,
+ "crypthost", user->crypthost,
+ "cryptip", user->cryptip,
+ "numeric", user->numeric,
+ "loc", user->loc,
+ "no_notice", user->no_notice,
+ "mark", user->mark,
+ "version_reply", user->version_reply,
+ "account", user->handle_info ? user->handle_info->handle : NULL,
+ "channels", pChanList);
+}
+
+static PyObject*
+emb_get_user(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* Get a python object containing everything x3 knows about a user, by nick.
- usage: svc.get_user(<nick>)
+ usage: _svc.get_user(<nick>)
*/
- char *nick;
+ char const* nick;
struct userNode *user;
- struct modeNode *mn;
- unsigned int n;
- PyObject* pChanList;
+
if(!PyArg_ParseTuple(args, "s", &nick))
return NULL;
+
if(!(user = GetUserH(nick))) {
- /* TODO: generate python exception here */
+ PyErr_SetString(PyExc_Exception, "no such user");
return NULL;
}
- pChanList = PyTuple_New(user->channels.used);
- for(n=0;n<user->channels.used;n++) {
- mn = user->channels.list[n];
- PyTuple_SetItem(pChanList, n, Py_BuildValue("s", mn->channel->name));
+
+ return pyobj_from_usernode(user);
+}
+
+static PyObject*
+pyobj_from_server(struct server* srv) {
+ size_t n, idx;
+ PyObject* tmp = NULL;
+ PyObject* retval = NULL;
+ PyObject* users = PyTuple_New(srv->clients);
+
+ if (users == NULL)
+ return NULL;
+
+ idx = 0;
+ for (n = 0; n < srv->num_mask; ++n) {
+ if (srv->users[n] == NULL)
+ continue;
+
+ tmp = PyString_FromString(srv->users[n]->nick);
+ if (tmp == NULL)
+ goto cleanup;
+
+ if (PyTuple_SetItem(users, idx++, tmp))
+ goto cleanup;
}
- return Py_BuildValue("{s:s,s:s,s:s,s:s,s:s" /* format strings. s=string, i=int */
- ",s:s,s:s,s:s,s:s,s:s" /* (format is key:value) O=object */
- ",s:i,s:i,s:s,s:s,s:s" /* blocks of 5 for readability */
- "s:O}",
- "nick", user->nick,
- "ident", user->ident,
- "info", user->info,
- "hostname", user->hostname,
- "ip", irc_ntoa(&user->ip),
+ retval = Py_BuildValue("{"
+ "s:s," /* name */
+ "s:l," /* boot */
+ "s:l," /* link_time */
+ "s:s," /* description */
+ "s:s," /* numeric */
+ "s:I," /* num_mask */
+ "s:I," /* hops */
+ "s:I," /* clients */
+ "s:I," /* max_clients */
+ "s:I," /* burst */
+ "s:I," /* self_burst */
+ "s:s" /* uplink */
+ "s:O" /* users */
+ /* TODO: Children */
+ "}",
+ "name", srv->name,
+ "boot", srv->boot,
+ "link_time", srv->link_time,
+ "description", srv->description,
+ "numeric", srv->numeric,
+ "num_mask", srv->num_mask,
+ "hops", srv->hops,
+ "clients", srv->clients,
+ "max_clients", srv->max_clients,
+ "burst", srv->burst,
+ "self_burst", srv->self_burst,
+ "uplink", srv->uplink ? srv->uplink->name : NULL,
+ "users", users
+ );
+
+ if (retval == NULL)
+ goto cleanup;
+
+ return retval;
+
+cleanup:
+ Py_XDECREF(retval);
+
+ for (n = 0; n < idx; ++n) {
+ tmp = PyTuple_GetItem(users, n);
+ PyTuple_SetItem(users, n, NULL);
+ Py_DECREF(tmp);
+ }
+ Py_DECREF(users);
+
+ return NULL;
+}
+
+static PyObject*
+emb_get_server(UNUSED_ARG(PyObject* self), PyObject* args) {
+ struct server* srv;
+ char const* name;
+
+ if (!PyArg_ParseTuple(args, "s", &name))
+ return NULL;
+
+ if (name == NULL || strlen(name) == 0) {
+ PyErr_SetString(PyExc_Exception, "invalid server name");
+ return NULL;
+ }
- "fakehost", user->fakehost,
- "sethost", user->sethost,
- "crypthost", user->crypthost,
- "cryptip", user->cryptip,
- "numeric", user->numeric, /* TODO: only ifdef WITH_PROTOCOL_P10 */
+ if ((srv = GetServerH(name)) == NULL) {
+ PyErr_SetString(PyExc_Exception, "unknown server");
+ return NULL;
+ }
- "loc", user->loc,
- "no_notice", user->no_notice,
- "mark", user->mark,
- "version_reply", user->version_reply,
- "account", user->handle_info?user->handle_info->handle:NULL,
- "channels", pChanList);
+ return pyobj_from_server(srv);
}
static PyObject*
-emb_get_channel(PyObject *self, PyObject *args)
+emb_get_channel(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* Returns a python dict object with all sorts of info about a channel.
- usage: svc.get_channel(<name>)
+ usage: _svc.get_channel(<name>)
*/
char *name;
struct chanNode *channel;
PyObject *pChannelBans;
PyObject *pChannelExempts;
+
if(!PyArg_ParseTuple(args, "s", &name))
return NULL;
+
if(!(channel = GetChannel(name))) {
- /* TODO: generate py exception here */
+ PyErr_SetString(PyExc_Exception, "unknown channel");
return NULL;
}
}
static PyObject*
-emb_get_account(PyObject *self, PyObject *args)
+emb_get_account(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* Returns a python dict object with all sorts of info about an account.
- usage: svc.get_account(<account name>)
+ usage:
_svc.get_account(<account name>)
*/
char *name;
struct handle_info *hi;
+
if(!PyArg_ParseTuple(args, "s", &name))
return NULL;
hi = get_handle_info(name);
+
if(!hi) {
+ PyErr_SetString(PyExc_Exception, "unknown account name");
return NULL;
}
+
return Py_BuildValue("{s:s,s:i,s:s,s:s,s:s"
",s:s,s:s}",
}
static PyObject*
-emb_log_module(PyObject *self, PyObject *args)
+emb_get_info(UNUSED_ARG(PyObject *self), UNUSED_ARG(PyObject *args))
+{
+ /* return some info about the general setup
+ * of X3, such as what the chanserv's nickname
+ * is.
+ */
+
+
+ return Py_BuildValue("{s:s,s:s,s:s,s:s,s:s}",
+ "chanserv", chanserv? chanserv->nick : "ChanServ",
+ "nickserv", nickserv?nickserv->nick : "NickServ",
+ "opserv", opserv?opserv->nick : "OpServ",
+ "global", global?global->nick : "Global",
+ "spamserv", spamserv?spamserv->nick : "SpamServ");
+}
+
+static PyObject*
+emb_log_module(UNUSED_ARG(PyObject *self), PyObject *args)
{
/* a gateway to standard X3 logging subsystem.
* level is a value 0 to 9 as defined by the log_severity enum in log.h.
- * LOG_INFO is 3, LOG_WARNING is 6, LOG_ERROR is 7.
*
* for now, all logs go to the PY_LOG log. In the future this will change.
*/
int ret = 0;
int level;
+
if(!PyArg_ParseTuple(args, "is", &level, &message))
return NULL;
{"send_target_privmsg", emb_send_target_privmsg, METH_VARARGS, "Send a message to somewhere"},
{"send_target_notice", emb_send_target_notice, METH_VARARGS, "Send a notice to somewhere"},
{"log_module", emb_log_module, METH_VARARGS, "Log something using the X3 log subsystem"},
+//TODO: {"exec_cmd", emb_exec_cmd, METH_VARARGS, "execute x3 command provided"},
+// This should use environment from "python command" call to pass in, if available
+//TODO: {"kill"
+//TODO: {"shun"
+//TODO: {"unshun"
+//TODO: {"gline", emb_gline, METH_VARARGS, "gline a mask"},
+//TODO: {"ungline", emb_ungline, METH_VARARGS, "remove a gline"},
+//TODO: {"kick", emb_kick, METH_VARARGS, "kick someone from a channel"},
+//TODO: {"channel_mode", emb_channel_mode, METH_VARARGS, "set modes on a channel"},
+//TODO: {"user_mode", emb_user_mode, METH_VARARGS, "Have x3 set usermodes on one of its own nicks"},
+//
+//TODO: {"get_config", emb_get_config, METH_VARARGS, "get x3.conf settings into a nested dict"},
+//TODO: {"config_set", emb_config_set, METH_VARARGS, "change a config setting 'on-the-fly'."},
+//
+//TODO: {"timeq_add", emb_timeq_new, METH_VARARGS, "some kind of interface to the timed event system."},
+//TODO: {"timeq_del", emb_timeq_new, METH_VARARGS, "some kind of interface to the timed event system."},
/* Information gathering methods */
{"get_user", emb_get_user, METH_VARARGS, "Get details about a nickname"},
+ {"get_users", emb_get_users, METH_VARARGS, "Get all connected users"},
{"get_channel", emb_get_channel, METH_VARARGS, "Get details about a channel"},
+ {"get_channels", emb_get_channels, METH_VARARGS, "Get all channels"},
+ {"get_server", emb_get_server, METH_VARARGS, "Get details about a server"},
+ {"get_servers", emb_get_servers, METH_VARARGS, "Get all server names"},
{"get_account", emb_get_account, METH_VARARGS, "Get details about an account"},
+ {"get_info", emb_get_info, METH_VARARGS, "Get various misc info about x3"},
/* null terminator */
{NULL, NULL, 0, NULL}
};
-/* ------------------------------------------------------------------------------------------------ *
- Thes functions set up the embedded environment for us to call out to modpython.py class
- methods.
+/*
+These functions set up the embedded environment for us to call out to
+modpython.py class methods.
*/
void python_log_module() {
PyObject *python_build_handler_args(size_t argc, char *args[], PyObject *pIrcObj) {
/* Sets up a python tuple with passed in arguments, prefixed by the Irc instance
- which handlers use to interact with c.
+ which handlers use to interact with C.
argc = number of args
args = array of args
pIrcObj = instance of the irc class
}
}
+static int
+python_handle_server_link(struct server *server)
+{
+ log_module(PY_LOG, LOG_INFO, "python module handle_server_link");
+ if(!server) {
+ log_module(PY_LOG, LOG_WARNING, "Python code got server link without server!");
+ return 0;
+ }
+ else {
+ char *args[] = {server->name, server->description};
+ return python_call_handler("server_link", args, 2, "", "", "");
+ }
+}
+
+static int
+python_handle_new_user(struct userNode *user)
+{
+ log_module(PY_LOG, LOG_INFO, "Python module handle_new_user");
+ if(!user) {
+ log_module(PY_LOG, LOG_WARNING, "Python code got new_user without the user");
+ return 0;
+ }
+ else {
+ char *args[] = {user->nick, user->ident, user->hostname, user->info};
+ return python_call_handler("new_user", args, 4, "", "", "");
+ }
+}
+
+static void
+python_handle_nick_change(struct userNode *user, const char *old_nick)
+{
+ log_module(PY_LOG, LOG_INFO, "Python module handle_nick_change");
+ if(!user) {
+ log_module(PY_LOG, LOG_WARNING, "Python code got nick_change without the user!");
+ }
+ else {
+ char *args[] = {user->nick, (char *)old_nick};
+ python_call_handler("nick_change", args, 2, "", "", "");
+ }
+}
+
/* ----------------------------------------------------------------------------- */
This is called during x3 startup, and on a python reload
*/
PyObject *pName;
+ char* buffer;
+ char* env = getenv("PYTHONPATH");
+
+ if (env)
+ env = strdup(env);
+
+ if (!env)
+ setenv("PYTHONPATH", modpython_conf.scripts_dir, 1);
+ else if (!strstr(env, modpython_conf.scripts_dir)) {
+ buffer = (char*)malloc(strlen(env) + strlen(modpython_conf.scripts_dir) + 2);
+ sprintf(buffer, "%s:%s", modpython_conf.scripts_dir, env);
+ setenv("PYTHONPATH", buffer, 1);
+ free(buffer);
+ free(env);
+ }
- setenv("PYTHONPATH", "/home/rubin/afternet/services/x3/x3-run/", 1);
Py_Initialize();
- Py_InitModule("svc", EmbMethods);
- /* TODO: get "modpython" from x3.conf */
- pName = PyString_FromString("modpython");
+ Py_InitModule("_svc", EmbMethods);
+ pName = PyString_FromString(modpython_conf.main_module);
base_module = PyImport_Import(pName);
Py_DECREF(pName);
+
+ Py_XDECREF(handler_object);
+ handler_object = NULL;
+
if(base_module != NULL) {
handler_object = python_new_handler_object();
if(handler_object) {
python_cleanup(void) {
/* Called on shutdown of the python module (or before reloading)
*/
+
log_module(PY_LOG, LOG_INFO, "python module cleanup");
- Py_Finalize(); /* Shut down python enterpriter */
- return;
+ if (PyErr_Occurred())
+ PyErr_Clear();
+ Py_Finalize(); /* Shut down python enterpreter */
}
/* ---------------------------------------------------------------------------------- *
return 1;
}
+static char* format_python_error(int space_nls) {
+ PyObject* extype = NULL, *exvalue = NULL, *extraceback = NULL;
+ PyObject* pextypestr = NULL, *pexvaluestr = NULL;
+ char* extypestr = NULL, *exvaluestr = NULL;
+ size_t retvallen = 0;
+ char* retval = NULL, *tmp;
+
+ PyErr_Fetch(&extype, &exvalue, &extraceback);
+ if (!extype)
+ goto cleanup;
+
+ pextypestr = PyObject_Str(extype);
+ if (!pextypestr)
+ goto cleanup;
+ extypestr = PyString_AsString(pextypestr);
+ if (!extypestr)
+ goto cleanup;
+
+ pexvaluestr = PyObject_Str(exvalue);
+ if (pexvaluestr)
+ exvaluestr = PyString_AsString(pexvaluestr);
+
+ retvallen = strlen(extypestr) + (exvaluestr ? strlen(exvaluestr) + 2 : 0) + 1;
+ retval = (char*)malloc(retvallen);
+ if (exvaluestr)
+ snprintf(retval, retvallen, "%s: %s", extypestr, exvaluestr);
+ else
+ strncpy(retval, extypestr, retvallen);
+
+ if (space_nls) {
+ tmp = retval;
+ while (*tmp) {
+ if (*tmp == '\n')
+ *tmp = ' ';
+ ++tmp;
+ }
+ }
+
+cleanup:
+ if (PyErr_Occurred())
+ PyErr_Clear(); /* ignore errors caused by formatting */
+ Py_XDECREF(extype);
+ Py_XDECREF(exvalue);
+ Py_XDECREF(extraceback);
+ Py_XDECREF(pextypestr);
+ Py_XDECREF(pexvaluestr);
+
+ if (retval)
+ return retval;
+
+ return strdup("unknown exception");
+}
+
static MODCMD_FUNC(cmd_run) {
- /* run an arbitrary python command. This can include shell commands, so should be disabled on
- production, and needs to be handled extremely cautiously as far as access control
- */
- char *msg;
+ /* this method allows running arbitrary python commands.
+ * use with care.
+ */
+ char* msg;
+ PyObject* py_main_module;
+ PyObject* py_globals;
+ PyObject* py_locals;
+ PyObject* py_retval;
+ PyObject* extype, *exvalue, *extraceback;
+ PyObject* exvaluestr = NULL;
+ char* exmsg = NULL, *exmsgptr;
+
+ py_main_module = PyImport_AddModule("__main__");
+ py_globals = py_locals = PyModule_GetDict(py_main_module);
+
msg = unsplit_string(argv + 1, argc - 1, NULL);
- char *args[] = {msg};
- python_call_handler("cmd_run", args, 1, cmd->parent->bot->nick, user?user->nick:"", channel?channel->name:"");
+
+ py_retval = PyRun_String(msg, Py_file_input, py_globals, py_locals);
+ if (py_retval == NULL) {
+ PyErr_Fetch(&extype, &exvalue, &extraceback);
+ if (exvalue != NULL) {
+ exvaluestr = PyObject_Str(exvalue);
+ exmsg = strdup(PyString_AS_STRING(exvaluestr));
+ exmsgptr = exmsg;
+ while (exmsgptr && *exmsgptr) {
+ if (*exmsgptr == '\n' || *exmsgptr == '\r' || *exmsgptr == '\t')
+ *exmsgptr = ' ';
+ exmsgptr++;
+ }
+ }
+ if (extype != NULL && exvalue != NULL && PyType_Check(extype)) {
+ reply("PYMSG_RUN_EXCEPTION", ((PyTypeObject*)extype)->tp_name, exmsg);
+ } else
+ reply("PYMSG_RUN_UNKNOWN_EXCEPTION");
+
+ if (extype != NULL)
+ Py_DECREF(extype);
+ if (exvalue != NULL)
+ Py_DECREF(exvalue);
+ if (extraceback != NULL)
+ Py_DECREF(extraceback);
+ if (exvaluestr != NULL)
+ Py_DECREF(exvaluestr);
+ if (exmsg)
+ free(exmsg);
+ } else {
+ Py_DECREF(py_retval);
+ }
+
return 1;
}
return 1;
}
+static void modpython_conf_read(void) {
+ dict_t conf_node;
+ char const* str;
+
+ if (!(conf_node = conf_get_data(MODPYTHON_CONF_NAME, RECDB_OBJECT))) {
+ log_module(PY_LOG, LOG_ERROR, "config node '%s' is missing or has wrong type", MODPYTHON_CONF_NAME);
+ return;
+ }
+
+ str = database_get_data(conf_node, "scripts_dir", RECDB_QSTRING);
+ modpython_conf.scripts_dir = str ? str : "./";
+
+ str = database_get_data(conf_node, "main_module", RECDB_QSTRING);
+ modpython_conf.main_module = str ? str : "modpython";
+}
+
int python_init(void) {
/* X3 calls this function on init of the module during startup. We use it to
do all our setup tasks and bindings
PY_LOG = log_register_type("Python", "file:python.log");
python_module = module_register("python", PY_LOG, "mod-python.help", NULL);
+ conf_register_reload(modpython_conf_read);
+
log_module(PY_LOG, LOG_INFO, "python module init");
message_register_table(msgtab);
modcmd_register(python_module, "reload", cmd_reload, 1, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
modcmd_register(python_module, "run", cmd_run, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
modcmd_register(python_module, "command", cmd_command, 3, MODCMD_REQUIRE_STAFF, NULL);
+
+// Please help us by implementing any of the callbacks listed as TODO below. They already exist
+// in x3, they just need handle_ bridges implemented. (see python_handle_join for an example)
+ reg_server_link_func(python_handle_server_link);
+ reg_new_user_func(python_handle_new_user);
+ reg_nick_change_func(python_handle_nick_change);
+//TODO: reg_del_user_func(python_handle_del_user);
+//TODO: reg_account_func(python_handle_account); /* stamping of account name to the ircd */
+//TODO: reg_handle_rename_func(python_handle_handle_rename); /* handle used to ALSO mean account name */
+//TODO: reg_failpw_func(python_handle_failpw);
+//TODO: reg_allowauth_func(python_handle_allowauth);
+//TODO: reg_handle_merge_func(python_handle_merge);
+//
+//TODO: reg_oper_func(python_handle_oper);
+//TODO: reg_new_channel_func(python_handle_new_channel);
reg_join_func(python_handle_join);
+//TODO: reg_del_channel_func(python_handle_del_channel);
+//TODO: reg_part_func(python_handle_part);
+//TODO: reg_kick_func(python_handle_kick);
+//TODO: reg_topic_func(python_handle_topic);
+//TODO: reg_channel_mode_func(python_handle_channel_mode);
+
+//TODO: reg_privmsg_func(python_handle_privmsg);
+//TODO: reg_notice_func
+//TODO: reg_svccmd_unbind_func(python_handle_svccmd_unbind);
+//TODO: reg_chanmsg_func(python_handle_chanmsg);
+//TODO: reg_allchanmsg_func
+//TODO: reg_user_mode_func
+
reg_exit_func(python_cleanup);
python_load();
projects / irc / evilnet / x3.git / blobdiff