/*
* Server functions which perform operations on user objects.
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
* GNU General Public License for more details.
*/
+
#include "support.h"
#include "control.h"
#include "ctdl_module.h"
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);
switch (a) {
void cmd_newu(char *cmdbuf)
{
int a;
- long len;
char username[SIZ];
if (CtdlGetConfigInt("c_auth_mode") != AUTHMODE_NATIVE) {
}
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);
return;
}
- a = create_user(username, len, 1);
+ a = create_user(username, 1);
if (a == 0) {
logged_in_response();
}
}
+
/*
* set password - citadel protocol implementation
*/
void cmd_creu(char *cmdbuf)
{
int a;
- long len;
char username[SIZ];
char password[SIZ];
struct ctdluser tmp;
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, 0);
if (a == 0) {
if (!IsEmptyStr(password)) {
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);
}
-
/*
* 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
*/
cprintf("%d Ok\n", CIT_OK);
}
+
/*
* set last read pointer
*/
client_write(HKEY("\n"));
}
+
/*
* INVT and KICK commands
*/
/* 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;
}
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);
+}
/*
}
}
+
/*
* Get Next Unregistered User
*/
return;
}
- if ((CitControl.MMflags & MM_VALID) == 0) {
+ if ((CtdlGetConfigInt("MMflags") & MM_VALID) == 0) {
cprintf("%d There are no unvalidated users.\n", CIT_OK);
return;
}
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;
*/
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);
-
-
}
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;
}
}
-
-
/*
* assorted info we need to check at login
*/
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);
}
}
-
/*
* Administrative Set User Parameters
*/
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");
}
}
+/*
+ * 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<num_e; ++i) {
+ extract_token(e, usbuf.emailaddrs, i, '|', sizeof e);
+ cprintf("%s\n", e);
+ }
+ cprintf("000\n");
+}
+
+
+/*
+ * Administrative Set Email Addresses
+ */
+void cmd_asea(char *cmdbuf)
+{
+ struct ctdluser usbuf;
+ char requested_user[128];
+ char buf[SIZ];
+ char whodat[64];
+ char new_emailaddrs[512] = { 0 } ;
+ int i;
+
+ 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 Ok\n", SEND_LISTING);
+ while (client_getln(buf, sizeof buf) >= 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);
+ }
+ }
+
+ if (CtdlGetUserLock(&usbuf, requested_user) != 0) { // We are relying on the fact that the DirectoryIndex functions don't lock.
+ return; // Silently fail here if we can't acquire a lock on the user record.
+ }
+
+ /* Delete all of the existing directory index records for the user (easier this way) */
+ for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+ extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+ CtdlDirectoryDelUser(buf, requested_user);
+ }
+
+ strcpy(usbuf.emailaddrs, new_emailaddrs); // make it official.
+
+ /* Index all of the new email addresses (they've already been sanitized) */
+ for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
+ extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
+ CtdlDirectoryAddUser(buf, requested_user);
+ }
+
+ CtdlPutUserLock(&usbuf);
+}
+
+
/*
* Set the preferred view for the current user/room combination
*/
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);
}
-
void cmd_quit(char *argbuf)
{
cprintf("%d Goodbye.\n", CIT_OK);
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");