From 3403c39cad2dba8c99c587501f4663f6a288f75f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 28 Sep 2009 16:40:47 +0000 Subject: [PATCH] * Found and removed a large section of the old LDAP connector. --- citadel/internet_addressing.c | 3 +- citadel/modules/vcard/serv_vcard.c | 231 ++++------------------------- citadel/serv_extensions.c | 141 ------------------ citadel/serv_extensions.h | 2 - citadel/sysdep.c | 1 - 5 files changed, 27 insertions(+), 351 deletions(-) diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 97a641cea..caca08066 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -899,7 +899,7 @@ void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { char key[SIZ]; if (IsDirectory(internet_addr, 0) == 0) return; - CtdlLogPrintf(CTDL_DEBUG, "Dir: %s --> %s\n", internet_addr, citadel_addr); + CtdlLogPrintf(CTDL_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr); directory_key(key, internet_addr); cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 ); } @@ -914,6 +914,7 @@ void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) { void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) { char key[SIZ]; + CtdlLogPrintf(CTDL_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr); directory_key(key, internet_addr); cdb_delete(CDB_DIRECTORY, key, strlen(key) ); } diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 1a53c7aaa..46b7cb1f8 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -127,199 +127,6 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, } -/* - * vCard-to-LDAP conversions. - * - * If 'op' is set to V2L_WRITE, then write - * (add, or change if already exists) a directory entry to the - * LDAP server, based on the information supplied in a vCard. - * - * If 'op' is set to V2L_DELETE, then delete the entry from LDAP. - */ - - -void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) { - struct vCard *v = NULL; - int i; - int have_addr = 0; - int have_cn = 0; - - void *objectlist = NULL; - - char givenname[128]; - char sn[128]; - char uid[256]; - char street[256]; - char city[128]; - char state[3]; - char zipcode[10]; - char calFBURL[256]; - char ldap_dn[SIZ]; - - if (msg == NULL) return; - if (msg->cm_fields['M'] == NULL) return; - if (msg->cm_fields['A'] == NULL) return; - if (msg->cm_fields['N'] == NULL) return; - - /* Initialize variables */ - strcpy(givenname, ""); - strcpy(sn, ""); - strcpy(calFBURL, ""); - - sprintf(uid, "%s@%s", - msg->cm_fields['A'], - msg->cm_fields['N'] - ); - - sprintf(ldap_dn, "euid=%s,ou=%s", msg->cm_fields['E'], msg->cm_fields['N']); - - /* Are we just deleting? If so, it's simple... */ - if (op == V2L_DELETE) { - (void) CtdlDoDirectoryServiceFunc (ldap_dn, NULL, NULL, "ldap", DIRECTORY_USER_DEL); - return; - } - - /* - * If we get to this point then it must be a V2L_WRITE operation. - */ - - /* First make sure the OU for the user's home Citadel host is created */ - (void) CtdlDoDirectoryServiceFunc (NULL, msg->cm_fields['N'], NULL, "ldap", DIRECTORY_CREATE_HOST); - - /* Next create the directory service object */ - (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_CREATE_OBJECT); - - /* The first LDAP attribute will be an 'objectclass' list. Citadel - * doesn't do anything with this. It's just there for compatibility - * with Kolab. - */ - (void) CtdlDoDirectoryServiceFunc("objectclass", "citadelInetOrgPerson", &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Convert the vCard fields to LDAP properties */ - v = vcard_load(msg->cm_fields['M']); - if (v->numprops) for (i=0; i<(v->numprops); ++i) if (striplt(v->prop[i].value), strlen(v->prop[i].value) > 0) { - - if (!strcasecmp(v->prop[i].name, "n")) { - extract_token(sn, v->prop[i].value, 0, ';', sizeof sn); - extract_token(givenname, v->prop[i].value, 1, ';', sizeof givenname); - } - - if (!strcasecmp(v->prop[i].name, "fn")) { - (void) CtdlDoDirectoryServiceFunc("cn", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - have_cn = 1; - } - - if (!strcasecmp(v->prop[i].name, "title")) { - (void) CtdlDoDirectoryServiceFunc("title", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - if (!strcasecmp(v->prop[i].name, "org")) { - (void) CtdlDoDirectoryServiceFunc("o", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - if ( (!strcasecmp(v->prop[i].name, "adr")) - ||(!strncasecmp(v->prop[i].name, "adr;", 4)) ) { - /* Unfortunately, we can only do a single address */ - if (!have_addr) { - have_addr = 1; - strcpy(street, ""); - extract_token(&street[strlen(street)], - v->prop[i].value, 0, ';', (sizeof street - strlen(street))); /* po box */ - strcat(street, " "); - extract_token(&street[strlen(street)], - v->prop[i].value, 1, ';', (sizeof street - strlen(street))); /* extend addr */ - strcat(street, " "); - extract_token(&street[strlen(street)], - v->prop[i].value, 2, ';', (sizeof street - strlen(street))); /* street */ - striplt(street); - extract_token(city, v->prop[i].value, 3, ';', sizeof city); - extract_token(state, v->prop[i].value, 4, ';', sizeof state); - extract_token(zipcode, v->prop[i].value, 5, ';', sizeof zipcode); - - // ldap requires these fields to be something - if (IsEmptyStr(street)) strcpy(street, "_"); - if (IsEmptyStr(zipcode)) strcpy(zipcode, "_"); - if (IsEmptyStr(city)) strcpy(city, "_"); - if (IsEmptyStr(state)) strcpy(state, "_"); - - (void) CtdlDoDirectoryServiceFunc("street", street, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("l", city, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("st", state, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("postalcode", zipcode, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - } - - if ( (!strcasecmp(v->prop[i].name, "tel;home")) - || (!strcasecmp(v->prop[i].name, "tel;type=home")) ) - (void) CtdlDoDirectoryServiceFunc("homePhone", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - else - if ( (!strcasecmp(v->prop[i].name, "tel;fax")) - || (!strcasecmp(v->prop[i].name, "tel;type=fax")) ) - (void) CtdlDoDirectoryServiceFunc("facsimileTelephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - else - if ( (!strcasecmp(v->prop[i].name, "tel;cell")) - || (!strcasecmp(v->prop[i].name, "tel;type=cell")) ) - (void) CtdlDoDirectoryServiceFunc("mobile", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - else - if ( (!strcasecmp(v->prop[i].name, "tel")) - ||(!strncasecmp(v->prop[i].name, "tel;", 4)) ) { - (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - - if ( (!strcasecmp(v->prop[i].name, "email")) - ||(!strcasecmp(v->prop[i].name, "email;internet")) ) { - (void) CtdlDoDirectoryServiceFunc("mail", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - /* Calendar free/busy URL (take the first one we find, but if a subsequent - * one contains the "pref" designation then we go with that instead.) - */ - if ( (!strcasecmp(v->prop[i].name, "fburl")) - ||(!strncasecmp(v->prop[i].name, "fburl;", 6)) ) { - if ( (IsEmptyStr(calFBURL)) - || (!strncasecmp(v->prop[i].name, "fburl;pref", 10)) ) { - safestrncpy(calFBURL, v->prop[i].value, sizeof calFBURL); - } - } - - } - vcard_free(v); /* Don't need this anymore. */ - - /* "sn" (surname) based on info in vCard */ - (void) CtdlDoDirectoryServiceFunc("sn", sn, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* "givenname" (first name) based on info in vCard */ - if (IsEmptyStr(givenname)) strcpy(givenname, "_"); - if (IsEmptyStr(sn)) strcpy(sn, "_"); - (void) CtdlDoDirectoryServiceFunc("givenname", givenname, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* "uid" is a Kolab compatibility thing. We just do cituser@citnode */ - (void) CtdlDoDirectoryServiceFunc("uid", uid, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Add a "cn" (Common Name) attribute based on the user's screen name, - * but only there was no 'fn' (full name) property in the vCard - */ - if (!have_cn) - (void) CtdlDoDirectoryServiceFunc("cn", msg->cm_fields['A'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Add a "calFBURL" attribute if a calendar free/busy URL exists */ - if (!IsEmptyStr(calFBURL)) { - (void) CtdlDoDirectoryServiceFunc("calFBURL", calFBURL, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - // Add this messages EUID as the primary key for this entry. - (void) CtdlDoDirectoryServiceFunc("euid", msg->cm_fields['E'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - - (void) CtdlDoDirectoryServiceFunc(ldap_dn, NULL, &objectlist, "ldap", DIRECTORY_SAVE_OBJECT); - - (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_FREE_OBJECT); - CtdlLogPrintf(CTDL_DEBUG, "Directory Services write operation complete.\n"); -} - - - /* * Callback for vcard_add_to_directory() * (Lotsa ugly nested callbacks. Oh well.) @@ -343,8 +150,7 @@ void vcard_directory_add_user(char *internet_addr, char *citadel_addr) { } } } - CtdlLogPrintf(CTDL_INFO, "Adding %s (%s) to directory\n", - citadel_addr, internet_addr); + CtdlLogPrintf(CTDL_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr); CtdlDirectoryAddUser(internet_addr, citadel_addr); } @@ -360,8 +166,6 @@ void vcard_add_to_directory(long msgnum, void *data) { vcard_extract_internet_addresses(msg, vcard_directory_add_user); } - ctdl_vcard_to_directory(msg, V2L_WRITE); - CtdlFreeMessage(msg); } @@ -1140,7 +944,6 @@ void vcard_delete_remove(char *room, long msgnum) { || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) { /* Bingo! A vCard is being deleted. */ vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser); - ctdl_vcard_to_directory(msg, V2L_DELETE); } ptr = strchr((char *)ptr, '\n'); if (ptr != NULL) ++ptr; @@ -1382,13 +1185,29 @@ void vcard_create_room(void) void vcard_session_login_hook(void) { struct vCard *v = NULL; + /* + * Is this an LDAP session? If so, copy various LDAP attributes from the directory entry + * into the user's vCard. + */ + /* FIXME THIS IS NOT IMPLEMENTED YET */ + + /* + * Extract from the user's vCard, any Internet email addresses and the user's real name. + * These are inserted into the session data for various message entry commands to use. + */ v = vcard_get_user(&CC->user); - extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email, - CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails, - v, 1); - extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); - vcard_free(v); + if (v) { + extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email, + CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails, + v, 1 + ); + extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); + vcard_free(v); + } + /* + * Create the user's 'Contacts' room (personal address book) if it doesn't already exist. + */ vcard_create_room(); } @@ -1574,6 +1393,7 @@ CTDL_MODULE_INIT(vcard) struct ctdlroom qr; char filename[256]; FILE *fp; + int rv = 0; if (!threading) { @@ -1583,8 +1403,7 @@ CTDL_MODULE_INIT(vcard) CtdlRegisterDeleteHook(vcard_delete_remove); CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info"); CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info"); - CtdlRegisterProtoHook(cmd_igab, "IGAB", - "Initialize Global Address Book"); + CtdlRegisterProtoHook(cmd_igab, "IGAB", "Initialize Global Address Book"); CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory"); CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names"); CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses"); @@ -1614,7 +1433,7 @@ CTDL_MODULE_INIT(vcard) assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir); fp = fopen(filename, "a"); if (fp != NULL) fclose(fp); - chown(filename, CTDLUID, (-1)); + rv = chown(filename, CTDLUID, (-1)); } /* for postfix tcpdict */ diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index 67fd4034e..421824a9b 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -53,19 +53,6 @@ struct ProtoFunctionHook { HashList *ProtoHookList = NULL; -struct DirectoryServiceHook { - int (*handler) (char *cn, char *ou, void **object); - int cmd; - char *module; - struct DirectoryServiceHook *next; -} *DirectoryServiceHookList = NULL; - -struct DirectoryObject { - char *module; - void *object; - struct DirectoryObject *next; -}; - #define ERR_PORT (1 << 1) @@ -1024,134 +1011,6 @@ int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg) } - - -int CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **object), int cmd, char *module) -{ - struct DirectoryServiceHook *newfcn; - - newfcn = DirectoryServiceHookList; - while (newfcn) - { - if (newfcn->cmd == cmd && !strcmp(newfcn->module, module)) - { - CtdlLogPrintf(CTDL_ERR, "Directory service function already handled by module %s\n", module); - return -1; - } - newfcn = newfcn->next; - } - - newfcn = (struct DirectoryServiceHook *) malloc (sizeof(struct DirectoryServiceHook)); - newfcn->handler = func; - newfcn->cmd = cmd; - newfcn->module = module; - newfcn->next = DirectoryServiceHookList; - DirectoryServiceHookList = newfcn; - - CtdlLogPrintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module); - return 0; -} - -int CtdlDoDirectoryServiceFunc(char *cn, char *ou, void **object, char *module, int cmd) -{ - struct DirectoryServiceHook *curfcn; - struct DirectoryObject *our_object_list = NULL; - struct DirectoryObject *newobject = NULL; - struct DirectoryObject *oldobject = NULL; - - - curfcn = DirectoryServiceHookList; - if (object) - our_object_list = (struct DirectoryObject *) *object; - - while (curfcn) - { - if (curfcn->cmd == cmd) - { - if (!module) - { - if (cmd == DIRECTORY_CREATE_OBJECT) - { - newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject)); - newobject->module = curfcn->module; - newobject->object = NULL; - newobject->next = our_object_list; - our_object_list = newobject; - } - if (our_object_list) - { - for(newobject = our_object_list; newobject; newobject=newobject->next) - { - if (!strcmp(newobject->module, curfcn->module)) - (void) curfcn->handler(cn, ou, &newobject->object); - } - } - else - (void) curfcn->handler(cn, ou, NULL); - - continue; - } - else - { - if(!strcmp(curfcn->module, module)) - { - if (cmd == DIRECTORY_CREATE_OBJECT) - { - newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject)); - newobject->module = module; - newobject->object = NULL; - newobject->next = our_object_list; - our_object_list = newobject; - } - if (our_object_list) - { - for(newobject = our_object_list; newobject; newobject=newobject->next) - { - if (!strcmp(newobject->module, curfcn->module)) - (void) curfcn->handler(cn, ou, &newobject->object); - } - } - else - (void) (curfcn->handler(cn, ou, NULL)); - - break; - } - } - } - curfcn=curfcn->next; - } - if (our_object_list) - { - *object = our_object_list; - if (cmd == DIRECTORY_FREE_OBJECT) - { // The objects pointed to by the list should have been freed by the module that created it - for(newobject = our_object_list; newobject; ) - { - oldobject=newobject; - newobject=newobject->next; - free(oldobject); - } - *object=NULL; - } - } - return 0; -} - -void CtdlDestroyDirectoryServiceFuncs(void) -{ - struct DirectoryServiceHook *cur, *next; - - cur = DirectoryServiceHookList; - DirectoryServiceHookList = NULL; - while (cur) - { - next = cur->next; - CtdlLogPrintf(CTDL_INFO, "Destroyed directory service function for module %s.\n", cur->module); - free(cur); - cur = next; - } -} - /* * Dirty hack until we impliment a hook mechanism for this */ diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h index 9256798e5..9a658b036 100644 --- a/citadel/serv_extensions.h +++ b/citadel/serv_extensions.h @@ -200,6 +200,4 @@ int PerformFixedOutputHooks(char *, char *, int); void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name); -void CtdlDestroyDirectoryServiceFuncs(void); - #endif /* SERV_EXTENSIONS_H */ diff --git a/citadel/sysdep.c b/citadel/sysdep.c index b1415a4ab..c06575888 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -878,7 +878,6 @@ void sysdep_master_cleanup(void) { CtdlDestroySessionHooks(); CtdlDestroyServiceHook(); CtdlDestroyRoomHooks(); - CtdlDestroyDirectoryServiceFuncs(); #ifdef HAVE_BACKTRACE eCrash_Uninit(); #endif -- 2.30.2