/*
* Server functions which perform operations on user objects.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2019 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.
int chkpwd_write_pipe[2];
int chkpwd_read_pipe[2];
+/*
+ * Trim a string down to the maximum username size and return the new length
+ */
+long cutusername(char *username) {
+ long len;
+ len = strlen(username);
+ if (len >= USERNAME_SIZE)
+ {
+ syslog(LOG_INFO, "Username too long: %s", username);
+ len = USERNAME_SIZE - 1;
+ username[len]='\0';
+ }
+ return len;
+}
+
+
+/*
+ * makeuserkey() - convert a username into the format used as a database key
+ * (it's just the username converted into lower case)
+ */
+void makeuserkey(char *key, const char *username, long len) {
+ int i;
+
+ if (len >= USERNAME_SIZE)
+ {
+ syslog(LOG_INFO, "Username too long: %s", username);
+ len = USERNAME_SIZE - 1;
+ }
+ for (i=0; i<=len; ++i) {
+ key[i] = tolower(username[i]);
+ }
+}
+
/*
* CtdlGetUser() retrieve named user into supplied buffer.
{
char usernamekey[USERNAME_SIZE];
struct cdbdata *cdbus;
- long len = cutuserkey(name);
+ long len = cutusername(name);
if (usbuf != NULL) {
memset(usbuf, 0, sizeof(struct ctdluser));
memcpy(usbuf, cdbus->ptr, ((cdbus->len > sizeof(struct ctdluser)) ? sizeof(struct ctdluser) : cdbus->len));
}
cdb_free(cdbus);
- return (0);
+ return(0);
}
if (retcode == 0) {
begin_critical_section(S_USERS);
}
- return (retcode);
+ return(retcode);
}
{
char usernamekey[USERNAME_SIZE];
- makeuserkey(usernamekey, usbuf->fullname, cutuserkey(usbuf->fullname));
+ makeuserkey(usernamekey, usbuf->fullname, cutusername(usbuf->fullname));
usbuf->version = REV_LEVEL;
cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
}
char newnamekey[USERNAME_SIZE];
/* Create the database keys... */
- makeuserkey(oldnamekey, oldname, cutuserkey(oldname));
- makeuserkey(newnamekey, newname, cutuserkey(newname));
+ makeuserkey(oldnamekey, oldname, cutusername(oldname));
+ makeuserkey(newnamekey, newname, cutusername(newname));
/* Lock up and get going */
begin_critical_section(S_USERS);
TheIndex.iUserID = UserID;
memcpy(IndexBuf, &TheIndex, sizeof(TheIndex));
- return (sizeof(TheIndex));
+ return(sizeof(TheIndex));
}
struct cdbdata *cdbvisit;
/* Generate an index */
- IndexLen = GenerateRelationshipIndex(IndexBuf,
- rel_room->QRnumber,
- rel_room->QRgen,
- rel_user->usernum);
+ IndexLen = GenerateRelationshipIndex(IndexBuf, rel_room->QRnumber, rel_room->QRgen, rel_user->usernum);
/* Clear out the buffer */
memset(vbuf, 0, sizeof(visit));
cdbvisit = cdb_fetch(CDB_VISIT, IndexBuf, IndexLen);
if (cdbvisit != NULL) {
- memcpy(vbuf, cdbvisit->ptr,
- ((cdbvisit->len > sizeof(visit)) ?
- sizeof(visit) : cdbvisit->len));
+ memcpy(vbuf, cdbvisit->ptr, ((cdbvisit->len > sizeof(visit)) ? sizeof(visit) : cdbvisit->len));
cdb_free(cdbvisit);
}
else {
int is_aide(void)
{
if (CC->user.axlevel >= AxAideU)
- return (1);
+ return(1);
else
- return (0);
+ return(0);
}
{
if (!CC->logged_in) {
- return (0);
+ return(0);
}
if ((CC->user.axlevel >= AxAideU) || (CC->room.QRroomaide == CC->user.usernum)) {
- return (1);
+ return(1);
} else {
- return (0);
+ return(0);
}
}
/*
* Helper function for rebuild_usersbynumber()
*/
-void rebuild_ubn_for_user(struct ctdluser *usbuf, void *data) {
-
- struct ubnlist {
- struct ubnlist *next;
- char username[USERNAME_SIZE];
- long usernum;
- };
+void rebuild_ubn_for_user(char *username, void *data) {
+ struct ctdluser u;
- static struct ubnlist *u = NULL;
- struct ubnlist *ptr = NULL;
-
- /* Lazy programming here. Call this function as a ForEachUser backend
- * in order to queue up the room names, or call it with a null user
- * to make it do the processing.
- */
- if (usbuf != NULL) {
- ptr = (struct ubnlist *) malloc(sizeof (struct ubnlist));
- if (ptr == NULL) return;
-
- ptr->usernum = usbuf->usernum;
- safestrncpy(ptr->username, usbuf->fullname, sizeof ptr->username);
- ptr->next = u;
- u = ptr;
- return;
- }
-
- while (u != NULL) {
- syslog(LOG_DEBUG, "user_ops: rebuilding usersbynumber index %10ld : %s", u->usernum, u->username);
- cdb_store(CDB_USERSBYNUMBER, &u->usernum, sizeof(long), u->username, strlen(u->username)+1);
- ptr = u;
- u = u->next;
- free(ptr);
+ syslog(LOG_DEBUG, "user_ops: rebuilding usersbynumber index for %s", username);
+ if (CtdlGetUser(&u, username) == 0) {
+ cdb_store(CDB_USERSBYNUMBER, &(u.usernum), sizeof(long), u.fullname, strlen(u.fullname)+1);
}
}
void rebuild_usersbynumber(void) {
cdb_trunc(CDB_USERSBYNUMBER); /* delete the old indices */
ForEachUser(rebuild_ubn_for_user, NULL); /* enumerate the users */
- rebuild_ubn_for_user(NULL, NULL); /* and index them */
}
/*
- * getuserbyuid() - get user by system uid (for PAM mode authentication)
- * returns 0 if user was found
- *
- * WARNING: don't use this function unless you absolutely have to. It does
- * a sequential search and therefore is computationally expensive.
- *
- * FIXME: build an index, dummy.
+ * getuserbyuid() Get user by system uid (for PAM mode authentication)
+ * Returns 0 if user was found
+ * This now uses an extauth index.
*/
int getuserbyuid(struct ctdluser *usbuf, uid_t number)
{
- struct cdbdata *cdbus;
+ struct cdbdata *cdbextauth;
+ long usernum = 0;
+ StrBuf *claimed_id;
+
+ claimed_id = NewStrBuf();
+ StrBufPrintf(claimed_id, "uid:%d", number);
+ cdbextauth = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id));
+ FreeStrBuf(&claimed_id);
+ if (cdbextauth == NULL) {
+ return(-1);
+ }
- cdb_rewind(CDB_USERS);
+ memcpy(&usernum, cdbextauth->ptr, sizeof(long));
+ cdb_free(cdbextauth);
- while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
- memset(usbuf, 0, sizeof(struct ctdluser));
- memcpy(usbuf, cdbus->ptr,
- ((cdbus->len > sizeof(struct ctdluser)) ?
- sizeof(struct ctdluser) : cdbus->len));
- cdb_free(cdbus);
- if (usbuf->uid == number) {
- cdb_close_cursor(CDB_USERS);
- return (0);
- }
+ if (!CtdlGetUserByNumber(usbuf, usernum)) {
+ return(0);
}
- return (-1);
+
+ return(-1);
}
/*
* Back end for cmd_user() and its ilk
- *
- * NOTE: "authname" should only be used if we are attempting to use the "master user" feature
*/
-int CtdlLoginExistingUser(char *authname, const char *trythisname)
+int CtdlLoginExistingUser(const char *trythisname)
{
char username[SIZ];
int found_user;
- syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s, %s)", authname, trythisname);
+ syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s)", trythisname);
if ((CC->logged_in)) {
return login_already_logged_in;
return login_not_found;
}
- /* If a "master user" is defined, handle its authentication if specified */
- CC->is_master = 0;
- if ( (!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) &&
- (!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
- (authname != NULL) &&
- (!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
- {
- CC->is_master = 1;
- }
-
/* Continue attempting user validation... */
safestrncpy(username, trythisname, sizeof (username));
striplt(username);
return login_not_found;
}
- /* Locate the associated Citadel account.
- * If not found, make one attempt to create it.
- */
+ /* Locate the associated Citadel account. If not found, make one attempt to create it. */
found_user = getuserbyuid(&CC->user, pd.pw_uid);
if (found_user != 0) {
create_user(username, CREATE_USER_DO_NOT_BECOME_USER, pd.pw_uid);
/* First, try to log in as if the supplied name is a display name */
found_user = CtdlGetUser(&CC->user, username);
- /* If that didn't work, try to log in as if the supplied name
- * is an e-mail address
- */
+ /* If that didn't work, try to log in as if the supplied name * is an e-mail address */
if (found_user != 0) {
valid = validate_recipients(username, NULL, 0);
if (valid != NULL) {
*/
void do_login(void)
{
- struct CitContext *CCC = CC;
-
- CCC->logged_in = 1;
- syslog(LOG_NOTICE, "user_ops: <%s> logged in", CCC->curr_user);
+ CC->logged_in = 1;
+ syslog(LOG_NOTICE, "user_ops: <%s> logged in", CC->curr_user);
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
- ++(CCC->user.timescalled);
- CCC->previous_login = CCC->user.lastcall;
- time(&CCC->user.lastcall);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
+ ++(CC->user.timescalled);
+ CC->previous_login = CC->user.lastcall;
+ time(&CC->user.lastcall);
/* If this user's name is the name of the system administrator
* (as specified in setup), automatically assign access level 6.
*/
- if (!strcasecmp(CCC->user.fullname, CtdlGetConfigStr("c_sysadm"))) {
- CCC->user.axlevel = AxAideU;
+ if ( (!IsEmptyStr(CtdlGetConfigStr("c_sysadm"))) && (!strcasecmp(CC->user.fullname, CtdlGetConfigStr("c_sysadm"))) ) {
+ CC->user.axlevel = AxAideU;
}
- /* If we're authenticating off the host system, automatically give
- * root the highest level of access.
- */
+ /* If we're authenticating off the host system, automatically give root the highest level of access. */
if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
- if (CCC->user.uid == 0) {
- CCC->user.axlevel = AxAideU;
+ if (CC->user.uid == 0) {
+ CC->user.axlevel = AxAideU;
}
}
+ CtdlPutUserLock(&CC->user);
- /*
- * If we are using LDAP authentication, extract the user's email addresses from the directory.
- * FIXME make this a site configurable setting
- */
- #ifdef HAVE_LDAP
- if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
- char new_emailaddrs[512];
- if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
- strcpy(CCC->user.emailaddrs, new_emailaddrs);
+ /* If we are using LDAP authentication, extract the user's email addresses from the directory. */
+#ifdef HAVE_LDAP
+ if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+ char new_emailaddrs[512];
+ if (CtdlGetConfigInt("c_ldap_sync_email_addrs") > 0) {
+ if (extract_email_addresses_from_ldap(CC->ldap_dn, new_emailaddrs) == 0) {
+ CtdlSetEmailAddressesForUser(CC->user.fullname, new_emailaddrs);
}
}
- #endif
+ }
+#endif
- /*
- * No email address for user? Make one up.
- */
- if (IsEmptyStr(CCC->user.emailaddrs)) {
- sprintf(CCC->user.emailaddrs, "cit%ld@%s", CCC->user.usernum, CtdlGetConfigStr("c_fqdn"));
+ /* If the user does not have any email addresses assigned, generate one. */
+ if (IsEmptyStr(CC->user.emailaddrs)) {
+ AutoGenerateEmailAddressForUser(&CC->user);
}
-
- CtdlPutUserLock(&CCC->user);
/*
* Populate cs_inet_email and cs_inet_other_emails with valid email addresses from the user record
*/
- strcpy(CCC->cs_inet_email, CCC->user.emailaddrs);
- char *firstsep = strstr(CCC->cs_inet_email, "|");
+ strcpy(CC->cs_inet_email, CC->user.emailaddrs);
+ char *firstsep = strstr(CC->cs_inet_email, "|");
if (firstsep) {
- strcpy(CCC->cs_inet_other_emails, firstsep+1);
+ strcpy(CC->cs_inet_other_emails, firstsep+1);
*firstsep = 0;
}
else {
- CCC->cs_inet_other_emails[0] = 0;
+ CC->cs_inet_other_emails[0] = 0;
}
/* Create any personal rooms required by the system.
* since it's possible to log in again without reconnecting, we cannot
* make that assumption.
*/
- strcpy(CCC->fake_username, "");
- strcpy(CCC->fake_hostname, "");
- strcpy(CCC->fake_roomname, "");
CCC->logged_in = 0;
- /* Check to see if the user was deleted whilst logged in and purge them if necessary */
+ /* Check to see if the user was deleted while logged in and purge them if necessary */
if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) {
purge_user(CCC->user.fullname);
}
/* Clear out the user record in memory so we don't behave like a ghost */
memset(&CCC->user, 0, sizeof(struct ctdluser));
CCC->curr_user[0] = 0;
- CCC->is_master = 0;
CCC->cs_inet_email[0] = 0;
CCC->cs_inet_other_emails[0] = 0;
CCC->cs_inet_fn[0] = 0;
- CCC->fake_username[0] = 0;
- CCC->fake_hostname[0] = 0;
- CCC->fake_roomname[0] = 0;
/* Free any output buffers */
unbuffer_output();
return pass_wrong_password;
}
- if (CCC->is_master) {
- code = strcmp(password, CtdlGetConfigStr("c_master_pass"));
- }
-
else if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
/* host auth mode */
struct ctdluser usbuf;
char usernamekey[USERNAME_SIZE];
- makeuserkey(usernamekey, pname, cutuserkey(pname));
+ makeuserkey(usernamekey, pname, cutusername(pname));
/* If the name is empty we can't find them in the DB any way so just return */
- if (IsEmptyStr(pname))
- return (ERROR + NO_SUCH_USER);
+ if (IsEmptyStr(pname)) {
+ return(ERROR + NO_SUCH_USER);
+ }
if (CtdlGetUser(&usbuf, pname) != 0) {
syslog(LOG_ERR, "user_ops: cannot purge user <%s> - not found", pname);
- return (ERROR + NO_SUCH_USER);
+ return(ERROR + NO_SUCH_USER);
}
+
/* Don't delete a user who is currently logged in. Instead, just
* set the access level to 0, and let the account get swept up
* during the next purge.
syslog(LOG_WARNING, "user_ops: <%s> is logged in; not deleting", pname);
usbuf.axlevel = AxDeleted;
CtdlPutUser(&usbuf);
- return (1);
+ return(1);
}
- syslog(LOG_NOTICE, "user_ops: deleting <%s>", pname);
-/*
- * FIXME:
- * This should all be wrapped in a S_USERS mutex.
- * Without the mutex the user could log in before we get to the next function
- * That would truly mess things up :-(
- * I would like to see the S_USERS start before the CtdlIsUserLoggedInByNum() above
- * and end after the user has been deleted from the database, below.
- * Question is should we enter the EVT_PURGEUSER while S_USERS is active?
- */
+ syslog(LOG_NOTICE, "user_ops: deleting <%s>", pname);
/* Perform any purge functions registered by server extensions */
PerformUserHooks(&usbuf, EVT_PURGEUSER);
/* delete the userlog entry */
cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
- return (0);
+ return(0);
}
int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid)
{
if (!CtdlGetUser(usbuf, username)) {
- return (ERROR + ALREADY_EXISTS);
+ return(ERROR + ALREADY_EXISTS);
}
/* Go ahead and initialize a new user record */
CtdlPutUser(usbuf);
cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1);
- return 0;
+ /* If non-native auth, index by uid */
+ if ((usbuf->uid > 0) && (usbuf->uid != NATIVE_AUTH_UID)) {
+ StrBuf *claimed_id = NewStrBuf();
+ StrBufPrintf(claimed_id, "uid:%d", usbuf->uid);
+ attach_extauth(usbuf, claimed_id);
+ FreeStrBuf(&claimed_id);
+ }
+
+ return(0);
}
/* Check to make sure we're still who we think we are */
if (CtdlGetUser(&CC->user, CC->curr_user)) {
- return (ERROR + INTERNAL_ERROR);
+ return(ERROR + INTERNAL_ERROR);
}
}
);
CtdlAideMessage(buf, "User Creation Notice");
syslog(LOG_NOTICE, "user_ops: <%s> created", username);
- return (0);
+ return(0);
}
(CC->logged_in ? CC->user.fullname : "an administrator")
);
CtdlAideMessage(bbb,"User Admin Message");
-
return(0);
}
/* Return to the Lobby, so we don't end up in an undefined room */
CtdlUserGoto(CtdlGetConfigStr("c_baseroom"), 0, 0, NULL, NULL, NULL, NULL);
return(0);
-
}
/*
- * Traverse the user file...
+ * Traverse the user file and perform a callback for each user record.
+ * (New improved version that runs in two phases so that callbacks can perform writes without having a r/o cursor open)
*/
-void ForEachUser(void (*CallBack) (struct ctdluser * EachUser, void *out_data),
- void *in_data)
+void ForEachUser(void (*CallBack) (char *, void *out_data), void *in_data)
{
- struct ctdluser usbuf;
+ struct feu {
+ char username[USERNAME_SIZE];
+ int version;
+ };
+
struct cdbdata *cdbus;
+ struct ctdluser *usptr;
+ int i = 0;
+ struct feu *usernames = NULL;
+ int num_users = 0;
+ int num_users_alloc = 0;
cdb_rewind(CDB_USERS);
+ // Phase 1 : load list of usernames
while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
- memset(&usbuf, 0, sizeof(struct ctdluser));
- memcpy(&usbuf, cdbus->ptr,
- ((cdbus->len > sizeof(struct ctdluser)) ?
- sizeof(struct ctdluser) : cdbus->len));
- cdb_free(cdbus);
- (*CallBack) (&usbuf, in_data);
- }
-}
-
+ usptr = (struct ctdluser *) cdbus->ptr;
-/*
- * List one user (this works with cmd_list)
- */
-void ListThisUser(struct ctdluser *usbuf, void *data)
-{
- char *searchstring;
-
- searchstring = (char *)data;
- if (bmstrcasestr(usbuf->fullname, searchstring) == NULL) {
- return;
- }
-
- if (usbuf->axlevel > AxDeleted) {
- if ((CC->user.axlevel >= AxAideU)
- || ((usbuf->flags & US_UNLISTED) == 0)
- || ((CC->internal_pgm))) {
- cprintf("%s|%d|%ld|%ld|%ld|%ld||\n",
- usbuf->fullname,
- usbuf->axlevel,
- usbuf->usernum,
- (long)usbuf->lastcall,
- usbuf->timescalled,
- usbuf->posted);
+ if (strlen(usptr->fullname) > 0) {
+ ++num_users;
+ if (num_users > num_users_alloc) {
+ num_users_alloc = ((num_users_alloc == 0) ? 1 : (num_users_alloc * 2));
+ usernames = realloc(usernames, num_users_alloc * sizeof(struct feu));
+ }
+ strcpy(usernames[num_users-1].username, usptr->fullname);
+ usernames[num_users-1].version = usptr->version;
}
}
+
+ // Phase 2 : perform the callback for each username
+ for (i=0; i<num_users; ++i) {
+ //if (usernames[i].version < 927) {
+ // FIXME This is where we will do the reindexing stuff
+ //}
+ (*CallBack) (usernames[i].username, in_data);
+ }
+
+ free(usernames);
}
int NewMailCount()
{
int num_newmsgs = 0;
-
num_newmsgs = CC->newmail;
CC->newmail = 0;
-
- return (num_newmsgs);
+ return(num_newmsgs);
}
CtdlMailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM);
if (CtdlGetRoom(&mailbox, mailboxname) != 0)
- return (0);
+ return(0);
CtdlGetRelationship(&vbuf, &CC->user, &mailbox);
cdbfr = cdb_fetch(CDB_MSGLISTS, &mailbox.QRnumber, sizeof(long));
if (msglist != NULL)
free(msglist);
- return (num_newmsgs);
+ return(num_newmsgs);
}