if StrBuf_ServGetln() is called in a loop, its return value has to be checked for...

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 3b8655f068c0e4726a3e8a38667bc719b63ddedf..0c89245516b225e459433d0ba970a0ef5863067a 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "webcit.h"
 #include "webserver.h"
@@ -36,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);
@@ -54,6 +50,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        ServInfo *info;
        StrBuf *Buf;
        int a;
+       int rc;
 
        Buf = NewStrBuf();
 
@@ -67,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(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -81,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(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -91,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(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -100,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);
@@ -127,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;
@@ -151,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;
        }
@@ -171,7 +172,6 @@ int GetConnected (void)
                WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
        
        if (WCC->serv_sock < 0) {
-               do_logout();
                FreeStrBuf(&WCC->ReadBuf);
                return 1;
        }
@@ -187,6 +187,8 @@ int GetConnected (void)
                /* 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 {
@@ -194,12 +196,16 @@ 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,
@@ -214,12 +220,13 @@ int GetConnected (void)
                        }
                        locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
                }
-               if (WCC->serv_info == NULL)
+               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 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();
@@ -267,7 +274,7 @@ void _fmout(StrBuf *Target, char *align)
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
@@ -295,7 +302,7 @@ void _fmout(StrBuf *Target, char *align)
        if (bq == 1) {
                wc_printf("</I>");
        }
-       wc_printf("</div><br />\n");
+       wc_printf("</div><br>\n");
 }
 
 void FmOut(StrBuf *Target, char *align, StrBuf *Source)
@@ -387,7 +394,7 @@ void pullquote_fmout(void) {
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br />");
+                       wc_printf("<br>");
                }
                intext = 1;
 
@@ -659,6 +666,14 @@ int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
        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;
@@ -755,7 +770,8 @@ InitModule_SERVFUNC
 
        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:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, 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);
        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);