X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=88289bde65adabc9c242d14b94dac00a303fef1a;hb=1f494963f66495189901c38c84cbc6d6b3e9f952;hp=9e7f0524fc816e27aaf46317e5d8d363b71423e2;hpb=3f1b85695cf9338d2b5f7fc7f9f8afedcb9d608c;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 9e7f0524f..88289bde6 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -5,32 +5,52 @@ #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] = ""; + +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_moreprompt); + 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 * 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; + 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); + StrBuf_ServGetln(Buf); /** Tell the server what kind of richtext we prefer */ - serv_puts("MSGP text/html|text/plain"); - serv_getln(buf, sizeof buf); + serv_puts("MSGP text/calendar|text/vnote|text/html|text/plain"); + StrBuf_ServGetln(Buf); /* * Tell the server that when we save a calendar event, we @@ -38,84 +58,249 @@ 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); /** 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) { + 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 (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) { +/* lprintf (1, "a: %d [%s]", a, ChrPtr(Buf));*/ 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); + info->serv_sysadm = NewStrBufDup(Buf); break; case 9: - safestrncpy(serv_info.serv_moreprompt, buf, sizeof serv_info.serv_moreprompt); + info->serv_moreprompt = 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; } ++a; } + FreeStrBuf(&Buf); + return info; } +int GetConnected (void) +{ + StrBuf *Buf; + wcsession *WCC = WC; + + if (WCC->ReadBuf == NULL) + WCC->ReadBuf = NewStrBuf(); + 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) { + do_logout(); + FreeStrBuf(&WCC->ReadBuf); + return 1; + } + else { + long Status; + Buf = NewStrBuf(); + WCC->connected = 1; + StrBuf_ServGetln(Buf); /* get the server greeting */ + GetServerStatus(Buf, &Status); + FreeStrBuf(&Buf); + /* Are there too many users already logged in? */ + if (Status == 571) { + wprintf(_("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.")); + 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->browser_host) == 0) ) { + if (WCC->Hdr->browser_host == NULL) { + WCC->Hdr->browser_host = NewStrBuf(); + Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"), + WCC->Hdr->browser_host, HFreeStrBuf); + } + locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock); + } + if (WCC->serv_info == NULL) + WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent); + if (WCC->serv_info == NULL){ + begin_burst(); + wprintf(_("Received unexpected answer from Citadel " + "server; bailing out.")); + 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; + } + if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) { + begin_burst(); + wprintf(_("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; + } + } + if (WCC->ReadBuf == NULL) + WCC->ReadBuf = NewStrBuf(); + 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) { + do_logout(); + FreeStrBuf(&WCC->ReadBuf); + return 1; + } + else { + long Status; + StrBuf *Buf; + + Buf = NewStrBuf(); + WCC->connected = 1; + StrBuf_ServGetln(Buf); + GetServerStatus(Buf,&Status); + /* get the server greeting */ + + /* Are there too many users already logged in? */ + if (Status == 571) { + wprintf(_("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.")); + 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->browser_host) == 0) ) { + if (WCC->Hdr->browser_host == NULL) { + WCC->Hdr->browser_host = NewStrBuf(); + Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"), + WCC->Hdr->browser_host, HFreeStrBuf); + } + locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock); + } + if (WCC->serv_info == NULL) + WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent); + if (WCC->serv_info == NULL){ + begin_burst(); + wprintf(_("Received unexpected answer from Citadel " + "server; bailing out.")); + 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; + } + if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) { + begin_burst(); + wprintf(_("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; + } + } + 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(char *align) +{ + _fmout(WC->WBuf, align); +} + +void _fmout(StrBuf *Target, 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))) { @@ -142,7 +327,7 @@ void fmout(char *align) url(buf, sizeof(buf)); escputs(buf); - wprintf("\n"); + StrBufAppendBufPlain(Target, HKEY("\n"), 0); } if (bq == 1) { wprintf(""); @@ -150,11 +335,79 @@ void fmout(char *align) wprintf(""), 0); bq = 1; } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf(""); + StrBufAppendBufPlain(Target, HKEY("
tags. + */ + 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; + + if (StrLength(Line) == 0) + continue; + /** Activate embedded URL's */ + UrlizeText(Line1, Line, Line2); + + StrEscAppend(Target, Line1, NULL, 0, 0); + + StrBufAppendBufPlain(Target, HKEY("\n"), 0); + } + for (i = 0; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("