X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=c5eeabd2cbca8bd9fec607d7d10fc542f15af69d;hp=7e82d3188184a900b491414c1fb59dca31dd1712;hb=bdfa2e9b6af7e32b11461433a28dd6551f830888;hpb=110d19a7389607e9a336456c79c20ba8b916d888

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 7e82d3188..c5eeabd2c 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2019 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.
@@ -32,6 +32,41 @@ int chkpwd_write_pipe[2];
 int chkpwd_read_pipe[2];
 
 
+
+/*
+ * Trim a string down to the maximum username size and return the new length
+ */
+long cutusername(char *username) { 
+	long len;
+	len = strlen(username);
+	if (len >= USERNAME_SIZE)
+	{
+		syslog(LOG_INFO, "Username too long: %s", username);
+		len = USERNAME_SIZE - 1; 
+		username[len]='\0';
+	}
+	return len;
+}
+
+
+/*
+ * makeuserkey() - convert a username into the format used as a database key
+ *		 (it's just the username converted into lower case)
+ */
+void makeuserkey(char *key, const char *username, long len) {
+	int i;
+
+	if (len >= USERNAME_SIZE)
+	{
+		syslog(LOG_INFO, "Username too long: %s", username);
+		len = USERNAME_SIZE - 1; 
+	}
+	for (i=0; i<=len; ++i) {
+		key[i] = tolower(username[i]);
+	}
+}
+
+
 /*
  * CtdlGetUser()	retrieve named user into supplied buffer.
  *			returns 0 on success
@@ -40,7 +75,7 @@ int CtdlGetUser(struct ctdluser *usbuf, char *name)
 {
 	char usernamekey[USERNAME_SIZE];
 	struct cdbdata *cdbus;
-	long len = cutuserkey(name);
+	long len = cutusername(name);
 
 	if (usbuf != NULL) {
 		memset(usbuf, 0, sizeof(struct ctdluser));
@@ -56,7 +91,7 @@ int CtdlGetUser(struct ctdluser *usbuf, char *name)
 		memcpy(usbuf, cdbus->ptr, ((cdbus->len > sizeof(struct ctdluser)) ?  sizeof(struct ctdluser) : cdbus->len));
 	}
 	cdb_free(cdbus);
-	return (0);
+	return(0);
 }
 
 
@@ -78,7 +113,7 @@ int CtdlGetUserLock(struct ctdluser *usbuf, char *name)
 	if (retcode == 0) {
 		begin_critical_section(S_USERS);
 	}
-	return (retcode);
+	return(retcode);
 }
 
 
@@ -89,7 +124,7 @@ void CtdlPutUser(struct ctdluser *usbuf)
 {
 	char usernamekey[USERNAME_SIZE];
 
-	makeuserkey(usernamekey, usbuf->fullname, cutuserkey(usbuf->fullname));
+	makeuserkey(usernamekey, usbuf->fullname, cutusername(usbuf->fullname));
 	usbuf->version = REV_LEVEL;
 	cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
 }
@@ -125,8 +160,8 @@ int rename_user(char *oldname, char *newname) {
 	char newnamekey[USERNAME_SIZE];
 
 	/* Create the database keys... */
-	makeuserkey(oldnamekey, oldname, cutuserkey(oldname));
-	makeuserkey(newnamekey, newname, cutuserkey(newname));
+	makeuserkey(oldnamekey, oldname, cutusername(oldname));
+	makeuserkey(newnamekey, newname, cutusername(newname));
 
 	/* Lock up and get going */
 	begin_critical_section(S_USERS);
@@ -188,7 +223,7 @@ int GenerateRelationshipIndex(char *IndexBuf,
 	TheIndex.iUserID = UserID;
 
 	memcpy(IndexBuf, &TheIndex, sizeof(TheIndex));
-	return (sizeof(TheIndex));
+	return(sizeof(TheIndex));
 }
 
 
