X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=c215e734a6706940472766ac502b366385868c4d;hb=288673812af6b3081aae5143f93c6674ff63e6ed;hp=b9a357db90aa3182a3a6a69dc5adf057e174610a;hpb=0566e798cbfc711e22b2e7328ed1d07a14265313;p=citadel.git diff --git a/citadel/user_ops.c b/citadel/user_ops.c index b9a357db9..c215e734a 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -31,6 +31,7 @@ int chkpwd_write_pipe[2]; int chkpwd_read_pipe[2]; + /* * Trim a string down to the maximum username size and return the new length */ @@ -49,19 +50,22 @@ long cutusername(char *username) { /* * makeuserkey() - convert a username into the format used as a database key - * (it's just the username converted into lower case) + * (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) { int i; + int keylen = 0; - if (len >= USERNAME_SIZE) - { + 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]); + if (isalnum((username[i]))) { + key[keylen++] = tolower(username[i]); + } } + key[keylen++] = 0; } @@ -178,10 +182,8 @@ int rename_user(char *oldname, char *newname) { if (CtdlGetUser(&usbuf, oldname) != 0) { retcode = RENAMEUSER_NOT_FOUND; } - else { /* Sanity checks succeeded. Now rename the user. */ - if (usbuf.usernum == 0) - { + if (usbuf.usernum == 0) { syslog(LOG_DEBUG, "user_ops: can not rename user \"Citadel\"."); retcode = RENAMEUSER_NOT_FOUND; } else { @@ -201,6 +203,57 @@ int rename_user(char *oldname, char *newname) { } +/* + * Convert a username into the format used as a database key prior to version 928 + * This only gets called by reindex_user_928() + */ +void makeuserkey_pre928(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]); + } +} + + +/* + * 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 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); + + 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)); + if (cdbus == NULL) { + 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)); + cdb_free(cdbus); + + // delete the old record + cdb_delete(CDB_USERS, oldkey, strlen(oldkey)); + + // write the new record + cdb_store(CDB_USERS, newkey, strlen(newkey), &usbuf, sizeof(struct ctdluser)); +} + + /* * Index-generating function used by Ctdl[Get|Set]Relationship */ @@ -209,7 +262,6 @@ int GenerateRelationshipIndex(char *IndexBuf, long RoomGen, long UserID) { - struct { long iRoomID; long iRoomGen; @@ -247,10 +299,7 @@ void put_visit(visit *newvisit) /* * Define a relationship between a user and a room */ -void CtdlSetRelationship(visit *newvisit, - struct ctdluser *rel_user, - struct ctdlroom *rel_room) -{ +void CtdlSetRelationship(visit *newvisit, struct ctdluser *rel_user, struct ctdlroom *rel_room) { /* We don't use these in Citadel because they're implicit by the * index, but they must be present if the database is exported. */ @@ -265,10 +314,7 @@ void CtdlSetRelationship(visit *newvisit, /* * Locate a relationship between a user and a room */ -void CtdlGetRelationship(visit *vbuf, - struct ctdluser *rel_user, - struct ctdlroom *rel_room) -{ +void CtdlGetRelationship(visit *vbuf, struct ctdluser *rel_user, struct ctdlroom *rel_room) { char IndexBuf[32]; int IndexLen; struct cdbdata *cdbvisit; @@ -1149,45 +1195,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; iusername, in_data); + f = ufirst; + ufirst = ufirst->next; + free(f); } - - free(usernames); }