X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=4d01fb55802a6095e2b0158cb164a012b10139a5;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=a2eb57c92ccf71aef51bb59f02432d89ea28aea2;hpb=749c2a7e25006217b60af84c3854760454f1f013;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index a2eb57c92..4d01fb558 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -55,9 +55,6 @@ #endif #include #include -#ifdef HAVE_USELOCALE -extern locale_t wc_locales[]; -#endif #define _(string) gettext(string) #else #define _(string) (string) @@ -89,7 +86,11 @@ extern locale_t wc_locales[]; #undef PACKAGE_BUGREPORT #include "sysdep.h" -////////#include "hash.h" +#include "subst.h" +#include "messages.h" +#include "paramhandling.h" +#include "preferences.h" +#include "roomops.h" #ifdef HAVE_OPENSSL /* Work around RedHat's b0rken OpenSSL includes */ @@ -97,8 +98,11 @@ extern locale_t wc_locales[]; #include #include #include +extern char *ssl_cipher_list; +#define DEFAULT_SSL_CIPHER_LIST "DEFAULT" /* See http://openssl.org/docs/apps/ciphers.html */ #endif + #define CALENDAR_ROOM_NAME "Calendar" #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" @@ -111,9 +115,9 @@ extern locale_t wc_locales[]; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 739 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 739 /* min required Citadel ver */ -#define LIBCITADEL_MIN 739 /* min required libcitadel ver */ +#define CLIENT_VERSION 766 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 766 /* min required Citadel ver */ +#define LIBCITADEL_MIN 766 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ @@ -171,6 +175,9 @@ extern locale_t wc_locales[]; #define UA_GOTOALLOWED 4 #define UA_HASNEWMSGS 8 #define UA_ZAPPED 16 +#define UA_POSTALLOWED 32 +#define UA_ADMINALLOWED 64 +#define UA_DELETEALLOWED 128 /* @@ -193,6 +200,42 @@ extern locale_t wc_locales[]; US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \ US_FLOORS | US_COLOR | US_PROMPTCTL ) + +#define MAJORCODE(a) (((int)(a / 100) ) * 100) + +#define LISTING_FOLLOWS 100 +#define CIT_OK 200 +#define MORE_DATA 300 +#define SEND_LISTING 400 +#define ERROR 500 +#define BINARY_FOLLOWS 600 +#define SEND_BINARY 700 +#define START_CHAT_MODE 800 +#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 MESSAGE_NOT_FOUND 75 /* * NLI is the string that shows up in a who's online listing for sessions * that are active, but for which no user has yet authenticated. @@ -201,308 +244,36 @@ extern locale_t wc_locales[]; /* - * \brief Linked list of session variables encoded in an x-www-urlencoded content type + * Linked list of session variables encoded in an x-www-urlencoded content type */ typedef struct urlcontent urlcontent; struct urlcontent { - char url_key[32]; /* the variable name */ - StrBuf *url_data; /* its value */ + char url_key[32]; /* key */ + StrBuf *url_data; /* value */ }; /* - * \brief information about us ??? + * Information about the Citadel server to which we are connected */ -struct serv_info { +typedef struct _serv_info { int serv_pid; /* Process ID of the Citadel server */ - char serv_nodename[32]; /* Node name of the Citadel server */ - char serv_humannode[64]; /* human readable node name of the Citadel server */ - char serv_fqdn[64]; /* fully quallified Domain Name (such as uncensored.citadel.org) */ - char serv_software[64]; /* What version does our connected citadel server use */ + StrBuf *serv_nodename; /* Node name of the Citadel server */ + StrBuf *serv_humannode; /* human readable node name of the Citadel server */ + StrBuf *serv_fqdn; /* fully quallified Domain Name (such as uncensored.citadel.org) */ + StrBuf *serv_software; /* What version does our connected citadel server use */ int serv_rev_level; /* Whats the citadel server revision */ - char serv_bbs_city[64]; /* Geographic location of the Citadel server */ - char serv_sysadm[64]; /* Name of system administrator */ - char serv_moreprompt[256]; /* Whats the commandline textprompt */ - int serv_ok_floors; /* nonzero == server supports floors */ + StrBuf *serv_bbs_city; /* Geographic location of the Citadel server */ + StrBuf *serv_sysadm; /* Name of system administrator */ + StrBuf *serv_moreprompt; /* Whats the commandline textprompt */ 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? */ - char serv_default_cal_zone[128];/* Default timezone for unspecified calendar items */ + StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ int serv_supports_sieve; /* Does the server support Sieve mail filtering? */ int serv_fulltext_enabled; /* Does the server have the full text index enabled? */ - char serv_svn_revision[256]; /* SVN revision of the server */ + StrBuf *serv_svn_revision; /* SVN revision of the server */ int serv_supports_openid; /* Does the server support authentication via OpenID? */ -}; - - - -/* - * \brief This struct holds a list of rooms for \\\oto operations. - */ -struct march { - struct march *next; /* pointer to next in linked list */ - char march_name[128]; /* name of room */ - int march_floor; /* floor number of room */ - int march_order; /* sequence in which we are to visit this room */ -}; - -/* * - * \brief This struct holds a list of rooms for client display. - * It is a binary tree. - */ -struct roomlisting { - struct roomlisting *lnext; /* pointer to 'left' tree node */ - struct roomlisting *rnext; /* pointer to 'right' tree node */ - char rlname[128]; /* name of room */ - unsigned rlflags; /* room flags */ - int rlfloor; /* the floor it resides on */ - int rlorder; /* room listing order */ -}; - - -#define TYPE_STR 1 -#define TYPE_LONG 2 -#define TYPE_PREFSTR 3 -#define TYPE_PREFINT 4 -#define TYPE_GETTEXT 5 -#define TYPE_BSTR 6 -#define MAXPARAM 20 - - -typedef struct _TemplateParam { - const char *Start; - int Type; - long len; - long lvalue; -} TemplateParam; - -typedef struct _TemplateToken { - const StrBuf *FileName; /* Reference to print error messages; not to be freed */ - StrBuf *FlatToken; - long Line; - const char *pTokenStart; - size_t TokenStart; - size_t TokenEnd; - const char *pTokenEnd; - int Flags; - void *PreEval; - - const char *pName; - size_t NameEnd; - - int HaveParameters; - int nParameters; - TemplateParam *Params[MAXPARAM]; -} WCTemplateToken; - -typedef void (*WCHandlerFunc)(); - - -/* - * \brief Dynamic content for variable substitution in templates - */ -typedef struct _wcsubst { - int wcs_type; /* which type of Substitution are we */ - char wcs_key[32]; /* copy of our hashkey for debugging */ - StrBuf *wcs_value; /* if we're a string, keep it here */ - long lvalue; /* type long? keep data here */ - int ContextRequired; /* do we require a context type? */ - WCHandlerFunc wcs_function; /* funcion hook ???*/ -} wcsubst; - -#define CTX_NONE 0 -#define CTX_SITECFG 1 -#define CTX_SESSION 2 -#define CTX_INETCFG 3 -#define CTX_VNOTE 4 -#define CTX_WHO 5 -#define CTX_PREF 6 -#define CTX_NODECONF 7 -#define CTX_USERLIST 8 -#define CTX_MAILSUM 9 -#define CTX_MIME_ATACH 10 -#define CTX_ATT 11 -#define CTX_STRBUF 12 -#define CTX_LONGVECTOR 13 - - -void RegisterNS(const char *NSName, long len, - int nMinArgs, - int nMaxArgs, - WCHandlerFunc HandlerFunc, - int ContextRequired); -#define RegisterNamespace(a, b, c, d, e) RegisterNS(a, sizeof(a)-1, b, c, d, e) - -typedef int (*WCConditionalFunc)(WCTemplateToken *Token, void *Context, int ContextType); -typedef struct _ConditionalStruct { - const char *PlainName; - int nParams; - int ContextRequired; - WCConditionalFunc CondF; -} ConditionalStruct; -void RegisterConditional(const char *Name, long len, - int nParams, - WCConditionalFunc CondF, - int ContextRequired); - - - -typedef void (*SubTemplFunc)(StrBuf *TemplBuffer, void *Context, WCTemplateToken *Token); -typedef HashList *(*RetrieveHashlistFunc)(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType); -typedef void (*HashDestructorFunc) (HashList **KillMe); -void RegisterITERATOR(const char *Name, long len, /* Our identifier */ - int AdditionalParams, /* doe we use more parameters? */ - HashList *StaticList, /* pointer to webcit lifetime hashlists */ - RetrieveHashlistFunc GetHash, /* else retrieve the hashlist by calling this function */ - SubTemplFunc DoSubTempl, /* call this function on each iteration for svput & friends */ - HashDestructorFunc Destructor, /* use this function to shut down the hash; NULL if its a reference */ - int ContextType, /* which context do we provide to the subtemplate? */ - int XPectContextType); /* which context do we expct to be called in? */ -#define RegisterIterator(a, b, c, d, e, f, g, h) RegisterITERATOR(a, sizeof(a)-1, b, c, d, e, f, g, h) - -void GetTemplateTokenString(WCTemplateToken *Tokens, - int N, - const char **Value, - long *len); - - -void SVPut(char *keyname, size_t keylen, int keytype, char *Data); -#define svput(a, b, c) SVPut(a, sizeof(a) - 1, b, c) -void SVPutLong(char *keyname, size_t keylen, long Data); -#define svputlong(a, b) SVPutLong(a, sizeof(a) - 1, b) -void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...) __attribute__((__format__(__printf__,4,5))); -void SVPRINTF(char *keyname, int keytype, const char *format,...) __attribute__((__format__(__printf__,3,4))); -void SVCALLBACK(char *keyname, WCHandlerFunc fcn_ptr); -void SVCallback(char *keyname, size_t keylen, WCHandlerFunc fcn_ptr); -#define svcallback(a, b) SVCallback(a, sizeof(a) - 1, b) - -void SVPUTBuf(const char *keyname, int keylen, const StrBuf *Buf, int ref); -#define SVPutBuf(a, b, c); SVPUTBuf(a, sizeof(a) - 1, b, c) - -void DoTemplate(const char *templatename, long len, StrBuf *Target, void *Context, int ContextType); -#define do_template(a, b) DoTemplate(a, sizeof(a) -1, NULL, b, 0); -void url_do_template(void); - -int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup); -int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup); - -void StrBufAppendTemplate(StrBuf *Target, - int nArgs, - WCTemplateToken *Tokens, - void *Context, int ContextType, - const StrBuf *Source, int FormatTypeIndex); -CompareFunc RetrieveSort(long ContextType, const char *OtherPrefix, - const char *Default, long ldefault, long DefaultDirection); -void RegisterSortFunc(const char *name, long len, - const char *prepend, long preplen, - CompareFunc Forward, - CompareFunc Reverse, - long ContextType); - - -/* - * \brief Values for wcs_type - */ -enum { - WCS_STRING, /* its a string */ - WCS_FUNCTION, /* its a function callback */ - WCS_SERVCMD, /* its a command to send to the citadel server */ - WCS_STRBUF, /* its a strbuf we own */ - WCS_STRBUF_REF, /* its a strbuf we mustn't free */ - WCS_LONG /* its an integer */ -}; - -/* - * \brief mail attachment ??? - */ -typedef struct _wc_attachment { - size_t length; /* length of the contenttype */ - StrBuf *content_type; /* the content itself ???*/ - StrBuf *filename; /* the filename hooked to this content ??? */ - char *data; /* the data pool; aka this content */ - long lvalue; /* if we put a long... */ -} wc_attachment; -void free_attachment(void *vattach); - - -typedef struct wc_mime_attachment wc_mime_attachment; -typedef void (*RenderMimeFunc)(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset); -struct wc_mime_attachment { - int level; - StrBuf *Name; - StrBuf *FileName; - StrBuf *PartNum; - StrBuf *Disposition; - StrBuf *ContentType; - StrBuf *Charset; - StrBuf *Data; - size_t length; /* length of the mimeatachment */ - long size_known; - char content_type[SIZ]; /* the content itself ???*/ - char filename[SIZ]; /* the filename hooked to this content ??? */ - char *data; /* the data pool; aka this content */ - long lvalue; /* if we put a long... */ - long msgnum; /**< the message number on the citadel server derived from message_summary */ - RenderMimeFunc Renderer; -}; -void DestroyMime(void *vMime); - - -/* - * \brief message summary structure. ??? - */ -typedef struct _message_summary { - time_t date; /**< its creation date */ - long msgnum; /**< the message number on the citadel server */ - int nhdr; - int format_type; - StrBuf *from; /**< the author */ - StrBuf *to; /**< the recipient */ - StrBuf *subj; /**< the title / subject */ - StrBuf *reply_inreplyto; - StrBuf *reply_references; - StrBuf *reply_to; - StrBuf *cccc; - StrBuf *hnod; - StrBuf *AllRcpt; - StrBuf *Room; - StrBuf *Rfca; - StrBuf *OtherNode; - const StrBuf *PartNum; - - HashList *Attachments; /**< list of Accachments */ - HashList *Submessages; - HashList *AttachLinks; - - HashList *AllAttach; - - int is_new; /**< is it yet read? */ - int hasattachments; /* does it have atachments? */ - - - /** The mime part of the message */ - wc_mime_attachment *MsgBody; -} message_summary; -void DestroyMessageSummary(void *vMsg); -inline message_summary* GetMessagePtrAt(int n, HashList *Summ); +} ServInfo; -typedef void (*ExamineMsgHeaderFunc)(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset); - -void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime); - - - -/** - * \brief Data structure for roomlist-to-folderlist conversion - */ -struct folder { - int floor; /* which floor is it on */ - char room[SIZ]; /* which roomname ??? */ - char name[SIZ]; /* which is its own name??? */ - int hasnewmsgs; /* are there unread messages inside */ - int is_mailbox; /* is it a mailbox? */ - int selectable; /* can we select it ??? */ - int view; /* whats its default view? inbox/calendar.... */ - int num_rooms; /* If this is a floor, how many rooms does it have */ -}; typedef struct _disp_cal { icalcomponent *cal; /* cal items for display */ @@ -515,20 +286,49 @@ typedef struct _disp_cal { int multi_day_event; int is_repeat; + icalcomponent *SortBy; /* cal items for display */ + icalproperty_status Status; } disp_cal; - +typedef struct _IcalEnumMap { + 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 */ + char ab_name[64]; /* name string */ + long ab_msgnum; /* message number of address book entry */ } addrbookent; +#define AJAX (1<<0) +#define ANONYMOUS (1<<1) +#define NEED_URL (1<<2) +#define XHTTP_COMMANDS (1<<3) +#define BOGUS (1<<4) +#define URLNAMESPACE (1<<4) +#define LOGCHATTY (1<<5) +#define COOKIEUNNEEDED (1<<6) +#define ISSTATIC (1<<7) +#define FORCE_SESSIONCLOSE (1<<8) +#define PARSE_REST_URL (1<<0) + +typedef void (*WebcitHandlerFunc)(void); +typedef struct _WebcitHandler{ + WebcitHandlerFunc F; + long Flags; + StrBuf *Name; + StrBuf *DisplayName; +} WebcitHandler; + + +void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags); + typedef struct _headereval { ExamineMsgHeaderFunc evaluator; int Type; @@ -547,92 +347,200 @@ enum { eNone }; +enum { + eGET, + ePOST, + eOPTIONS, + ePROPFIND, + ePUT, + eDELETE, + eHEAD, + eMOVE, + eCOPY, + eNONE +}; +const char *ReqStrs[eNONE]; + +#define NO_AUTH 0 +#define AUTH_COOKIE 1 +#define AUTH_BASIC 2 + + + +typedef struct _HdrRefs { + long eReqType; /* HTTP method */ + int desired_session; + int SessionKey; + + int got_auth; + int DontNeedAuth; + long ContentLength; + time_t if_modified_since; + int gzip_ok; /* Nonzero if Accept-encoding: gzip */ + int prohibit_caching; + int dav_depth; + + /* these are references into Hdr->HTTPHeaders, so we don't need to free them. */ + StrBuf *ContentType; + StrBuf *RawCookie; + StrBuf *ReqLine; + StrBuf *http_host; /* HTTP Host: header */ + StrBuf *browser_host; + StrBuf *user_agent; + StrBuf *plainauth; + StrBuf *dav_ifmatch; + + const WebcitHandler *Handler; +} HdrRefs; + +typedef struct _ParsedHttpHdrs { + int http_sock; /* HTTP server socket */ + const char *Pos; + StrBuf *ReadBuf; + + StrBuf *c_username; + StrBuf *c_password; + StrBuf *c_roomname; + StrBuf *c_language; + StrBuf *this_page; /* URL of current page */ + StrBuf *PlainArgs; + + 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. */ +typedef struct wcsession wcsession; struct wcsession { - struct wcsession *next; /**< Linked list */ - int wc_session; /**< WebCit session ID */ - char wc_username[128]; /**< login name of current user */ - char wc_fullname[128]; /**< Screen name of current user */ - char wc_password[128]; /**< Password of current user */ - char wc_roomname[256]; /**< Room we are currently in */ - int connected; /**< nonzero == we are connected to Citadel */ - int logged_in; /**< nonzero == we are logged in */ - int axlevel; /**< this user's access level */ - int is_aide; /**< nonzero == this user is an Aide */ - int is_room_aide; /**< nonzero == this user is a Room Aide in this room */ - int http_sock; /**< HTTP server socket */ - int serv_sock; /**< Client socket to Citadel server */ - int chat_sock; /**< Client socket to Citadel server - for chat */ - unsigned room_flags; /**< flags associated with the current room */ - unsigned room_flags2; /**< flags associated with the current room */ - int wc_view; /**< view for the current room */ - int wc_default_view; /**< default view for the current room */ - int wc_is_trash; /**< nonzero == current room is a Trash folder */ - int wc_floor; /**< floor number of current room */ - char ugname[128]; /**< where does 'ungoto' take us */ - long uglsn; /**< last seen message number for ungoto */ - int upload_length; /**< content length of http-uploaded data */ - char *upload; /**< pointer to http-uploaded data */ - char upload_filename[PATH_MAX]; /**< filename of http-uploaded data */ - char upload_content_type[256]; /**< content type of http-uploaded data */ - int new_mail; /**< user has new mail waiting */ - int remember_new_mail; /**< last count of new mail messages */ - int need_regi; /**< This user needs to register. */ - int need_vali; /**< New users require validation. */ - char cs_inet_email[256]; /**< User's preferred Internet addr. */ - pthread_mutex_t SessionMutex; /**< mutex for exclusive access */ - time_t lastreq; /**< Timestamp of most recent HTTP */ - int killthis; /**< Nonzero == purge this session */ - struct march *march; /**< march mode room list */ - char reply_to[512]; /**< reply-to address */ - HashList *summ; /**< list of messages for mailbox summary view */ - int is_mobile; /**< Client is a handheld browser */ - HashList *urlstrings; /**< variables passed to webcit in a URL */ - HashList *vars; /**< HTTP variable substitutions for this page */ - char this_page[512]; /**< URL of current page */ - char http_host[512]; /**< HTTP Host: header */ - HashList *hash_prefs; /**< WebCit preferences for this user */ - HashList *disp_cal_items; /**< sorted list of calendar items; startdate is the sort criteria. */ - HashList *attachments; /**< list of attachments for 'enter message' */ - char last_chat_user[256]; /**< ??? todo */ - char ImportantMessage[SIZ]; /**< ??? todo */ - int ctdl_pid; /**< Session ID on the Citadel server */ - char httpauth_user[256]; /**< only for GroupDAV sessions */ - char httpauth_pass[256]; /**< only for GroupDAV sessions */ - int gzip_ok; /**< Nonzero if Accept-encoding: gzip */ - int is_mailbox; /**< the current room is a private mailbox */ - struct folder *cache_fold; /**< cache the iconbar room list */ - int cache_max_folders; /**< ??? todo */ - int cache_num_floors; /**< ??? todo */ - time_t cache_timestamp; /**< ??? todo */ - HashList *IconBarSetttings; /**< which icons should be shown / not shown? */ - long current_iconbar; /**< What is currently in the iconbar? */ - const StrBuf *floordiv_expanded; /**< which floordiv currently expanded */ - int selected_language; /**< Language selected by user */ - time_t last_pager_check; /**< last time we polled for instant msgs */ - int nonce; /**< session nonce (to prevent session riding) */ - int time_format_cache; /**< which timeformat does our user like? */ - StrBuf *UrlFragment1; /**< first urlfragment, if NEED_URL is specified by the handler*/ - StrBuf *UrlFragment2; /**< second urlfragment, if NEED_URL is specified by the handler*/ - StrBuf *UrlFragment3; /**< third urlfragment, if NEED_URL is specified by the handler*/ - StrBuf *WBuf; /**< Our output buffer */ - StrBuf *HBuf; /**< Our HeaderBuffer */ - StrBuf *CLineBuf; /**< linebuffering client stuff */ - StrBuf *DefaultCharset; /**< Charset the user preferes */ - HashList *ServCfg; /**< cache our server config for editing */ - HashList *InetCfg; /**< Our inet server config for editing */ - - StrBuf *trailing_javascript; /**< extra javascript to be appended to page */ -}; +/* 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 is_mobile; /* Client is a handheld browser */ + int ctdl_pid; /* Session ID on the Citadel server */ + int nonce; /* session nonce (to prevent session riding) */ + int SessionKey; + +/* Session local Members */ + int serv_sock; /* Client socket to Citadel server */ + StrBuf *ReadBuf; /* here we keep our stuff while reading linebuffered from the server. */ + StrBuf *MigrateReadLineBuf; /* here we buffer legacy server read stuff */ + const char *ReadPos; /* whats our read position in ReadBuf? */ + int chat_sock; /* Client socket to Citadel server - for chat */ + 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 */ + int is_ajax; /* are we doing an ajax request? */ + +/* Request local Members */ + StrBuf *CLineBuf; /* linebuffering client stuff */ + ParsedHttpHdrs *Hdr; + StrBuf *WBuf; /* Our output buffer */ + StrBuf *HBuf; /* Our HeaderBuffer */ + + HashList *vars; /* HTTP variable substitutions for this page */ + StrBuf *trailing_javascript; /* extra javascript to be appended to page */ + char ImportantMessage[SIZ]; + StrBuf *ImportantMsg; + 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 is_room_aide; /* nonzero == this user is a Room Aide in this room */ + 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. */ + char reply_to[512]; /* reply-to address */ + 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? */ + +/* current room related */ + StrBuf *wc_roomname; /* Room we are currently in */ + unsigned room_flags; /* flags associated with the current room */ + unsigned room_flags2; /* flags associated with the current room */ + int wc_view; /* view for the current room */ + int wc_default_view; /* default view for the current room */ + int wc_is_trash; /* nonzero == current room is a Trash folder */ + int wc_floor; /* floor number of current room */ + int is_mailbox; /* the current room is a private mailbox */ + +/* 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 */ + +/* 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 */ + char upload_filename[PATH_MAX]; /* filename of http-uploaded data */ + char upload_content_type[256]; /* content type of http-uploaded data */ + + int new_mail; /* user has new mail waiting */ + int remember_new_mail; /* last count of new mail messages */ + +/* Roomiew control */ + HashList *Floors; /* floors our citserver has... */ + 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. */ + + + char last_chat_user[256]; + +/* Iconbar controls */ + struct __ofolder *cache_fold; /* cache the iconbar room list */ + int cache_max_folders; + int cache_num_floors; + time_t cache_timestamp; + HashList *IconBarSettings; /* which icons should be shown / not shown? */ + const StrBuf *floordiv_expanded; /* which floordiv currently expanded */ + + + +/* cache stuff for templates. TODO: find a smartrer way */ + HashList *ServCfg; /* cache our server config for editing */ + HashList *InetCfg; /* Our inet server config for editing */ -/* values for WC->current_iconbar */ -enum { - current_iconbar_menu, /* view the icon menue */ - current_iconbar_roomlist /* view the roomtree */ }; + + +typedef void (*Header_Evaluator)(StrBuf *Line, ParsedHttpHdrs *hdr); + +typedef struct _HttpHeader { + Header_Evaluator H; + StrBuf *Val; + int HaveEvaluator; +} OneHttpHeader; + +void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F); + + enum { S_SELECT, S_SHUTDOWN, @@ -640,26 +548,6 @@ enum { }; -/* - * calview contains data passed back and forth between the message fetching loop - * and the calendar view renderer. - */ -enum { - calview_month, - calview_day, - calview_week, - calview_brief -}; - -struct calview { - int view; - int year; - int month; - int day; - time_t lower_bound; - time_t upper_bound; -}; - #ifndef num_parms #define num_parms(source) num_tokens(source, '|') #endif @@ -678,7 +566,6 @@ extern char file_crpt_file_csr[PATH_MAX]; extern char file_crpt_file_cer[PATH_MAX]; #endif -struct serv_info serv_info; extern char floorlist[128][SIZ]; extern char *axdefs[]; extern char *ctdlhost, *ctdlport; @@ -687,35 +574,29 @@ extern char *server_cookie; extern int is_https; extern int setup_wizard; extern char wizard_filename[]; -extern time_t if_modified_since; extern int follow_xff; -extern HashList *HandlerHash; -extern HashList *PreferenceHooks; -extern HashList *WirelessTemplateCache; -extern HashList *WirelessLocalTemplateCache; -extern HashList *TemplateCache; -extern HashList *LocalTemplateCache; -extern HashList *GlobalNS; -extern HashList *Iterators; -extern HashList *ZoneHash; -extern HashList *Conditionals; -extern HashList *MsgHeaderHandler; -extern HashList *MimeRenderHandler; -extern HashList *SortHash; +extern int num_threads; void InitialiseSemaphores(void); void begin_critical_section(int which_one); void end_critical_section(int which_one); - -void stuff_to_cookie(char *cookie, size_t clen, int session, - char *user, char *pass, char *room); -void cookie_to_stuff(StrBuf *cookie, int *session, - char *user, size_t user_len, - char *pass, size_t pass_len, - char *room, size_t room_len); -void locate_host(char *, int); -void become_logged_in(char *, char *, char *); +void stuff_to_cookie(char *cookie, size_t clen, + int session, + StrBuf *user, + StrBuf *pass, + StrBuf *room, + const char *language +); +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 openid_manual_create(void); void display_login(); void display_openids(void); @@ -725,7 +606,11 @@ void display_main_menu(void); void display_aide_menu(void); void display_advanced_menu(void); void slrp_highest(void); -void get_serv_info(char *, char *); +ServInfo *get_serv_info(StrBuf *, StrBuf *); +void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority); +void CreateMimeStr(void); +int GetConnected(void); +void DeleteServInfo(ServInfo **FreeMe); int uds_connectsock(char *); int tcp_connectsock(char *, char *); int serv_getln(char *strbuf, int bufsize); @@ -741,39 +626,6 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source); void pullquote_fmout(void); void wDumpContent(int); -int Flathash(const char *str, long len); - - -/* These may return NULL if not foud */ -#define sbstr(a) SBstr(a, sizeof(a) - 1) -const StrBuf *SBSTR(const char *key); -const StrBuf *SBstr(const char *key, size_t keylen); - -#define xbstr(a, b) (char*) XBstr(a, sizeof(a) - 1, b) -const char *XBstr(const char *key, size_t keylen, size_t *len); -const char *XBSTR(const char *key, size_t *len); - -#define lbstr(a) LBstr(a, sizeof(a) - 1) -long LBstr(const char *key, size_t keylen); -long LBSTR(const char *key); - -#define ibstr(a) IBstr(a, sizeof(a) - 1) -int IBstr(const char *key, size_t keylen); -int IBSTR(const char *key); - -#define havebstr(a) HaveBstr(a, sizeof(a) - 1) -int HaveBstr(const char *key, size_t keylen); -int HAVEBSTR(const char *key); - -#define yesbstr(a) YesBstr(a, sizeof(a) - 1) -int YesBstr(const char *key, size_t keylen); -int YESBSTR(const char *key); - -/* TODO: get rid of the non-const-typecast */ -#define bstr(a) (char*) Bstr(a, sizeof(a) - 1) -const char *BSTR(const char *key); -const char *Bstr(const char *key, size_t keylen); - void UrlescPutStrBuf(const StrBuf *strbuf); @@ -790,70 +642,57 @@ void output_headers( int do_httpheaders, int unset_cookies, int suppress_check, int cache); +void output_custom_content_header(const char *ctype); void wprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); -void output_static(char *what); -void display_mime_icon(void); -void print_menu_box(char* Title, char *Class, int nLines, ...); +void output_static(const char* What); + long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks); -void escputs(char *strbuf); +void escputs(const char *strbuf); void url(char *buf, size_t bufsize); void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); -void escputs1(char *strbuf, int nbsp, int nolinebreaks); +void escputs1(const char *strbuf, int nbsp, int nolinebreaks); void msgesc(char *target, size_t tlen, char *strbuf); void msgescputs(char *strbuf); void msgescputs1(char *strbuf); -void stripout(char *str, char leftboundary, char rightboundary); void dump_vars(void); void embed_main_menu(void); -void serv_read(char *buf, int bytes); -enum { - do_search, - headers, - readfwd, - readnew, - readold -}; - -typedef void (*readloop_servcmd)(char *buf, long bufsize); - -typedef struct _readloopstruct { - ConstStr name; - readloop_servcmd cmd; -} readloop_struct; -void readloop(long oper); -int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *section); void do_addrbook_view(addrbookent *addrbook, int num_ab); -void display_vcard(StrBuf *Target, const char *vcard_source, char alpha, int full, char *storename, long msgnum); +void fetch_ab_name(message_summary *Msg, char **namebuf); +void display_vcard(StrBuf *Target, StrBuf *vcard_source, char alpha, int full, char **storename, long msgnum); +void jsonMessageList(void); +void new_summary_view(void); +void getseen(void); void text_to_server(char *ptr); void text_to_server_qp(char *ptr); void confirm_delete_msg(void); void display_success(char *); -void authorization_required(const char *message); +void CheckAuthBasic(ParsedHttpHdrs *hdr); +void GetAuthBasic(ParsedHttpHdrs *hdr); void server_to_text(void); void save_edit(char *description, char *enter_cmd, int regoto); void display_edit(char *description, char *check_cmd, char *read_cmd, char *save_cmd, int with_room_banner); -int gotoroom(char *gname); +long gotoroom(const StrBuf *gname); +void remove_march(const StrBuf *aaa); +void dotskip(void); void confirm_delete_room(void); void validate(void); void display_graphics_upload(char *, char *, char *); void do_graphics_upload(char *upl_cmd); -void serv_read(char *buf, int bytes); void serv_gets(char *strbuf); void serv_write(const char *buf, int nbytes); -void serv_puts(const char *string); void serv_putbuf(const StrBuf *string); void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); -void load_floorlist(void); +void load_floorlist(StrBuf *Buf); void shutdown_sessions(void); void do_housekeeping(void); -void smart_goto(char *); +void smart_goto(const StrBuf *); void worker_entry(void); -void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *ReqType, StrBuf *ReadBuf); +void session_loop(void); size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm); -void fmt_time(char *buf, time_t thetime); +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); void end_webcit_session(void); @@ -869,64 +708,35 @@ char *memreadline(char *start, char *buf, int maxlen); char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen); long extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen); void remove_token(char *source, int parmnum, char separator); -char *load_mimepart(long msgnum, char *partnum); +StrBuf *load_mimepart(long msgnum, char *partnum); void MimeLoadData(wc_mime_attachment *Mime); int pattern2(char *search, char *patn); -void do_edit_vcard(long, char *, char *, char *); -void striplt(char *); -void stripltlen(char *, int *); -void select_user_to_edit(char *message, char *preselect); +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 delete_user(char *); void do_change_view(int); void folders(void); -void load_preferences(void); -void save_preferences(void); -#define get_preference(a, b) get_PREFERENCE(a, sizeof(a) - 1, b) -#define get_pref(a, b) get_PREFERENCE(ChrPtr(a), StrLength(a), b) -int get_PREFERENCE(const char *key, size_t keylen, StrBuf **value); -#define set_preference(a, b, c) set_PREFERENCE(a, sizeof(a) - 1, b, c) -#define set_pref(a, b, c) set_PREFERENCE(ChrPtr(a), StrLength(a), b, c) -void set_PREFERENCE(const char *key, size_t keylen, StrBuf *value, int save_to_server); - -#define get_pref_long(a, b, c) get_PREF_LONG(a, sizeof(a) - 1, b, c) -int get_PREF_LONG(const char *key, size_t keylen, long *value, long Default); -#define set_pref_long(a, b, c) set_PREF_LONG(a, sizeof(a) - 1, b, c) -void set_PREF_LONG(const char *key, size_t keylen, long value, int save_to_server); - -#define get_pref_yesno(a, b, c) get_PREF_YESNO(a, sizeof(a) - 1, b, c) -int get_PREF_YESNO(const char *key, size_t keylen, int *value, int Default); -#define set_pref_yesno(a, b, c) set_PREF_YESNO(a, sizeof(a) - 1, b, c) -void set_PREF_YESNO(const char *key, size_t keylen, int value, int save_to_server); - -#define get_room_pref(a) get_ROOM_PREFS(a, sizeof(a) - 1) -StrBuf *get_ROOM_PREFS(const char *key, size_t keylen); - -#define set_room_pref(a, b, c) set_ROOM_PREFS(a, sizeof(a) - 1, b, c) -void set_ROOM_PREFS(const char *key, size_t keylen, StrBuf *value, int save_to_server); -int is_msg_in_mset(char *mset, long msgnum); void display_addressbook(long msgnum, char alpha); -void offer_start_page(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); -void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext); +void offer_start_page(StrBuf *Target, WCTemplputParams *TP); +void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext); void output_html(const char *, int, int, StrBuf *, StrBuf *); void do_listsub(void); -void toggle_self_service(void); ssize_t write(int fd, const void *buf, size_t count); void cal_process_attachment(wc_mime_attachment *Mime); -void load_calendar_item(message_summary *Msg, int unread, struct calview *c); void display_calendar(message_summary *Msg, int unread); -void display_task(message_summary *Msg, int unread); void display_note(message_summary *Msg, int unread); void updatenote(void); -void parse_calendar_view_request(struct calview *c); -void render_calendar_view(struct calview *c); void do_tasks_view(void); -void calendar_summary_view(void); -int load_msg_ptrs(char *servcmd, int with_headers); -void free_attachments(struct wcsession *sess); -void free_march_list(struct wcsession *wcf); +int calendar_summary_view(void); +void free_march_list(wcsession *wcf); void display_rules_editor_inner_div(void); void generate_uuid(char *); void CtdlMakeTempFileName(char *, int); @@ -945,15 +755,9 @@ icaltimezone *get_default_icaltimezone(void); void display_icaltimetype_as_webform(struct icaltimetype *, char *, int); void icaltime_from_webform(struct icaltimetype *result, char *prefix); void icaltime_from_webform_dateonly(struct icaltimetype *result, char *prefix); -void display_edit_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, - int unread, struct calview *calv); -void save_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, - int unread, struct calview *calv); -void ical_dezonify(icalcomponent *cal); void partstat_as_string(char *buf, icalproperty *attendee); icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp); void check_attendee_availability(icalcomponent *supplied_vevent); -void do_freebusy(const char *req); int ical_ctdl_is_overlap( struct icaltimetype t1start, struct icaltimetype t1end, @@ -961,31 +765,21 @@ int ical_ctdl_is_overlap( struct icaltimetype t2end ); -#ifdef ENABLE_NLS -void initialize_locales(void); -void ShutdownLocale(void); -#endif -void TmplGettext(StrBuf *Target, int nTokens, WCTemplateToken *Token); extern char *months[]; extern char *days[]; -int read_server_binary(StrBuf *Ret, size_t total_len); +int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf); int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize); -int read_server_text(StrBuf *Buf, long *nLines);; -int goto_config_room(void); -long locate_user_vcard(char *username, long usernum); +int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize); +int read_server_text(StrBuf *Buf, long *nLines); +int goto_config_room(StrBuf *Buf); +long locate_user_vcard_in_this_room(message_summary **VCMsg, + wc_mime_attachment **VCAtt); void sleeeeeeeeeep(int); void http_transmit_thing(const char *content_type, int is_static); long unescape_input(char *buf); void do_selected_iconbar(void); void spawn_another_worker_thread(void); -void display_rss(char *roomname, StrBuf *request_method); -void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); -void set_selected_language(const char *); -void go_selected_language(void); -void stop_selected_language(void); -void preset_locale(void); -void httplang_to_locale(StrBuf *LocaleString); void StrEndTab(StrBuf *Target, int tabnum, int num_tabs); void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs); void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]); @@ -993,22 +787,38 @@ void tabbed_dialog(int num_tabs, char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); void str_wiki_index(char *s); +long guess_calhourformat(void); int get_time_format_cached (void); int xtoi(const char *in, size_t len); const char *get_selected_language(void); -void webcit_fmt_date(char *buf, time_t thetime, int brief); + +#define DATEFMT_FULL 0 +#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); int fetch_http(char *url, char *target_buf, int maxbytes); +void free_attachments(wcsession *sess); +void summary(void); int is_mobile_ua(char *user_agent); void embed_room_banner(char *, int); - +HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP); +HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP); +int SortRoomsByListOrder(const void *room1, const void *room2); /* navbar types that can be passed to embed_room_banner */ enum { navbar_none, navbar_default }; +/* actual supported locales */ +void TmplGettext(StrBuf *Target, WCTemplputParams *TP); +void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); +void set_selected_language(const char *); +void go_selected_language(void); +void stop_selected_language(void); #ifdef HAVE_OPENSSL void init_ssl(void); @@ -1020,13 +830,7 @@ int client_read_sslbuffer(StrBuf *buf, int timeout); void client_write_ssl(const StrBuf *Buf); #endif -#ifdef HAVE_ZLIB -#include -int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen, - const Bytef * source, uLong sourceLen, int level); -#endif - -void utf8ify_rfc822_string(char *buf); +void utf8ify_rfc822_string(char **buf); void begin_burst(void); long end_burst(void); @@ -1036,18 +840,6 @@ extern char *hourname[]; /* Names of hours (12am, 1am, etc.) */ void http_datestring(char *buf, size_t n, time_t xtime); -typedef void (*WebcitHandlerFunc)(void); -typedef struct _WebcitHandler{ - WebcitHandlerFunc F; - long Flags; -} WebcitHandler; -void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, long Flags); - -#define AJAX (1<<0) -#define ANONYMOUS (1<<1) -#define NEED_URL (1<<2) - - /* These should be empty, but we have them for testing */ #define DEFAULT_HTTPAUTH_USER "" #define DEFAULT_HTTPAUTH_PASS "" @@ -1064,4 +856,3 @@ void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc #define WC_TIMEFORMAT_AMPM 1 #define WC_TIMEFORMAT_24 2 -