X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=2ca3b4220ddfb43c754da98643c37ccbbeacc047;hb=9caef44a2f42ab81b2489ae19859f1bbc25d4430;hp=7eefb54eb8240359e8c70aef6d4b1c007db17f99;hpb=a5ae0d92892091d0d5aa52ee0369e3ad4d21db57;p=citadel.git diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 7eefb54eb..2ca3b4220 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -230,10 +230,10 @@ int rename_user(char *oldname, char *newname) { else { /* Sanity checks succeeded. Now rename the user. */ if (usbuf.usernum == 0) { - syslog(LOG_DEBUG, "Can not rename user \"Citadel\".\n"); + CONM_syslog(LOG_DEBUG, "Can not rename user \"Citadel\".\n"); retcode = RENAMEUSER_NOT_FOUND; } else { - syslog(LOG_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname); + CON_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); @@ -417,11 +417,11 @@ int CtdlGetUserByNumber(struct ctdluser *usbuf, long number) cdbun = cdb_fetch(CDB_USERSBYNUMBER, &number, sizeof(long)); if (cdbun == NULL) { - syslog(LOG_INFO, "User %ld not found\n", number); + CON_syslog(LOG_INFO, "User %ld not found\n", number); return(-1); } - syslog(LOG_INFO, "User %ld maps to %s\n", number, cdbun->ptr); + CON_syslog(LOG_INFO, "User %ld maps to %s\n", number, cdbun->ptr); r = CtdlGetUser(usbuf, cdbun->ptr); cdb_free(cdbun); return(r); @@ -470,7 +470,7 @@ void rebuild_ubn_for_user(struct ctdluser *usbuf, void *data) { } while (u != NULL) { - syslog(LOG_DEBUG, "Rebuilding usersbynumber index %10ld : %s\n", + CON_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); @@ -531,7 +531,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) int found_user; long len; - syslog(LOG_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); + CON_syslog(LOG_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname); if ((CC->logged_in)) { return login_already_logged_in; @@ -541,7 +541,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) if (!strncasecmp(trythisname, "SYS_", 4)) { - syslog(LOG_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname); + CON_syslog(LOG_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname); return login_not_found; } @@ -570,21 +570,21 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) struct passwd *tempPwdPtr; char pwdbuffer[256]; - syslog(LOG_DEBUG, "asking host about <%s>\n", username); + CON_syslog(LOG_DEBUG, "asking host about <%s>\n", username); #ifdef HAVE_GETPWNAM_R #ifdef SOLARIS_GETPWUID - syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); + CON_syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer); #else // SOLARIS_GETPWUID - syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); + CONM_syslog(LOG_DEBUG, "Calling getpwnam_r()\n"); getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr); #endif // SOLARIS_GETPWUID #else // HAVE_GETPWNAM_R - syslog(LOG_DEBUG, "SHOULD NEVER GET HERE!!!\n"); + CON_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); + CON_syslog(LOG_DEBUG, "no such user <%s>\n", username); return login_not_found; } @@ -592,7 +592,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname) * 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", + CON_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) { len = cutuserkey(username); @@ -675,11 +675,11 @@ void cmd_user(char *cmdbuf) char username[256]; int a; - syslog(LOG_DEBUG, "cmd_user(%s)\n", cmdbuf); + CON_syslog(LOG_DEBUG, "cmd_user(%s)\n", cmdbuf); extract_token(username, cmdbuf, 0, '|', sizeof username); - syslog(LOG_DEBUG, "username: %s\n", username); + CON_syslog(LOG_DEBUG, "username: %s\n", username); striplt(username); - syslog(LOG_DEBUG, "username: %s\n", username); + CON_syslog(LOG_DEBUG, "username: %s\n", username); a = CtdlLoginExistingUser(NULL, username); switch (a) { @@ -712,40 +712,42 @@ void cmd_user(char *cmdbuf) */ void do_login(void) { - CC->logged_in = 1; - syslog(LOG_NOTICE, "<%s> logged in\n", CC->curr_user); + struct CitContext *CCC = CC; - CtdlGetUserLock(&CC->user, CC->curr_user); - ++(CC->user.timescalled); - CC->previous_login = CC->user.lastcall; - time(&CC->user.lastcall); + CCC->logged_in = 1; + CON_syslog(LOG_NOTICE, "<%s> logged in\n", CCC->curr_user); + + CtdlGetUserLock(&CCC->user, CCC->curr_user); + ++(CCC->user.timescalled); + CCC->previous_login = CCC->user.lastcall; + time(&CCC->user.lastcall); /* If this user's name is the name of the system administrator * (as specified in setup), automatically assign access level 6. */ - if (!strcasecmp(CC->user.fullname, config.c_sysadm)) { - CC->user.axlevel = AxAideU; + if (!strcasecmp(CCC->user.fullname, config.c_sysadm)) { + CCC->user.axlevel = AxAideU; } /* If we're authenticating off the host system, automatically give * root the highest level of access. */ if (config.c_auth_mode == AUTHMODE_HOST) { - if (CC->user.uid == 0) { - CC->user.axlevel = AxAideU; + if (CCC->user.uid == 0) { + CCC->user.axlevel = AxAideU; } } - CtdlPutUserLock(&CC->user); + CtdlPutUserLock(&CCC->user); /* - * Populate CC->cs_inet_email with a default address. This will be + * Populate CCC->cs_inet_email with a default address. This will be * overwritten with the user's directory address, if one exists, when * the vCard module's login hook runs. */ - snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s", - CC->user.fullname, config.c_fqdn); - convert_spaces_to_underscores(CC->cs_inet_email); + snprintf(CCC->cs_inet_email, sizeof CCC->cs_inet_email, "%s@%s", + CCC->user.fullname, config.c_fqdn); + convert_spaces_to_underscores(CCC->cs_inet_email); /* Create any personal rooms required by the system. * (Technically, MAILROOM should be there already, but just in case...) @@ -778,7 +780,9 @@ void CtdlUserLogout(void) { CitContext *CCC = MyContext(); - syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s>\n", CCC->curr_user); + CON_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. @@ -795,13 +799,6 @@ void CtdlUserLogout(void) abort_upl(CCC); } - /* - * If we were talking to a network node, we're not anymore... - */ - if (!IsEmptyStr(CCC->net_node)) { - network_talking_to(CCC->net_node, NTT_REMOVE); - } - /* Run any hooks registered by modules... */ PerformSessionHooks(EVT_LOGOUT); @@ -846,24 +843,39 @@ static int validpw(uid_t uid, const char *pass) int rv = 0; if (IsEmptyStr(pass)) { - syslog(LOG_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid); + CON_syslog(LOG_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid); return 0; } - syslog(LOG_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid); + CON_syslog(LOG_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid); begin_critical_section(S_CHKPWD); rv = write(chkpwd_write_pipe[1], &uid, sizeof(uid_t)); + if (rv == -1) { + CON_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) { + CON_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) { + CON_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)) { - syslog(LOG_DEBUG, "...pass\n"); + CONM_syslog(LOG_DEBUG, "...pass\n"); return(1); } - syslog(LOG_DEBUG, "...fail\n"); + CONM_syslog(LOG_DEBUG, "...fail\n"); return 0; } @@ -875,7 +887,7 @@ void start_chkpwd_daemon(void) { struct stat filestats; int i; - syslog(LOG_DEBUG, "Starting chkpwd daemon for host authentication mode\n"); + CONM_syslog(LOG_DEBUG, "Starting chkpwd daemon for host authentication mode\n"); if ((stat(file_chkpwd, &filestats)==-1) || (filestats.st_size==0)){ @@ -883,29 +895,29 @@ void start_chkpwd_daemon(void) { abort(); } if (pipe(chkpwd_write_pipe) != 0) { - syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); + CON_syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); abort(); } if (pipe(chkpwd_read_pipe) != 0) { - syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); + CON_syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno)); abort(); } chkpwd_pid = fork(); if (chkpwd_pid < 0) { - syslog(LOG_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno)); + CON_syslog(LOG_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno)); abort(); } if (chkpwd_pid == 0) { - syslog(LOG_DEBUG, "Now calling dup2() write\n"); + CONM_syslog(LOG_DEBUG, "Now calling dup2() write\n"); dup2(chkpwd_write_pipe[0], 0); - syslog(LOG_DEBUG, "Now calling dup2() write\n"); + CONM_syslog(LOG_DEBUG, "Now calling dup2() write\n"); dup2(chkpwd_read_pipe[1], 1); - syslog(LOG_DEBUG, "Now closing stuff\n"); + CONM_syslog(LOG_DEBUG, "Now closing stuff\n"); for (i=2; i<256; ++i) close(i); - syslog(LOG_DEBUG, "Now calling execl(%s)\n", file_chkpwd); + CON_syslog(LOG_DEBUG, "Now calling execl(%s)\n", file_chkpwd); execl(file_chkpwd, file_chkpwd, NULL); - syslog(LOG_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno)); + CON_syslog(LOG_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno)); abort(); exit(errno); } @@ -915,26 +927,27 @@ void start_chkpwd_daemon(void) { int CtdlTryPassword(const char *password, long len) { int code; + CitContext *CCC = CC; - if ((CC->logged_in)) { - syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n"); + if ((CCC->logged_in)) { + CONM_syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n"); return pass_already_logged_in; } - if (!strcmp(CC->curr_user, NLI)) { - syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n"); + if (!strcmp(CCC->curr_user, NLI)) { + CONM_syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n"); return pass_no_user; } - if (CtdlGetUser(&CC->user, CC->curr_user)) { - syslog(LOG_ERR, "CtdlTryPassword: internal error\n"); + if (CtdlGetUser(&CCC->user, CCC->curr_user)) { + CONM_syslog(LOG_ERR, "CtdlTryPassword: internal error\n"); return pass_internal_error; } if (password == NULL) { - syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n"); + CONM_syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n"); return pass_wrong_password; } code = (-1); - if (CC->is_master) { + if (CCC->is_master) { code = strcmp(password, config.c_master_pass); } @@ -942,7 +955,7 @@ int CtdlTryPassword(const char *password, long len) /* host auth mode */ - if (validpw(CC->user.uid, password)) { + if (validpw(CCC->user.uid, password)) { code = 0; /* @@ -953,9 +966,9 @@ int CtdlTryPassword(const char *password, long len) * this is a security hazard, comment it out. */ - CtdlGetUserLock(&CC->user, CC->curr_user); - safestrncpy(CC->user.password, password, sizeof CC->user.password); - CtdlPutUserLock(&CC->user); + CtdlGetUserLock(&CCC->user, CCC->curr_user); + safestrncpy(CCC->user.password, password, sizeof CCC->user.password); + CtdlPutUserLock(&CCC->user); /* * (sooper-seekrit hack ends here) @@ -972,7 +985,7 @@ int CtdlTryPassword(const char *password, long len) /* LDAP auth mode */ - if ((CC->ldap_dn) && (!CtdlTryPasswordLDAP(CC->ldap_dn, password))) { + if ((CCC->ldap_dn) && (!CtdlTryPasswordLDAP(CCC->ldap_dn, password))) { code = 0; } else { @@ -989,11 +1002,11 @@ int CtdlTryPassword(const char *password, long len) pw = (char*) malloc(len + 1); memcpy(pw, password, len + 1); strproc(pw); - strproc(CC->user.password); - code = strcasecmp(CC->user.password, pw); + strproc(CCC->user.password); + code = strcasecmp(CCC->user.password, pw); strproc(pw); - strproc(CC->user.password); - code = strcasecmp(CC->user.password, pw); + strproc(CCC->user.password); + code = strcasecmp(CCC->user.password, pw); free (pw); } @@ -1001,7 +1014,16 @@ int CtdlTryPassword(const char *password, long len) do_login(); return pass_ok; } else { - syslog(LOG_WARNING, "Bad password specified for <%s>\n", CC->curr_user); + CON_syslog(LOG_WARNING, "Bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>\n", + CCC->curr_user, + CCC->ServiceName, + CCC->tcp_port, + CCC->cs_host, + CCC->cs_addr); + + +//citserver[5610]: Bad password specified for Service Remote + return pass_wrong_password; } } @@ -1052,7 +1074,7 @@ int purge_user(char pname[]) return (ERROR + NO_SUCH_USER); if (CtdlGetUser(&usbuf, pname) != 0) { - syslog(LOG_ERR, "Cannot purge user <%s> - not found\n", pname); + CON_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 @@ -1060,12 +1082,12 @@ int purge_user(char pname[]) * during the next purge. */ if (CtdlIsUserLoggedInByNum(usbuf.usernum)) { - syslog(LOG_WARNING, "User <%s> is logged in; not deleting.\n", pname); + CON_syslog(LOG_WARNING, "User <%s> is logged in; not deleting.\n", pname); usbuf.axlevel = AxDeleted; CtdlPutUser(&usbuf); return (1); } - syslog(LOG_NOTICE, "Deleting user <%s>\n", pname); + CON_syslog(LOG_NOTICE, "Deleting user <%s>\n", pname); /* * FIXME: @@ -1245,7 +1267,7 @@ int create_user(const char *newusername, long len, int become_user) CC->cs_addr ); CtdlAideMessage(buf, "User Creation Notice"); - syslog(LOG_NOTICE, "New user <%s> created\n", username); + CON_syslog(LOG_NOTICE, "New user <%s> created\n", username); return (0); } @@ -1258,7 +1280,7 @@ void cmd_newu(char *cmdbuf) { int a; long len; - char username[26]; + char username[SIZ]; if (config.c_auth_mode != AUTHMODE_NATIVE) { cprintf("%d This system does not use native mode authentication.\n", @@ -1323,7 +1345,7 @@ 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); + CON_syslog(LOG_INFO, "Password changed for user <%s>\n", CC->curr_user); PerformSessionHooks(EVT_SETPASS); } @@ -1333,8 +1355,6 @@ void CtdlSetPassword(char *new_pw) */ void cmd_setp(char *new_pw) { - int generate_random_password = 0; - if (CtdlAccessCheck(ac_logged_in)) { return; } @@ -1350,7 +1370,6 @@ void cmd_setp(char *new_pw) if (!strcasecmp(new_pw, "GENERATE_RANDOM_PASSWORD")) { char random_password[17]; - generate_random_password = 1; snprintf(random_password, sizeof random_password, "%08lx%08lx", random(), random()); CtdlSetPassword(random_password); cprintf("%d %s\n", CIT_OK, random_password); @@ -1383,17 +1402,16 @@ 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); - len = cutuserkey(username); - if (IsEmptyStr(username)) { 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); @@ -1562,7 +1580,8 @@ int CtdlInvtKick(char *iuser, int op) { iuser, ((op == 1) ? "invited to" : "kicked out of"), CC->room.QRname, - CC->user.fullname); + (CC->logged_in ? CC->user.fullname : "an administrator") + ); CtdlAideMessage(bbb,"User Admin Message"); return(0); @@ -1941,7 +1960,9 @@ void cmd_asup(char *cmdbuf) if (deleted) { snprintf(notify, SIZ, "User \"%s\" has been deleted by %s.\n", - usbuf.fullname, CC->user.fullname); + usbuf.fullname, + (CC->logged_in ? CC->user.fullname : "an administrator") + ); CtdlAideMessage(notify, "User Deletion Message"); } @@ -2087,18 +2108,18 @@ CTDL_MODULE_INIT(user_ops) 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_gnur, "GNUR", "Get Next Unregistered User"); 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."); + CtdlRegisterProtoHook(cmd_chek, "CHEK", "assorted info we need to check at login"); + 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_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"); + CtdlRegisterProtoHook(cmd_renu, "RENU", "Rename a user"); + CtdlRegisterProtoHook(cmd_newu, "NEWU", "Log in as a new user"); } /* return our Subversion id for the Log */ return "user_ops";