X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=6e15afb8f9f3cae5a849c535e441a974ce661dd4;hb=20fcf8e6ddd54370da3d30c2f73b0604a0411a12;hp=26bcb0c7205fe596ab5302616f6291bdb0fd94b7;hpb=73a4e2f4e3f8ae5d9f3216eeee58d8c69eac04b5;p=citadel.git diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 26bcb0c72..6e15afb8f 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -38,7 +38,6 @@ #include "citadel.h" #include "server.h" #include "database.h" -#include "user_ops.h" #include "sysdep_decls.h" #include "support.h" #include "room_ops.h" @@ -51,39 +50,34 @@ #include "genstamp.h" #include "threads.h" #include "citadel_ldap.h" +#include "context.h" #include "ctdl_module.h" +////#define CTDL_INLINE_USR INLINE +#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 */ -INLINE void makeuserkey(char *key, char *username) { - int i, len; - - len = strlen(username); - if (len >= USERNAME_SIZE) - { - CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username); - cit_backtrace (); - len = USERNAME_SIZE - 1; - username[USERNAME_SIZE - 1]='\0'; - } - 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]; @@ -93,7 +87,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 */ @@ -110,14 +104,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); } @@ -126,13 +126,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, @@ -142,13 +153,31 @@ 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); - end_critical_section(S_USERS); + CtdlPutUserLock(usbuf); } @@ -159,33 +188,31 @@ void lputuser(struct ctdluser *usbuf) * */ int rename_user(char *oldname, char *newname) { - struct CitContext *cptr; int retcode = RENAMEUSER_OK; struct ctdluser usbuf; char oldnamekey[USERNAME_SIZE]; char newnamekey[USERNAME_SIZE]; - /* We cannot rename a user who is currently logged in */ - for (cptr = ContextList; cptr != NULL; cptr = cptr->next) { - if (!strcasecmp(cptr->user.fullname, oldname)) { - return(RENAMEUSER_LOGGED_IN); - } - } - /* Create the database keys... */ - makeuserkey(oldnamekey, oldname); - makeuserkey(newnamekey, newname); + makeuserkey(oldnamekey, oldname, cutuserkey(oldname)); + makeuserkey(newnamekey, newname, cutuserkey(newname)); /* Lock up and get going */ begin_critical_section(S_USERS); - if (getuser(&usbuf, newname) == 0) { + /* 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 (getuser(&usbuf, oldname) != 0) { + if (CtdlGetUser(&usbuf, oldname) != 0) { retcode = RENAMEUSER_NOT_FOUND; } @@ -198,7 +225,7 @@ int rename_user(char *oldname, char *newname) { CtdlLogPrintf(CTDL_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname); cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey)); safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname); - putuser(&usbuf); + CtdlPutUser(&usbuf); cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long), usbuf.fullname, strlen(usbuf.fullname)+1 ); @@ -324,6 +351,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); @@ -335,7 +368,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); @@ -352,7 +385,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 { @@ -361,12 +394,12 @@ int is_room_aide(void) } /* - * getuserbynumber() - get user by number + * CtdlGetUserByNumber() - 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) +int CtdlGetUserByNumber(struct ctdluser *usbuf, long number) { struct cdbdata *cdbun; int r; @@ -378,11 +411,22 @@ int getuserbynumber(struct ctdluser *usbuf, long number) } CtdlLogPrintf(CTDL_INFO, "User %ld maps to %s\n", number, cdbun->ptr); - r = getuser(usbuf, 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); +} + /* @@ -470,10 +514,11 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number) * * NOTE: "authname" should only be used if we are attempting to use the "master user" feature */ -int CtdlLoginExistingUser(char *authname, char *trythisname) +int CtdlLoginExistingUser(char *authname, const char *trythisname) { char username[SIZ]; int found_user; + long len; CtdlLogPrintf(9, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); @@ -498,8 +543,9 @@ int CtdlLoginExistingUser(char *authname, char *trythisname) } /* Continue attempting user validation... */ - safestrncpy(username, trythisname, USERNAME_SIZE); + safestrncpy(username, trythisname, sizeof (username)); striplt(username); + len = cutuserkey(username); if (IsEmptyStr(username)) { return login_not_found; @@ -538,7 +584,8 @@ int CtdlLoginExistingUser(char *authname, char *trythisname) CtdlLogPrintf(CTDL_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); } @@ -560,7 +607,7 @@ int CtdlLoginExistingUser(char *authname, char *trythisname) found_user = getuserbyuid(&CC->user, ldap_uid); if (found_user != 0) { - create_user(trythisname, 0); + create_user(username, len, 0); found_user = getuserbyuid(&CC->user, ldap_uid); } @@ -578,7 +625,7 @@ int CtdlLoginExistingUser(char *authname, char *trythisname) 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 @@ -587,7 +634,7 @@ int CtdlLoginExistingUser(char *authname, char *trythisname) 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); } @@ -596,7 +643,7 @@ int CtdlLoginExistingUser(char *authname, 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, @@ -657,7 +704,7 @@ void do_login(void) CC->logged_in = 1; CtdlLogPrintf(CTDL_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); @@ -666,7 +713,7 @@ void do_login(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 @@ -674,11 +721,11 @@ void do_login(void) */ 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 @@ -692,16 +739,16 @@ void do_login(void) /* 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); - /* create_room(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); temporarily disabled for 7.60 */ + 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); temporarily disabled for 7.60 */ /* 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); } @@ -721,7 +768,13 @@ void logged_in_response(void) */ void logout(void) { - struct CitContext *CCC = CC; /* CachedCitContext - performance boost */ + CtdlUserLogout(); +} + + +void CtdlUserLogout(void) +{ + CitContext *CCC = MyContext(); /* * If there is a download in progress, abort it. */ @@ -759,7 +812,7 @@ void logout(void) CCC->logged_in = 0; /* Check to see if the user was deleted whilst logged in and purge them if necessary */ - if ((CCC->user.axlevel == 0) && (CCC->user.usernum)) + if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) purge_user(CCC->user.fullname); /* Free any output buffers */ @@ -772,6 +825,7 @@ void logout(void) static int validpw(uid_t uid, const char *pass) { char buf[256]; + int rv = 0; if (IsEmptyStr(pass)) { CtdlLogPrintf(CTDL_DEBUG, "refusing to check empty password for uid=%d using chkpwd...\n", uid); @@ -781,9 +835,9 @@ static int validpw(uid_t uid, const char *pass) CtdlLogPrintf(CTDL_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid); begin_critical_section(S_CHKPWD); - write(chkpwd_write_pipe[1], &uid, sizeof(uid_t)); - write(chkpwd_write_pipe[1], pass, 256); - read(chkpwd_read_pipe[0], buf, 4); + rv = write(chkpwd_write_pipe[1], &uid, sizeof(uid_t)); + rv = write(chkpwd_write_pipe[1], pass, 256); + rv = read(chkpwd_read_pipe[0], buf, 4); end_critical_section(S_CHKPWD); if (!strncmp(buf, "PASS", 4)) { @@ -840,7 +894,7 @@ void start_chkpwd_daemon(void) { } -int CtdlTryPassword(char *password) +int CtdlTryPassword(const char *password, long len) { int code; @@ -852,7 +906,7 @@ int CtdlTryPassword(char *password) CtdlLogPrintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n"); return pass_no_user; } - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { CtdlLogPrintf(CTDL_ERR, "CtdlTryPassword: internal error\n"); return pass_internal_error; } @@ -881,9 +935,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) @@ -912,13 +966,17 @@ int CtdlTryPassword(char *password) 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) { @@ -933,12 +991,13 @@ int CtdlTryPassword(char *password) void cmd_pass(char *buf) { - char password[256]; + char password[SIZ]; int a; + long len; memset(password, 0, sizeof(password)); - extract_token(password, buf, 0, '|', sizeof password); - a = CtdlTryPassword(password); + len = extract_token(password, buf, 0, '|', sizeof password); + a = CtdlTryPassword(password, len); switch (a) { case pass_already_logged_in: @@ -967,16 +1026,14 @@ 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 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 (getuser(&usbuf, pname) != 0) { + if (CtdlGetUser(&usbuf, pname) != 0) { CtdlLogPrintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", pname); return (ERROR + NO_SUCH_USER); } @@ -984,22 +1041,24 @@ int purge_user(char pname[]) * 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) { + if (CtdlIsUserLoggedInByNum(usbuf.usernum)) { CtdlLogPrintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname); - usbuf.axlevel = 0; - putuser(&usbuf); + usbuf.axlevel = AxDeleted; + CtdlPutUser(&usbuf); return (1); } CtdlLogPrintf(CTDL_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); @@ -1032,9 +1091,9 @@ int purge_user(char pname[]) } -int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid) +int internal_create_user (const char *username, long len, struct ctdluser *usbuf, uid_t uid) { - if (!getuser(usbuf, username)) { + if (!CtdlGetUserLen(usbuf, username, len)) { return (ERROR + ALREADY_EXISTS); } @@ -1058,7 +1117,7 @@ int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid) usbuf->usernum = get_new_user_number(); /* add user to the database */ - putuser(usbuf); + CtdlPutUser(usbuf); cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1); return 0; @@ -1073,7 +1132,7 @@ int internal_create_user (char *username, struct ctdluser *usbuf, uid_t uid) * 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; @@ -1094,7 +1153,7 @@ int create_user(char *newusername, int become_user) struct passwd pd; struct passwd *tempPwdPtr; - char pwdbuffer[256]; + char pwdbuffer[SIZ]; #ifdef HAVE_GETPWNAM_R #ifdef SOLARIS_GETPWUID @@ -1111,6 +1170,7 @@ int create_user(char *newusername, int become_user) if (IsEmptyStr (username)) { safestrncpy(username, pd.pw_name, sizeof username); + len = cutuserkey(username); } } else { @@ -1126,21 +1186,21 @@ int create_user(char *newusername, int become_user) } #endif /* HAVE_LDAP */ - if ((retval = internal_create_user(username, &usbuf, uid)) != 0) + 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 */ @@ -1157,7 +1217,7 @@ int create_user(char *newusername, int become_user) 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); } } @@ -1168,7 +1228,7 @@ int create_user(char *newusername, int become_user) CC->cs_host, CC->cs_addr ); - aide_message(buf, "User Creation Notice"); + CtdlAideMessage(buf, "User Creation Notice"); CtdlLogPrintf(CTDL_NOTICE, "New user <%s> created\n", username); return (0); } @@ -1181,6 +1241,7 @@ int create_user(char *newusername, int become_user) void cmd_newu(char *cmdbuf) { int a; + long len; char username[26]; if (config.c_auth_mode != AUTHMODE_NATIVE) { @@ -1205,8 +1266,8 @@ 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 (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); @@ -1220,7 +1281,7 @@ void cmd_newu(char *cmdbuf) return; } - a = create_user(username, 1); + a = create_user(username, len, 1); if (a == 0) { logged_in_response(); @@ -1243,9 +1304,9 @@ void cmd_newu(char *cmdbuf) */ void CtdlSetPassword(char *new_pw) { - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password)); - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); CtdlLogPrintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user); PerformSessionHooks(EVT_SETPASS); } @@ -1296,8 +1357,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)) { @@ -1306,23 +1368,24 @@ 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; + ////username[25] = 0; + //password[31] = 0; strproc(username); strproc(password); + len = cutuserkey(username); if (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); return; } - a = create_user(username, 0); + a = create_user(username, len, 0); if (a == 0) { if (!IsEmptyStr(password)) { - lgetuser(&tmp, username); + CtdlGetUserLock(&tmp, username); safestrncpy(tmp.password, password, sizeof(tmp.password)); - lputuser(&tmp); + CtdlPutUserLock(&tmp); } cprintf("%d User '%s' created %s.\n", CIT_OK, username, (!IsEmptyStr(password)) ? "and password set" : @@ -1351,7 +1414,7 @@ void cmd_getu(char *cmdbuf) if (CtdlAccessCheck(ac_logged_in)) return; - getuser(&CC->user, CC->curr_user); + CtdlGetUser(&CC->user, CC->curr_user); cprintf("%d %d|%d|%d|\n", CIT_OK, CC->user.USscreenwidth, @@ -1372,14 +1435,14 @@ void cmd_setu(char *new_parms) cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE); return; } - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); CC->user.USscreenwidth = extract_int(new_parms, 0); CC->user.USscreenheight = extract_int(new_parms, 1); 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); + CtdlPutUserLock(&CC->user); cprintf("%d Ok\n", CIT_OK); } @@ -1402,7 +1465,7 @@ 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)); @@ -1415,7 +1478,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); } @@ -1465,7 +1528,7 @@ int CtdlInvtKick(char *iuser, int op) { struct visit vbuf; char bbb[SIZ]; - if (getuser(&USscratch, iuser) != 0) { + if (CtdlGetUser(&USscratch, iuser) != 0) { return(1); } @@ -1486,7 +1549,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); } @@ -1546,17 +1609,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); } @@ -1608,7 +1671,7 @@ void cmd_gnur(char *argbuf) 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; @@ -1642,11 +1705,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; } @@ -1654,7 +1719,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) { @@ -1702,8 +1767,8 @@ 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||\n", @@ -1746,11 +1811,11 @@ void cmd_chek(char *argbuf) 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; @@ -1770,7 +1835,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); @@ -1791,7 +1856,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; } @@ -1826,7 +1891,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; } @@ -1841,8 +1906,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) { @@ -1851,8 +1916,8 @@ 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; } @@ -1862,7 +1927,7 @@ void cmd_asup(char *cmdbuf) snprintf(notify, SIZ, "User \"%s\" has been deleted by %s.\n", usbuf.fullname, CC->user.fullname); - aide_message(notify, "User Deletion Message"); + CtdlAideMessage(notify, "User Deletion Message"); } cprintf("%d Ok", CIT_OK); @@ -1873,26 +1938,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 */ @@ -1921,8 +1966,8 @@ int InitialMailCheck() 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); @@ -2016,28 +2061,30 @@ void cmd_renu(char *cmdbuf) CTDL_MODULE_INIT(user_ops) { - CtdlRegisterProtoHook(cmd_user, "USER", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_pass, "PASS", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_creu, "CREU", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_setp, "SETP", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_getu, "GETU", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_setu, "SETU", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_slrp, "SLRP", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_invt, "INVT", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_kick, "KICK", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_forg, "FORG", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_vali, "VALI", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_list, "LIST", "Autoconverted. TODO: document me."); - 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."); + if (!threading) { + CtdlRegisterProtoHook(cmd_user, "USER", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_pass, "PASS", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_creu, "CREU", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_setp, "SETP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_getu, "GETU", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_setu, "SETU", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_slrp, "SLRP", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_invt, "INVT", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_kick, "KICK", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_forg, "FORG", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_vali, "VALI", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_list, "LIST", "Autoconverted. TODO: document me."); + 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 "$Id$"; }