X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=0dc5ae3276b4909587f673041368b5f53cc2fc8a;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=aaf26a5b3a9b6fe775124121832087a8cfab8061;hpb=0c90ed3253337bfd864b4d780df4701d0cc0f2c4;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index aaf26a5b3..0dc5ae327 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-2019 by the citadel.org team
+ * Copyright (c) 1987-2020 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.
@@ -31,35 +31,23 @@
 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
- *                 (Key format is the username with all non-alphanumeric characters removed, and converted to lower case.)
+ *			"key" must be a buffer of at least USERNAME_SIZE
+ *			(Key format is the username with all non-alphanumeric characters removed, and converted to lower case.)
  */
-void makeuserkey(char *key, const char *username, long len) {
+void makeuserkey(char *key, const char *username) {
 	int i;
 	int keylen = 0;
 
-	if (len >= USERNAME_SIZE) {
-		syslog(LOG_INFO, "Username too long: %s", username);
-		len = USERNAME_SIZE - 1; 
+	if (IsEmptyStr(username)) {
+		key[0] = 0;
+		return;
 	}
-	for (i=0; i<=len; ++i) {
+
+	int len = strlen(username);
+	for (i=0; ((i<=len) && (i<USERNAME_SIZE-1)); ++i) {
 		if (isalnum((username[i]))) {
 			key[keylen++] = tolower(username[i]);
 		}
@@ -68,6 +56,20 @@ void makeuserkey(char *key, const char *username, long len) {
 }
 
 
+/*
+ * Compare two usernames to see if they are the same user after being keyed for the database
+ * Usage is identical to strcmp()
+ */
+int CtdlUserCmp(char *s1, char *s2) {
+	char k1[USERNAME_SIZE];
+	char k2[USERNAME_SIZE];
+
+	makeuserkey(k1, s1);
+	makeuserkey(k2, s2);
+	return(strcmp(k1,k2));
+}
+
+
 /*
  * CtdlGetUser()	retrieve named user into supplied buffer.
  *			returns 0 on success
@@ -76,13 +78,12 @@ int CtdlGetUser(struct ctdluser *usbuf, char *name)
 {
 	char usernamekey[USERNAME_SIZE];
 	struct cdbdata *cdbus;
-	long len = cutusername(name);
 
 	if (usbuf != NULL) {
 		memset(usbuf, 0, sizeof(struct ctdluser));
 	}
 
-	makeuserkey(usernamekey, name, len);
+	makeuserkey(usernamekey, name);
 	cdbus = cdb_fetch(CDB_USERS, usernamekey, strlen(usernamekey));
 
 	if (cdbus == NULL) {	/* user not found */
@@ -125,7 +126,7 @@ void CtdlPutUser(struct ctdluser *usbuf)
 {
 	char usernamekey[USERNAME_SIZE];
 
-	makeuserkey(usernamekey, usbuf->fullname, cutusername(usbuf->fullname));
+	makeuserkey(usernamekey, usbuf->fullname);
 	usbuf->version = REV_LEVEL;
 	cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
 }
@@ -161,8 +162,8 @@ int rename_user(char *oldname, char *newname) {
 	char newnamekey[USERNAME_SIZE];
 
 	/* Create the database keys... */
-	makeuserkey(oldnamekey, oldname, cutusername(oldname));
-	makeuserkey(newnamekey, newname, cutusername(newname));
+	makeuserkey(oldnamekey, oldname);
+	makeuserkey(newnamekey, newname);
 
 	/* Lock up and get going */
 	begin_critical_section(S_USERS);
@@ -204,11 +205,13 @@ int rename_user(char *oldname, char *newname) {
 
 /*
  * Convert a username into the format used as a database key prior to version 928
- * (This is only used during database upgrade)
+ * This only gets called by reindex_user_928()
  */
-void makeuserkey_pre928(char *key, const char *username, long len) {
+void makeuserkey_pre928(char *key, const char *username) {
 	int i;
 
+	int len = strlen(username);
+
 	if (len >= USERNAME_SIZE) {
 		syslog(LOG_INFO, "Username too long: %s", username);
 		len = USERNAME_SIZE - 1; 
@@ -221,20 +224,19 @@ void makeuserkey_pre928(char *key, const char *username, long len) {
 
 /*
  * Read a user record using the pre-v928 index format, and write it back using the v928-and-higher index format.
- * This ONLY gets called by...
+ * This ONLY gets called during an upgrade from version <928 to version >=928.
  */
 void reindex_user_928(char *username, void *out_data) {
 
 	char oldkey[USERNAME_SIZE];
 	char newkey[USERNAME_SIZE];
 	struct cdbdata *cdbus;
-	long len = cutusername(username);
 	struct ctdluser usbuf;
 
-	makeuserkey_pre928(oldkey, username, len);
-	makeuserkey(newkey, username, len);
+	makeuserkey_pre928(oldkey, username);
+	makeuserkey(newkey, username);
 
-	syslog(LOG_DEBUG, "user_ops: reindex_user_928 <%s> <%s> <%s>", username, oldkey, newkey);
+	syslog(LOG_DEBUG, "user_ops: reindex_user_928: %s <%s> --> <%s>", username, oldkey, newkey);
 
 	// Fetch the user record using the old index format
 	cdbus = cdb_fetch(CDB_USERS, oldkey, strlen(oldkey));
@@ -242,7 +244,7 @@ void reindex_user_928(char *username, void *out_data) {
 		syslog(LOG_INFO, "user_ops: <%s> not found, were they already reindexed?", username);
 		return;
 	}
-	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);
 
 	// delete the old record
@@ -621,7 +623,7 @@ int CtdlLoginExistingUser(const char *trythisname)
 	else {
 		/* native auth mode */
 
-		recptypes *valid = NULL;
+		struct recptypes *valid = NULL;
 	
 		/* First, try to log in as if the supplied name is a display name */
 		found_user = CtdlGetUser(&CC->user, username);
@@ -696,6 +698,12 @@ void do_login(void)
 		AutoGenerateEmailAddressForUser(&CC->user);
 	}
 
+	/* Populate the user principal identity, which is consistent and never aliased */
+	strcpy(CC->cs_principal_id, "");
+	makeuserkey(CC->cs_principal_id, CC->user.fullname);
+	strcat(CC->cs_principal_id, "@");
+	strcat(CC->cs_principal_id, CtdlGetConfigStr("c_fqdn"));
+
 	/*
 	 * Populate cs_inet_email and cs_inet_other_emails with valid email addresses from the user record
 	 */
@@ -963,7 +971,7 @@ int purge_user(char pname[])
 	struct ctdluser usbuf;
 	char usernamekey[USERNAME_SIZE];
 
-	makeuserkey(usernamekey, pname, cutusername(pname));
+	makeuserkey(usernamekey, pname);
 
 	/* If the name is empty we can't find them in the DB any way so just return */
 	if (IsEmptyStr(pname)) {
@@ -1194,41 +1202,46 @@ int CtdlForgetThisRoom(void) {
  */
 void ForEachUser(void (*CallBack) (char *, void *out_data), void *in_data)
 {
+	struct cdbdata *cdbus;
+	struct ctdluser *usptr;
+
 	struct feu {
+		struct feu *next;
 		char username[USERNAME_SIZE];
-		int version;
 	};
-
-	struct cdbdata *cdbus;
-	struct ctdluser *usptr;
-	int i = 0;
-	struct feu *usernames = NULL;
-	int num_users = 0;
-	int num_users_alloc = 0;
+	struct feu *ufirst = NULL;
+	struct feu *ulast = NULL;
+	struct feu *f = NULL;
 
 	cdb_rewind(CDB_USERS);
 
-	// Phase 1 : load list of usernames
+	// Phase 1 : build a linked list of all our user account names
 	while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
 		usptr = (struct ctdluser *) cdbus->ptr;
 
 		if (strlen(usptr->fullname) > 0) {
-			++num_users;
-			if (num_users > num_users_alloc) {
-				num_users_alloc = ((num_users_alloc == 0) ? 1 : (num_users_alloc * 2));
-				usernames = realloc(usernames, num_users_alloc * sizeof(struct feu));
+			f = malloc(sizeof(struct feu));
+			f->next = NULL;
+			strncpy(f->username, usptr->fullname, USERNAME_SIZE);
+
+			if (ufirst == NULL) {
+				ufirst = f;
+				ulast = f;
+			}
+			else {
+				ulast->next = f;
+				ulast = f;
 			}
-			strcpy(usernames[num_users-1].username, usptr->fullname);
-			usernames[num_users-1].version = usptr->version;
 		}
 	}
 
-	// Phase 2 : perform the callback for each username
-	for (i=0; i<num_users; ++i) {
-		(*CallBack) (usernames[i].username, in_data);
+	// Phase 2 : perform the callback for each user while de-allocating the list
+	while (ufirst != NULL) {
+		(*CallBack) (ufirst->username, in_data);
+		f = ufirst;
+		ufirst = ufirst->next;
+		free(f);
 	}
-
-	free(usernames);
 }