X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=0c89245516b225e459433d0ba970a0ef5863067a;hb=fa4703876cbb0330af860bb686d044ddb59dbadb;hp=50dd83b52b9212bfc6bce34ce01b4793b26fe8bf;hpb=3395b2dbe9d460d5381497850ed833c60befb746;p=citadel.git
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 50dd83b52..0c8924551 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,10 +1,27 @@
-/*
- * $Id$
- */
#include "webcit.h"
#include "webserver.h"
+int is_uds = 0;
+char serv_sock_name[PATH_MAX] = "";
+
+HashList *EmbeddableMimes = NULL;
+StrBuf *EmbeddableMimeStrs = NULL;
+
+
+void SetInlinMimeRenderers(void)
+{
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+
+ /* Tell the server what kind of richtext we prefer */
+ serv_putbuf(EmbeddableMimeStrs);
+ StrBuf_ServGetln(Buf);
+
+ FreeStrBuf(&Buf);
+}
+
void DeleteServInfo(ServInfo **FreeMe)
{
@@ -16,7 +33,6 @@ void DeleteServInfo(ServInfo **FreeMe)
FreeStrBuf(&(*FreeMe)->serv_software);
FreeStrBuf(&(*FreeMe)->serv_bbs_city);
FreeStrBuf(&(*FreeMe)->serv_sysadm);
- FreeStrBuf(&(*FreeMe)->serv_moreprompt);
FreeStrBuf(&(*FreeMe)->serv_default_cal_zone);
FreeStrBuf(&(*FreeMe)->serv_svn_revision);
free(*FreeMe);
@@ -26,29 +42,33 @@ void DeleteServInfo(ServInfo **FreeMe)
/*
* get info about the server we've connected to
*
- * browser_host the citadell we want to connect to
+ * browser_host the citadel we want to connect to
* user_agent which browser uses our client?
*/
-ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
+ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
{
ServInfo *info;
StrBuf *Buf;
- char buf[SIZ];
int a;
+ int rc;
- /** Tell the server what kind of client is connecting */
+ Buf = NewStrBuf();
+
+ /* Tell the server what kind of client is connecting */
serv_printf("IDEN %d|%d|%d|%s|%s",
DEVELOPER_ID,
CLIENT_ID,
CLIENT_VERSION,
- user_agent,
+ ChrPtr(user_agent),
ChrPtr(browser_host)
);
- serv_getln(buf, sizeof buf);
-
- /** Tell the server what kind of richtext we prefer */
- serv_puts("MSGP text/calendar|text/html|text/plain");
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
/*
* Tell the server that when we save a calendar event, we
@@ -56,20 +76,32 @@ ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
* instead of by the client.
*/
serv_puts("ICAL sgi|1");
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
- /** 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')
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
+ syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
return NULL;
+ }
info = (ServInfo*)malloc(sizeof(ServInfo));
memset(info, 0, sizeof(ServInfo));
a = 0;
- Buf = NewStrBuf();
- while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) {
-/* lprintf (1, "a: %d [%s]", a, ChrPtr(Buf));*/
+ while (rc = StrBuf_ServGetln(Buf),
+ (rc >= 0) &&
+ ((rc != 3) ||
+ strcmp(ChrPtr(Buf), "000")))
+ {
switch (a) {
case 0:
info->serv_pid = StrToi(Buf);
@@ -96,9 +128,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
case 7:
info->serv_sysadm = NewStrBufDup(Buf);
break;
- case 9:
- info->serv_moreprompt = NewStrBufDup(Buf);
- break;
case 14:
info->serv_supports_ldap = StrToi(Buf);
break;
@@ -120,6 +149,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
case 23:
info->serv_supports_openid = StrToi(Buf);
break;
+ case 24:
+ info->serv_supports_guest = StrToi(Buf);
+ break;
}
++a;
}
@@ -127,9 +159,103 @@ ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
return info;
}
+int GetConnected (void)
+{
+ StrBuf *Buf;
+ wcsession *WCC = WC;
+
+ if (WCC->ReadBuf == NULL)
+ WCC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
+ if (is_uds) /* unix domain socket */
+ WCC->serv_sock = uds_connectsock(serv_sock_name);
+ else /* tcp socket */
+ WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+
+ if (WCC->serv_sock < 0) {
+ FreeStrBuf(&WCC->ReadBuf);
+ return 1;
+ }
+ else {
+ long Status;
+ int short_status;
+ Buf = NewStrBuf();
+ WCC->connected = 1;
+ StrBuf_ServGetln(Buf); /* get the server greeting */
+ short_status = GetServerStatus(Buf, &Status);
+ FreeStrBuf(&Buf);
+
+ /* Server isn't ready for us? */
+ if (short_status != 2) {
+ if (Status == 571) {
+ hprintf("HTTP/1.1 503 Service Unavailable\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time. Please try again later or contact your system administrator."));
+ }
+ else {
+ wc_printf("%ld %s\n",
+ Status,
+ _("Received unexpected answer from Citadel server; bailing out.")
+ );
+ hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ }
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+
+ /* 2010jun03: every now and then the connection to Citadel dies before this point. why? */
+ /*
+ * From what host is our user connecting? Go with
+ * the host at the other end of the HTTP socket,
+ * unless we are following X-Forwarded-For: headers
+ * and such a header has already turned up something.
+ */
+ if ( (!follow_xff) || (StrLength(WCC->Hdr->HR.browser_host) == 0) ) {
+ if (WCC->Hdr->HR.browser_host == NULL) {
+ WCC->Hdr->HR.browser_host = NewStrBuf();
+ Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"),
+ WCC->Hdr->HR.browser_host, HFreeStrBuf);
+ }
+ locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
+ }
+ if (WCC->serv_info == NULL) {
+ WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
+ }
+ if (WCC->serv_info == NULL){
+ begin_burst();
+ wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
+ hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+ if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
+ begin_burst();
+ wc_printf(_("You are connected to a Citadel "
+ "server running Citadel %d.%02d. \n"
+ "In order to run this version of WebCit "
+ "you must also have Citadel %d.%02d or"
+ " newer.\n\n\n"),
+ WCC->serv_info->serv_rev_level / 100,
+ WCC->serv_info->serv_rev_level % 100,
+ MINIMUM_CIT_VERSION / 100,
+ MINIMUM_CIT_VERSION % 100
+ );
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+ SetInlinMimeRenderers();
+ }
+ return 0;
+}
-/**
+/*
* Read Citadel variformat text and spit it out as HTML.
* align html align string
*/
@@ -148,11 +274,11 @@ void _fmout(StrBuf *Target, char *align)
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("
");
+ wc_printf("
");
}
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. @@ -167,80 +293,87 @@ void _fmout(StrBuf *Target, char *align) if ((bq == 1) && (!strncmp(buf, " >", 2))) { strcpy(buf, &buf[2]); } - /** Activate embedded URL's */ + /* Activate embedded URL's */ url(buf, sizeof(buf)); escputs(buf); StrBufAppendBufPlain(Target, HKEY("\n"), 0); } if (bq == 1) { - wprintf(""); + wc_printf(""); } - wprintf("
\n"); + wc_printf("
\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(); + StrBuf *Line = NewStrBufPlain(NULL, SIZ); + StrBuf *Line1 = NewStrBufPlain(NULL, SIZ); + StrBuf *Line2 = NewStrBufPlain(NULL, SIZ); int bn = 0; int bq = 0; - int i, n, done = 0; + int i; 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 (StrLength(Source) > 0) + do { - if (*ptr == '>') - bq++; - ptr ++; - i++; - } + StrBufSipLine(Line, Source, &BufPtr); + bq = 0; + i = 0; + ptr = ChrPtr(Line); + len = StrLength(Line); + pte = ptr + len; - /** - * Quoted text should be displayed in italics and in a - * different colour. This code understands Citadel-style - * " >" quotes and will convert totags. - */ - if (i > 0) StrBufCutLeft(Line, i); + 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 totags. + */ + if (i > 0) StrBufCutLeft(Line, i); - for (i = bn; i < bq; i++) - StrBufAppendBufPlain(Target, HKEY(""), 0); + } StrBufAppendBufPlain(Target, HKEY(""), 0); - for (i = bq; i < bn; i++) - StrBufAppendBufPlain(Target, HKEY(""), 0); - bn = bq; + 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); + if (StrLength(Line) == 0) + continue; - StrEscAppend(Target, Line1, NULL, 0, 0); + /* Activate embedded URL's */ + UrlizeText(Line1, Line, Line2); - StrBufAppendBufPlain(Target, HKEY("\n"), 0); - } - for (i = 0; i < bn; i++) + StrEscAppend(Target, Line1, NULL, 0, 0); + + StrBufAppendBufPlain(Target, HKEY("\n"), 0); + } + while ((BufPtr != StrBufNOTNULL) && + (BufPtr != NULL)); + + for (i = 0; i < bn; i++) { StrBufAppendBufPlain(Target, HKEY("
\n"), 0); FreeStrBuf(&Line); FreeStrBuf(&Line1); @@ -248,10 +381,8 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) } - - -/** - * Read Citadel variformat text and spit it out as HTML in a form +/* + * 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!) */ @@ -263,20 +394,20 @@ void pullquote_fmout(void) { while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if ((intext == 1) && (isspace(buf[0]))) { - wprintf("
"); + wc_printf("
"); } intext = 1; - /** + /* * Quoted text should be displayed in italics and in a * different colour. This code understands Citadel-style * " >" quotes and will convert totags. */ if ((bq == 0) && (!strncmp(buf, " >", 2))) { - wprintf(""); + wc_printf(""); bq = 0; } if ((bq == 1) && (!strncmp(buf, " >", 2))) { @@ -286,17 +417,15 @@ void pullquote_fmout(void) { msgescputs(buf); } if (bq == 1) { - wprintf(""); + wc_printf(""); } } -/** +/* * Transmit message text (in memory) to the server. - * - * ptr Pointer to the message being transmitted */ void text_to_server(char *ptr) { @@ -336,11 +465,8 @@ void text_to_server(char *ptr) } -/** - * Transmit message text (in memory) to the server, - * converting to Quoted-Printable encoding as we go. - * - * ptr Pointer to the message being transmitted +/* + * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go. */ void text_to_server_qp(char *ptr) { @@ -412,9 +538,8 @@ void text_to_server_qp(char *ptr) -/** - * translate server message output to text - * (used for editing room info files and such) +/* + * translate server message output to text (used for editing room info files and such) */ void server_to_text() { @@ -424,67 +549,18 @@ void server_to_text() while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if ((buf[0] == 32) && (count > 0)) { - wprintf("\n"); + wc_printf("\n"); } - wprintf("%s", buf); + wc_printf("%s", buf); ++count; } } -/** - * Read binary data from server into memory using a series of - * server READ commands. - * \return the read content as StrBuf - */ -int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf) -{ - char buf[SIZ]; - size_t bytes = 0; - size_t thisblock = 0; - - if (Ret == NULL) - return -1; - - while (bytes < total_len) { - thisblock = 4095; - if ((total_len - bytes) < thisblock) { - thisblock = total_len - bytes; - if (thisblock == 0) { - FlushStrBuf(Ret); - FreeStrBuf(&Buf); - return -1; - } - } - serv_printf("READ %d|%d", (int)bytes, (int)thisblock); - if (StrBuf_ServGetlnBuffered(Buf) > 0) - { - if (GetServerStatus(Buf, NULL) == 6) - { - StrBufCutLeft(Buf, 4); - thisblock = StrTol(Buf); - if (!WC->connected) { - FlushStrBuf(Ret); - FreeStrBuf(&Buf); - return -1; - } - StrBuf_ServGetBLOBBuffered(Ret, thisblock); - bytes += thisblock; - } - else { - FreeStrBuf(&Buf); - lprintf(3, "Error: %s\n", &buf[4]); - return -1; - } - } - } - 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. */ @@ -512,10 +588,6 @@ int read_server_text(StrBuf *Buf, long *nLines) } - - - - int GetServerStatus(StrBuf *Line, long* FullState) { if (FullState != NULL) @@ -577,6 +649,7 @@ int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) return 0; return WCC->serv_info->serv_newuser_disabled != 0; } + int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -585,6 +658,22 @@ int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) return WCC->serv_info->serv_supports_openid != 0; } +int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_fulltext_enabled != 0; +} + +int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_supports_ldap != 0; +} + void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -593,7 +682,6 @@ void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0); } - void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) { int n = 0; @@ -628,22 +716,77 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) FreeStrBuf(&Line); } + +void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority) +{ + StrBuf *MT; + MT = NewStrBufPlain(MimeType, MTLen); + Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf); +} + +void CreateMimeStr(void) +{ + HashPos *it; + void *vMime; + long len = 0; + const char *Key; + + it = GetNewHashPos(EmbeddableMimes, 0); + while (GetNextHashPos(EmbeddableMimes, it, &len, &Key, &vMime) && + (vMime != NULL)) { + if (StrLength(EmbeddableMimeStrs) > 0) + StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("|"), 0); + else + StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("MSGP "), 0); + StrBufAppendBuf(EmbeddableMimeStrs, (StrBuf*) vMime, 0); + } + DeleteHashPos(&it); +} + +void +ServerStartModule_SERV_FUNC +(void) +{ + EmbeddableMimes = NewHash(1, Flathash); + EmbeddableMimeStrs = NewStrBuf(); +} + + +void +ServerShutdownModule_SERV_FUNC +(void) +{ + FreeStrBuf(&EmbeddableMimeStrs); + DeleteHash(&EmbeddableMimes); +} + void InitModule_SERVFUNC (void) { + is_uds = strcasecmp(ctdlhost, "uds") == 0; + if (is_uds) + snprintf(serv_sock_name, PATH_MAX, "%s/citadel.socket", ctdlport); 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("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE); - RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, CTX_NONE); - RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, CTX_NONE); - RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, CTX_NONE); - RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, CTX_NONE); - RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE); - RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, CTX_NONE); - RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, CTX_NONE); -/*TODO // RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */ + RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE); + RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE); + RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE); + RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE); + RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE); + RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE); + RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, NULL, CTX_NONE); + RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE); + RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE); + RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE); } -/*@}*/ + + +void +SessionDestroyModule_SERVFUNC +(wcsession *sess) +{ + DeleteServInfo(&sess->serv_info); +}"); bq = 1; } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf(""); + wc_printf("