@@ -241,19 +276,14 @@ void CtdlGetRelationship(visit *vbuf,
 	struct cdbdata *cdbvisit;
 
 	/* Generate an index */
-	IndexLen = GenerateRelationshipIndex(IndexBuf,
-					     rel_room->QRnumber,
-					     rel_room->QRgen,
-					     rel_user->usernum);
+	IndexLen = GenerateRelationshipIndex(IndexBuf, rel_room->QRnumber, rel_room->QRgen, rel_user->usernum);
 
 	/* Clear out the buffer */
 	memset(vbuf, 0, sizeof(visit));
 
 	cdbvisit = cdb_fetch(CDB_VISIT, IndexBuf, IndexLen);
 	if (cdbvisit != NULL) {
-		memcpy(vbuf, cdbvisit->ptr,
-		       ((cdbvisit->len > sizeof(visit)) ?
-			sizeof(visit) : cdbvisit->len));
+		memcpy(vbuf, cdbvisit->ptr, ((cdbvisit->len > sizeof(visit)) ?  sizeof(visit) : cdbvisit->len));
 		cdb_free(cdbvisit);
 	}
 	else {
@@ -351,9 +381,9 @@ int CtdlAccessCheck(int required_level)
 int is_aide(void)
 {
 	if (CC->user.axlevel >= AxAideU)
-		return (1);
+		return(1);
 	else
-		return (0);
+		return(0);
 }
 
 
@@ -364,13 +394,13 @@ int is_room_aide(void)
 {
 
 	if (!CC->logged_in) {
-		return (0);
+		return(0);
 	}
 
 	if ((CC->user.axlevel >= AxAideU) || (CC->room.QRroomaide == CC->user.usernum)) {
-		return (1);
+		return(1);
 	} else {
-		return (0);
+		return(0);
 	}
 }
 
@@ -449,46 +479,44 @@ void rebuild_usersbynumber(void) {
 
 
 /*
- * getuserbyuid()  -     get user by system uid (for PAM mode authentication)
- *		       returns 0 if user was found
- *
- * WARNING:	don't use this function unless you absolutely have to.  It does
- *		a sequential search and therefore is computationally expensive.
- *
- * FIXME:	build an index, dummy.
+ * getuserbyuid()	Get user by system uid (for PAM mode authentication)
+ *			Returns 0 if user was found
+ *			This now uses an extauth index.
  */
 int getuserbyuid(struct ctdluser *usbuf, uid_t number)
 {
-	struct cdbdata *cdbus;
+	struct cdbdata *cdbextauth;
+	long usernum = 0;
+	StrBuf *claimed_id;
+
+	claimed_id = NewStrBuf();
+	StrBufPrintf(claimed_id, "uid:%d", number);
+	cdbextauth = cdb_fetch(CDB_EXTAUTH, ChrPtr(claimed_id), StrLength(claimed_id));
+	FreeStrBuf(&claimed_id);
+	if (cdbextauth == NULL) {
+		return(-1);
+	}
 
-	cdb_rewind(CDB_USERS);
+	memcpy(&usernum, cdbextauth->ptr, sizeof(long));
+	cdb_free(cdbextauth);
 
-	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));
-		cdb_free(cdbus);
-		if (usbuf->uid == number) {
-			cdb_close_cursor(CDB_USERS);
-			return (0);
-		}
+	if (!CtdlGetUserByNumber(usbuf, usernum)) {
+		return(0);
 	}
-	return (-1);
+
+	return(-1);
 }
 
 
 /*
  * Back end for cmd_user() and its ilk
- *
- * NOTE: "authname" should only be used if we are attempting to use the "master user" feature
  */
-int CtdlLoginExistingUser(char *authname, const char *trythisname)
+int CtdlLoginExistingUser(const char *trythisname)
 {
 	char username[SIZ];
 	int found_user;
 
-	syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s, %s)", authname, trythisname);
+	syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s)", trythisname);
 
 	if ((CC->logged_in)) {
 		return login_already_logged_in;
@@ -502,16 +530,6 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 		return login_not_found;
 	}
 
