X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=873a3ffde67114687c9492af222b5273a31a1e0a;hb=d50cb4fb0a9d5c05841dad2d2f8ce4c35e5a6847;hp=50a7ab8b46db6e2a2f1679214721bee48e33df94;hpb=d0e2028fa275ff13c4906aabdd190fcec143b172;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 50a7ab8b4..873a3ffde 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -1,36 +1,74 @@ -/* - * $Id$ - */ #include "webcit.h" #include "webserver.h" -struct serv_info serv_info; /**< our connection data to the server */ -HashList *ServHash = NULL;//// TODO; +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) +{ + if (*FreeMe == NULL) + return; + FreeStrBuf(&(*FreeMe)->serv_nodename); + FreeStrBuf(&(*FreeMe)->serv_humannode); + FreeStrBuf(&(*FreeMe)->serv_fqdn); + FreeStrBuf(&(*FreeMe)->serv_software); + FreeStrBuf(&(*FreeMe)->serv_bbs_city); + FreeStrBuf(&(*FreeMe)->serv_sysadm); + FreeStrBuf(&(*FreeMe)->serv_default_cal_zone); + FreeStrBuf(&(*FreeMe)->serv_svn_revision); + free(*FreeMe); + *FreeMe = NULL; +} + /* * 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? */ -void get_serv_info(char *browser_host, char *user_agent) +ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) { - char buf[SIZ]; + ServInfo *info; + StrBuf *Buf; 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, - browser_host + DEVELOPER_ID, + CLIENT_ID, + CLIENT_VERSION, + ChrPtr(user_agent), + ChrPtr(browser_host) ); - serv_getln(buf, sizeof buf); - - /** Tell the server what kind of richtext we prefer */ - serv_puts("MSGP 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 @@ -38,168 +76,313 @@ void get_serv_info(char *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') - return; + 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; - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + while (rc = StrBuf_ServGetln(Buf), + (rc >= 0) && + ((rc != 3) || + strcmp(ChrPtr(Buf), "000"))) + { switch (a) { case 0: - serv_info.serv_pid = atoi(buf); - WC->ctdl_pid = serv_info.serv_pid; + info->serv_pid = StrToi(Buf); + WC->ctdl_pid = info->serv_pid; break; case 1: - safestrncpy(serv_info.serv_nodename, buf, sizeof serv_info.serv_nodename); + info->serv_nodename = NewStrBufDup(Buf); break; case 2: - safestrncpy(serv_info.serv_humannode, buf, sizeof serv_info.serv_humannode); + info->serv_humannode = NewStrBufDup(Buf); break; case 3: - safestrncpy(serv_info.serv_fqdn, buf, sizeof serv_info.serv_fqdn); + info->serv_fqdn = NewStrBufDup(Buf); break; case 4: - safestrncpy(serv_info.serv_software, buf, sizeof serv_info.serv_software); + info->serv_software = NewStrBufDup(Buf); break; case 5: - serv_info.serv_rev_level = atoi(buf); + info->serv_rev_level = StrToi(Buf); break; case 6: - safestrncpy(serv_info.serv_bbs_city, buf, sizeof serv_info.serv_bbs_city); + info->serv_bbs_city = NewStrBufDup(Buf); break; case 7: - safestrncpy(serv_info.serv_sysadm, buf, sizeof serv_info.serv_sysadm); - break; - case 9: - safestrncpy(serv_info.serv_moreprompt, buf, sizeof serv_info.serv_moreprompt); + info->serv_sysadm = NewStrBufDup(Buf); break; case 14: - serv_info.serv_supports_ldap = atoi(buf); + info->serv_supports_ldap = StrToi(Buf); break; case 15: - serv_info.serv_newuser_disabled = atoi(buf); + info->serv_newuser_disabled = StrToi(Buf); break; case 16: - safestrncpy(serv_info.serv_default_cal_zone, buf, sizeof serv_info.serv_default_cal_zone); + info->serv_default_cal_zone = NewStrBufDup(Buf); break; case 20: - serv_info.serv_supports_sieve = atoi(buf); + info->serv_supports_sieve = StrToi(Buf); break; case 21: - serv_info.serv_fulltext_enabled = atoi(buf); + info->serv_fulltext_enabled = StrToi(Buf); break; case 22: - safestrncpy(serv_info.serv_svn_revision, buf, sizeof serv_info.serv_svn_revision); + info->serv_svn_revision = NewStrBufDup(Buf); break; case 23: - serv_info.serv_supports_openid = atoi(buf); + info->serv_supports_openid = StrToi(Buf); + break; + case 24: + info->serv_supports_guest = StrToi(Buf); break; } ++a; } + FreeStrBuf(&Buf); + 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) { + WCC->connected = 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; + } + /* + * 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; +} -/** - * \brief Read Citadel variformat text and spit it out as HTML. - * \param align html align string +/* + * Read Citadel variformat text and spit it out as HTML. + * align html align string */ -void fmout(char *align) +inline void fmout(const char *align) +{ + _fmout(WC->WBuf, align); +} + +void _fmout(StrBuf *Target, const char *align) { int intext = 0; int bq = 0; char buf[SIZ]; - wprintf("
tags. */ if ((bq == 0) && (!strncmp(buf, " >", 2))) { - wprintf(""); + StrBufAppendBufPlain(Target, HKEY(""), 0); bq = 0; } if ((bq == 1) && (!strncmp(buf, " >", 2))) { strcpy(buf, &buf[2]); } - /** Activate embedded URL's */ + /* Activate embedded URL's */ url(buf, sizeof(buf)); escputs(buf); - wprintf("\n"); + StrBufAppendBufPlain(Target, HKEY("\n"), 0); } if (bq == 1) { - wprintf(""); + wc_printf(""); } - wprintf(""), 0); bq = 1; } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf(""); + StrBufAppendBufPlain(Target, HKEY("
tags. + */ + if (i > 0) StrBufCutLeft(Line, i); + - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + for (i = bn; i < bq; i++) + StrBufAppendBufPlain(Target, HKEY(""), 0); + for (i = bq; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY(""), 0); + bn = bq; - if ((intext == 1) && (isspace(buf[0]))) { - wprintf("
"); - } - intext = 1; + if (StrLength(Line) == 0) + continue; - /** - * 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(""), 0); } + StrBufAppendBufPlain(Target, HKEY(""); - bq = 1; - } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf(""); - bq = 0; - } - if ((bq == 1) && (!strncmp(buf, " >", 2))) { - strcpy(buf, &buf[2]); + /* Activate embedded URL's */ + UrlizeText(Line1, Line, Line2); + + StrEscAppend(Target, Line1, NULL, 0, 0); + + StrBufAppendBufPlain(Target, HKEY("\n"), 0); } + while ((BufPtr != StrBufNOTNULL) && + (BufPtr != NULL)); - msgescputs(buf); - } - if (bq == 1) { - wprintf(""); + for (i = 0; i < bn; i++) { + StrBufAppendBufPlain(Target, HKEY("