From: Art Cancro Date: Sat, 2 Mar 2024 21:36:54 +0000 (-0500) Subject: Smuggled classified secrets into this repository. X-Git-Tag: v999~30 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=16c0a868a43e20d7172692cda62d35f5100ac58e Smuggled classified secrets into this repository. --- diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index eac1e7e38..c47164fa7 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -259,16 +259,19 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S // Compare function for "time-range" tests (RFC4791 section 9.9) // Returns nonzero if the supplied icalcomponent occurs within the specified time range -int caldav_time_range_filter_matches(icalcomponent *cal, char *start, char *end) { +int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) { - TRACE; - syslog(LOG_DEBUG, "Does this %s fall between %s and %s ?", + + struct icaltimetype start = (start_str ? icaltime_from_string(start_str) : icaltime_null_time()); + struct icaltimetype end = (end_str ? icaltime_from_string(end_str) : icaltime_null_time()); + + syslog(LOG_DEBUG, "\033[7mcaldav_time_range_filter_matches()\033[0m : Does this %s fall between %s and %s ?", icalcomponent_kind_to_string(icalcomponent_isa(cal)), start, end ); - return(1); + return(0); // reject everything for now } diff --git a/webcit/event.c b/webcit/event.c index e2894d1dc..a2e473b8f 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -1,7 +1,7 @@ /* * Editing calendar events. * - * Copyright (c) 1996-2012 by the citadel.org team + * Copyright (c) 2002-2012 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. diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c index de444a9d5..f20be4279 100644 --- a/webcit/ical_dezonify.c +++ b/webcit/ical_dezonify.c @@ -1,20 +1,17 @@ -/* - * Function to go through an ical component set and convert all non-UTC - * date/time properties to UTC. It also strips out any VTIMEZONE - * subcomponents afterwards, because they're irrelevant. - * - * Everything here will work on both a fully encapsulated VCALENDAR component - * or any type of subcomponent. - */ +// Function to go through an ical component set and convert all non-UTC +// date/time properties to UTC. It also strips out any VTIMEZONE +// subcomponents afterwards, because they're irrelevant. +// +// Everything here will work on both components and subcomponents. If subcomponents are discovered it will recurse through them. +// +// Copyright (c) 2002-2024 by the citadel.org team (Art Cancro et al) +// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3. #include "webcit.h" #include "webserver.h" -/* - * Figure out which time zone needs to be used for timestamps that are - * not UTC and do not have a time zone specified. - * - */ +// Figure out which time zone needs to be used for timestamps that are +// not UTC and do not have a time zone specified. icaltimezone *get_default_icaltimezone(void) { icaltimezone *zone = NULL; @@ -34,34 +31,30 @@ icaltimezone *get_default_icaltimezone(void) { } -/* - * Back end function for ical_dezonify() - * - * We supply this with the master component, the relevant component, - * and the property (which will be a DTSTART, DTEND, etc.) - * which we want to convert to UTC. - */ -void ical_dezonify_backend(icalcomponent *cal, - icalcomponent *rcal, - icalproperty *prop) { +// Back end function for ical_dezonify() +// +// We supply this with the master component, the relevant component, +// and the property (which will be a DTSTART, DTEND, etc.) +// which we want to convert to UTC. +void ical_dezonify_backend(icalcomponent *cal, icalcomponent *rcal, icalproperty *prop) { icaltimezone *t = NULL; icalparameter *param; const char *tzid = NULL; struct icaltimetype TheTime; - int utc_declared_as_tzid = 0; /* Component declared 'TZID=GMT' instead of using Z syntax */ + int utc_declared_as_tzid = 0; // Component declared 'TZID=GMT' instead of using Z syntax - /* Give me nothing and I will give you nothing in return. */ + // Give me nothing and I will give you nothing in return. if (cal == NULL) return; - /* Hunt for a TZID parameter in this property. */ + // Hunt for a TZID parameter in this property. param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER); - /* Get the stringish name of this TZID. */ + // Get the stringish name of this TZID. if (param != NULL) { tzid = icalparameter_get_tzid(param); - /* Convert it to an icaltimezone type. */ + // Convert it to an icaltimezone type. if (tzid != NULL) { #ifdef DBG_ICAL syslog(LOG_DEBUG, " * Stringy supplied timezone is: '%s'\n", tzid); @@ -73,14 +66,14 @@ void ical_dezonify_backend(icalcomponent *cal, #endif } else { - /* try attached first */ + // try attached first t = icalcomponent_get_timezone(cal, tzid); #ifdef DBG_ICAL syslog(LOG_DEBUG, " * ...and I %s have tzdata for that zone.\n", (t ? "DO" : "DO NOT") ); #endif - /* then try built-in timezones */ + // then try built-in timezones if (!t) { t = icaltimezone_get_builtin_timezone(tzid); #ifdef DBG_ICAL @@ -94,7 +87,7 @@ void ical_dezonify_backend(icalcomponent *cal, } - /* Now we know the timezone. Convert to UTC. */ + // Now we know the timezone. Convert to UTC. if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) { TheTime = icalproperty_get_dtstart(prop); @@ -130,7 +123,7 @@ void ical_dezonify_backend(icalcomponent *cal, } else { - /* Do the conversion. */ + // Do the conversion. if (t != NULL) { #ifdef DBG_ICAL syslog(LOG_DEBUG, " * Timezone prop found. Converting to UTC.\n"); @@ -154,7 +147,7 @@ void ical_dezonify_backend(icalcomponent *cal, syslog(LOG_DEBUG, " * Now: %s\n", icaltime_as_ical_string(TheTime)); #endif - /* Now add the converted property back in. */ + // Now add the converted property back in. if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) { icalproperty_set_dtstart(prop, TheTime); } @@ -170,31 +163,23 @@ void ical_dezonify_backend(icalcomponent *cal, } -/* - * Recursive portion of ical_dezonify() - */ +// Recursive portion of ical_dezonify() void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) { icalcomponent *c; icalproperty *p; - /* - * Recurse through all subcomponents *except* VTIMEZONE ones. - */ - for (c=icalcomponent_get_first_component( - rcal, ICAL_ANY_COMPONENT); + // Recurse through all subcomponents *except* VTIMEZONE ones. + for ( c=icalcomponent_get_first_component(rcal, ICAL_ANY_COMPONENT); c != NULL; - c = icalcomponent_get_next_component( - rcal, ICAL_ANY_COMPONENT) + c = icalcomponent_get_next_component(rcal, ICAL_ANY_COMPONENT) ) { if (icalcomponent_isa(c) != ICAL_VTIMEZONE_COMPONENT) { ical_dezonify_recurse(cal, c); } } - /* - * Now look for DTSTART and DTEND properties - */ - for (p=icalcomponent_get_first_property(rcal, ICAL_ANY_PROPERTY); + // Now look for DTSTART and DTEND properties + for ( p=icalcomponent_get_first_property(rcal, ICAL_ANY_PROPERTY); p != NULL; p = icalcomponent_get_next_property(rcal, ICAL_ANY_PROPERTY) ) { @@ -203,18 +188,16 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) { || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY) || (icalproperty_isa(p) == ICAL_DUE_PROPERTY) || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY) - ) { + ) { ical_dezonify_backend(cal, rcal, p); } } } -/* - * Convert all DTSTART and DTEND properties in all subcomponents to UTC. - * This function will search any VTIMEZONE subcomponents to learn the - * relevant timezone information. - */ +// Convert all DTSTART and DTEND properties in all subcomponents to UTC. +// This function will search any VTIMEZONE subcomponents to learn the +// relevant timezone information. void ical_dezonify(icalcomponent *cal) { icalcomponent *vt = NULL; @@ -222,12 +205,11 @@ void ical_dezonify(icalcomponent *cal) { syslog(LOG_DEBUG, "ical_dezonify() started\n"); #endif - /* Convert all times to UTC */ + // Convert all times to UTC ical_dezonify_recurse(cal, cal); - /* Strip out VTIMEZONE subcomponents -- we don't need them anymore */ - while (vt = icalcomponent_get_first_component( - cal, ICAL_VTIMEZONE_COMPONENT), vt != NULL) { + // Strip out VTIMEZONE subcomponents -- we don't need them anymore. + while (vt = icalcomponent_get_first_component(cal, ICAL_VTIMEZONE_COMPONENT), vt != NULL) { icalcomponent_remove_component(cal, vt); icalcomponent_free(vt); } @@ -236,4 +218,3 @@ void ical_dezonify(icalcomponent *cal) { syslog(LOG_DEBUG, "ical_dezonify() completed\n"); #endif } - diff --git a/webcit/netconf.c b/webcit/netconf.c index 83c391429..6ff53fa56 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -1,3 +1,7 @@ +// Copyright (c) 1999-2004 by the citadel.org team +// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3. + + #include "webcit.h" void display_netconf(void); @@ -13,10 +17,9 @@ typedef struct _nodeconf { StrBuf *Secret; StrBuf *Host; StrBuf *Port; -}NodeConf; +} NodeConf; -void DeleteNodeConf(void *vNode) -{ +void DeleteNodeConf(void *vNode) { NodeConf *Node = (NodeConf*) vNode; FreeStrBuf(&Node->NodeName); FreeStrBuf(&Node->Secret); @@ -25,12 +28,11 @@ void DeleteNodeConf(void *vNode) free(Node); } -NodeConf *NewNode(StrBuf *SerializedNode) -{ +NodeConf *NewNode(StrBuf *SerializedNode) { NodeConf *Node; if (StrLength(SerializedNode) < 8) - return NULL; /** we need at least 4 pipes and some other text so its invalid. */ + return NULL; /* we need at least 4 pipes and some other text so its invalid. */ Node = (NodeConf *) malloc(sizeof(NodeConf)); Node->DeleteMe = 0; Node->NodeName=NewStrBuf(); @@ -44,8 +46,7 @@ NodeConf *NewNode(StrBuf *SerializedNode) return Node; } -NodeConf *HttpGetNewNode(void) -{ +NodeConf *HttpGetNewNode(void) { NodeConf *Node; if (!havebstr("node") || @@ -63,8 +64,7 @@ NodeConf *HttpGetNewNode(void) return Node; } -void SerializeNode(NodeConf *Node, StrBuf *Buf) -{ +void SerializeNode(NodeConf *Node, StrBuf *Buf) { StrBufPrintf(Buf, "%s|%s|%s|%s", ChrPtr(Node->NodeName), ChrPtr(Node->Secret), @@ -73,8 +73,7 @@ void SerializeNode(NodeConf *Node, StrBuf *Buf) } -HashList *load_netconf(StrBuf *Target, WCTemplputParams *TP) -{ +HashList *load_netconf(StrBuf *Target, WCTemplputParams *TP) { StrBuf *Buf; HashList *Hash; char nnn[64]; @@ -104,8 +103,7 @@ HashList *load_netconf(StrBuf *Target, WCTemplputParams *TP) -void save_net_conf(HashList *Nodelist) -{ +void save_net_conf(HashList *Nodelist) { char buf[SIZ]; StrBuf *Buf; HashPos *where; @@ -171,8 +169,7 @@ void edit_node(void) { /* * modify an existing node */ -void display_edit_node(void) -{ +void display_edit_node(void) { WCTemplputParams SubTP; HashList *NodeConfig; const StrBuf *Index; @@ -211,16 +208,14 @@ void display_edit_node(void) /* * display all configured nodes */ -void display_netconf(void) -{ +void display_netconf(void) { wDumpContent(1); } /* * display the dialog to verify the deletion */ -void display_confirm_delete_node(void) -{ +void display_confirm_delete_node(void) { wDumpContent(1); } @@ -228,8 +223,7 @@ void display_confirm_delete_node(void) /* * actually delete the node */ -void delete_node(void) -{ +void delete_node(void) { HashList *NodeConfig; const StrBuf *Index; NodeConf *Node; @@ -260,26 +254,22 @@ void delete_node(void) } -void tmplput_NodeName(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_NodeName(StrBuf *Target, WCTemplputParams *TP) { NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF); StrBufAppendTemplate(Target, TP, Node->NodeName, 0); } -void tmplput_Secret(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_Secret(StrBuf *Target, WCTemplputParams *TP) { NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF); StrBufAppendTemplate(Target, TP, Node->Secret, 0); } -void tmplput_Host(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_Host(StrBuf *Target, WCTemplputParams *TP) { NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF); StrBufAppendTemplate(Target, TP, Node->Host, 0); } -void tmplput_Port(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_Port(StrBuf *Target, WCTemplputParams *TP) { NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF); StrBufAppendTemplate(Target, TP, Node->Port, 0); }