-	/* If a "master user" is defined, handle its authentication if specified */
-	CC->is_master = 0;
-	if (	(!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) && 
-	    	(!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
-		(authname != NULL) &&
-		(!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
-	{
-		CC->is_master = 1;
-	}
-
 	/* Continue attempting user validation... */
 	safestrncpy(username, trythisname, sizeof (username));
 	striplt(username);
@@ -546,9 +564,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 			return login_not_found;
 		}
 	
-		/* Locate the associated Citadel account.
-		 * If not found, make one attempt to create it.
-		 */
+		/* Locate the associated Citadel account.  If not found, make one attempt to create it. */
 		found_user = getuserbyuid(&CC->user, pd.pw_uid);
 		if (found_user != 0) {
 			create_user(username, CREATE_USER_DO_NOT_BECOME_USER, pd.pw_uid);
@@ -594,9 +610,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 		/* First, try to log in as if the supplied name is a display name */
 		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
-	 	*/
+		/* If that didn't work, try to log in as if the supplied name * is an e-mail address */
 		if (found_user != 0) {
 			valid = validate_recipients(username, NULL, 0);
 			if (valid != NULL) {
@@ -626,65 +640,57 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
  */
 void do_login(void)
 {
-	struct CitContext *CCC = CC;
+	CC->logged_in = 1;
+	syslog(LOG_NOTICE, "user_ops: <%s> logged in", CC->curr_user);
 
-	CCC->logged_in = 1;
-	syslog(LOG_NOTICE, "user_ops: <%s> logged in", CCC->curr_user);
-
-	CtdlGetUserLock(&CCC->user, CCC->curr_user);
-	++(CCC->user.timescalled);
-	CCC->previous_login = CCC->user.lastcall;
-	time(&CCC->user.lastcall);
+	CtdlGetUserLock(&CC->user, CC->curr_user);
+	++(CC->user.timescalled);
+	CC->previous_login = CC->user.lastcall;
+	time(&CC->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(CCC->user.fullname, CtdlGetConfigStr("c_sysadm"))) {
-		CCC->user.axlevel = AxAideU;
+	if ( (!IsEmptyStr(CtdlGetConfigStr("c_sysadm"))) && (!strcasecmp(CC->user.fullname, CtdlGetConfigStr("c_sysadm"))) ) {
+		CC->user.axlevel = AxAideU;
 	}
 
-	/* If we're authenticating off the host system, automatically give
-	 * root the highest level of access.
-	 */
+	/* If we're authenticating off the host system, automatically give root the highest level of access. */
 	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
-		if (CCC->user.uid == 0) {
-			CCC->user.axlevel = AxAideU;
+		if (CC->user.uid == 0) {
+			CC->user.axlevel = AxAideU;
 		}
 	}
+	CtdlPutUserLock(&CC->user);
 
-	/*
-	 * If we are using LDAP authentication, extract the user's email addresses from the directory.
-	 * FIXME make this a site configurable setting
-	 */
-	#ifdef HAVE_LDAP
-		if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
-			char new_emailaddrs[512];
-			if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
-				strcpy(CCC->user.emailaddrs, new_emailaddrs);
+	/* If we are using LDAP authentication, extract the user's email addresses from the directory. */
+#ifdef HAVE_LDAP
+	if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+		char new_emailaddrs[512];
+		if (CtdlGetConfigInt("c_ldap_sync_email_addrs") > 0) {
+			if (extract_email_addresses_from_ldap(CC->ldap_dn, new_emailaddrs) == 0) {
+				CtdlSetEmailAddressesForUser(CC->user.fullname, new_emailaddrs);
 			}
 		}
-	#endif
+	}
+#endif
 
-	/*
-	 * No email address for user?  Make one up.
-	 */
-	if (IsEmptyStr(CCC->user.emailaddrs)) {
-		sprintf(CCC->user.emailaddrs, "cit%ld@%s", CCC->user.usernum, CtdlGetConfigStr("c_fqdn"));
+	/* If the user does not have any email addresses assigned, generate one. */
+	if (IsEmptyStr(CC->user.emailaddrs)) {
+		AutoGenerateEmailAddressForUser(&CC->user);
 	}
-	
-	CtdlPutUserLock(&CCC->user);
 
 	/*
 	 * Populate cs_inet_email and cs_inet_other_emails with valid email addresses from the user record
 	 */
-	strcpy(CCC->cs_inet_email, CCC->user.emailaddrs);
-	char *firstsep = strstr(CCC->cs_inet_email, "|");
+	strcpy(CC->cs_inet_email, CC->user.emailaddrs);
+	char *firstsep = strstr(CC->cs_inet_email, "|");
 	if (firstsep) {
-		strcpy(CCC->cs_inet_other_emails, firstsep+1);
+		strcpy(CC->cs_inet_other_emails, firstsep+1);
 		*firstsep = 0;
 	}
 	else {
-		CCC->cs_inet_other_emails[0] = 0;
+		CC->cs_inet_other_emails[0] = 0;
 	}
 
 	/* Create any personal rooms required by the system.
@@ -729,12 +735,9 @@ void CtdlUserLogout(void)
 	 * 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 */
+	/* Check to see if the user was deleted while logged in and purge them if necessary */
 	if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) {
 		purge_user(CCC->user.fullname);
 	}
@@ -742,13 +745,9 @@ void CtdlUserLogout(void)
 	/* Clear out the user record in memory so we don't behave like a ghost */
 	memset(&CCC->user, 0, sizeof(struct ctdluser));
 	CCC->curr_user[0] = 0;
-	CCC->is_master = 0;
 	CCC->cs_inet_email[0] = 0;
 	CCC->cs_inet_other_emails[0] = 0;
 	CCC->cs_inet_fn[0] = 0;
-	CCC->fake_username[0] = 0;
-	CCC->fake_hostname[0] = 0;
-	CCC->fake_roomname[0] = 0;
 
 	/* Free any output buffers */
 	unbuffer_output();
@@ -863,10 +862,6 @@ int CtdlTryPassword(const char *password, long len)
 		return pass_wrong_password;
 	}
 
-	if (CCC->is_master) {
-		code = strcmp(password, CtdlGetConfigStr("c_master_pass"));
-	}
-
 	else if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 
 		/* host auth mode */
@@ -952,16 +947,18 @@ int purge_user(char pname[])
 	struct ctdluser usbuf;
 	char usernamekey[USERNAME_SIZE];
 
-	makeuserkey(usernamekey, pname, cutuserkey(pname));
+	makeuserkey(usernamekey, pname, cutusername(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 (IsEmptyStr(pname)) {
+		return(ERROR + NO_SUCH_USER);
+	}
 
 	if (CtdlGetUser(&usbuf, pname) != 0) {
 		syslog(LOG_ERR, "user_ops: cannot purge user <%s> - not found", pname);
-		return (ERROR + NO_SUCH_USER);
+		return(ERROR + NO_SUCH_USER);
 	}
+
 	/* Don't delete a user who is currently logged in.  Instead, just
 	 * set the access level to 0, and let the account get swept up
 	 * during the next purge.
@@ -970,19 +967,10 @@ int purge_user(char pname[])
 		syslog(LOG_WARNING, "user_ops: <%s> is logged in; not deleting", pname);
 		usbuf.axlevel = AxDeleted;
 		CtdlPutUser(&usbuf);
-		return (1);
+		return(1);
 	}
-	syslog(LOG_NOTICE, "user_ops: deleting <%s>", 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 while S_USERS is active?
- */
+	syslog(LOG_NOTICE, "user_ops: deleting <%s>", pname);
 
 	/* Perform any purge functions registered by server extensions */
 	PerformUserHooks(&usbuf, EVT_PURGEUSER);
@@ -996,14 +984,14 @@ int purge_user(char pname[])
 	/* delete the userlog entry */
 	cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 
-	return (0);
+	return(0);
 }
 
 
 int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid)
 {
 	if (!CtdlGetUser(usbuf, username)) {
-		return (ERROR + ALREADY_EXISTS);
+		return(ERROR + ALREADY_EXISTS);
 	}
 
 	/* Go ahead and initialize a new user record */
@@ -1028,14 +1016,14 @@ int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid)
 	cdb_store(CDB_USERSBYNUMBER, &usbuf->usernum, sizeof(long), usbuf->fullname, strlen(usbuf->fullname)+1);
 
 	/* If non-native auth, index by uid */
-	if (usbuf->uid > 0) {
+	if ((usbuf->uid > 0) && (usbuf->uid != NATIVE_AUTH_UID)) {
 		StrBuf *claimed_id = NewStrBuf();
 		StrBufPrintf(claimed_id, "uid:%d", usbuf->uid);
 		attach_extauth(usbuf, claimed_id);
 		FreeStrBuf(&claimed_id);
 	}
 
-	return 0;
+	return(0);
 }
 
 
@@ -1089,7 +1077,7 @@ int create_user(char *username, int become_user, uid_t uid)
 	
 		/* Check to make sure we're still who we think we are */
 		if (CtdlGetUser(&CC->user, CC->curr_user)) {
-			return (ERROR + INTERNAL_ERROR);
+			return(ERROR + INTERNAL_ERROR);
 		}
 	}
 	
@@ -1101,7 +1089,7 @@ int create_user(char *username, int become_user, uid_t uid)
 	);
 	CtdlAideMessage(buf, "User Creation Notice");
 	syslog(LOG_NOTICE, "user_ops: <%s> created", username);
-	return (0);
+	return(0);
 }
 
 
@@ -1152,7 +1140,6 @@ int CtdlInvtKick(char *iuser, int op) {
 		(CC->logged_in ? CC->user.fullname : "an administrator")
 	);
 	CtdlAideMessage(bbb,"User Admin Message");
-
 	return(0);
 }
 
@@ -1182,7 +1169,6 @@ int CtdlForgetThisRoom(void) {
 	/* Return to the Lobby, so we don't end up in an undefined room */
 	CtdlUserGoto(CtdlGetConfigStr("c_baseroom"), 0, 0, NULL, NULL, NULL, NULL);
 	return(0);
-
 }
 
 
@@ -1242,11 +1228,9 @@ void ListThisUser(struct ctdluser *usbuf, void *data)
 int NewMailCount()
 {
 	int num_newmsgs = 0;
-
 	num_newmsgs = CC->newmail;
 	CC->newmail = 0;
-
-	return (num_newmsgs);
+	return(num_newmsgs);
 }
 
 
@@ -1266,7 +1250,7 @@ int InitialMailCheck()
 
 	CtdlMailboxName(mailboxname, sizeof mailboxname, &CC->user, MAILROOM);
 	if (CtdlGetRoom(&mailbox, mailboxname) != 0)
-		return (0);
+		return(0);
 	CtdlGetRelationship(&vbuf, &CC->user, &mailbox);
 
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &mailbox.QRnumber, sizeof(long));
@@ -1288,5 +1272,5 @@ int InitialMailCheck()
 	if (msglist != NULL)
 		free(msglist);
 
-	return (num_newmsgs);
+	return(num_newmsgs);
 }