From 0b83ae50f5442c82dc8fb11ad3322d90383e34d5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 22 Mar 2024 13:19:15 -0700 Subject: [PATCH] xmpp_sasl_service.c: style cleanup --- .../server/modules/xmpp/xmpp_sasl_service.c | 54 +++++++------------ webcit-ng/server/caldav_reports.c | 20 ++++--- 2 files changed, 30 insertions(+), 44 deletions(-) diff --git a/citadel/server/modules/xmpp/xmpp_sasl_service.c b/citadel/server/modules/xmpp/xmpp_sasl_service.c index 28f3c6a35..25b5195a9 100644 --- a/citadel/server/modules/xmpp/xmpp_sasl_service.c +++ b/citadel/server/modules/xmpp/xmpp_sasl_service.c @@ -1,18 +1,9 @@ -/* - * Barebones SASL authentication service for XMPP (Jabber) clients. - * - * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN. - * - * Copyright (c) 2007-2019 by Art Cancro - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// Barebones SASL authentication service for XMPP (Jabber) clients. +// +// Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN. +// +// Copyright (c) 2007-2019 by Art Cancro +// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3. #include "../../sysdep.h" #include @@ -41,11 +32,8 @@ #include "serv_xmpp.h" -/* - * PLAIN authentication. Returns zero on success, nonzero on failure. - */ -int xmpp_auth_plain(char *authstring) -{ +// PLAIN authentication. Returns zero on success, nonzero on failure. +int xmpp_auth_plain(char *authstring) { char decoded_authstring[1024]; char ident[256]; char user[256]; @@ -53,7 +41,7 @@ int xmpp_auth_plain(char *authstring) int result; long len; - /* Take apart the authentication string */ + // Take apart the authentication string memset(pass, 0, sizeof(pass)); CtdlDecodeBase64(decoded_authstring, authstring, strlen(authstring)); @@ -73,17 +61,15 @@ int xmpp_auth_plain(char *authstring) if (result == login_ok) { if (CtdlTryPassword(pass, len) == pass_ok) { - return(0); /* success */ + return(0); // success } } - return(1); /* failure */ + return(1); // failure } -/* - * Output the list of SASL mechanisms offered by this stream. - */ +// Output the list of SASL mechanisms offered by this stream. void xmpp_output_auth_mechs(void) { cprintf(""); cprintf("PLAIN"); @@ -91,9 +77,7 @@ void xmpp_output_auth_mechs(void) { } -/* - * Here we go ... client is trying to authenticate. - */ +// Here we go ... client is trying to authenticate. void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { if (strcasecmp(sasl_auth_mech, "PLAIN")) { @@ -104,7 +88,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { } if (CC->logged_in) { - CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ + CtdlUserLogout(); // Client may try to log in twice. Handle this. } if (CC->nologin) { @@ -125,27 +109,25 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { } -/* - * Non-SASL authentication - */ +// Non-SASL authentication void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password) { int result; char xmlbuf[256]; if (CC->logged_in) { - CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ + CtdlUserLogout(); // Client may try to log in twice. Handle this. } result = CtdlLoginExistingUser(username); if (result == login_ok) { result = CtdlTryPassword(password, strlen(password)); if (result == pass_ok) { - cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* success */ + cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); // success return; } } - /* failure */ + // failure cprintf("", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); cprintf("" "" diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index 646b40893..374d50ee5 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -82,13 +82,12 @@ void caldav_xml_start(void *data, const char *el, const char **attr) { char newfilter[SIZ]; int a = 0; int len = snprintf(newfilter, SIZ, "%d|", crp->comp_filter_nesting_level - crp->filter_nest - 1); - len += snprintf(&newfilter[len], SIZ-len, "%s", &el[CALDAVLEN]); // filter name without the namespace + len += snprintf(&newfilter[len], SIZ-len, "%s", &el[CALDAVLEN]); // filter name without the namespace while (attr[a]) { len += snprintf(&newfilter[len], SIZ-len, "|%s", attr[a++]); // now save the attributes } array_append(crp->filters, newfilter); } - } @@ -263,11 +262,10 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S // Returns nonzero if the supplied icalcomponent occurs within the specified time range int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) { - struct icaltimetype start = icaltime_from_string(start_str); - syslog(LOG_DEBUG, " search start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(start), icaltime_get_tzid(start)); + // syslog(LOG_DEBUG, "caldav_time_range_filter_matches() comparing:\n\033[35m%s\033[0m", icalcomponent_as_ical_string(cal)); - struct icaltimetype end = icaltime_from_string(end_str); - syslog(LOG_DEBUG, " search end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(end), icaltime_get_tzid(end)); + // NOTE TO ME: + // Recurrence info is available at this level. We can handle it here. // IMPLEMENTATION NOTE: // ical_ctdl_is_overlap() works because icaltime_compare() is really smart. @@ -282,6 +280,12 @@ int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char * icaltimetype dte = icalcomponent_get_dtend(cal); syslog(LOG_DEBUG, "component end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dte), icaltime_get_tzid(dte)); + struct icaltimetype start = icaltime_from_string(start_str); + syslog(LOG_DEBUG, " search start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(start), icaltime_get_tzid(start)); + + struct icaltimetype end = icaltime_from_string(end_str); + syslog(LOG_DEBUG, " search end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(end), icaltime_get_tzid(end)); + return(ical_ctdl_is_overlap(dts, dte, start, end)); // We have a convenience function for this. } @@ -290,8 +294,8 @@ int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char * // Returns zero if the calendar item was disqualified by a filter, nonzero if the calendar item still qualifies. int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) { - int f = 0; // filter number iterator - int qual = 1; // 0 for disqualify, 1 for qualify + int f = 0; // filter number iterator + int qual = 1; // 0 for disqualify, 1 for qualify int previous_level = -1; int disregard_further_comp_filters = 0; -- 2.30.2