/*
- * $Id$
- *
* XMPP (Jabber) service for the Citadel system
* Copyright (c) 2007-2010 by Art Cancro
*
struct xmpp_event *xmpp_queue = NULL;
-/* We have just received a <stream> tag from the client, so send them ours */
+/*
+ * Given a source string and a target buffer, returns the string
+ * properly escaped for insertion into an XML stream. Returns a
+ * pointer to the target buffer for convenience.
+ *
+ * BUG: this does not properly handle UTF-8
+ */
+char *xmlesc(char *buf, char *str, int bufsiz)
+{
+ char *ptr;
+ unsigned char ch;
+ int len = 0;
+
+ if (!buf) return(NULL);
+ buf[0] = 0;
+ len = 0;
+ if (!str) {
+ return(buf);
+ }
+
+ for (ptr=str; *ptr; ptr++) {
+ ch = *ptr;
+ if (ch == '<') {
+ strcpy(&buf[len], "<");
+ len += 4;
+ }
+ else if (ch == '>') {
+ strcpy(&buf[len], ">");
+ len += 4;
+ }
+ else if (ch == '&') {
+ strcpy(&buf[len], "&");
+ len += 5;
+ }
+ else if ((ch >= 0x20) && (ch <= 0x7F)) {
+ buf[len++] = ch;
+ buf[len] = 0;
+ }
+ else if (ch < 0x20) {
+ /* we probably shouldn't be doing this */
+ buf[len++] = '_';
+ buf[len] = 0;
+ }
+ else {
+ char oct[10];
+ sprintf(oct, "&#%o;", ch);
+ strcpy(&buf[len], oct);
+ len += strlen(oct);
+ }
+ if ((len + 6) > bufsiz) {
+ return(buf);
+ }
+ }
+ return(buf);
+}
+
+/*
+ * We have just received a <stream> tag from the client, so send them ours
+ */
void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
{
+ char xmlbuf[256];
+
while (*attr) {
if (!strcasecmp(attr[0], "to")) {
safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name);
cprintf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
cprintf("<stream:stream ");
- cprintf("from=\"%s\" ", XMPP->server_name);
+ cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf));
cprintf("id=\"%08x\" ", CC->cs_pid);
cprintf("version=\"1.0\" ");
cprintf("xmlns:stream=\"http://etherx.jabber.org/streams\" ");
void xmpp_xml_end(void *data, const char *supplied_el) {
char el[256];
char *sep = NULL;
+ char xmlbuf[256];
/* Axe the namespace, we don't care about it */
safestrncpy(el, supplied_el, sizeof el);
else if (XMPP->ping_requested) {
cprintf("<iq type=\"result\" ");
if (!IsEmptyStr(XMPP->iq_from)) {
- cprintf("to=\"%s\" ", XMPP->iq_from);
+ cprintf("to=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf));
}
if (!IsEmptyStr(XMPP->iq_to)) {
- cprintf("from=\"%s\" ", XMPP->iq_to);
+ cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf));
}
- cprintf("id=\"%s\"/>", XMPP->iq_id);
+ cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
}
/*
"Unknown query <%s> - returning <service-unavailable/>\n",
el
);
- cprintf("<iq type=\"error\" id=\"%s\">", XMPP->iq_id);
+ cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
cprintf("<error code=\"503\" type=\"cancel\">"
"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
"</error>"
/* Tell the client what its JID is */
- cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_id);
+ cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
- cprintf("<jid>%s</jid>", XMPP->client_jid);
+ cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
cprintf("</bind>");
cprintf("</iq>");
}
else if (XMPP->iq_session) {
- cprintf("<iq type=\"result\" id=\"%s\">", XMPP->iq_id);
+ cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
cprintf("</iq>");
}
else {
- cprintf("<iq type=\"error\" id=\"%s\">", XMPP->iq_id);
- cprintf("<error>Don't know howto do '%s'!</error>", XMPP->iq_type);
+ cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+ cprintf("<error>Don't know howto do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
cprintf("</iq>");
}
void xmpp_xml_chardata(void *data, const XML_Char *s, int len)
{
- struct citxmpp *X = XMPP;
+ citxmpp *X = XMPP;
if (X->chardata_alloc == 0) {
X->chardata_alloc = SIZ;
* Here's where our XMPP session begins its happy day.
*/
void xmpp_greeting(void) {
+ client_set_inbound_buf(4);
strcpy(CC->cs_clientname, "XMPP session");
- CC->session_specific_data = malloc(sizeof(struct citxmpp));
- memset(XMPP, 0, sizeof(struct citxmpp));
+ CC->session_specific_data = malloc(sizeof(citxmpp));
+ memset(XMPP, 0, sizeof(citxmpp));
XMPP->last_event_processed = queue_event_seq;
/* XMPP does not use a greeting, but we still have to initialize some things. */
* Main command loop for XMPP sessions.
*/
void xmpp_command_loop(void) {
- char cmdbuf[16];
- int retval;
+ int rc;
+ StrBuf *stream_input = NewStrBuf();
time(&CC->lastcmd);
- memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
- retval = client_read(cmdbuf, 1);
- if (retval != 1) {
- CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
+ rc = client_read_random_blob(stream_input, 30);
+ if (rc > 0) {
+ XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
+ }
+ else {
+ CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n");
CC->kill_me = 1;
- return;
}
-
- /* FIXME ... this is woefully inefficient. */
-
- XML_Parse(XMPP->xp, cmdbuf, 1, 0);
+ FreeStrBuf(&stream_input);
}
xmpp_greeting,
xmpp_command_loop,
xmpp_async_loop,
- CitadelServiceXMPP);
+ CitadelServiceXMPP
+ );
CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
}
/* return our Subversion id for the Log */
- return "$Id$";
+ return "xmpp";
}
projects / citadel.git / blobdiff