X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=2b66fdbe24029a51e77fd6896008977b5ebc31c1;hp=417ef630cc3bb114553cc6571100a87899313a99;hb=11e722f9406b58f2884d6d63f4acba49b668f53f;hpb=6e3ac9b743a16b4ab69fec6575f92d5e6de25d65 diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 417ef630c..2b66fdbe2 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -1,8 +1,21 @@ /* - * $Id$ - * * Server functions which perform operations on user objects. * + * Copyright (c) 1987-2011 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 as published + * by the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -16,6 +29,10 @@ #include #include #include +#include +#ifdef HAVE_SYS_STAT_H +#include +#endif #if TIME_WITH_SYS_TIME # include @@ -30,12 +47,11 @@ #include #include +#include #include "auth.h" #include "citadel.h" #include "server.h" #include "database.h" -#include "user_ops.h" -#include "serv_extensions.h" #include "sysdep_decls.h" #include "support.h" #include "room_ops.h" @@ -43,34 +59,36 @@ #include "control.h" #include "msgbase.h" #include "config.h" -#include "tools.h" #include "citserver.h" #include "citadel_dirs.h" #include "genstamp.h" +#include "threads.h" +#include "citadel_ldap.h" +#include "context.h" +#include "ctdl_module.h" +#include "user_ops.h" /* These pipes are used to talk to the chkpwd daemon, which is forked during startup */ int chkpwd_write_pipe[2]; int chkpwd_read_pipe[2]; + + /* - * makeuserkey() - convert a username into the format used as a database key - * (it's just the username converted into lower case) + * getuser() - retrieve named user into supplied buffer. + * returns 0 on success */ -static INLINE void makeuserkey(char *key, char *username) { - int i, len; - - len = strlen(username); - for (i=0; i<=len; ++i) { - key[i] = tolower(username[i]); - } +int getuser(struct ctdluser *usbuf, char name[]) +{ + return CtdlGetUser(usbuf, name); } /* - * getuser() - retrieve named user into supplied buffer. + * CtdlGetUser() - retrieve named user into supplied buffer. * returns 0 on success */ -int getuser(struct ctdluser *usbuf, char name[]) +int CtdlGetUserLen(struct ctdluser *usbuf, const char *name, long len) { char usernamekey[USERNAME_SIZE]; @@ -80,7 +98,7 @@ int getuser(struct ctdluser *usbuf, char name[]) memset(usbuf, 0, sizeof(struct ctdluser)); } - makeuserkey(usernamekey, name); + makeuserkey(usernamekey, name, len); cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey)); if (cdbus == NULL) { /* user not found */ @@ -97,14 +115,20 @@ int getuser(struct ctdluser *usbuf, char name[]) } +int CtdlGetUser(struct ctdluser *usbuf, char *name) +{ + return CtdlGetUserLen(usbuf, name, cutuserkey(name)); +} + + /* - * lgetuser() - same as getuser() but locks the record + * CtdlGetUserLock() - same as getuser() but locks the record */ -int lgetuser(struct ctdluser *usbuf, char *name) +int CtdlGetUserLock(struct ctdluser *usbuf, char *name) { int retcode; - retcode = getuser(usbuf, name); + retcode = CtdlGetUser(usbuf, name); if (retcode == 0) { begin_critical_section(S_USERS); } @@ -113,13 +137,24 @@ int lgetuser(struct ctdluser *usbuf, char *name) /* - * putuser() - write user buffer into the correct place on disk + * lgetuser() - same as getuser() but locks the record */ -void putuser(struct ctdluser *usbuf) +int lgetuser(struct ctdluser *usbuf, char *name) +{ + return CtdlGetUserLock(usbuf, name); +} + + +/* + * CtdlPutUser() - write user buffer into the correct place on disk + */ +void CtdlPutUser(struct ctdluser *usbuf) { char usernamekey[USERNAME_SIZE]; - makeuserkey(usernamekey, usbuf->fullname); + makeuserkey(usernamekey, + usbuf->fullname, + cutuserkey(usbuf->fullname)); usbuf->version = REV_LEVEL; cdb_store(CDB_USERS, @@ -129,15 +164,94 @@ void putuser(struct ctdluser *usbuf) } +/* + * putuser() - write user buffer into the correct place on disk + */ +void putuser(struct ctdluser *usbuf) +{ + CtdlPutUser(usbuf); +} + + +/* + * CtdlPutUserLock() - same as putuser() but locks the record + */ +void CtdlPutUserLock(struct ctdluser *usbuf) +{ + CtdlPutUser(usbuf); + end_critical_section(S_USERS); +} + + /* * lputuser() - same as putuser() but locks the record */ void lputuser(struct ctdluser *usbuf) { - putuser(usbuf); + CtdlPutUserLock(usbuf); +} + + +/* + * rename_user() - this is tricky because the user's display name is the database key + * + * Returns 0 on success or nonzero if there was an error... + * + */ +int rename_user(char *oldname, char *newname) { + int retcode = RENAMEUSER_OK; + struct ctdluser usbuf; + + char oldnamekey[USERNAME_SIZE]; + char newnamekey[USERNAME_SIZE]; + + /* Create the database keys... */ + makeuserkey(oldnamekey, oldname, cutuserkey(oldname)); + makeuserkey(newnamekey, newname, cutuserkey(newname)); + + /* Lock up and get going */ + begin_critical_section(S_USERS); + + /* We cannot rename a user who is currently logged in */ + if (CtdlIsUserLoggedIn(oldname)) { + end_critical_section(S_USERS); + return RENAMEUSER_LOGGED_IN; + } + + if (CtdlGetUser(&usbuf, newname) == 0) { + retcode = RENAMEUSER_ALREADY_EXISTS; + } + else { + + if (CtdlGetUser(&usbuf, oldname) != 0) { + retcode = RENAMEUSER_NOT_FOUND; + } + + else { /* Sanity checks succeeded. Now rename the user. */ + if (usbuf.usernum == 0) + { + syslog(LOG_DEBUG, "Can not rename user \"Citadel\".\n"); + retcode = RENAMEUSER_NOT_FOUND; + } else { + syslog(LOG_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname); + cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey)); + safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname); + CtdlPutUser(&usbuf); + cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long), + usbuf.fullname, strlen(usbuf.fullname)+1 ); + + retcode = RENAMEUSER_OK; + } + } + + } + end_critical_section(S_USERS); + return(retcode); } + + /* * Index-generating function used by Ctdl[Get|Set]Relationship */ @@ -166,11 +280,12 @@ int GenerateRelationshipIndex(char *IndexBuf, /* * Back end for CtdlSetRelationship() */ -void put_visit(struct visit *newvisit) +void put_visit(visit *newvisit) { char IndexBuf[32]; int IndexLen = 0; + memset (IndexBuf, 0, sizeof (IndexBuf)); /* Generate an index */ IndexLen = GenerateRelationshipIndex(IndexBuf, newvisit->v_roomnum, @@ -179,7 +294,7 @@ void put_visit(struct visit *newvisit) /* Store the record */ cdb_store(CDB_VISIT, IndexBuf, IndexLen, - newvisit, sizeof(struct visit) + newvisit, sizeof(visit) ); } @@ -189,7 +304,7 @@ void put_visit(struct visit *newvisit) /* * Define a relationship between a user and a room */ -void CtdlSetRelationship(struct visit *newvisit, +void CtdlSetRelationship(visit *newvisit, struct ctdluser *rel_user, struct ctdlroom *rel_room) { @@ -208,7 +323,7 @@ void CtdlSetRelationship(struct visit *newvisit, /* * Locate a relationship between a user and a room */ -void CtdlGetRelationship(struct visit *vbuf, +void CtdlGetRelationship(visit *vbuf, struct ctdluser *rel_user, struct ctdlroom *rel_room) { @@ -224,13 +339,13 @@ void CtdlGetRelationship(struct visit *vbuf, rel_user->usernum); /* Clear out the buffer */ - memset(vbuf, 0, sizeof(struct visit)); + memset(vbuf, 0, sizeof(visit)); cdbvisit = cdb_fetch(CDB_VISIT, IndexBuf, IndexLen); if (cdbvisit != NULL) { memcpy(vbuf, cdbvisit->ptr, - ((cdbvisit->len > sizeof(struct visit)) ? - sizeof(struct visit) : cdbvisit->len)); + ((cdbvisit->len > sizeof(visit)) ? + sizeof(visit) : cdbvisit->len)); cdb_free(cdbvisit); } else { @@ -247,6 +362,12 @@ void CtdlGetRelationship(struct visit *vbuf, } +void CtdlMailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix) +{ + snprintf(buf, n, "%010ld.%s", who->usernum, prefix); +} + + void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix) { snprintf(buf, n, "%010ld.%s", who->usernum, prefix); @@ -258,7 +379,7 @@ void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *pr */ int is_aide(void) { - if (CC->user.axlevel >= 6) + if (CC->user.axlevel >= AxAideU) return (1); else return (0); @@ -275,7 +396,7 @@ int is_room_aide(void) return (0); } - if ((CC->user.axlevel >= 6) + if ((CC->user.axlevel >= AxAideU) || (CC->room.QRroomaide == CC->user.usernum)) { return (1); } else { @@ -284,33 +405,94 @@ int is_room_aide(void) } /* - * getuserbynumber() - get user by number - * returns 0 if user was found + * CtdlGetUserByNumber() - get user by number + * 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. + * Note: fetching a user this way requires one additional database operation. */ -int getuserbynumber(struct ctdluser *usbuf, long int number) +int CtdlGetUserByNumber(struct ctdluser *usbuf, long number) { - struct cdbdata *cdbus; + struct cdbdata *cdbun; + int r; - cdb_rewind(CDB_USERS); + cdbun = cdb_fetch(CDB_USERSBYNUMBER, &number, sizeof(long)); + if (cdbun == NULL) { + syslog(LOG_INFO, "User %ld not found\n", number); + return(-1); + } - 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->usernum == number) { - cdb_close_cursor(CDB_USERS); - return (0); - } + syslog(LOG_INFO, "User %ld maps to %s\n", number, cdbun->ptr); + r = CtdlGetUser(usbuf, cdbun->ptr); + cdb_free(cdbun); + return(r); +} + +/* + * getuserbynumber() - get user by number + * returns 0 if user was found + * + * Note: fetching a user this way requires one additional database operation. + */ +int getuserbynumber(struct ctdluser *usbuf, long number) +{ + return CtdlGetUserByNumber(usbuf, number); +} + + + +/* + * 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; + }; + + 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; } - return (-1); + + while (u != NULL) { + syslog(LOG_DEBUG, "Rebuilding usersbynumber index %10ld : %s\n", + 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); + } +} + + + +/* + * Rebuild the users-by-number index + */ +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 @@ -338,29 +520,49 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number) 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 *trythisname) +int CtdlLoginExistingUser(char *authname, const char *trythisname) { char username[SIZ]; int found_user; + long len; + + syslog(LOG_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); if ((CC->logged_in)) { return login_already_logged_in; } if (trythisname == NULL) return login_not_found; - safestrncpy(username, trythisname, USERNAME_SIZE); + + if (!strncasecmp(trythisname, "SYS_", 4)) + { + syslog(LOG_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname); + return login_not_found; + } + + /* If a "master user" is defined, handle its authentication if specified */ + CC->is_master = 0; + if (strlen(config.c_master_user) > 0) if (strlen(config.c_master_pass) > 0) if (authname) { + if (!strcasecmp(authname, config.c_master_user)) { + CC->is_master = 1; + } + } + + /* Continue attempting user validation... */ + safestrncpy(username, trythisname, sizeof (username)); striplt(username); + len = cutuserkey(username); - if (strlen(username) == 0) { + if (IsEmptyStr(username)) { return login_not_found; } - if (config.c_auth_mode == 1) { + if (config.c_auth_mode == AUTHMODE_HOST) { /* host auth mode */ @@ -368,44 +570,82 @@ int CtdlLoginExistingUser(char *trythisname) struct passwd *tempPwdPtr; char pwdbuffer[256]; - lprintf(CTDL_DEBUG, "asking host about <%s>\n", username); + syslog(LOG_DEBUG, "asking host about <%s>\n", username); +#ifdef HAVE_GETPWNAM_R #ifdef SOLARIS_GETPWUID + syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer); -#else +#else // SOLARIS_GETPWUID + syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr); -#endif +#endif // SOLARIS_GETPWUID +#else // HAVE_GETPWNAM_R + syslog(LOG_DEBUG, "SHOULD NEVER GET HERE!!!\n"); + tempPwdPtr = NULL; +#endif // HAVE_GETPWNAM_R if (tempPwdPtr == NULL) { + syslog(LOG_DEBUG, "no such user <%s>\n", username); return login_not_found; } - lprintf(CTDL_DEBUG, "found it! uid=%ld, gecos=%s\n", (long)pd.pw_uid, pd.pw_gecos); /* Locate the associated Citadel account. * If not found, make one attempt to create it. */ found_user = getuserbyuid(&CC->user, pd.pw_uid); + syslog(LOG_DEBUG, "found it: uid=%ld, gecos=%s here: %d\n", + (long)pd.pw_uid, pd.pw_gecos, found_user); if (found_user != 0) { - create_user(username, 0); + len = cutuserkey(username); + create_user(username, len, 0); found_user = getuserbyuid(&CC->user, pd.pw_uid); } } +#ifdef HAVE_LDAP + else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) { + + /* LDAP auth mode */ + + uid_t ldap_uid; + char ldap_cn[256]; + char ldap_dn[256]; + + found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid); + if (found_user != 0) { + return login_not_found; + } + + found_user = getuserbyuid(&CC->user, ldap_uid); + if (found_user != 0) { + create_user(username, len, 0); + found_user = getuserbyuid(&CC->user, ldap_uid); + } + + if (found_user == 0) { + if (CC->ldap_dn != NULL) free(CC->ldap_dn); + CC->ldap_dn = strdup(ldap_dn); + } + + } +#endif + else { /* native auth mode */ struct recptypes *valid = NULL; /* First, try to log in as if the supplied name is a display name */ - found_user = getuser(&CC->user, username); + 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 (found_user != 0) { - valid = validate_recipients(username); + valid = validate_recipients(username, NULL, 0); if (valid != NULL) { if (valid->num_local == 1) { - found_user = getuser(&CC->user, valid->recp_local); + found_user = CtdlGetUser(&CC->user, valid->recp_local); } free_recipients(valid); } @@ -414,7 +654,7 @@ int CtdlLoginExistingUser(char *trythisname) /* Did we find something? */ if (found_user == 0) { - if (((CC->nologin)) && (CC->user.axlevel < 6)) { + if (((CC->nologin)) && (CC->user.axlevel < AxAideU)) { return login_too_many_users; } else { safestrncpy(CC->curr_user, CC->user.fullname, @@ -435,10 +675,13 @@ void cmd_user(char *cmdbuf) char username[256]; int a; + syslog(LOG_DEBUG, "cmd_user(%s)\n", cmdbuf); extract_token(username, cmdbuf, 0, '|', sizeof username); + syslog(LOG_DEBUG, "username: %s\n", username); striplt(username); + syslog(LOG_DEBUG, "username: %s\n", username); - a = CtdlLoginExistingUser(username); + a = CtdlLoginExistingUser(NULL, username); switch (a) { case login_already_logged_in: cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN); @@ -467,13 +710,12 @@ void cmd_user(char *cmdbuf) /* * session startup code which is common to both cmd_pass() and cmd_newu() */ -void session_startup(void) +void do_login(void) { - int i = 0; - - lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user); + CC->logged_in = 1; + syslog(LOG_NOTICE, "<%s> logged in\n", CC->curr_user); - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); ++(CC->user.timescalled); CC->previous_login = CC->user.lastcall; time(&CC->user.lastcall); @@ -482,19 +724,19 @@ void session_startup(void) * (as specified in setup), automatically assign access level 6. */ if (!strcasecmp(CC->user.fullname, config.c_sysadm)) { - CC->user.axlevel = 6; + CC->user.axlevel = AxAideU; } /* If we're authenticating off the host system, automatically give * root the highest level of access. */ - if (config.c_auth_mode == 1) { + if (config.c_auth_mode == AUTHMODE_HOST) { if (CC->user.uid == 0) { - CC->user.axlevel = 6; + CC->user.axlevel = AxAideU; } } - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); /* * Populate CC->cs_inet_email with a default address. This will be @@ -503,24 +745,21 @@ void session_startup(void) */ snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s", CC->user.fullname, config.c_fqdn); - for (i=0; ics_inet_email); ++i) { - if (isspace(CC->cs_inet_email[i])) { - CC->cs_inet_email[i] = '_'; - } - } + convert_spaces_to_underscores(CC->cs_inet_email); /* Create any personal rooms required by the system. * (Technically, MAILROOM should be there already, but just in case...) */ - create_room(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); - create_room(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX); - create_room(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); + CtdlCreateRoom(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); + CtdlCreateRoom(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX); + CtdlCreateRoom(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); + CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); /* Run any startup routines registered by loadable modules */ PerformSessionHooks(EVT_LOGIN); /* Enter the lobby */ - usergoto(config.c_baseroom, 0, 0, NULL, NULL); + CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL); } @@ -535,75 +774,113 @@ void logged_in_response(void) -/* - * misc things to be taken care of when a user is logged out - */ -void logout(struct CitContext *who) +void CtdlUserLogout(void) { - /* - * Clear out some session data. Most likely, the CitContext for this - * session is about to get nuked when the session disconnects, but - * since it's possible to log in again without reconnecting, we cannot - * make that assumption. - */ - strcpy(who->fake_username, ""); - strcpy(who->fake_hostname, ""); - strcpy(who->fake_roomname, ""); - who->logged_in = 0; + CitContext *CCC = MyContext(); + + syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s> from session %d", + CCC->curr_user, CCC->cs_pid + ); /* * If there is a download in progress, abort it. */ - if (who->download_fp != NULL) { - fclose(who->download_fp); - who->download_fp = NULL; + if (CCC->download_fp != NULL) { + fclose(CCC->download_fp); + CCC->download_fp = NULL; } /* * If there is an upload in progress, abort it. */ - if (who->upload_fp != NULL) { - abort_upl(who); + if (CCC->upload_fp != NULL) { + abort_upl(CCC); } /* * If we were talking to a network node, we're not anymore... */ - if (strlen(who->net_node) > 0) { - network_talking_to(who->net_node, NTT_REMOVE); + if (!IsEmptyStr(CCC->net_node)) { + network_talking_to(CCC->net_node, NTT_REMOVE); } - /* Do modular stuff... */ + /* Run any hooks registered by modules... */ PerformSessionHooks(EVT_LOGOUT); + + /* + * Clear out some session data. Most likely, the CitContext for this + * session is about to get nuked when the session disconnects, but + * 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 */ + 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 */ - if (who->output_buffer != NULL) { - unbuffer_output(); - } + unbuffer_output(); } + /* * Validate a password on the host unix system by talking to the chkpwd daemon */ static int validpw(uid_t uid, const char *pass) { char buf[256]; + int rv = 0; + + if (IsEmptyStr(pass)) { + syslog(LOG_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid); + return 0; + } - lprintf(CTDL_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid); + syslog(LOG_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid); begin_critical_section(S_CHKPWD); - snprintf(buf, sizeof buf, "%016d", uid); - write(chkpwd_write_pipe[1], buf, 16); - write(chkpwd_write_pipe[1], pass, 256); - read(chkpwd_read_pipe[0], buf, 4); + rv = write(chkpwd_write_pipe[1], &uid, sizeof(uid_t)); + if (rv == -1) { + syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno)); + end_critical_section(S_CHKPWD); + return 0; + } + rv = write(chkpwd_write_pipe[1], pass, 256); + if (rv == -1) { + syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno)); + end_critical_section(S_CHKPWD); + return 0; + } + rv = read(chkpwd_read_pipe[0], buf, 4); + if (rv == -1) { + syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno)); + end_critical_section(S_CHKPWD); + return 0; + } end_critical_section(S_CHKPWD); if (!strncmp(buf, "PASS", 4)) { - lprintf(CTDL_DEBUG, "...pass\n"); + syslog(LOG_DEBUG, "...pass\n"); return(1); } - lprintf(CTDL_DEBUG, "...fail\n"); + syslog(LOG_DEBUG, "...fail\n"); return 0; } @@ -612,70 +889,73 @@ static int validpw(uid_t uid, const char *pass) */ void start_chkpwd_daemon(void) { pid_t chkpwd_pid; + struct stat filestats; int i; - lprintf(CTDL_DEBUG, "Starting chkpwd daemon for host authentication mode\n"); + syslog(LOG_DEBUG, "Starting chkpwd daemon for host authentication mode\n"); + if ((stat(file_chkpwd, &filestats)==-1) || + (filestats.st_size==0)){ + printf("didn't find chkpwd daemon in %s: %s\n", file_chkpwd, strerror(errno)); + abort(); + } if (pipe(chkpwd_write_pipe) != 0) { - lprintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); + syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); abort(); } if (pipe(chkpwd_read_pipe) != 0) { - lprintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); + syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); abort(); } chkpwd_pid = fork(); if (chkpwd_pid < 0) { - lprintf(CTDL_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno)); + syslog(LOG_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno)); abort(); } if (chkpwd_pid == 0) { - lprintf(CTDL_DEBUG, "Now calling dup2() write\n"); + syslog(LOG_DEBUG, "Now calling dup2() write\n"); dup2(chkpwd_write_pipe[0], 0); - lprintf(CTDL_DEBUG, "Now calling dup2() write\n"); + syslog(LOG_DEBUG, "Now calling dup2() write\n"); dup2(chkpwd_read_pipe[1], 1); - lprintf(CTDL_DEBUG, "Now closing stuff\n"); + syslog(LOG_DEBUG, "Now closing stuff\n"); for (i=2; i<256; ++i) close(i); - lprintf(CTDL_DEBUG, "Now calling execl(%s)\n", file_chkpwd); + syslog(LOG_DEBUG, "Now calling execl(%s)\n", file_chkpwd); execl(file_chkpwd, file_chkpwd, NULL); - lprintf(CTDL_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno)); + syslog(LOG_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno)); abort(); exit(errno); } } -void do_login() -{ - (CC->logged_in) = 1; - session_startup(); -} - - -int CtdlTryPassword(char *password) +int CtdlTryPassword(const char *password, long len) { int code; if ((CC->logged_in)) { - lprintf(CTDL_WARNING, "CtdlTryPassword: already logged in\n"); + syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n"); return pass_already_logged_in; } if (!strcmp(CC->curr_user, NLI)) { - lprintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n"); + syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n"); return pass_no_user; } - if (getuser(&CC->user, CC->curr_user)) { - lprintf(CTDL_ERR, "CtdlTryPassword: internal error\n"); + if (CtdlGetUser(&CC->user, CC->curr_user)) { + syslog(LOG_ERR, "CtdlTryPassword: internal error\n"); return pass_internal_error; } if (password == NULL) { - lprintf(CTDL_INFO, "CtdlTryPassword: NULL password string supplied\n"); + syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n"); return pass_wrong_password; } code = (-1); - if (config.c_auth_mode == 1) { + if (CC->is_master) { + code = strcmp(password, config.c_master_pass); + } + + else if (config.c_auth_mode == AUTHMODE_HOST) { /* host auth mode */ @@ -690,9 +970,9 @@ int CtdlTryPassword(char *password) * this is a security hazard, comment it out. */ - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); safestrncpy(CC->user.password, password, sizeof CC->user.password); - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); /* * (sooper-seekrit hack ends here) @@ -704,23 +984,41 @@ int CtdlTryPassword(char *password) } } +#ifdef HAVE_LDAP + else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) { + + /* LDAP auth mode */ + + if ((CC->ldap_dn) && (!CtdlTryPasswordLDAP(CC->ldap_dn, password))) { + code = 0; + } + else { + code = (-1); + } + } +#endif + else { /* native auth mode */ + char *pw; - strproc(password); + pw = (char*) malloc(len + 1); + memcpy(pw, password, len + 1); + strproc(pw); strproc(CC->user.password); - code = strcasecmp(CC->user.password, password); - strproc(password); + code = strcasecmp(CC->user.password, pw); + strproc(pw); strproc(CC->user.password); - code = strcasecmp(CC->user.password, password); + code = strcasecmp(CC->user.password, pw); + free (pw); } if (!code) { do_login(); return pass_ok; } else { - lprintf(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user); + syslog(LOG_WARNING, "Bad password specified for <%s>\n", CC->curr_user); return pass_wrong_password; } } @@ -728,11 +1026,13 @@ int CtdlTryPassword(char *password) void cmd_pass(char *buf) { - char password[256]; + char password[SIZ]; int a; + long len; - extract_token(password, buf, 0, '|', sizeof password); - a = CtdlTryPassword(password); + memset(password, 0, sizeof(password)); + len = extract_token(password, buf, 0, '|', sizeof password); + a = CtdlTryPassword(password, len); switch (a) { case pass_already_logged_in: @@ -761,34 +1061,38 @@ int purge_user(char pname[]) char filename[64]; struct ctdluser usbuf; char usernamekey[USERNAME_SIZE]; - struct CitContext *ccptr; - int user_is_logged_in = 0; - makeuserkey(usernamekey, pname); + makeuserkey(usernamekey, pname, cutuserkey(pname)); - if (getuser(&usbuf, pname) != 0) { - lprintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", 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 (CtdlGetUser(&usbuf, pname) != 0) { + syslog(LOG_ERR, "Cannot purge user <%s> - not found\n", pname); 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. */ - user_is_logged_in = 0; - begin_critical_section(S_SESSION_TABLE); - for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) { - if (ccptr->user.usernum == usbuf.usernum) { - user_is_logged_in = 1; - } - } - end_critical_section(S_SESSION_TABLE); - if (user_is_logged_in == 1) { - lprintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname); - usbuf.axlevel = 0; - putuser(&usbuf); + if (CtdlIsUserLoggedInByNum(usbuf.usernum)) { + syslog(LOG_WARNING, "User <%s> is logged in; not deleting.\n", pname); + usbuf.axlevel = AxDeleted; + CtdlPutUser(&usbuf); return (1); } - lprintf(CTDL_NOTICE, "Deleting user <%s>\n", pname); + syslog(LOG_NOTICE, "Deleting user <%s>\n", 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 whilst S_USERS is active? + */ /* Perform any purge functions registered by server extensions */ PerformUserHooks(&usbuf, EVT_PURGEUSER); @@ -796,6 +1100,9 @@ int purge_user(char pname[]) /* delete any existing user/room relationships */ cdb_delete(CDB_VISIT, &usbuf.usernum, sizeof(long)); + /* delete the users-by-number index record */ + cdb_delete(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long)); + /* delete the userlog entry */ cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey)); @@ -819,6 +1126,38 @@ int purge_user(char pname[]) } +int internal_create_user (const char *username, long len, struct ctdluser *usbuf, uid_t uid) +{ + if (!CtdlGetUserLen(usbuf, username, len)) { + return (ERROR + ALREADY_EXISTS); + } + + /* Go ahead and initialize a new user record */ + memset(usbuf, 0, sizeof(struct ctdluser)); + safestrncpy(usbuf->fullname, username, sizeof usbuf->fullname); + strcpy(usbuf->password, ""); + usbuf->uid = uid; + + /* These are the default flags on new accounts */ + usbuf->flags = US_LASTOLD | US_DISAPPEAR | US_PAGINATOR | US_FLOORS; + + usbuf->timescalled = 0; + usbuf->posted = 0; + usbuf->axlevel = config.c_initax; + usbuf->lastcall = time(NULL); + + /* fetch a new user number */ + usbuf->usernum = get_new_user_number(); + + /* add user to the database */ + CtdlPutUser(usbuf); + cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1); + + return 0; +} + + + /* * create_user() - back end processing to create a new user * @@ -826,83 +1165,75 @@ int purge_user(char pname[]) * Set 'become_user' to nonzero if this is self-service account creation and we want * to actually log in as the user we just created, otherwise set it to 0. */ -int create_user(char *newusername, int become_user) +int create_user(const char *newusername, long len, int become_user) { struct ctdluser usbuf; struct ctdlroom qrbuf; char username[256]; char mailboxname[ROOMNAMELEN]; char buf[SIZ]; + int retval; uid_t uid = (-1); + safestrncpy(username, newusername, sizeof username); strproc(username); - if (config.c_auth_mode == 1) { + + if (config.c_auth_mode == AUTHMODE_HOST) { /* host auth mode */ struct passwd pd; struct passwd *tempPwdPtr; - char pwdbuffer[256]; + char pwdbuffer[SIZ]; +#ifdef HAVE_GETPWNAM_R #ifdef SOLARIS_GETPWUID tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer)); -#else +#else // SOLARIS_GETPWUID getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr); -#endif +#endif // SOLARIS_GETPWUID +#else // HAVE_GETPWNAM_R + tempPwdPtr = NULL; +#endif // HAVE_GETPWNAM_R if (tempPwdPtr != NULL) { extract_token(username, pd.pw_gecos, 0, ',', sizeof username); uid = pd.pw_uid; + if (IsEmptyStr (username)) + { + safestrncpy(username, pd.pw_name, sizeof username); + len = cutuserkey(username); + } } else { return (ERROR + NO_SUCH_USER); } } - if (!getuser(&usbuf, username)) { - return (ERROR + ALREADY_EXISTS); - } - - /* Go ahead and initialize a new user record */ - memset(&usbuf, 0, sizeof(struct ctdluser)); - safestrncpy(usbuf.fullname, username, sizeof usbuf.fullname); - strcpy(usbuf.password, ""); - usbuf.uid = uid; - - /* These are the default flags on new accounts */ - usbuf.flags = US_LASTOLD | US_DISAPPEAR | US_PAGINATOR | US_FLOORS; - - usbuf.timescalled = 0; - usbuf.posted = 0; - usbuf.axlevel = config.c_initax; - usbuf.USscreenwidth = 80; - usbuf.USscreenheight = 24; - usbuf.lastcall = time(NULL); - - /* fetch a new user number */ - usbuf.usernum = get_new_user_number(); - - /* The very first user created on the system will always be an Aide */ - if (usbuf.usernum == 1L) { - usbuf.axlevel = 6; +#ifdef HAVE_LDAP + if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) { + if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid) != 0) { + return(ERROR + NO_SUCH_USER); + } } - - /* add user to userlog */ - putuser(&usbuf); - +#endif /* HAVE_LDAP */ + + if ((retval = internal_create_user(username, len, &usbuf, uid)) != 0) + return retval; + /* * Give the user a private mailbox and a configuration room. * Make the latter an invisible system room. */ - MailboxName(mailboxname, sizeof mailboxname, &usbuf, MAILROOM); - create_room(mailboxname, 5, "", 0, 1, 1, VIEW_MAILBOX); + CtdlMailboxName(mailboxname, sizeof mailboxname, &usbuf, MAILROOM); + CtdlCreateRoom(mailboxname, 5, "", 0, 1, 1, VIEW_MAILBOX); - MailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM); - create_room(mailboxname, 5, "", 0, 1, 1, VIEW_BBS); - if (lgetroom(&qrbuf, mailboxname) == 0) { + CtdlMailboxName(mailboxname, sizeof mailboxname, &usbuf, USERCONFIGROOM); + CtdlCreateRoom(mailboxname, 5, "", 0, 1, 1, VIEW_BBS); + if (CtdlGetRoomLock(&qrbuf, mailboxname) == 0) { qrbuf.QRflags2 |= QR2_SYSTEM; - lputroom(&qrbuf); + CtdlPutRoomLock(&qrbuf); } /* Perform any create functions registered by server extensions */ @@ -916,10 +1247,10 @@ int create_user(char *newusername, int become_user) /* Now become the user we just created */ memcpy(&CC->user, &usbuf, sizeof(struct ctdluser)); safestrncpy(CC->curr_user, username, sizeof CC->curr_user); - CC->logged_in = 1; + do_login(); /* Check to make sure we're still who we think we are */ - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { return (ERROR + INTERNAL_ERROR); } } @@ -930,23 +1261,23 @@ int create_user(char *newusername, int become_user) CC->cs_host, CC->cs_addr ); - aide_message(buf, "User Creation Notice"); - lprintf(CTDL_NOTICE, "New user <%s> created\n", username); + CtdlAideMessage(buf, "User Creation Notice"); + syslog(LOG_NOTICE, "New user <%s> created\n", username); return (0); } - /* * cmd_newu() - create a new user account and log in as that user */ void cmd_newu(char *cmdbuf) { int a; - char username[26]; + long len; + char username[SIZ]; - if (config.c_auth_mode == 1) { + if (config.c_auth_mode != AUTHMODE_NATIVE) { cprintf("%d This system does not use native mode authentication.\n", ERROR + NOT_HERE); return; @@ -968,10 +1299,10 @@ void cmd_newu(char *cmdbuf) config.c_nodename, config.c_maxsessions); } extract_token(username, cmdbuf, 0, '|', sizeof username); - username[25] = 0; strproc(username); + len = cutuserkey(username); - if (strlen(username) == 0) { + if (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); return; } @@ -983,10 +1314,9 @@ void cmd_newu(char *cmdbuf) return; } - a = create_user(username, 1); + a = create_user(username, len, 1); if (a == 0) { - session_startup(); logged_in_response(); } else if (a == ERROR + ALREADY_EXISTS) { cprintf("%d '%s' already exists.\n", @@ -1002,9 +1332,21 @@ void cmd_newu(char *cmdbuf) } +/* + * set password - back end api code + */ +void CtdlSetPassword(char *new_pw) +{ + CtdlGetUserLock(&CC->user, CC->curr_user); + safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password)); + CtdlPutUserLock(&CC->user); + syslog(LOG_INFO, "Password changed for user <%s>\n", CC->curr_user); + PerformSessionHooks(EVT_SETPASS); +} + /* - * set password + * set password - citadel protocol implementation */ void cmd_setp(char *new_pw) { @@ -1015,17 +1357,27 @@ void cmd_setp(char *new_pw) cprintf("%d Not allowed. Use the 'passwd' command.\n", ERROR + NOT_HERE); return; } - strproc(new_pw); - if (strlen(new_pw) == 0) { - cprintf("%d Password unchanged.\n", CIT_OK); + if (CC->is_master) { + cprintf("%d The master prefix password cannot be changed with this command.\n", + ERROR + NOT_HERE); return; } - lgetuser(&CC->user, CC->curr_user); - safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password)); - lputuser(&CC->user); - cprintf("%d Password changed.\n", CIT_OK); - lprintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user); - PerformSessionHooks(EVT_SETPASS); + + if (!strcasecmp(new_pw, "GENERATE_RANDOM_PASSWORD")) { + char random_password[17]; + snprintf(random_password, sizeof random_password, "%08lx%08lx", random(), random()); + CtdlSetPassword(random_password); + cprintf("%d %s\n", CIT_OK, random_password); + } + else { + strproc(new_pw); + if (IsEmptyStr(new_pw)) { + cprintf("%d Password unchanged.\n", CIT_OK); + return; + } + CtdlSetPassword(new_pw); + cprintf("%d Password changed.\n", CIT_OK); + } } @@ -1035,8 +1387,9 @@ void cmd_setp(char *new_pw) void cmd_creu(char *cmdbuf) { int a; - char username[26]; - char password[32]; + long len; + char username[SIZ]; + char password[SIZ]; struct ctdluser tmp; if (CtdlAccessCheck(ac_aide)) { @@ -1044,35 +1397,38 @@ void cmd_creu(char *cmdbuf) } extract_token(username, cmdbuf, 0, '|', sizeof username); - extract_token(password, cmdbuf, 1, '|', sizeof password); - username[25] = 0; - password[31] = 0; strproc(username); strproc(password); - - if (strlen(username) == 0) { + if (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); return; } + len = cutuserkey(username); - a = create_user(username, 0); + + extract_token(password, cmdbuf, 1, '|', sizeof password); + + a = create_user(username, len, 0); if (a == 0) { - if (strlen(password) > 0) { - lgetuser(&tmp, username); + if (!IsEmptyStr(password)) { + CtdlGetUserLock(&tmp, username); safestrncpy(tmp.password, password, sizeof(tmp.password)); - lputuser(&tmp); + CtdlPutUserLock(&tmp); } cprintf("%d User '%s' created %s.\n", CIT_OK, username, - (strlen(password) > 0) ? "and password set" : + (!IsEmptyStr(password)) ? "and password set" : "with no password"); return; } else if (a == ERROR + ALREADY_EXISTS) { - cprintf("%d '%s' already exists.\n", - ERROR + ALREADY_EXISTS, username); + cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, username); + return; + } else if ( (config.c_auth_mode != AUTHMODE_NATIVE) && (a == ERROR + NO_SUCH_USER) ) { + cprintf("%d User accounts are not created within Citadel in host authentication mode.\n", + ERROR + NO_SUCH_USER); return; } else { - cprintf("%d An error occured creating the user account.\n", ERROR + INTERNAL_ERROR); + cprintf("%d An error occurred creating the user account.\n", ERROR + INTERNAL_ERROR); } } @@ -1081,19 +1437,17 @@ void cmd_creu(char *cmdbuf) /* * get user parameters */ -void cmd_getu(void) +void cmd_getu(char *cmdbuf) { if (CtdlAccessCheck(ac_logged_in)) return; - getuser(&CC->user, CC->curr_user); - cprintf("%d %d|%d|%d|\n", + CtdlGetUser(&CC->user, CC->curr_user); + cprintf("%d 80|24|%d|\n", CIT_OK, - CC->user.USscreenwidth, - CC->user.USscreenheight, (CC->user.flags & US_USER_SET) - ); + ); } /* @@ -1108,14 +1462,10 @@ void cmd_setu(char *new_parms) cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE); return; } - lgetuser(&CC->user, CC->curr_user); - CC->user.USscreenwidth = extract_int(new_parms, 0); - CC->user.USscreenheight = extract_int(new_parms, 1); + CtdlGetUserLock(&CC->user, CC->curr_user); CC->user.flags = CC->user.flags & (~US_USER_SET); - CC->user.flags = CC->user.flags | - (extract_int(new_parms, 2) & US_USER_SET); - - lputuser(&CC->user); + CC->user.flags = CC->user.flags | (extract_int(new_parms, 2) & US_USER_SET); + CtdlPutUserLock(&CC->user); cprintf("%d Ok\n", CIT_OK); } @@ -1125,8 +1475,8 @@ void cmd_setu(char *new_parms) void cmd_slrp(char *new_ptr) { long newlr; - struct visit vbuf; - struct visit original_vbuf; + visit vbuf; + visit original_vbuf; if (CtdlAccessCheck(ac_logged_in)) { return; @@ -1138,10 +1488,10 @@ void cmd_slrp(char *new_ptr) newlr = atol(new_ptr); } - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); CtdlGetRelationship(&vbuf, &CC->user, &CC->room); - memcpy(&original_vbuf, &vbuf, sizeof(struct visit)); + memcpy(&original_vbuf, &vbuf, sizeof(visit)); vbuf.v_lastseen = newlr; snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld", newlr); @@ -1151,7 +1501,7 @@ void cmd_slrp(char *new_ptr) CtdlSetRelationship(&vbuf, &CC->user, &CC->room); } - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); cprintf("%d %ld\n", CIT_OK, newlr); } @@ -1179,14 +1529,18 @@ void cmd_seen(char *argbuf) { void cmd_gtsn(char *argbuf) { - char buf[SIZ]; + visit vbuf; if (CtdlAccessCheck(ac_logged_in)) { return; } - CtdlGetSeen(buf, ctdlsetseen_seen); - cprintf("%d %s\n", CIT_OK, buf); + /* Learn about the user and room in question */ + CtdlGetRelationship(&vbuf, &CC->user, &CC->room); + + cprintf("%d ", CIT_OK); + client_write(vbuf.v_seen, strlen(vbuf.v_seen)); + client_write(HKEY("\n")); } @@ -1198,10 +1552,10 @@ void cmd_gtsn(char *argbuf) { */ int CtdlInvtKick(char *iuser, int op) { struct ctdluser USscratch; - struct visit vbuf; + visit vbuf; char bbb[SIZ]; - if (getuser(&USscratch, iuser) != 0) { + if (CtdlGetUser(&USscratch, iuser) != 0) { return(1); } @@ -1222,7 +1576,7 @@ int CtdlInvtKick(char *iuser, int op) { ((op == 1) ? "invited to" : "kicked out of"), CC->room.QRname, CC->user.fullname); - aide_message(bbb,"User Admin Message"); + CtdlAideMessage(bbb,"User Admin Message"); return(0); } @@ -1237,8 +1591,9 @@ void cmd_invt_kick(char *iuser, int op) { * These commands are only allowed by aides, room aides, * and room namespace owners */ - if (is_room_aide() - || (atol(CC->room.QRname) == CC->user.usernum) ) { + if (is_room_aide()) { + /* access granted */ + } else if ( ((atol(CC->room.QRname) == CC->user.usernum) ) && (CC->user.usernum != 0) ) { /* access granted */ } else { /* access denied */ @@ -1266,13 +1621,15 @@ void cmd_invt_kick(char *iuser, int op) { return; } +void cmd_invt(char *iuser) {cmd_invt_kick(iuser, 1);} +void cmd_kick(char *iuser) {cmd_invt_kick(iuser, 0);} /* * Forget (Zap) the current room (API call) * Returns 0 on success */ int CtdlForgetThisRoom(void) { - struct visit vbuf; + visit vbuf; /* On some systems, Aides are not allowed to forget rooms */ if (is_aide() && (config.c_aide_zap == 0) @@ -1280,17 +1637,17 @@ int CtdlForgetThisRoom(void) { return(1); } - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); CtdlGetRelationship(&vbuf, &CC->user, &CC->room); vbuf.v_flags = vbuf.v_flags | V_FORGET; vbuf.v_flags = vbuf.v_flags & ~V_ACCESS; CtdlSetRelationship(&vbuf, &CC->user, &CC->room); - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); /* Return to the Lobby, so we don't end up in an undefined room */ - usergoto(config.c_baseroom, 0, 0, NULL, NULL); + CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL); return(0); } @@ -1299,7 +1656,7 @@ int CtdlForgetThisRoom(void) { /* * forget (Zap) the current room */ -void cmd_forg(void) +void cmd_forg(char *argbuf) { if (CtdlAccessCheck(ac_logged_in)) { @@ -1317,7 +1674,7 @@ void cmd_forg(void) /* * Get Next Unregistered User */ -void cmd_gnur(void) +void cmd_gnur(char *argbuf) { struct cdbdata *cdbus; struct ctdluser usbuf; @@ -1342,7 +1699,7 @@ void cmd_gnur(void) sizeof(struct ctdluser) : cdbus->len)); cdb_free(cdbus); if ((usbuf.flags & US_NEEDVALID) - && (usbuf.axlevel > 0)) { + && (usbuf.axlevel > AxDeleted)) { cprintf("%d %s\n", MORE_DATA, usbuf.fullname); cdb_close_cursor(CDB_USERS); return; @@ -1376,11 +1733,13 @@ void cmd_vali(char *v_args) extract_token(user, v_args, 0, '|', sizeof user); newax = extract_int(v_args, 1); - if (CtdlAccessCheck(ac_aide)) { + if (CtdlAccessCheck(ac_aide) || + (newax > AxAideU) || + (newax < AxDeleted)) { return; } - if (lgetuser(&userbuf, user) != 0) { + if (CtdlGetUserLock(&userbuf, user) != 0) { cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, user); return; } @@ -1388,7 +1747,7 @@ void cmd_vali(char *v_args) userbuf.axlevel = newax; userbuf.flags = (userbuf.flags & ~US_NEEDVALID); - lputuser(&userbuf); + CtdlPutUserLock(&userbuf); /* If the access level was set to zero, delete the user */ if (newax == 0) { @@ -1436,20 +1795,17 @@ void ListThisUser(struct ctdluser *usbuf, void *data) return; } - if (usbuf->axlevel > 0) { - if ((CC->user.axlevel >= 6) + if (usbuf->axlevel > AxDeleted) { + if ((CC->user.axlevel >= AxAideU) || ((usbuf->flags & US_UNLISTED) == 0) || ((CC->internal_pgm))) { - cprintf("%s|%d|%ld|%ld|%ld|%ld|", + cprintf("%s|%d|%ld|%ld|%ld|%ld||\n", usbuf->fullname, usbuf->axlevel, usbuf->usernum, (long)usbuf->lastcall, usbuf->timescalled, usbuf->posted); - if (CC->user.axlevel >= 6) - cprintf("%s", usbuf->password); - cprintf("\n"); } } } @@ -1473,7 +1829,7 @@ void cmd_list(char *cmdbuf) /* * assorted info we need to check at login */ -void cmd_chek(void) +void cmd_chek(char *argbuf) { int mail = 0; int regis = 0; @@ -1483,11 +1839,11 @@ void cmd_chek(void) return; } - getuser(&CC->user, CC->curr_user); /* no lock is needed here */ + CtdlGetUser(&CC->user, CC->curr_user); /* no lock is needed here */ if ((REGISCALL != 0) && ((CC->user.flags & US_REGIS) == 0)) regis = 1; - if (CC->user.axlevel >= 6) { + if (CC->user.axlevel >= AxAideU) { get_control(); if (CitControl.MMflags & MM_VALID) vali = 1; @@ -1507,7 +1863,7 @@ void cmd_qusr(char *who) { struct ctdluser usbuf; - if (getuser(&usbuf, who) == 0) { + if (CtdlGetUser(&usbuf, who) == 0) { cprintf("%d %s\n", CIT_OK, usbuf.fullname); } else { cprintf("%d No such user.\n", ERROR + NO_SUCH_USER); @@ -1528,7 +1884,7 @@ void cmd_agup(char *cmdbuf) } extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user); - if (getuser(&usbuf, requested_user) != 0) { + if (CtdlGetUser(&usbuf, requested_user) != 0) { cprintf("%d No such user.\n", ERROR + NO_SUCH_USER); return; } @@ -1563,7 +1919,7 @@ void cmd_asup(char *cmdbuf) return; extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user); - if (lgetuser(&usbuf, requested_user) != 0) { + if (CtdlGetUserLock(&usbuf, requested_user) != 0) { cprintf("%d No such user.\n", ERROR + NO_SUCH_USER); return; } @@ -1578,8 +1934,8 @@ void cmd_asup(char *cmdbuf) usbuf.posted = extract_int(cmdbuf, 4); if (np > 5) { newax = extract_int(cmdbuf, 5); - if ((newax >= 0) && (newax <= 6)) { - usbuf.axlevel = extract_int(cmdbuf, 5); + if ((newax >= AxDeleted) && (newax <= AxAideU)) { + usbuf.axlevel = newax; } } if (np > 7) { @@ -1588,17 +1944,18 @@ void cmd_asup(char *cmdbuf) if (np > 8) { usbuf.USuserpurge = extract_int(cmdbuf, 8); } - lputuser(&usbuf); - if (usbuf.axlevel == 0) { + CtdlPutUserLock(&usbuf); + if (usbuf.axlevel == AxDeleted) { if (purge_user(requested_user) == 0) { deleted = 1; } } if (deleted) { - sprintf(notify, "User \"%s\" has been deleted by %s.\n", - usbuf.fullname, CC->user.fullname); - aide_message(notify, "User Deletion Message"); + snprintf(notify, SIZ, + "User \"%s\" has been deleted by %s.\n", + usbuf.fullname, CC->user.fullname); + CtdlAideMessage(notify, "User Deletion Message"); } cprintf("%d Ok", CIT_OK); @@ -1609,26 +1966,6 @@ void cmd_asup(char *cmdbuf) -/* - * Check to see if the user who we just sent mail to is logged in. If yes, - * bump the 'new mail' counter for their session. That enables them to - * receive a new mail notification without having to hit the database. - */ -void BumpNewMailCounter(long which_user) { - struct CitContext *ptr; - - begin_critical_section(S_SESSION_TABLE); - - for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { - if (ptr->user.usernum == which_user) { - ptr->newmail += 1; - } - } - - end_critical_section(S_SESSION_TABLE); -} - - /* * Count the number of new mail messages the user has */ @@ -1652,13 +1989,13 @@ int InitialMailCheck() int a; char mailboxname[ROOMNAMELEN]; struct ctdlroom mailbox; - struct visit vbuf; + visit vbuf; struct cdbdata *cdbfr; long *msglist = NULL; int num_msgs = 0; - MailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM); - if (getroom(&mailbox, mailboxname) != 0) + CtdlMailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM); + if (CtdlGetRoom(&mailbox, mailboxname) != 0) return (0); CtdlGetRelationship(&vbuf, &CC->user, &mailbox); @@ -1691,7 +2028,7 @@ int InitialMailCheck() */ void cmd_view(char *cmdbuf) { int requested_view; - struct visit vbuf; + visit vbuf; if (CtdlAccessCheck(ac_logged_in)) { return; @@ -1705,3 +2042,77 @@ void cmd_view(char *cmdbuf) { cprintf("%d ok\n", CIT_OK); } + + +/* + * Rename a user + */ +void cmd_renu(char *cmdbuf) +{ + int retcode; + char oldname[USERNAME_SIZE]; + char newname[USERNAME_SIZE]; + + if (CtdlAccessCheck(ac_aide)) { + return; + } + + extract_token(oldname, cmdbuf, 0, '|', sizeof oldname); + extract_token(newname, cmdbuf, 1, '|', sizeof newname); + + retcode = rename_user(oldname, newname); + switch(retcode) { + case RENAMEUSER_OK: + cprintf("%d '%s' has been renamed to '%s'.\n", CIT_OK, oldname, newname); + return; + case RENAMEUSER_LOGGED_IN: + cprintf("%d '%s' is currently logged in and cannot be renamed.\n", + ERROR + ALREADY_LOGGED_IN , oldname); + return; + case RENAMEUSER_NOT_FOUND: + cprintf("%d '%s' does not exist.\n", ERROR + NO_SUCH_USER, oldname); + return; + case RENAMEUSER_ALREADY_EXISTS: + cprintf("%d A user named '%s' already exists.\n", ERROR + ALREADY_EXISTS, newname); + return; + } + + cprintf("%d An unknown error occurred.\n", ERROR); +} + + + +/*****************************************************************************/ +/* MODULE INITIALIZATION STUFF */ +/*****************************************************************************/ + + +CTDL_MODULE_INIT(user_ops) +{ + if (!threading) { + CtdlRegisterProtoHook(cmd_user, "USER", "Submit username for login"); + CtdlRegisterProtoHook(cmd_pass, "PASS", "Complete login by submitting a password"); + CtdlRegisterProtoHook(cmd_creu, "CREU", "Create User"); + CtdlRegisterProtoHook(cmd_setp, "SETP", "Set the password for an account"); + CtdlRegisterProtoHook(cmd_getu, "GETU", "Get User parameters"); + CtdlRegisterProtoHook(cmd_setu, "SETU", "Set User parameters"); + CtdlRegisterProtoHook(cmd_slrp, "SLRP", "Set Last Read Pointer"); + CtdlRegisterProtoHook(cmd_invt, "INVT", "Invite a user to a room"); + CtdlRegisterProtoHook(cmd_kick, "KICK", "Kick a user out of a room"); + CtdlRegisterProtoHook(cmd_forg, "FORG", "Forget a room"); + CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_vali, "VALI", "Validate new users"); + CtdlRegisterProtoHook(cmd_list, "LIST", "List users"); + CtdlRegisterProtoHook(cmd_chek, "CHEK", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_qusr, "QUSR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_agup, "AGUP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_asup, "ASUP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_seen, "SEEN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_view, "VIEW", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_renu, "RENU", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me."); + } + /* return our Subversion id for the Log */ + return "user_ops"; +}