X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=cd7b73a39b63971e674cd97a5d065a476485f08f;hb=8c321fbcc2a64f0d0627562fdf5651442e525ab1;hp=dca9352bfbfdd70dc97721bbe2dffd7a07e2ebb7;hpb=3dda3cda8acb9c1c4eb227f4780630913ffc633a;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index dca9352bf..cd7b73a39 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -1,43 +1,24 @@ /* * $Id$ - * - * Handles various types of data transfer operations with the Citadel service. - * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "webcit.h" #include "webserver.h" -struct serv_info serv_info; - +struct serv_info serv_info; /**< our connection data to the server */ +HashList *ServHash = NULL;//// TODO; /* * get info about the server we've connected to + * + * browser_host the citadell we want to connect to + * user_agent which browser uses our client? */ void get_serv_info(char *browser_host, char *user_agent) { char buf[SIZ]; int a; - /* Tell the server what kind of client is connecting */ + /** Tell the server what kind of client is connecting */ serv_printf("IDEN %d|%d|%d|%s|%s", DEVELOPER_ID, CLIENT_ID, @@ -47,20 +28,19 @@ void get_serv_info(char *browser_host, char *user_agent) ); serv_getln(buf, sizeof buf); - /* Tell the server what kind of richtext we prefer */ + /** Tell the server what kind of richtext we prefer */ serv_puts("MSGP text/html|text/plain"); serv_getln(buf, sizeof buf); -#ifdef WEBCIT_WITH_CALENDAR_SERVICE - /* Tell the server that when we save a calendar event, we + /* + * Tell the server that when we save a calendar event, we * want invitations to be generated by the Citadel server * instead of by the client. */ serv_puts("ICAL sgi|1"); serv_getln(buf, sizeof buf); -#endif - /* Now ask the server to tell us a little bit about itself... */ + /** Now ask the server to tell us a little bit about itself... */ serv_puts("INFO"); serv_getln(buf, sizeof buf); if (buf[0] != '1') @@ -74,32 +54,50 @@ void get_serv_info(char *browser_host, char *user_agent) WC->ctdl_pid = serv_info.serv_pid; break; case 1: - strcpy(serv_info.serv_nodename, buf); + safestrncpy(serv_info.serv_nodename, buf, sizeof serv_info.serv_nodename); break; case 2: - strcpy(serv_info.serv_humannode, buf); + safestrncpy(serv_info.serv_humannode, buf, sizeof serv_info.serv_humannode); break; case 3: - strcpy(serv_info.serv_fqdn, buf); + safestrncpy(serv_info.serv_fqdn, buf, sizeof serv_info.serv_fqdn); break; case 4: - strcpy(serv_info.serv_software, buf); + safestrncpy(serv_info.serv_software, buf, sizeof serv_info.serv_software); break; case 5: serv_info.serv_rev_level = atoi(buf); break; case 6: - strcpy(serv_info.serv_bbs_city, buf); + safestrncpy(serv_info.serv_bbs_city, buf, sizeof serv_info.serv_bbs_city); break; case 7: - strcpy(serv_info.serv_sysadm, buf); + safestrncpy(serv_info.serv_sysadm, buf, sizeof serv_info.serv_sysadm); break; case 9: - strcpy(serv_info.serv_moreprompt, buf); + safestrncpy(serv_info.serv_moreprompt, buf, sizeof serv_info.serv_moreprompt); break; case 14: serv_info.serv_supports_ldap = atoi(buf); break; + case 15: + serv_info.serv_newuser_disabled = atoi(buf); + break; + case 16: + safestrncpy(serv_info.serv_default_cal_zone, buf, sizeof serv_info.serv_default_cal_zone); + break; + case 20: + serv_info.serv_supports_sieve = atoi(buf); + break; + case 21: + serv_info.serv_fulltext_enabled = atoi(buf); + break; + case 22: + safestrncpy(serv_info.serv_svn_revision, buf, sizeof serv_info.serv_svn_revision); + break; + case 23: + serv_info.serv_supports_openid = atoi(buf); + break; } ++a; } @@ -107,39 +105,146 @@ void get_serv_info(char *browser_host, char *user_agent) -/* - * Function to spit out Citadel variformat text in HTML - * If fp is non-null, it is considered to be the file handle to read the - * text from. Otherwise, text is read from the server. +/** + * Read Citadel variformat text and spit it out as HTML. + * align html align string */ -void fmout(FILE *fp, char *align) +inline void fmout(char *align) { + _fmout(WC->WBuf, align); +} +void _fmout(StrBuf *Target, char *align) +{ int intext = 0; int bq = 0; char buf[SIZ]; - wprintf("
\n", align); - while (1) { - if (fp == NULL) - serv_getln(buf, sizeof buf); - if (fp != NULL) { - if (fgets(buf, SIZ, fp) == NULL) - strcpy(buf, "000"); - buf[strlen(buf) - 1] = 0; + StrBufAppendPrintf(Target, "
\n", align); + while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + + if ((intext == 1) && (isspace(buf[0]))) { + wprintf("
"); } - if (!strcmp(buf, "000")) { - if (bq == 1) - wprintf(""); - wprintf("

