X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fserv_func.c;h=b0427be542e162b70fe7beebaf82939936309537;hp=228c5b7e69ea8d4838fbca73ee9d25778da964d8;hb=5e96c2718b49483ac4098a16da52b0724bb7cf9e;hpb=f5c1330914acc193f96892efc191a32ee537dfb5 diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 228c5b7e6..b0427be54 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -33,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); @@ -51,6 +50,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) ServInfo *info; StrBuf *Buf; int a; + int rc; Buf = NewStrBuf(); @@ -64,7 +64,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) ); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 2) { - lprintf(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 +78,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) serv_puts("ICAL sgi|1"); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 2) { - lprintf(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 +88,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) serv_puts("INFO"); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) != 1) { - lprintf(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; @@ -97,7 +97,11 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) info = (ServInfo*)malloc(sizeof(ServInfo)); memset(info, 0, sizeof(ServInfo)); a = 0; - while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) { + while (rc = StrBuf_ServGetln(Buf), + (rc >= 0) && + ((rc != 3) || + strcmp(ChrPtr(Buf), "000"))) + { switch (a) { case 0: info->serv_pid = StrToi(Buf); @@ -124,9 +128,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *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; @@ -148,6 +149,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) case 23: info->serv_supports_openid = StrToi(Buf); break; + case 24: + info->serv_supports_guest = StrToi(Buf); + break; } ++a; } @@ -168,7 +172,7 @@ int GetConnected (void) WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport); if (WCC->serv_sock < 0) { - do_logout(); + WCC->connected = 0; FreeStrBuf(&WCC->ReadBuf); return 1; } @@ -183,7 +187,9 @@ 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.")); } else { @@ -191,14 +197,14 @@ int GetConnected (void) 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, @@ -219,7 +225,7 @@ int GetConnected (void) if (WCC->serv_info == NULL){ begin_burst(); wc_printf(_("Received unexpected answer from Citadel server; bailing out.")); - hprintf("HTTP/1.1 200 OK\r\n"); + hprintf("HTTP/1.1 502 Bad Gateway\r\n"); hprintf("Content-type: text/plain; charset=utf-8\r\n"); end_burst(); end_webcit_session(); @@ -248,57 +254,8 @@ int GetConnected (void) return 0; } -/* - * Read Citadel variformat text and spit it out as HTML. - * align html align string - */ -inline void fmout(char *align) -{ - _fmout(WC->WBuf, align); -} -void _fmout(StrBuf *Target, 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, char *align, StrBuf *Source) +void FmOut(StrBuf *Target, const char *align, const StrBuf *Source) { const char *ptr, *pte; const char *BufPtr = NULL; @@ -374,48 +331,6 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) } -/* - * 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]))) { - 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))) { - wc_printf("
"); - bq = 1; - } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wc_printf("
"); - bq = 0; - } - if ((bq == 1) && (!strncmp(buf, " >", 2))) { - strcpy(buf, &buf[2]); - } - - msgescputs(buf); - } - if (bq == 1) { - wc_printf(""); - } -} - - - /* * Transmit message text (in memory) to the server. @@ -461,71 +376,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); } @@ -560,32 +417,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; } @@ -594,6 +460,14 @@ void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) StrBufAppendPrintf(Target, "%d", WC->ctdl_pid); } +void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_sysadm, 0); +} + void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -643,6 +517,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; @@ -709,6 +591,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) { @@ -761,18 +649,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); + + }