X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=168639ed91da8c3a93e6d84f2668e4c04c63b589;hb=03b525bdbd5fa51c1b5a56c5fdecfdb8200cb046;hp=05f2fa0fbffeb00886a99a436f627f7e9525a8cf;hpb=5e9fd062f7d9920b6483c68d0f48181439dfc89c;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 05f2fa0fb..168639ed9 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-2018 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];
 
 
+
+/*
+ * Figure out what this does and make it cleaner
+ */
+long cutuserkey(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
@@ -475,15 +510,13 @@ int getuserbyuid(struct ctdluser *usbuf, uid_t number)
 
 /*
  * 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;
@@ -497,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);
@@ -654,11 +677,7 @@ void do_login(void)
 
 	/* If the user does not have any email addresses assigned, generate one. */
 	if (IsEmptyStr(CC->user.emailaddrs)) {
-		char synthetic_email_addr[1024];
-		snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"));
-		CtdlSetEmailAddressesForUser(CC->user.fullname, synthetic_email_addr);
-		strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(CC->user.emailaddrs));
-		syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, CC->user.fullname);
+		AutoGenerateEmailAddressForUser(&CC->user);
 	}
 
 	/*
@@ -716,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);
 	}
@@ -729,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();
@@ -850,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 */
@@ -942,8 +950,9 @@ int purge_user(char pname[])
 	makeuserkey(usernamekey, pname, cutuserkey(pname));
 
 	/* If the name is empty we can't find them in the DB any way so just return */
-	if (IsEmptyStr(pname))
+	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);