X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fctdlproto%2Fserv_user.c;h=48799de77d955c73e92bae7599d2c4affd8f1c0b;hb=e329db30593524cc2d8851a4500bac41f2340354;hp=7d6b18c6c4e8115f8bbdb845f9660a54af9a17c6;hpb=a7ba5521416e2e2d8f84065e2f5411450c612607;p=citadel.git diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c index 7d6b18c6c..48799de77 100644 --- a/citadel/modules/ctdlproto/serv_user.c +++ b/citadel/modules/ctdlproto/serv_user.c @@ -1,7 +1,7 @@ /* * Server functions which perform operations on user objects. * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2018 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. @@ -12,6 +12,7 @@ * GNU General Public License for more details. */ + #include "support.h" #include "control.h" #include "ctdl_module.h" @@ -29,13 +30,11 @@ void cmd_user(char *cmdbuf) char username[256]; int a; - CON_syslog(LOG_DEBUG, "cmd_user(%s)\n", cmdbuf); extract_token(username, cmdbuf, 0, '|', sizeof username); - CON_syslog(LOG_DEBUG, "username: %s\n", username); striplt(username); - CON_syslog(LOG_DEBUG, "username: %s\n", username); + syslog(LOG_DEBUG, "user_ops: cmd_user(%s)", username); - a = CtdlLoginExistingUser(NULL, username); + a = CtdlLoginExistingUser(username); switch (a) { case login_already_logged_in: cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN); @@ -94,7 +93,6 @@ void cmd_pass(char *buf) void cmd_newu(char *cmdbuf) { int a; - long len; char username[SIZ]; if (CtdlGetConfigInt("c_auth_mode") != AUTHMODE_NATIVE) { @@ -121,7 +119,6 @@ void cmd_newu(char *cmdbuf) } extract_token(username, cmdbuf, 0, '|', sizeof username); strproc(username); - len = cutuserkey(username); if (IsEmptyStr(username)) { cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); @@ -135,7 +132,7 @@ void cmd_newu(char *cmdbuf) return; } - a = create_user(username, len, 1); + a = create_user(username, CREATE_USER_BECOME_USER, NATIVE_AUTH_UID); if (a == 0) { logged_in_response(); @@ -152,6 +149,7 @@ void cmd_newu(char *cmdbuf) } } + /* * set password - citadel protocol implementation */ @@ -164,11 +162,6 @@ void cmd_setp(char *new_pw) cprintf("%d Not allowed. Use the 'passwd' command.\n", ERROR + NOT_HERE); return; } - if (CC->is_master) { - cprintf("%d The master prefix password cannot be changed with this command.\n", - ERROR + NOT_HERE); - return; - } if (!strcasecmp(new_pw, "GENERATE_RANDOM_PASSWORD")) { char random_password[17]; @@ -194,7 +187,6 @@ void cmd_setp(char *new_pw) void cmd_creu(char *cmdbuf) { int a; - long len; char username[SIZ]; char password[SIZ]; struct ctdluser tmp; @@ -210,12 +202,10 @@ void cmd_creu(char *cmdbuf) cprintf("%d You must supply a user name.\n", ERROR + USERNAME_REQUIRED); return; } - len = cutuserkey(username); - extract_token(password, cmdbuf, 1, '|', sizeof password); - a = create_user(username, len, 0); + a = create_user(username, CREATE_USER_DO_NOT_BECOME_USER, NATIVE_AUTH_UID); if (a == 0) { if (!IsEmptyStr(password)) { @@ -223,16 +213,13 @@ void cmd_creu(char *cmdbuf) safestrncpy(tmp.password, password, sizeof(tmp.password)); CtdlPutUserLock(&tmp); } - cprintf("%d User '%s' created %s.\n", CIT_OK, username, - (!IsEmptyStr(password)) ? "and password set" : - "with no password"); + cprintf("%d User '%s' created %s.\n", CIT_OK, username, (!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); return; } else if ( (CtdlGetConfigInt("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); + cprintf("%d User accounts are not created within Citadel in host authentication mode.\n", ERROR + NO_SUCH_USER); return; } else { cprintf("%d An error occurred creating the user account.\n", ERROR + INTERNAL_ERROR); @@ -240,23 +227,19 @@ void cmd_creu(char *cmdbuf) } - /* * get user parameters */ void cmd_getu(char *cmdbuf) { - if (CtdlAccessCheck(ac_logged_in)) return; CtdlGetUser(&CC->user, CC->curr_user); - cprintf("%d 80|24|%d|\n", - CIT_OK, - (CC->user.flags & US_USER_SET) - ); + cprintf("%d 80|24|%d|\n", CIT_OK, (CC->user.flags & US_USER_SET)); } + /* * set user parameters */ @@ -276,6 +259,7 @@ void cmd_setu(char *new_parms) cprintf("%d Ok\n", CIT_OK); } + /* * set last read pointer */ @@ -350,6 +334,7 @@ void cmd_gtsn(char *argbuf) { client_write(HKEY("\n")); } + /* * INVT and KICK commands */ @@ -365,15 +350,13 @@ void cmd_invt_kick(char *iuser, int op) { /* access granted */ } else { /* access denied */ - cprintf("%d Higher access or room ownership required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); + cprintf("%d Higher access or room ownership required.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } if (!strncasecmp(CC->room.QRname, CtdlGetConfigStr("c_baseroom"), ROOMNAMELEN)) { - cprintf("%d Can't add/remove users from this room.\n", - ERROR + NOT_HERE); + cprintf("%d Can't add/remove users from this room.\n", ERROR + NOT_HERE); return; } @@ -389,8 +372,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);} + +void cmd_invt(char *iuser) { + cmd_invt_kick(iuser, 1); +} + + +void cmd_kick(char *iuser) { + cmd_invt_kick(iuser, 0); +} /* @@ -411,6 +401,7 @@ void cmd_forg(char *argbuf) } } + /* * Get Next Unregistered User */ @@ -423,7 +414,7 @@ void cmd_gnur(char *argbuf) return; } - if ((CitControl.MMflags & MM_VALID) == 0) { + if ((CtdlGetConfigInt("MMflags") & MM_VALID) == 0) { cprintf("%d There are no unvalidated users.\n", CIT_OK); return; } @@ -434,12 +425,9 @@ void cmd_gnur(char *argbuf) cdb_rewind(CDB_USERS); 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)); + memcpy(&usbuf, cdbus->ptr, ((cdbus->len > sizeof(struct ctdluser)) ? sizeof(struct ctdluser) : cdbus->len)); cdb_free(cdbus); - if ((usbuf.flags & US_NEEDVALID) - && (usbuf.axlevel > AxDeleted)) { + if ((usbuf.flags & US_NEEDVALID) && (usbuf.axlevel > AxDeleted)) { cprintf("%d %s\n", MORE_DATA, usbuf.fullname); cdb_close_cursor(CDB_USERS); return; @@ -451,13 +439,12 @@ void cmd_gnur(char *argbuf) */ begin_critical_section(S_CONTROL); - get_control(); - CitControl.MMflags = CitControl.MMflags & (~MM_VALID); - put_control(); + int flags; + flags = CtdlGetConfigInt("MMflags"); + flags = flags & (~MM_VALID); + CtdlSetConfigInt("MMflags", flags); end_critical_section(S_CONTROL); cprintf("%d *** End of registration.\n", CIT_OK); - - } @@ -473,9 +460,7 @@ void cmd_vali(char *v_args) extract_token(user, v_args, 0, '|', sizeof user); newax = extract_int(v_args, 1); - if (CtdlAccessCheck(ac_aide) || - (newax > AxAideU) || - (newax < AxDeleted)) { + if (CtdlAccessCheck(ac_aide) || (newax > AxAideU) || (newax < AxDeleted)) { return; } @@ -513,8 +498,6 @@ void cmd_list(char *cmdbuf) } - - /* * assorted info we need to check at login */ @@ -528,18 +511,18 @@ void cmd_chek(char *argbuf) return; } - CtdlGetUser(&CC->user, CC->curr_user); /* no lock is needed here */ - if ((REGISCALL != 0) && ((CC->user.flags & US_REGIS) == 0)) + 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 >= AxAideU) { - get_control(); - if (CitControl.MMflags & MM_VALID) + if (CtdlGetConfigInt("MMflags") & MM_VALID) { vali = 1; + } } - /* check for mail */ - mail = InitialMailCheck(); + mail = InitialMailCheck(); // check for mail cprintf("%d %d|%d|%d|%s|\n", CIT_OK, mail, regis, vali, CC->cs_inet_email); } @@ -591,7 +574,6 @@ void cmd_agup(char *cmdbuf) } - /* * Administrative Set User Parameters */ @@ -642,16 +624,16 @@ void cmd_asup(char *cmdbuf) if (deleted) { snprintf(notify, SIZ, - "User \"%s\" has been deleted by %s.\n", - usbuf.fullname, - (CC->logged_in ? CC->user.fullname : "an administrator") + "User \"%s\" has been deleted by %s.\n", + usbuf.fullname, (CC->logged_in ? CC->user.fullname : "an administrator") ); CtdlAideMessage(notify, "User Deletion Message"); } cprintf("%d Ok", CIT_OK); - if (deleted) + if (deleted) { cprintf(" (%s deleted)", requested_user); + } cprintf("\n"); } @@ -675,6 +657,77 @@ void cmd_isme(char *argbuf) { } +/* + * Administrative Get Email Addresses + */ +void cmd_agea(char *cmdbuf) +{ + struct ctdluser usbuf; + char requested_user[128]; + int i, num_e; + char e[512]; + + if (CtdlAccessCheck(ac_aide)) { + return; + } + + extract_token(requested_user, cmdbuf, 0, '|', sizeof requested_user); + if (CtdlGetUser(&usbuf, requested_user) != 0) { + cprintf("%d No such user.\n", ERROR + NO_SUCH_USER); + return; + } + cprintf("%d internet email addresses for %s\n", LISTING_FOLLOWS, usbuf.fullname); + num_e = num_tokens(usbuf.emailaddrs, '|'); + for (i=0; i= 0 && strcmp(buf, "000")) { + if ( // addresses must be: + (!IsEmptyStr(buf)) // non-empty + && ((strlen(new_emailaddrs) + strlen(buf) + 2) < sizeof(new_emailaddrs)) // fit in the remaining buffer + && (IsDirectory(buf, 0)) // in one of our own domains + && ( // not belong to someone else + (CtdlDirectoryLookup(whodat, buf, sizeof whodat) != 0) + || (!strcasecmp(whodat, requested_user)) + ) + ) { + if (!IsEmptyStr(new_emailaddrs)) { + strcat(new_emailaddrs, "|"); + } + strcat(new_emailaddrs, buf); + } + } + + + CtdlSetEmailAddressesForUser(requested_user, new_emailaddrs); +} + + /* * Set the preferred view for the current user/room combination */ @@ -719,7 +772,8 @@ void cmd_renu(char *cmdbuf) return; case RENAMEUSER_LOGGED_IN: cprintf("%d '%s' is currently logged in and cannot be renamed.\n", - ERROR + ALREADY_LOGGED_IN , oldname); + ERROR + ALREADY_LOGGED_IN , oldname + ); return; case RENAMEUSER_NOT_FOUND: cprintf("%d '%s' does not exist.\n", ERROR + NO_SUCH_USER, oldname); @@ -733,7 +787,6 @@ void cmd_renu(char *cmdbuf) } - void cmd_quit(char *argbuf) { cprintf("%d Goodbye.\n", CIT_OK); @@ -776,6 +829,8 @@ CTDL_MODULE_INIT(serv_user) CtdlRegisterProtoHook(cmd_qusr, "QUSR", "check to see if a user exists"); CtdlRegisterProtoHook(cmd_agup, "AGUP", "Administratively Get User Parameters"); CtdlRegisterProtoHook(cmd_asup, "ASUP", "Administratively Set User Parameters"); + CtdlRegisterProtoHook(cmd_agea, "AGEA", "Administratively Get Email Addresses"); + CtdlRegisterProtoHook(cmd_asea, "ASEA", "Administratively Set Email Addresses"); CtdlRegisterProtoHook(cmd_seen, "SEEN", "Manipulate seen/unread message flags"); CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Fetch seen/unread message flags"); CtdlRegisterProtoHook(cmd_view, "VIEW", "Set preferred view for user/room combination");