X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=66afe5e12e87dd818c95a461d4371fa6f9ec6fc8;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=2f6c8073526021482cc519ccfefdebf34c874b97;hpb=73a35bec83ea60f5c034290964de64dcd970f43b;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 2f6c80735..66afe5e12 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -1,3 +1,11 @@ +/* + * Functions which handle communication with the Citadel server. + * + * Copyright (c) 1996-2018 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. + */ #include "webcit.h" #include "webserver.h" @@ -64,7 +72,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) ); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 2) { - syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n", + syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n", ChrPtr(Buf)); FreeStrBuf(&Buf); return NULL; @@ -78,7 +86,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) serv_puts("ICAL sgi|1"); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 2) { - syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n", + syslog(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n", ChrPtr(Buf)); FreeStrBuf(&Buf); return NULL; @@ -88,7 +96,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) serv_puts("INFO"); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 1) { - syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n", + syslog(LOG_WARNING, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n", ChrPtr(Buf)); FreeStrBuf(&Buf); return NULL; @@ -172,6 +180,7 @@ int GetConnected (void) WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport); if (WCC->serv_sock < 0) { + WCC->connected = 0; FreeStrBuf(&WCC->ReadBuf); return 1; } @@ -186,7 +195,7 @@ int GetConnected (void) /* Server isn't ready for us? */ if (short_status != 2) { - if (Status == 571) { + if (Status == 551) { 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.")); @@ -253,55 +262,6 @@ int GetConnected (void) return 0; } -/* - * Read Citadel variformat text and spit it out as HTML. - * align html align string - */ -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]; - - StrBufAppendPrintf(Target, "
\n", align); - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - - if ((intext == 1) && (isspace(buf[0]))) { - 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. - */ - 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); - StrBufAppendBufPlain(Target, HKEY("\n"), 0); - } - if (bq == 1) { - wc_printf(""); - } - wc_printf("

\n"); -} void FmOut(StrBuf *Target, const char *align, const StrBuf *Source) { @@ -424,71 +384,13 @@ void text_to_server(char *ptr) /* * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go. */ -void text_to_server_qp(char *ptr) +void text_to_server_qp(const StrBuf *SendMeEncoded) { - 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++]); + StrBuf *ServBuf; - 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; - } + ServBuf = StrBufRFC2047encodeMessage(SendMeEncoded); + serv_putbuf(ServBuf); + FreeStrBuf(&ServBuf); } @@ -523,32 +425,41 @@ void server_to_text() int read_server_text(StrBuf *Buf, long *nLines) { wcsession *WCC = WC; + StrBuf *ReadBuf; long nRead; long nTotal = 0; long nlines; nlines = 0; + ReadBuf = NewStrBuf(); while ((WCC->serv_sock!=-1) && - (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) )) + (nRead = StrBuf_ServGetln(ReadBuf), (nRead >= 0) && + ((nRead != 3)||(strcmp(ChrPtr(ReadBuf), "000") != 0)))) { - if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) { - StrBufCutRight(Buf, nRead); - break; - } + StrBufAppendBuf(Buf, ReadBuf, 0); + StrBufAppendBufPlain(Buf, HKEY("\n"), 0); nTotal += nRead; nlines ++; } - + FreeStrBuf(&ReadBuf); *nLines = nlines; return nTotal; } -int GetServerStatus(StrBuf *Line, long* FullState) +int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK) { + int rc; if (FullState != NULL) *FullState = StrTol(Line); - return ChrPtr(Line)[0] - 48; + rc = ChrPtr(Line)[0] - 48; + if ((!PutImportantMessage) || + (MajorOK == rc)|| + (StrLength(Line) <= 4)) + return rc; + + AppendImportantMessage(ChrPtr(Line) + 4, StrLength(Line) - 4); + return rc; } @@ -599,12 +510,8 @@ void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) { - wcsession *WCC = WC; - if (WCC->serv_info == NULL) - return; - StrBufAppendPrintf(Target, "%d.%02d", - WCC->serv_info->serv_rev_level / 100, - WCC->serv_info->serv_rev_level % 100); + if (WC->serv_info == NULL) return; + StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level); } int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) { @@ -614,6 +521,14 @@ int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) return WCC->serv_info->serv_newuser_disabled != 0; } +int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_supports_guest != 0; +} + int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -680,6 +595,12 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) FreeStrBuf(&Line); } +void tmplput_site_prefix(StrBuf *Target, WCTemplputParams *TP) { + wcsession *WCC = WC; + if ((WCC != NULL) && (WCC->Hdr->HostHeader != NULL)) { + StrBufAppendTemplate(Target, TP, WCC->Hdr->HostHeader, 0); + } +} void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority) { @@ -732,19 +653,25 @@ InitModule_SERVFUNC 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); - 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); + RegisterConditional("COND:SERV:OPENID", 2, conditional_serv_supports_openid, CTX_NONE); + RegisterConditional("COND:SERV:NEWU", 2, conditional_serv_newuser_disabled, CTX_NONE); + RegisterConditional("COND:SERV:FULLTEXT_ENABLED", 2, conditional_serv_fulltext_enabled, CTX_NONE); + RegisterConditional("COND:SERV:LDAP_ENABLED", 2, conditional_serv_ldap_enabled, CTX_NONE); + RegisterConditional("COND:SERV:SUPPORTS_GUEST", 2, conditional_serv_supports_guest, 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); RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE); + + RegisterNamespace("SERV:SITE:PREFIX", 0, 1, tmplput_site_prefix, NULL, CTX_NONE); + + }