X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=5e58b755a6e5c879418b224d0949d468fb829b9b;hb=c6aec42f213ec284e34648f3d69bcf927dccddb1;hp=d3ef2977202e2c008f3d4e8f91aa21c8f2023832;hpb=dc4679ebfb997ad5941b5a32b8e0f1fd0488ea68;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index d3ef29772..5e58b755a 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,5 +1,6 @@ + /* - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2021 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. @@ -25,9 +26,6 @@ #include #include #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #include #ifdef HAVE_LIMITS_H #include @@ -64,8 +62,6 @@ #define _(string) (string) #endif -#define IsEmptyStr(a) ((a)[0] == '\0') - #define DO_DBG_QR 0 #define DBG_QR(x) if(DO_DBG_QR) _DBG_QR(x) #define DBG_QR2(x) if(DO_DBG_QR) _DBG_QR2(x) @@ -92,9 +88,10 @@ typedef struct wcsession wcsession; #include "roomops.h" #include "preferences.h" -#include "tcp_sockets.h" +#include "sockets.h" #include "utils.h" #ifdef HAVE_OPENSSL + /* Work around RedHat's b0rken OpenSSL includes */ #define OPENSSL_NO_KRB5 #include @@ -104,7 +101,7 @@ extern char *ssl_cipher_list; #define DEFAULT_SSL_CIPHER_LIST "DEFAULT" /* See http://openssl.org/docs/apps/ciphers.html */ #endif -#if SIZEOF_SIZE_T == SIZEOF_INT +#if SIZEOF_SIZE_T == SIZEOF_INT #define SIZE_T_FMT "%d" #else #define SIZE_T_FMT "%ld" @@ -119,107 +116,42 @@ extern char *ssl_cipher_list; #define CALENDAR_ROOM_NAME "Calendar" #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" -#define SIZ 4096 /* generic buffer size */ +#define SIZ 4096 /* generic buffer size */ #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__) -#define SLEEPING 180 /* TCP connection timeout */ -#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ -#define PORT_NUM 2000 /* port number to listen on */ +#ifdef UNDEF_MEMCPY +#undef memcpy +#endif + +#define SLEEPING 180 /* TCP connection timeout */ +#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ +#define PORT_NUM 80 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 813 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 813 /* Minimum required version of Citadel server */ -#define LIBCITADEL_MIN 813 /* Minimum required version of libcitadel */ -#define DEFAULT_HOST "localhost" /* Default Citadel server */ -#define DEFAULT_PORT "504" +#define CLIENT_VERSION 957 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 931 /* Minimum required version of Citadel server */ +#define LIBCITADEL_MIN 931 /* Minimum required version of libcitadel */ +#define DEFAULT_CTDLDIR "/usr/local/citadel" /* Default Citadel server directory */ #define TARGET "webcit01" /* Window target for inline URL's */ -#define HOUSEKEEPING 15 /* Housekeeping frequency */ +#define HOUSEKEEPING 15 /* Housekeeping frequency */ #define MAX_WORKER_THREADS 250 -#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */ +#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */ #define USERCONFIGROOM "My Citadel Config" #define DEFAULT_MAXMSGS 20 - #ifdef LIBCITADEL_VERSION_NUMBER #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN #error libcitadel is too old. Please upgrade it before continuing. #endif #endif - -/* - * Room flags (from Citadel) - * - * bucket one... - */ -#define QR_PERMANENT 1 /* Room does not purge */ -#define QR_INUSE 2 /* Set if in use, clear if avail */ -#define QR_PRIVATE 4 /* Set for any type of private room */ -#define QR_PASSWORDED 8 /* Set if there's a password too */ -#define QR_GUESSNAME 16 /* Set if it's a guessname room */ -#define QR_DIRECTORY 32 /* Directory room */ -#define QR_UPLOAD 64 /* Allowed to upload */ -#define QR_DOWNLOAD 128 /* Allowed to download */ -#define QR_VISDIR 256 /* Visible directory */ -#define QR_ANONONLY 512 /* Anonymous-Only room */ -#define QR_ANONOPT 1024 /* Anonymous-Option room */ -#define QR_NETWORK 2048 /* Shared network room */ -#define QR_PREFONLY 4096 /* Preferred status needed to enter */ -#define QR_READONLY 8192 /* Aide status required to post */ -#define QR_MAILBOX 16384 /* Set if this is a private mailbox */ - -/* - * bucket two... - */ -#define QR2_SYSTEM 1 /* System room; hide by default */ -#define QR2_SELFLIST 2 /* Self-service mailing list mgmt */ -#define QR2_COLLABDEL 4 /* Anyone who can post can also delete */ -#define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ -#define QR2_SMTP_PUBLIC 16 /* smtp public postable room */ -#define QR2_MODERATED 32 /* Listservice aide has to permit posts */ - -/* - * user/room access - */ -#define UA_KNOWN 2 -#define UA_GOTOALLOWED 4 -#define UA_HASNEWMSGS 8 -#define UA_ZAPPED 16 -#define UA_POSTALLOWED 32 -#define UA_ADMINALLOWED 64 -#define UA_DELETEALLOWED 128 -#define UA_ISTRASH 256 /* Only available in room view... */ - - -/* - * User flags (from Citadel) - */ -#define US_NEEDVALID 1 /* User needs to be validated */ -#define US_PERM 4 /* Permanent user */ -#define US_LASTOLD 16 /* Print last old message with new */ -#define US_EXPERT 32 /* Experienced user */ -#define US_UNLISTED 64 /* Unlisted userlog entry */ -#define US_NOPROMPT 128 /* Don't prompt after each message */ -#define US_PROMPTCTL 256 /* ext & top work at prompt */ -#define US_DISAPPEAR 512 /* Use "disappearing msg prompts" */ -#define US_REGIS 1024 /* Registered user */ -#define US_PAGINATOR 2048 /* Pause after each screen of text */ -#define US_INTERNET 4096 /* Internet mail privileges */ -#define US_FLOORS 8192 /* User wants to see floors */ -#define US_COLOR 16384 /* User wants ANSI color support */ -#define US_USER_SET (US_LASTOLD | US_EXPERT | US_UNLISTED | \ - US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \ - US_FLOORS | US_COLOR | US_PROMPTCTL ) - - - #define SRV_STATUS_MSG(ServerLineBuf) (ChrPtr(ServerLineBuf) + 4), (StrLength(ServerLineBuf) - 4) #define MAJORCODE(a) (((int)(a / 100) ) * 100) #define LISTING_FOLLOWS 100 -#define CIT_OK 200 +#define CIT_OK 200 #define MORE_DATA 300 #define SEND_LISTING 400 #define ERROR 500 @@ -229,27 +161,27 @@ extern char *ssl_cipher_list; #define ASYNC_MSG 900 #define MINORCODE(a) (a % 100) -#define ASYNC_GEXP 02 -#define INTERNAL_ERROR 10 -#define TOO_BIG 11 -#define ILLEGAL_VALUE 12 -#define NOT_LOGGED_IN 20 -#define CMD_NOT_SUPPORTED 30 -#define SERVER_SHUTTING_DOWN 31 -#define PASSWORD_REQUIRED 40 -#define ALREADY_LOGGED_IN 41 -#define USERNAME_REQUIRED 42 -#define HIGHER_ACCESS_REQUIRED 50 -#define MAX_SESSIONS_EXCEEDED 51 -#define RESOURCE_BUSY 52 -#define RESOURCE_NOT_OPEN 53 -#define NOT_HERE 60 -#define INVALID_FLOOR_OPERATION 61 -#define NO_SUCH_USER 70 -#define FILE_NOT_FOUND 71 -#define ROOM_NOT_FOUND 72 -#define NO_SUCH_SYSTEM 73 -#define ALREADY_EXISTS 74 +#define ASYNC_GEXP 02 +#define INTERNAL_ERROR 10 +#define TOO_BIG 11 +#define ILLEGAL_VALUE 12 +#define NOT_LOGGED_IN 20 +#define CMD_NOT_SUPPORTED 30 +#define SERVER_SHUTTING_DOWN 31 +#define PASSWORD_REQUIRED 40 +#define ALREADY_LOGGED_IN 41 +#define USERNAME_REQUIRED 42 +#define HIGHER_ACCESS_REQUIRED 50 +#define MAX_SESSIONS_EXCEEDED 51 +#define RESOURCE_BUSY 52 +#define RESOURCE_NOT_OPEN 53 +#define NOT_HERE 60 +#define INVALID_FLOOR_OPERATION 61 +#define NO_SUCH_USER 70 +#define FILE_NOT_FOUND 71 +#define ROOM_NOT_FOUND 72 +#define NO_SUCH_SYSTEM 73 +#define ALREADY_EXISTS 74 #define MESSAGE_NOT_FOUND 75 /* @@ -261,42 +193,38 @@ extern char *ssl_cipher_list; /* * Expiry policy for the autopurger */ -#define EXPIRE_NEXTLEVEL 0 /* Inherit expiration policy */ -#define EXPIRE_MANUAL 1 /* Don't expire messages at all */ -#define EXPIRE_NUMMSGS 2 /* Keep only latest n messages */ -#define EXPIRE_AGE 3 /* Expire messages after n days */ typedef struct __ExpirePolicy { - int expire_mode; - int expire_value; + int expire_mode; + int expire_value; } ExpirePolicy; -void LoadExpirePolicy(GPEXWhichPolicy which); -void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which); /* * Linked list of session variables encoded in an x-www-urlencoded content type */ typedef struct urlcontent urlcontent; struct urlcontent { - char url_key[32]; /* key */ - StrBuf *url_data; /* value */ + char url_key[32]; /* key */ + long klen; + StrBuf *url_data; /* value */ + HashList *sub; }; /* * Information about the Citadel server to which we are connected - */ + */ typedef struct _serv_info { - int serv_pid; /* Process ID of the Citadel server */ - StrBuf *serv_nodename; /* Node name of the Citadel server */ - StrBuf *serv_humannode; /* Juman readable node name of the Citadel server */ - StrBuf *serv_fqdn; /* Fully qualified Domain Name (such as uncensored.citadel.org) */ - StrBuf *serv_software; /* Free form text description of the server software in use */ - int serv_rev_level; /* Server version number (times 100) */ - StrBuf *serv_bbs_city; /* Geographic location of the Citadel server */ - StrBuf *serv_sysadm; /* Name of system administrator */ - int serv_supports_ldap; /* is the server linked against an ldap tree for adresses? */ + int serv_pid; /* Process ID of the Citadel server */ + StrBuf *serv_nodename; /* Node name of the Citadel server */ + StrBuf *serv_humannode; /* Juman readable node name of the Citadel server */ + StrBuf *serv_fqdn; /* Fully qualified Domain Name (such as uncensored.citadel.org) */ + StrBuf *serv_software; /* Free form text description of the server software in use */ + int serv_rev_level; /* Server version number (times 100) */ + StrBuf *serv_bbs_city; /* Geographic location of the Citadel server */ + StrBuf *serv_sysadm; /* Name of system administrator */ + int serv_supports_ldap; /* is the server linked against an ldap tree for adresses? */ int serv_newuser_disabled; /* Has the server disabled self-service new user creation? */ - StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ + StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ int serv_supports_sieve; /* Server supports Sieve mail filtering */ int serv_fulltext_enabled; /* Full text index is enabled */ StrBuf *serv_svn_revision; /* svn or git revision of the server */ @@ -305,35 +233,31 @@ typedef struct _serv_info { } ServInfo; -typedef struct _disp_cal { - icalcomponent *cal; /* cal items for display */ - long cal_msgnum; /* cal msgids for display */ - char *from; /* owner of this component */ - int unread; /* already seen by the user? */ +typedef struct _disp_cal { + icalcomponent *cal; /* cal items for display */ + long cal_msgnum; /* cal msgids for display */ + char *from; /* owner of this component */ + int unread; /* already seen by the user? */ time_t event_start; time_t event_end; int multi_day_event; int is_repeat; - icalcomponent *SortBy; /* cal items for display */ + icalcomponent *SortBy; /* cal items for display */ icalproperty_status Status; -} disp_cal; +} disp_cal; -typedef struct _IcalEnumMap { +typedef struct _IcalKindEnumMap { const char *Name; long NameLen; icalproperty_kind map; -} IcalEnumMap; - -/* - * Address book entry (keep it short and sweet, it's just a quickie lookup - * which we can use to get to the real meat and bones later) - */ -typedef struct _addrbookent { - char ab_name[64]; /* name string */ - long ab_msgnum; /* message number of address book entry */ -} addrbookent; +} IcalKindEnumMap; +typedef struct _IcalMethodEnumMap { + const char *Name; + long NameLen; + icalproperty_method map; +} IcalMethodEnumMap; #define AJAX (1<<0) @@ -354,7 +278,7 @@ typedef struct _addrbookent { #define DATEFMT_BRIEF 1 #define DATEFMT_RAWDATE 2 #define DATEFMT_LOCALEDATE 3 -void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format); +long webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format); typedef enum _RESTDispatchID { @@ -365,7 +289,7 @@ typedef enum _RESTDispatchID { typedef int (*WebcitRESTDispatchID)(RESTDispatchID WhichAction, int IgnoreFloor); typedef void (*WebcitHandlerFunc)(void); -typedef struct _WebcitHandler{ +typedef struct _WebcitHandler { WebcitHandlerFunc F; WebcitRESTDispatchID RID; long Flags; @@ -373,21 +297,18 @@ typedef struct _WebcitHandler{ StrBuf *DisplayName; } WebcitHandler; - -void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags); +void WebcitAddUrlHandler(const char *UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags); typedef struct _headereval { ExamineMsgHeaderFunc evaluator; int Type; } headereval; - struct attach_link { char partnum[32]; char html[1024]; }; - enum { eUp, eDown, @@ -413,10 +334,8 @@ extern const char *ReqStrs[eNONE]; #define AUTH_COOKIE 1 #define AUTH_BASIC 2 - - typedef struct _HdrRefs { - long eReqType; /* HTTP method */ + long eReqType; /* HTTP method */ int desired_session; int SessionKey; @@ -424,7 +343,7 @@ typedef struct _HdrRefs { int DontNeedAuth; long ContentLength; time_t if_modified_since; - int gzip_ok; /* Nonzero if Accept-encoding: gzip */ + int gzip_ok; /* Nonzero if Accept-encoding: gzip */ int prohibit_caching; int dav_depth; int Static; @@ -443,7 +362,11 @@ typedef struct _HdrRefs { } HdrRefs; typedef struct _ParsedHttpHdrs { - int http_sock; /* HTTP server socket */ + int http_sock; /* HTTP server socket */ + long HaveRange; + long RangeStart; + long RangeTil; + long TotalBytes; const char *Pos; StrBuf *ReadBuf; @@ -451,109 +374,114 @@ typedef struct _ParsedHttpHdrs { StrBuf *c_password; StrBuf *c_roomname; StrBuf *c_language; - StrBuf *this_page; /* URL of current page */ - StrBuf *PlainArgs; + StrBuf *this_page; /* URL of current page */ + StrBuf *PlainArgs; StrBuf *HostHeader; - HashList *urlstrings; /* variables passed to webcit in a URL */ - HashList *HTTPHeaders; /* the headers the client sent us */ - int nWildfireHeaders; /* how many wildfire headers did we already send? */ + HashList *urlstrings; /* variables passed to webcit in a URL */ + HashList *HTTPHeaders; /* the headers the client sent us */ + int nWildfireHeaders; /* how many wildfire headers did we already send? */ HdrRefs HR; } ParsedHttpHdrs; - /* * One of these is kept for each active Citadel session. * HTTP transactions are bound to one at a time. */ struct wcsession { + /* infrastructural members */ - wcsession *next; /* Linked list */ - pthread_mutex_t SessionMutex; /* mutex for exclusive access */ - int wc_session; /* WebCit session ID */ - int killthis; /* Nonzero == purge this session */ - int ctdl_pid; /* Session ID on the Citadel server */ - int nonce; /* session nonce (to prevent session riding) */ - int inuse; /* set to nonzero if bound to a running thread */ + wcsession *next; /* Linked list */ + pthread_mutex_t SessionMutex; /* mutex for exclusive access */ + int wc_session; /* WebCit session ID */ + int killthis; /* Nonzero == purge this session */ + int ctdl_pid; /* Session ID on the Citadel server */ + int nonce; /* session nonce (to prevent session riding) */ + int inuse; /* set to nonzero if bound to a running thread */ + int isFailure; /* Http 2xx or 5xx? */ /* Session local Members */ - int serv_sock; /* Client socket to Citadel server */ - StrBuf *ReadBuf; /* linebuffered reads from the server */ - StrBuf *MigrateReadLineBuf; /* here we buffer legacy server read stuff */ - const char *ReadPos; /* whats our read position in ReadBuf? */ - int last_chat_seq; /* When in chat - last message seq# we saw */ - time_t lastreq; /* Timestamp of most recent HTTP */ - time_t last_pager_check; /* last time we polled for instant msgs */ - ServInfo *serv_info; /* Information about the citserver we're connected to */ - StrBuf *PushedDestination; /* Where to go after login, registration, etc. */ + int serv_sock; /* Client socket to Citadel server */ + StrBuf *ReadBuf; /* linebuffered reads from the server */ + StrBuf *MigrateReadLineBuf; /* here we buffer legacy server read stuff */ + const char *ReadPos; /* whats our read position in ReadBuf? */ + int last_chat_seq; /* When in chat - last message seq# we saw */ + time_t lastreq; /* Timestamp of most recent HTTP */ + time_t last_pager_check; /* last time we polled for instant msgs */ + ServInfo *serv_info; /* Information about the citserver we're connected to */ + StrBuf *PushedDestination; /* Where to go after login, registration, etc. */ /* Request local Members */ - StrBuf *CLineBuf; /* linebuffering client stuff */ + StrBuf *CLineBuf; /* linebuffering client stuff */ ParsedHttpHdrs *Hdr; - StrBuf *WBuf; /* Our output buffer */ - StrBuf *HBuf; /* Our HeaderBuffer */ - StrBuf *WFBuf; /* Wildfire error logging buffer */ - StrBuf *trailing_javascript; /* extra javascript to be appended to page */ + StrBuf *WBuf; /* Our output buffer */ + StrBuf *HBuf; /* Our HeaderBuffer */ + StrBuf *WFBuf; /* Wildfire error logging buffer */ + StrBuf *trailing_javascript; /* extra javascript to be appended to page */ StrBuf *ImportantMsg; - HashList *Directory; /* Parts of the directory URL in snippets */ - const Floor *CurrentFloor; /* when Parsing REST, which floor are we on? */ + HashList *Directory; /* Parts of the directory URL in snippets */ + const Floor *CurrentFloor; /* when Parsing REST, which floor are we on? */ /* accounting */ - StrBuf *wc_username; /* login name of current user */ - StrBuf *wc_fullname; /* Screen name of current user */ - StrBuf *wc_password; /* Password of current user */ - StrBuf *httpauth_pass; /* only for GroupDAV sessions */ - int axlevel; /* this user's access level */ - int is_aide; /* nonzero == this user is an Aide */ - int connected; /* nonzero == we are connected to Citadel */ - int logged_in; /* nonzero == we are logged in */ - int need_regi; /* This user needs to register. */ - int need_vali; /* New users require validation. */ + StrBuf *wc_username; /* login name of current user */ + StrBuf *wc_fullname; /* Screen name of current user */ + StrBuf *wc_password; /* Password of current user */ + StrBuf *httpauth_pass; /* only for GroupDAV sessions */ + int axlevel; /* this user's access level */ + int is_aide; /* nonzero == this user is an Admin */ + int connected; /* nonzero == we are connected to Citadel */ + int logged_in; /* nonzero == we are logged in */ + int need_regi; /* This user needs to register. */ + int need_vali; /* New users require validation. */ /* Preferences */ - StrBuf *cs_inet_email; /* User's preferred Internet addr. */ - HashList *hash_prefs; /* WebCit preferences for this user */ - StrBuf *DefaultCharset; /* Charset the user preferes */ - int downloaded_prefs; /* Has the client download its prefs yet? */ - int SavePrefsToServer; /* Should we save our preferences to the server at the end of the request? */ - int selected_language; /* Language selected by user */ - int time_format_cache; /* which timeformat does our user like? */ - - folder CurRoom; /* information about our current room */ - const folder *ThisRoom; /* if REST found a room, remember it here. */ + StrBuf *cs_inet_email; /* User's preferred Internet addr. */ + HashList *hash_prefs; /* WebCit preferences for this user */ + StrBuf *DefaultCharset; /* Charset the user preferes */ + int downloaded_prefs; /* Has the client download its prefs yet? */ + int SavePrefsToServer; /* Should we save our preferences to the server at the end of the request? */ + int selected_language; /* Language selected by user */ + int time_format_cache; /* which timeformat does our user like? */ + + folder CurRoom; /* information about our current room */ + const folder *ThisRoom; /* if REST found a room, remember it here. */ + /* next/previous room thingabob */ - struct march *march; /* march mode room list */ - char ugname[128]; /* where does 'ungoto' take us */ - long uglsn; /* last seen message number for ungoto */ + struct march *march; /* march mode room list */ + char ugname[128]; /* where does 'ungoto' take us */ + long uglsn; /* last seen message number for ungoto */ /* Uploading; mime attachments for composing messages */ - HashList *attachments; /* list of attachments for 'enter message' */ - int upload_length; /* content length of http-uploaded data */ - StrBuf *upload; /* pointer to http-uploaded data */ - StrBuf *upload_filename; /* filename of http-uploaded data */ - char upload_content_type[256]; /* content type of http-uploaded data */ + HashList *attachments; /* list of attachments for 'enter message' */ + int upload_length; /* content length of http-uploaded data */ + StrBuf *upload; /* pointer to http-uploaded data */ + StrBuf *upload_filename; /* filename of http-uploaded data */ + char upload_content_type[256]; /* content type of http-uploaded data */ - int remember_new_mail; /* last count of new mail messages */ + int remember_new_mail; /* last count of new mail messages */ /* Roomiew control */ - HashList *Floors; /* floors our citserver has hashed numeric for quicker access*/ - HashList *FloorsByName; /* same but hashed by its name */ - HashList *Rooms; /* our directory structure as loaded by LKRA */ - HashList *summ; /* list of messages for mailbox summary view */ + HashList *Floors; /* floors our citserver has hashed numeric for quicker access */ + HashList *FloorsByName; /* same but hashed by its name */ + HashList *Rooms; /* our directory structure as loaded by LKRA */ + HashList *summ; /* list of messages for mailbox summary view */ + /** Perhaps these should be within a struct instead */ - long startmsg; /* message number to start at */ - long maxmsgs; /* maximum messages to display */ - long num_displayed; /* number of messages actually displayed */ - HashList *disp_cal_items; /* sorted list of calendar items; startdate is the sort criteria. */ + long startmsg; /* message number to start at */ + long maxmsgs; /* maximum messages to display */ + long num_displayed; /* number of messages actually displayed */ + HashList *disp_cal_items; /* sorted list of calendar items; startdate is the sort criteria. */ char last_chat_user[256]; + StrBuf *IconTheme; /* Icontheme setting */ + /* Iconbar controls */ int cache_max_folders; int cache_num_floors; - long *IBSettingsVec; /* which icons should be shown / not shown? */ + long *IBSettingsVec; /* which icons should be shown / not shown? */ const StrBuf *floordiv_expanded; /* which floordiv currently expanded */ int ib_wholist_expanded; int ib_roomlist_expanded; @@ -566,16 +494,14 @@ struct wcsession { StrBuf *ConvertBuf2; /* cache stuff for templates. TODO: find a smarter way */ - HashList *ServCfg; /* cache our server config for editing */ - HashList *InetCfg; /* Our inet server config for editing */ + HashList *ServCfg; /* cache our server config for editing */ + HashList *InetCfg; /* Our inet server config for editing */ ExpirePolicy Policy[maxpolicy]; -/* used by the blog viewer */ - int bptlid; /* hash of thread currently being rendered */ }; -typedef void (*Header_Evaluator)(StrBuf *Line, ParsedHttpHdrs *hdr); +typedef void (*Header_Evaluator)(StrBuf * Line, ParsedHttpHdrs * hdr); typedef struct _HttpHeader { Header_Evaluator H; @@ -593,7 +519,7 @@ enum { }; #ifndef num_parms -#define num_parms(source) num_tokens(source, '|') +#define num_parms(source) num_tokens(source, '|') #endif #define site_prefix (WC ? (WC->Hdr->HostHeader) : NULL) @@ -606,34 +532,27 @@ extern pthread_key_t MyConKey; #ifdef HAVE_OPENSSL #define THREADSSL ((SSL *)pthread_getspecific(ThreadSSL)) extern pthread_key_t ThreadSSL; -extern char ctdl_key_dir[PATH_MAX]; -extern char file_crpt_file_key[PATH_MAX]; -extern char file_crpt_file_csr[PATH_MAX]; -extern char file_crpt_file_cer[PATH_MAX]; void init_ssl(void); void endtls(void); -void ssl_lock(int mode, int n, const char *file, int line); int starttls(int sock); -extern SSL_CTX *ssl_ctx; -int client_read_sslbuffer(StrBuf *buf, int timeout); -void client_write_ssl(const StrBuf *Buf); +extern SSL_CTX *ssl_ctx; +int client_read_sslbuffer(StrBuf * buf, int timeout); +int client_write_ssl(const StrBuf * Buf); #endif extern int is_https; extern int follow_xff; extern char *server_cookie; -extern char *ctdlhost, *ctdlport; extern char *axdefs[]; extern int num_threads_existing; extern int num_threads_executing; -extern int setup_wizard; -extern char wizard_filename[]; void InitialiseSemaphores(void); void begin_critical_section(int which_one); void end_critical_section(int which_one); +void CheckGZipCompressionAllowed(const char *MimeType, long MLen); extern void do_404(void); void http_redirect(const char *); @@ -642,180 +561,98 @@ void http_redirect(const char *); #ifdef UBER_VERBOSE_DEBUGGING #define wc_printf(...) wcc_printf(__FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) void wcc_printf(const char *FILE, const char *FUNCTION, long LINE, const char *format, ...); -#else -void wc_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); +#else +void wc_printf(const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); #endif - -void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); - -void CheckAuthBasic(ParsedHttpHdrs *hdr); -void GetAuthBasic(ParsedHttpHdrs *hdr); - +void hprintf(const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); +void CheckAuthBasic(ParsedHttpHdrs * hdr); +void GetAuthBasic(ParsedHttpHdrs * hdr); void sleeeeeeeeeep(int); - size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm); void fmt_time(char *buf, size_t siz, time_t thetime); void httpdate(char *buf, time_t thetime); -time_t httpdate_to_timestamp(StrBuf *buf); - - - - +time_t httpdate_to_timestamp(StrBuf * buf); void end_webcit_session(void); - - - - -void cookie_to_stuff(StrBuf *cookie, - int *session, - StrBuf *user, - StrBuf *pass, - StrBuf *room, - StrBuf *language -); -void locate_host(StrBuf *TBuf, int); -void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response); - +void cookie_to_stuff(StrBuf * cookie, int *session, StrBuf * user, StrBuf * pass, StrBuf * room, StrBuf * language); +void locate_host(StrBuf * TBuf, int); +void become_logged_in(const StrBuf * user, const StrBuf * pass, StrBuf * serv_response); void display_login(void); void display_openids(void); void display_default_landing_page(void); void do_welcome(void); - void display_reg(int during_login); void display_main_menu(void); void display_aide_menu(void); - void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority); void CreateMimeStr(void); - - void pop_destination(void); - -void FmOut(StrBuf *Target, const char *align, const StrBuf *Source); +void FmOut(StrBuf * Target, const char *align, const StrBuf * Source); void wDumpContent(int); - - void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt); - -void output_headers( int do_httpheaders, - int do_htmlhead, - int do_room_banner, - int unset_cookies, - int suppress_check, - int cache); -void output_custom_content_header(const char *ctype); +void output_headers(int do_httpheaders, int do_htmlhead, int do_room_banner, int unset_cookies, int suppress_check, int cache); void cdataout(char *rawdata); - - void url(char *buf, size_t bufsize); -void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); - - -void display_vcard(StrBuf *Target, wc_mime_attachment *Mime, char alpha, int full, char **storename, long msgnum); - +void UrlizeText(StrBuf * Target, StrBuf * Source, StrBuf * WrkBuf); void display_success(const char *successmessage); - void shutdown_sessions(void); - - - StrBuf *load_mimepart(long msgnum, char *partnum); -void MimeLoadData(wc_mime_attachment *Mime); -void do_edit_vcard(long msgnum, char *partnum, - message_summary *VCMsg, - wc_mime_attachment *VCAtt, - const char *return_to, +void MimeLoadData(wc_mime_attachment * Mime); +void do_edit_vcard(long msgnum, char *partnum, message_summary * VCMsg, wc_mime_attachment * VCAtt, const char *return_to, const char *force_room); - void select_user_to_edit(const char *preselect); - void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext); void output_html(const char *, int, int, StrBuf *, StrBuf *); - ssize_t write(int fd, const void *buf, size_t count); -void cal_process_attachment(wc_mime_attachment *Mime); - -void address_book_popup(void); +void cal_process_attachment(wc_mime_attachment * Mime); void begin_ajax_response(void); void end_ajax_response(void); - extern char *months[]; extern char *days[]; -long locate_user_vcard_in_this_room(message_summary **VCMsg, - wc_mime_attachment **VCAtt); +long locate_user_vcard_in_this_room(message_summary ** VCMsg, wc_mime_attachment ** VCAtt); void http_transmit_thing(const char *content_type, int is_static); +void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip); long unescape_input(char *buf); void check_thread_pool_size(void); -void StrEndTab(StrBuf *Target, int tabnum, int num_tabs); -void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names); -void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]); -void tabbed_dialog(int num_tabs, char *tabnames[]); +void StrEndTab(StrBuf * Target, int tabnum, int num_tabs); +void StrBeginTab(StrBuf * Target, int tabnum, int num_tabs, StrBuf ** Names); +void StrTabbedDialog(StrBuf * Target, int num_tabs, StrBuf * tabnames[]); +void tabbed_dialog(int num_tabs, const char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); - -int get_time_format_cached (void); +int get_time_format_cached(void); void display_wiki_pagelist(void); -void str_wiki_index(char *); - -HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP); - -/* actual supported locales */ -void TmplGettext(StrBuf *Target, WCTemplputParams *TP); - +void str_wiki_index(StrBuf *); +HashList *GetRoomListHashLKRA(StrBuf * Target, WCTemplputParams * TP); +void TmplGettext(StrBuf * Target, WCTemplputParams * TP); /* actual supported locales */ void set_selected_language(const char *); void go_selected_language(void); -void stop_selected_language(void); const char *get_selected_language(void); - -void utf8ify_rfc822_string(char **buf); - +// void utf8ify_rfc822_string(char **buf); this is in libcitadel now void begin_burst(void); long end_burst(void); - void AppendImportantMessage(const char *pch, long len); - void http_datestring(char *buf, size_t n, time_t xtime); - +void display_enter(void); /* These should be empty, but we have them for testing */ #define DEFAULT_HTTPAUTH_USER "" #define DEFAULT_HTTPAUTH_PASS "" - /* Exit codes 101 through 109 are initialization failures so we don't want to * just keep respawning indefinitely. */ #define WC_EXIT_BIND 101 /* Can't bind to the port */ #define WC_EXIT_SSL 102 /* Can't initialize SSL */ - #define WC_TIMEFORMAT_NONE 0 #define WC_TIMEFORMAT_AMPM 1 #define WC_TIMEFORMAT_24 2 -extern int time_to_die; /* Nonzero if server is shutting down */ +extern int time_to_die; /* Nonzero if server is shutting down */ extern int DisableGzip; -/* - * Array type for a blog post. The first message is the post; the rest are comments - */ -struct blogpost { - int top_level_id; - long *msgs; /* Array of msgnums for messages we are displaying */ - int num_msgs; /* Number of msgnums stored in 'msgs' */ - int alloc_msgs; /* Currently allocated size of array */ -}; - - -/* - * Data which gets returned from a call to blogview_learn_thread_references() - */ -struct bltr { - int id; - int refs; -}; - - -struct bltr blogview_learn_thread_references(long msgnum); -void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP); void display_summary_page(void); +HashList *GetValidDomainNames(StrBuf * Target, WCTemplputParams * TP); +void output_error_pic(const char *ErrMsg1, const char *ErrMsg2); +void jsonMessageListHdr(void); +extern char *ctdl_dir; /* Directory where Citadel Server is running */