\n"); - return; + intext = 1; + + /** + * Quoted text should be displayed in italics and in a + * different colour. This code understands Citadel-style + * " >" quotes and will convert to
tags. + */ + if ((bq == 0) && (!strncmp(buf, " >", 2))) { + StrBufAppendBufPlain(Target, HKEY("
"), 0); + bq = 1; + } else if ((bq == 1) && (strncmp(buf, " >", 2))) { + StrBufAppendBufPlain(Target, HKEY("
"), 0); + bq = 0; } + if ((bq == 1) && (!strncmp(buf, " >", 2))) { + strcpy(buf, &buf[2]); + } + /** Activate embedded URL's */ + url(buf, sizeof(buf)); + + escputs(buf);//// TODO: Target + StrBufAppendBufPlain(Target, HKEY("\n"), 0); + } + if (bq == 1) { + wprintf(""); + } + wprintf("

\n"); +} + +void FmOut(StrBuf *Target, char *align, StrBuf *Source) +{ + const char *ptr, *pte; + const char *BufPtr = NULL; + StrBuf *Line = NewStrBuf(); + StrBuf *Line1 = NewStrBuf(); + StrBuf *Line2 = NewStrBuf(); + int bn = 0; + int bq = 0; + int i, n, done = 0; + long len; + int intext = 0; + + StrBufAppendPrintf(Target, "
\n", align); + while ((n = StrBufSipLine(Line, Source, &BufPtr), n >= 0) && !done) + { + done = n == 0; + bq = 0; + i = 0; + ptr = ChrPtr(Line); + len = StrLength(Line); + pte = ptr + len; + + if ((intext == 1) && (isspace(*ptr))) { + StrBufAppendBufPlain(Target, HKEY("
"), 0); + } + intext = 1; + if (isspace(*ptr)) while ((ptr < pte) && + ((*ptr == '>') || + isspace(*ptr))) + { + if (*ptr == '>') + bq++; + ptr ++; + i++; + } + + /** + * Quoted text should be displayed in italics and in a + * different colour. This code understands Citadel-style + * " >" quotes and will convert to
tags. + */ + if (i > 0) StrBufCutLeft(Line, i); + + + for (i = bn; i < bq; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + for (i = bq; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + bn = bq; + + if (StrLength(Line) == 0) + continue; + /** Activate embedded URL's */ + UrlizeText(Line1, Line, Line2); + + StrEscAppend(Target, Line1, NULL, 0, 0); + + StrBufAppendBufPlain(Target, HKEY("\n"), 0); + } + for (i = 0; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + StrBufAppendBufPlain(Target, HKEY("

\n"), 0); + FreeStrBuf(&Line); + FreeStrBuf(&Line1); + FreeStrBuf(&Line2); +} + + + + +/** + * Read Citadel variformat text and spit it out as HTML in a form + * suitable for embedding in another message (forward/quote). + * (NO LINEBREAKS ALLOWED HERE!) + */ +void pullquote_fmout(void) { + int intext = 0; + int bq = 0; + char buf[SIZ]; + + while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + if ((intext == 1) && (isspace(buf[0]))) { wprintf("
"); } intext = 1; - /* Quoted text should be displayed in italics and in a + /** + * Quoted text should be displayed in italics and in a * different colour. This code understands Citadel-style * " >" quotes and will convert to
tags. */ @@ -153,48 +258,41 @@ void fmout(FILE *fp, char *align) if ((bq == 1) && (!strncmp(buf, " >", 2))) { strcpy(buf, &buf[2]); } - /* Activate embedded URL's */ - url(buf); - escputs(buf); - wprintf("\n"); + msgescputs(buf); + } + if (bq == 1) { + wprintf(""); } } -/* - * Transmit message text (in memory) to the server. - * If convert_to_html is set to 1, the message is converted into something - * which kind of resembles HTML. +/** + * Transmit message text (in memory) to the server. + * + * ptr Pointer to the message being transmitted */ -void text_to_server(char *ptr, int convert_to_html) +void text_to_server(char *ptr) { - char buf[SIZ]; - char conv[4]; - int ch, a, pos; + char buf[256]; + int ch, a, pos, len; pos = 0; - strcpy(buf, ""); + buf[0] = 0; while (ptr[pos] != 0) { ch = ptr[pos++]; if (ch == 10) { - while ( (isspace(buf[strlen(buf) - 1])) - && (strlen(buf) > 1) ) - buf[strlen(buf) - 1] = 0; + len = strlen(buf); + while ( (isspace(buf[len - 1])) + && (buf[0] != '\0') + && (buf[1] != '\0') ) + buf[--len] = 0; serv_puts(buf); - strcpy(buf, ""); - if (convert_to_html) { - strcat(buf, "
"); - } - else { - if (ptr[pos] != 0) strcat(buf, " "); - } - } else if ((convert_to_html)&&(strchr("#&;`'|*?-~<>^()[]{}$\\", ch) != NULL)) { - sprintf(conv, "%c", ch); - stresc(&buf[strlen(buf)], conv, 0, 0); + buf[0] = 0; + if (ptr[pos] != 0) strcat(buf, " "); } else { a = strlen(buf); buf[a + 1] = 0; @@ -202,22 +300,96 @@ void text_to_server(char *ptr, int convert_to_html) if ((ch == 32) && (strlen(buf) > 200)) { buf[a] = 0; serv_puts(buf); - strcpy(buf, ""); + buf[0] = 0; } if (strlen(buf) > 250) { serv_puts(buf); - strcpy(buf, ""); + buf[0] = 0; } } } serv_puts(buf); +} + + +/** + * Transmit message text (in memory) to the server, + * converting to Quoted-Printable encoding as we go. + * + * ptr Pointer to the message being transmitted + */ +void text_to_server_qp(char *ptr) +{ + unsigned char ch, buf[256]; + int pos; + int output_len = 0; + + pos = 0; + buf[0] = 0; + output_len = 0; + + while (ptr[pos] != 0) { + ch = (unsigned char)(ptr[pos++]); + if (ch == 13) { + /* ignore carriage returns */ + } + else if (ch == 10) { + /* hard line break */ + if (output_len > 0) { + if (isspace(buf[output_len-1])) { + sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]); + output_len += 2; + } + } + buf[output_len++] = 0; + serv_puts((char *)buf); + output_len = 0; + } + else if (ch == 9) { + buf[output_len++] = ch; + } + else if ( (ch >= 32) && (ch <= 60) ) { + buf[output_len++] = ch; + } + else if ( (ch >= 62) && (ch <= 126) ) { + buf[output_len++] = ch; + } + else { + sprintf((char *)&buf[output_len], "=%02X", ch); + output_len += 3; + } + + if (output_len > 72) { + /* soft line break */ + if (isspace(buf[output_len-1])) { + sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]); + output_len += 2; + } + buf[output_len++] = '='; + buf[output_len++] = 0; + serv_puts((char *)buf); + output_len = 0; + } + } + + /* end of data - transmit anything that's left */ + if (output_len > 0) { + if (isspace(buf[output_len-1])) { + sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]); + output_len += 2; + } + buf[output_len++] = 0; + serv_puts((char *)buf); + output_len = 0; + } } -/* - * translate server message output to text + +/** + * translate server message output to text * (used for editing room info files and such) */ void server_to_text() @@ -237,71 +409,204 @@ void server_to_text() -/* +/** * Read binary data from server into memory using a series of * server READ commands. + * \return the read content as StrBuf */ -void read_server_binary(char *buffer, size_t total_len) { +int read_server_binary(StrBuf *Ret, size_t total_len) +{ char buf[SIZ]; size_t bytes = 0; size_t thisblock = 0; + StrBuf *Buf; + + Buf = NewStrBuf(); + if (Ret == NULL) + return -1; - memset(buffer, 0, total_len); while (bytes < total_len) { thisblock = 4095; if ((total_len - bytes) < thisblock) { thisblock = total_len - bytes; - if (thisblock == 0) return; + if (thisblock == 0) { + FlushStrBuf(Ret); + FreeStrBuf(&Buf); + return -1; + } } serv_printf("READ %d|%d", (int)bytes, (int)thisblock); - serv_getln(buf, sizeof buf); - if (buf[0] == '6') { - thisblock = (size_t)atoi(&buf[4]); - if (!WC->connected) return; - serv_read(&buffer[bytes], thisblock); - bytes += thisblock; - } - else { - lprintf(3, "Error: %s\n", &buf[4]); - return; + if (StrBuf_ServGetln(Buf) > 0) + { + if (ChrPtr(Buf)[0] == '6') + { + StrBufCutLeft(Buf, 4); //thisblock = (size_t)atoi(&buf[4]); + thisblock = StrTol(Buf); + if (!WC->connected) { + FlushStrBuf(Ret); + FreeStrBuf(&Buf); + return -1; + } + StrBuf_ServGetBLOB(Ret, thisblock); + bytes += thisblock; + } + else { + FreeStrBuf(&Buf); + lprintf(3, "Error: %s\n", &buf[4]); + return -1; + } } } + FreeStrBuf(&Buf); + return StrLength(Ret); } -/* - * Read text from server, appending to a string buffer until the +/** + * Read text from server, appending to a string buffer until the * usual 000 terminator is found. Caller is responsible for freeing * the returned pointer. */ -char *read_server_text(void) { - char *text = NULL; - size_t bytes_allocated = 0; - size_t bytes_read = 0; - int linelen; - char buf[SIZ]; - - text = malloc(SIZ); - if (text == NULL) { - return(NULL); +int read_server_text(StrBuf *Buf, long *nLines) +{ + wcsession *WCC = WC; + long nRead; + long nTotal = 0; + long nlines; + + nlines = 0; + while ((WCC->serv_sock!=-1) && + (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) )) + { + if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) { + StrBufCutRight(Buf, nRead); + break; + } + nTotal += nRead; + nlines ++; } - strcpy(text, ""); - bytes_allocated = SIZ; - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - linelen = strlen(buf); - buf[linelen] = '\n'; - buf[linelen+1] = 0; - ++linelen; - - if ((bytes_read + linelen) >= (bytes_allocated - 2)) { - bytes_allocated = 2 * bytes_allocated; - text = realloc(text, bytes_allocated); - } + *nLines = nlines; + return nTotal; +} + + + + + + +int GetServerStatus(StrBuf *Line, long* FullState) +{ + if (FullState != NULL) + *FullState = StrTol(Line); + return ChrPtr(Line)[0] - 48; +} + - strcpy(&text[bytes_read], buf); - bytes_read += linelen; +void tmplput_serv_ip(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrBufAppendPrintf(Target, "%d", WC->ctdl_pid); +} + +void tmplput_serv_nodename(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, serv_info.serv_nodename, 0, 0); +} + +void tmplput_serv_humannode(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, serv_info.serv_humannode, 0, 0); +} + +void tmplput_serv_fqdn(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, serv_info.serv_fqdn, 0, 0); +} + +void tmplput_serv_software(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, serv_info.serv_software, 0, 0); +} + +void tmplput_serv_rev_level(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrBufAppendPrintf(Target, "%d.%02d", + serv_info.serv_rev_level / 100, + serv_info.serv_rev_level % 100); +} +int conditional_serv_newuser_disabled(WCTemplateToken *Tokens, void *Context, int ContextType) +{ + return serv_info.serv_newuser_disabled != 0; +} +int conditional_serv_supports_openid(WCTemplateToken *Tokens, void *Context, int ContextType) +{ + return serv_info.serv_supports_openid != 0; +} + +void tmplput_serv_bbs_city(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, serv_info.serv_bbs_city, 0, 0); +} + +void tmplput_current_user(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, WC->wc_fullname, 0, 0); +} + +void tmplput_current_room(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + StrEscAppend(Target, NULL, WC->wc_roomname, 0, 0); +} + + +void tmplput_mesg(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +{ + int n = 0; + int Done = 0; + StrBuf *Line; + StrBuf *Buf; + + Buf = NewStrBuf(); + Line = NewStrBuf(); + serv_printf("MESG %s", Tokens->Params[0]->Start); + StrBuf_ServGetln(Line); + while (!Done && (StrBuf_ServGetln(Line)>=0)) { + if ( (StrLength(Line)==3) && + !strcmp(ChrPtr(Line), "000")) + Done = 1; + else + { + if (n > 0) + StrBufAppendBufPlain(Buf, "\n", 1, 0); + StrBufAppendBuf(Buf, Line, 0); + } + n++; } + FlushStrBuf(Line); + FmOut(Line, "center", Buf); + StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Line, 1); + FreeStrBuf(&Buf); + FreeStrBuf(&Line); +} + +void +InitModule_SERVFUNC +(void) +{ - return(text); + RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE); + RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE); + RegisterNamespace("CURRENT_USER", 0, 0, tmplput_current_user, CTX_NONE); + RegisterNamespace("CURRENT_ROOM", 0, 0, tmplput_current_room, CTX_NONE); + RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE); + RegisterNamespace("SERV:NODENAME", 0, 0, tmplput_serv_nodename, CTX_NONE); + RegisterNamespace("SERV:HUMANNODE", 0, 0, tmplput_serv_humannode, CTX_NONE); + RegisterNamespace("SERV:FQDN", 0, 0, tmplput_serv_fqdn, CTX_NONE); + RegisterNamespace("SERV:SOFTWARE", 0, 0, tmplput_serv_software, CTX_NONE); + RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE); + RegisterNamespace("SERV:BBS_CITY", 0, 0, tmplput_serv_bbs_city, CTX_NONE); + RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, CTX_NONE); +/// RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); } + +/*@}*/