-/*
- * 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 <stdlib.h>
#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];
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));
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("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
cprintf("<mechanism>PLAIN</mechanism>");
}
-/*
- * 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")) {
}
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) {
}
-/*
- * 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("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); /* success */
+ cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf)); // success
return;
}
}
- /* failure */
+ // failure
cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
cprintf("<error code=\"401\" type=\"auth\">"
"<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
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);
}
-
}
// 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.
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.
}
// 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;
projects / citadel.git / commitdiff