#include "citserver.h"
#include "citadel_dirs.h"
#include "genstamp.h"
+#include "threads.h"
/* These pipes are used to talk to the chkpwd daemon, which is forked during startup */
int chkpwd_write_pipe[2];
len = strlen(username);
if (len >= USERNAME_SIZE)
{
- lprintf (CTDL_EMERG, "Username to long: %s", username);
+ CtdlLogPrintf (CTDL_EMERG, "Username to long: %s", username);
cit_backtrace ();
len = USERNAME_SIZE - 1;
username[USERNAME_SIZE - 1]='\0';
end_critical_section(S_USERS);
}
+
+/*
+ * 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) {
+ 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);
+
+ /* Lock up and get going */
+ begin_critical_section(S_USERS);
+
+ if (getuser(&usbuf, newname) == 0) {
+ retcode = RENAMEUSER_ALREADY_EXISTS;
+ }
+ else {
+
+ if (getuser(&usbuf, oldname) != 0) {
+ retcode = RENAMEUSER_NOT_FOUND;
+ }
+
+ else { /* Sanity checks succeeded. Now rename the user. */
+
+ 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);
+ retcode = RENAMEUSER_OK;
+ }
+
+ }
+
+ end_critical_section(S_USERS);
+ return(retcode);
+}
+
+
+
/*
* Index-generating function used by Ctdl[Get|Set]Relationship
*/
char username[SIZ];
int found_user;
+ CtdlLogPrintf(9, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname);
+
if ((CC->logged_in)) {
return login_already_logged_in;
}
return login_not_found;
}
- if (config.c_auth_mode == 1) {
+ if (config.c_auth_mode == AUTHMODE_HOST) {
/* host auth mode */
struct passwd *tempPwdPtr;
char pwdbuffer[256];
- lprintf(CTDL_DEBUG, "asking host about <%s>\n", username);
+ CtdlLogPrintf(CTDL_DEBUG, "asking host about <%s>\n", username);
+#ifdef HAVE_GETPWNAM_R
#ifdef SOLARIS_GETPWUID
+ CtdlLogPrintf(CTDL_DEBUG, "Calling getpwnam_r()\n");
tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
-#else
+#else // SOLARIS_GETPWUID
+ CtdlLogPrintf(CTDL_DEBUG, "Calling getpwnam_r()\n");
getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWNAM_R
+ CtdlLogPrintf(CTDL_DEBUG, "SHOULD NEVER GET HERE!!!\n");
+ tempPwdPtr = NULL;
+#endif // HAVE_GETPWNAM_R
if (tempPwdPtr == NULL) {
+ CtdlLogPrintf(CTDL_DEBUG, "no such user <%s>\n", username);
return login_not_found;
}
* If not found, make one attempt to create it.
*/
found_user = getuserbyuid(&CC->user, pd.pw_uid);
- lprintf(CTDL_DEBUG, "found it: uid=%ld, gecos=%s here: %ld\n", (long)pd.pw_uid, pd.pw_gecos, found_user);
+ 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);
found_user = getuserbyuid(&CC->user, pd.pw_uid);
*/
void session_startup(void)
{
- int i = 0;
-
- lprintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
+ CtdlLogPrintf(CTDL_NOTICE, "<%s> logged in\n", CC->curr_user);
lgetuser(&CC->user, CC->curr_user);
++(CC->user.timescalled);
/* 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;
}
*/
snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s",
CC->user.fullname, config.c_fqdn);
- for (i=0; !IsEmptyStr(&CC->cs_inet_email[i]); ++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...)
/*
* misc things to be taken care of when a user is logged out
*/
-void logout(struct CitContext *who)
+void logout(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;
-
+ struct CitContext *CCC = CC; /* CachedCitContext - performance boost */
/*
* 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 (!IsEmptyStr(who->net_node)) {
- 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 == 0)
+ purge_user(CCC->user.fullname);
/* Free any output buffers */
- if (who->output_buffer != NULL) {
+ if (CCC->output_buffer != NULL) {
unbuffer_output();
}
}
{
char buf[256];
- lprintf(CTDL_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid);
+ if (IsEmptyStr(pass)) {
+ CtdlLogPrintf(CTDL_DEBUG, "refusing to check empty password for uid=%d using chkpwd...\n", uid);
+ return 0;
+ }
+
+ 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));
end_critical_section(S_CHKPWD);
if (!strncmp(buf, "PASS", 4)) {
- lprintf(CTDL_DEBUG, "...pass\n");
+ CtdlLogPrintf(CTDL_DEBUG, "...pass\n");
return(1);
}
- lprintf(CTDL_DEBUG, "...fail\n");
+ CtdlLogPrintf(CTDL_DEBUG, "...fail\n");
return 0;
}
struct stat filestats;
int i;
- lprintf(CTDL_DEBUG, "Starting chkpwd daemon for host authentication mode\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Starting chkpwd daemon for host authentication mode\n");
if ((stat(file_chkpwd, &filestats)==-1) ||
(filestats.st_size==0)){
abort();
}
if (pipe(chkpwd_write_pipe) != 0) {
- lprintf(CTDL_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ CtdlLogPrintf(CTDL_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));
+ CtdlLogPrintf(CTDL_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));
+ CtdlLogPrintf(CTDL_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno));
abort();
}
if (chkpwd_pid == 0) {
- lprintf(CTDL_DEBUG, "Now calling dup2() write\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_write_pipe[0], 0);
- lprintf(CTDL_DEBUG, "Now calling dup2() write\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_read_pipe[1], 1);
- lprintf(CTDL_DEBUG, "Now closing stuff\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Now closing stuff\n");
for (i=2; i<256; ++i) close(i);
- lprintf(CTDL_DEBUG, "Now calling execl(%s)\n", file_chkpwd);
+ CtdlLogPrintf(CTDL_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));
+ CtdlLogPrintf(CTDL_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno));
abort();
exit(errno);
}
int code;
if ((CC->logged_in)) {
- lprintf(CTDL_WARNING, "CtdlTryPassword: already logged in\n");
+ CtdlLogPrintf(CTDL_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");
+ CtdlLogPrintf(CTDL_WARNING, "CtdlTryPassword: no user selected\n");
return pass_no_user;
}
if (getuser(&CC->user, CC->curr_user)) {
- lprintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
+ CtdlLogPrintf(CTDL_ERR, "CtdlTryPassword: internal error\n");
return pass_internal_error;
}
if (password == NULL) {
- lprintf(CTDL_INFO, "CtdlTryPassword: NULL password string supplied\n");
+ CtdlLogPrintf(CTDL_INFO, "CtdlTryPassword: NULL password string supplied\n");
return pass_wrong_password;
}
code = (-1);
code = strcmp(password, config.c_master_pass);
}
- else if (config.c_auth_mode == 1) {
+ else if (config.c_auth_mode == AUTHMODE_HOST) {
/* host auth mode */
do_login();
return pass_ok;
} else {
- lprintf(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
+ CtdlLogPrintf(CTDL_WARNING, "Bad password specified for <%s>\n", CC->curr_user);
return pass_wrong_password;
}
}
makeuserkey(usernamekey, 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) {
- lprintf(CTDL_ERR, "Cannot purge user <%s> - not found\n", pname);
+ CtdlLogPrintf(CTDL_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
}
end_critical_section(S_SESSION_TABLE);
if (user_is_logged_in == 1) {
- lprintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
+ CtdlLogPrintf(CTDL_WARNING, "User <%s> is logged in; not deleting.\n", pname);
usbuf.axlevel = 0;
putuser(&usbuf);
return (1);
}
- lprintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
+ CtdlLogPrintf(CTDL_NOTICE, "Deleting user <%s>\n", pname);
/* Perform any purge functions registered by server extensions */
PerformUserHooks(&usbuf, EVT_PURGEUSER);
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 *tempPwdPtr;
char pwdbuffer[256];
+#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))
{
- lprintf (CTDL_EMERG,
+ CtdlLogPrintf (CTDL_EMERG,
"Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
newusername, pd.pw_uid);
snprintf(buf, SIZ,
CC->cs_addr
);
aide_message(buf, "User Creation Notice");
- lprintf(CTDL_NOTICE, "New user <%s> created\n", username);
+ CtdlLogPrintf(CTDL_NOTICE, "New user <%s> created\n", username);
return (0);
}
int a;
char username[26];
- 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;
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);
+ CtdlLogPrintf(CTDL_INFO, "Password changed for user <%s>\n", CC->curr_user);
PerformSessionHooks(EVT_SETPASS);
}
} else if (a == ERROR + ALREADY_EXISTS) {
cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, username);
return;
- } else if ( (config.c_auth_mode == 1) && (a == ERROR + NO_SUCH_USER) ) {
+ } 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;
}
if (deleted) {
- sprintf(notify, "User \"%s\" has been deleted by %s.\n",
- usbuf.fullname, CC->user.fullname);
+ snprintf(notify, SIZ,
+ "User \"%s\" has been deleted by %s.\n",
+ usbuf.fullname, CC->user.fullname);
aide_message(notify, "User Deletion Message");
}
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);
+}
projects / citadel.git / blobdiff