* A server-side module for Citadel which supports address book information
* using the standard vCard format.
*
- * Copyright (c) 1999-2012 by the citadel.org team
+ * Copyright (c) 1999-2016 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.
* set global flag calling for an aide to validate new users
*/
void set_mm_valid(void) {
+ int flags = 0;
+
begin_critical_section(S_CONTROL);
- get_control();
- CitControl.MMflags = CitControl.MMflags | MM_VALID ;
- put_control();
+ flags = CtdlGetConfigInt("MMflags");
+ flags = flags | MM_VALID ;
+ CtdlSetConfigInt("MMflags", flags);
end_critical_section(S_CONTROL);
}
void vcard_add_to_directory(long msgnum, void *data) {
struct CtdlMessage *msg;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg != NULL) {
vcard_extract_internet_addresses(msg, vcard_directory_add_user);
}
int yes_my_citadel_config = 0;
int yes_any_vcard_room = 0;
- if (!CCC->logged_in) return(0); /* Only do this if logged in. */
+ if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */
/* Is this some user's "My Citadel Config" room? */
if (((CCC->room.QRflags & QR_MAILBOX) != 0) &&
(!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
/* Yes, we want to do this */
yes_my_citadel_config = 1;
-
#ifdef VCARD_SAVES_BY_AIDES_ONLY
- /* Prevent non-aides from performing registration changes */
- if (CCC->user.axlevel < AxAideU) {
+ /* Prevent non-aides from performing registration changes, but ldap is ok. */
+ if ((CCC->user.axlevel < AxAideU) && (CCC->vcard_updated_by_ldap==0)) {
return(1);
}
#endif
if (CM_IsEmpty(msg, eMesageText)) return(0);
- mime_parser(msg->cm_fields[eMesageText],
- NULL,
- *vcard_extract_vcard,
- NULL, NULL,
- &v, /* user data ptr - put the vcard here */
- 0
+ mime_parser(CM_RANGE(msg, eMesageText),
+ *vcard_extract_vcard,
+ NULL, NULL,
+ &v, /* user data ptr - put the vcard here */
+ 0
);
if (v == NULL) return(0); /* no vCards were found in this message */
/* If users cannot create their own accounts, they cannot re-register either. */
- if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CCC->user.axlevel < AxAideU) ) {
+ if ( (yes_my_citadel_config) &&
+ (CtdlGetConfigInt("c_disable_newu")) &&
+ (CCC->user.axlevel < AxAideU) &&
+ (CCC->vcard_updated_by_ldap==0) )
+ {
return(1);
}
vcard_get_prop(v, "fn", 1, 0, 0);
+
if (yes_my_citadel_config) {
/* Bingo! The user is uploading a new vCard, so
* delete the old one. First, figure out which user
CtdlDeleteMessages(CCC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
/* Make the author of the message the name of the user. */
- CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
+ if (!IsEmptyStr(usbuf.fullname)) {
+ CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
+ }
}
/* Insert or replace RFC2739-compliant free/busy URL */
if (yes_my_citadel_config) {
sprintf(buf, "http://%s/%s.vfb",
- config.c_fqdn,
+ CtdlGetConfigStr("c_fqdn"),
usbuf.fullname);
for (i=0; buf[i]; ++i) {
if (buf[i] == ' ') buf[i] = '_';
vcard_set_prop(v, "FBURL;PREF", buf, 0);
}
- /* If the vCard has no UID, then give it one. */
+
s = vcard_get_prop(v, "UID", 1, 0, 0);
- if (s == NULL) {
+ if (s == NULL) { /* Note LDAP auth sets UID from the LDAP UUID, use that if it exists. */
+ /* Enforce local UID policy if applicable */
+ if (yes_my_citadel_config) {
+ snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME);
+ } else {
+ /* If the vCard has no UID, then give it one. */
generate_uuid(buf);
- vcard_set_prop(v, "UID", buf, 0);
- }
+ }
+ vcard_set_prop(v, "UID", buf, 0);
+ }
- /* Enforce local UID policy if applicable */
- if (yes_my_citadel_config) {
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME);
- vcard_set_prop(v, "UID", buf, 0);
- }
/*
* Set the EUID of the message to the UID of the vCard.
CM_FlushField(msg, eExclusiveID);
s = vcard_get_prop(v, "UID", 1, 0, 0);
- if (s != NULL) {
+ if (!IsEmptyStr(s)) {
CM_SetField(msg, eExclusiveID, s, strlen(s));
if (CM_IsEmpty(msg, eMsgSubject)) {
CM_CopyField(msg, eMsgSubject, eExclusiveID);
if (s == NULL) {
s = vcard_get_prop(v, "N", 1, 0, 0);
}
- if (s != NULL) {
+ if (!IsEmptyStr(s)) {
CM_SetField(msg, eMsgSubject, s, strlen(s));
}
/* Re-serialize it back into the msg body */
ser = vcard_serialize(v);
- if (ser != NULL) {
+ if (!IsEmptyStr(ser)) {
StrBuf *buf;
long serlen;
char roomname[ROOMNAMELEN];
if (msg->cm_format_type != 4) return(0);
- if (!CCC->logged_in) return(0); /* Only do this if logged in. */
+ if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */
/* We're interested in user config rooms only. */
- if ( (strlen(CCC->room.QRname) >= 12) && (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
+ if ( !IsEmptyStr(CCC->room.QRname) &&
+ (strlen(CCC->room.QRname) >= 12) &&
+ (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
is_UserConf = 1; /* It's someone's config room */
}
CtdlMailboxName(roomname, sizeof roomname, &CCC->user, USERCONFIGROOM);
ptr = msg->cm_fields[eMesageText];
+ CCC->vcard_updated_by_ldap=0; /* As this will write LDAP's previous changes, disallow LDAP change auth until next LDAP change. */
+
NewStrBufDupAppendFlush(&CCC->StatusMessage, NULL, NULL, 0);
StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS);
* Assume they don't need validating.
*/
if (CCC->user.axlevel >= AxAideU) {
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ CtdlLockGetCurrentUser();
CCC->user.flags |= US_REGIS;
- CtdlPutUserLock(&CCC->user);
+ CtdlPutCurrentUserLock();
return (0);
}
set_mm_valid();
/* ...which also means we need to flag the user */
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ CtdlLockGetCurrentUser();
CCC->user.flags |= (US_REGIS|US_NEEDVALID);
- CtdlPutUserLock(&CCC->user);
+ CtdlPutCurrentUserLock();
return(0);
}
if (VCmsgnum < 0L) return vcard_new();
- msg = CtdlFetchMessage(VCmsgnum, 1);
+ msg = CtdlFetchMessage(VCmsgnum, 1, 1);
if (msg == NULL) return vcard_new();
v = vcard_load(msg->cm_fields[eMesageText]);
if (ser == NULL) {
ser = strdup("begin:vcard\r\nend:vcard\r\n");
}
- if (!ser) return;
+ if (ser == NULL) return;
/* This handy API function does all the work for us.
* NOTE: normally we would want to set that last argument to 1, to
}
/* If users cannot create their own accounts, they cannot re-register either. */
- if ( (config.c_disable_newu) && (CCC->user.axlevel < AxAideU) ) {
+ if ( (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) ) {
cprintf("%d Self-service registration is not allowed here.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
}
char buf[256];
int i;
struct vCard *v;
+ int need_default_vcard;
+ need_default_vcard =1;
vcard_fn_to_n(vname, usbuf->fullname, sizeof vname);
syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname);
#ifdef HAVE_GETPWUID_R
/* If using host auth mode, we add an email address based on the login */
- if (config.c_auth_mode == AUTHMODE_HOST) {
+ if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
struct passwd pwd;
char pwd_buffer[SIZ];
syslog(LOG_DEBUG, "Searching for uid %d", usbuf->uid);
if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
#endif // HAVE_GETPWUID_R
- snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
+ snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn"));
vcard_add_prop(v, "email;internet", buf);
+ need_default_vcard = 0;
}
}
#endif
- /* Everyone gets an email address based on their display name */
- snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, config.c_fqdn);
- for (i=0; buf[i]; ++i) {
- if (buf[i] == ' ') buf[i] = '_';
- }
- vcard_add_prop(v, "email;internet", buf);
+#ifdef HAVE_LDAP
+ /*
+ * Is this an LDAP session? If so, copy various LDAP attributes from the directory entry
+ * into the user's vCard.
+ */
+ if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+ //uid_t ldap_uid;
+ int found_user;
+ char ldap_cn[512];
+ char ldap_dn[512];
+ found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid,1);
+ if (found_user == 0) {
+ if (Ctdl_LDAP_to_vCard(ldap_dn, v)) {
+ /* Allow global address book and internet directory update without login long enough to write this. */
+ CC->vcard_updated_by_ldap++; /* Otherwise we'll only update the user config. */
+ need_default_vcard = 0;
+ syslog(LOG_DEBUG, "LDAP Created Initial Vcard for %s\n",usbuf->fullname);
+ }
+ }
+ }
+#endif
+ if (need_default_vcard!=0) {
+ /* Everyone gets an email address based on their display name */
+ snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, CtdlGetConfigStr("c_fqdn"));
+ for (i=0; buf[i]; ++i) {
+ if (buf[i] == ' ') buf[i] = '_';
+ }
+ vcard_add_prop(v, "email;internet", buf);
+ }
vcard_write_user(usbuf, v);
vcard_free(v);
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 0;
- CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname));
+ if (!IsEmptyStr(usbuf->fullname)) {
+ CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname));
+ }
CM_SetField(msg, eOriginalRoom, HKEY(ADDRESS_BOOK_ROOM));
- CM_SetField(msg, eNodeName, NODENAME, strlen(NODENAME));
+ CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
CM_SetField(msg, eMesageText, HKEY("Purge this vCard\n"));
len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
return;
}
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) return;
if (CM_IsEmpty(msg, eMesageText))
void dvca_callback(long msgnum, void *userdata) {
struct CtdlMessage *msg = NULL;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) return;
- mime_parser(msg->cm_fields[eMesageText],
- NULL,
- *dvca_mime_callback, /* callback function */
- NULL, NULL,
- NULL, /* user data */
- 0
- );
+ mime_parser(CM_RANGE(msg, eMesageText),
+ *dvca_mime_callback, /* callback function */
+ NULL, NULL,
+ NULL, /* user data */
+ 0
+ );
CM_Free(msg);
}
* Is this an LDAP session? If so, copy various LDAP attributes from the directory entry
* into the user's vCard.
*/
- if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+ if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
v = vcard_get_user(&CCC->user);
if (v) {
if (Ctdl_LDAP_to_vCard(CCC->ldap_dn, v)) {
+ CCC->vcard_updated_by_ldap++; /* Make sure changes make it to the global address book and internet directory, not just the user config. */
+ syslog(LOG_DEBUG, "LDAP Detected vcard change.\n");
vcard_write_user(&CCC->user, v);
}
}
collected_addresses = (char *)userdata;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) return;
v = vcard_load(msg->cm_fields[eMesageText]);
CM_Free(msg);
int i;
/* First remove any addresses we already have in the address book */
- CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL);
+ CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL, NULL, NULL);
CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
strip_addresses_already_have, aptr->collected_addresses);
vmsg->cm_format_type = FMT_RFC822;
CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
s = vcard_get_prop(v, "UID", 1, 0, 0);
- CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+ if (!IsEmptyStr(s)) {
+ CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+ }
ser = vcard_serialize(v);
if (ser != NULL) {
StrBuf *buf;
* on this room even if we don't share it with any other nodes.
* This allows the CANCEL messages (i.e. "Purge this vCard") to be
* purged.
+ *
+ * FIXME this no longer works
*/
assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir);
fp = fopen(filename, "a");
- if (fp != NULL) fclose(fp);
- rv = chown(filename, CTDLUID, (-1));
- if (rv == -1)
- syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]",
- filename, strerror(errno));
- rv = chmod(filename, 0600);
- if (rv == -1)
- syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]",
- filename, strerror(errno));
+ if (fp != NULL) {
+ fclose(fp);
+ rv = chown(filename, CTDLUID, (-1));
+ if (rv == -1) {
+ syslog(LOG_ERR, "Failed to adjust ownership of %s: %s", filename, strerror(errno));
+ }
+ rv = chmod(filename, 0600);
+ if (rv == -1) {
+ syslog(LOG_ERR, "Failed to adjust ownership of %s: %s", filename, strerror(errno));
+ }
+ }
+ else {
+ syslog(LOG_ERR, "Cannot create %s: %s", filename, strerror(errno));
+ }
}
/* for postfix tcpdict */
- CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), /* Postfix */
NULL,
check_get_greeting,
check_get,
projects / citadel.git / blobdiff