Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Opaque robj: add get/set methods and remove all robj->ptr refs #1658

Open
wants to merge 3 commits into
base: unstable
Choose a base branch
from
Open

Opaque robj: add get/set methods and remove all robj->ptr refs #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00efb94
Opaque robj: add objectGetVal and remove ~80% of all robj->ptr refere…
SoftlyRaining Feb 3, 2025
634f526
clang-format
SoftlyRaining Feb 3, 2025
5b5de16
add objectSetVal, remove remaining robj->ptr references outside of ob…
SoftlyRaining Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions src/acl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,7 @@ void ACLInit(void) {
* ENOENT: if the specified user does not exist at all.
*/
int ACLCheckUserCredentials(robj *username, robj *password) {
user *u = ACLGetUserByName(username->ptr, sdslen(username->ptr));
user *u = ACLGetUserByName(objectGetVal(username), sdslen(objectGetVal(username)));
if (u == NULL) {
errno = ENOENT;
return C_ERR;
Expand All @@ -1470,7 +1470,7 @@ int ACLCheckUserCredentials(robj *username, robj *password) {
listIter li;
listNode *ln;
listRewind(u->passwords, &li);
sds hashed = ACLHashPassword(password->ptr, sdslen(password->ptr));
sds hashed = ACLHashPassword(objectGetVal(password), sdslen(objectGetVal(password)));
while ((ln = listNext(&li))) {
sds thispass = listNodeValue(ln);
if (!time_independent_strcmp(hashed, thispass, HASH_PASSWORD_LEN)) {
Expand All @@ -1493,7 +1493,7 @@ void addAuthErrReply(client *c, robj *err) {
addReplyError(c, "-WRONGPASS invalid username-password pair or user is disabled.");
return;
}
addReplyError(c, err->ptr);
addReplyError(c, objectGetVal(err));
}

/* This is like ACLCheckUserCredentials(), however if the user/pass
Expand All @@ -1504,11 +1504,11 @@ void addAuthErrReply(client *c, robj *err) {
int checkPasswordBasedAuth(client *c, robj *username, robj *password) {
if (ACLCheckUserCredentials(username, password) == C_OK) {
c->flag.authenticated = 1;
c->user = ACLGetUserByName(username->ptr, sdslen(username->ptr));
c->user = ACLGetUserByName(objectGetVal(username), sdslen(objectGetVal(username)));
moduleNotifyUserChanged(c);
return AUTH_OK;
} else {
addACLLogEntry(c, ACL_DENIED_AUTH, (c->flag.multi) ? ACL_LOG_CTX_MULTI : ACL_LOG_CTX_TOPLEVEL, 0, username->ptr,
addACLLogEntry(c, ACL_DENIED_AUTH, (c->flag.multi) ? ACL_LOG_CTX_MULTI : ACL_LOG_CTX_TOPLEVEL, 0, objectGetVal(username),
NULL);
return AUTH_ERR;
}
Expand Down Expand Up @@ -1711,7 +1711,7 @@ static int ACLSelectorCheckCmd(aclSelector *selector,
while (1) {
if (selector->allowed_firstargs[id][subid] == NULL) return ACL_DENIED_CMD;
int idx = cmd->parent ? 2 : 1;
if (!strcasecmp(argv[idx]->ptr, selector->allowed_firstargs[id][subid]))
if (!strcasecmp(objectGetVal(argv[idx]), selector->allowed_firstargs[id][subid]))
break; /* First argument match found. Stop here. */
subid++;
}
Expand All @@ -1730,7 +1730,7 @@ static int ACLSelectorCheckCmd(aclSelector *selector,
keyReference *resultidx = result->keys;
for (int j = 0; j < result->numkeys; j++) {
int idx = resultidx[j].pos;
ret = ACLSelectorCheckKey(selector, argv[idx]->ptr, sdslen(argv[idx]->ptr), resultidx[j].flags);
ret = ACLSelectorCheckKey(selector, objectGetVal(argv[idx]), sdslen(objectGetVal(argv[idx])), resultidx[j].flags);
if (ret != ACL_OK) {
if (keyidxptr) *keyidxptr = resultidx[j].pos;
return ret;
Expand All @@ -1751,7 +1751,7 @@ static int ACLSelectorCheckCmd(aclSelector *selector,
if (!(channelref[j].flags & channel_flags)) continue;
int is_pattern = channelref[j].flags & CMD_CHANNEL_PATTERN;
int ret =
ACLCheckChannelAgainstList(selector->channels, argv[idx]->ptr, sdslen(argv[idx]->ptr), is_pattern);
ACLCheckChannelAgainstList(selector->channels, objectGetVal(argv[idx]), sdslen(objectGetVal(argv[idx])), is_pattern);
if (ret != ACL_OK) {
if (keyidxptr) *keyidxptr = channelref[j].pos;
getKeysFreeResult(&channels);
Expand Down Expand Up @@ -1964,7 +1964,7 @@ int ACLShouldKillPubsubClient(client *c, list *upcoming) {
dictEntry *de;
while (!kill && ((de = dictNext(di)) != NULL)) {
o = dictGetKey(de);
int res = ACLCheckChannelAgainstList(upcoming, o->ptr, sdslen(o->ptr), 1);
int res = ACLCheckChannelAgainstList(upcoming, objectGetVal(o), sdslen(objectGetVal(o)), 1);
kill = (res == ACL_DENIED_CHANNEL);
}
dictReleaseIterator(di);
Expand All @@ -1976,7 +1976,7 @@ int ACLShouldKillPubsubClient(client *c, list *upcoming) {

while (!kill && ((de = dictNext(di)) != NULL)) {
o = dictGetKey(de);
int res = ACLCheckChannelAgainstList(upcoming, o->ptr, sdslen(o->ptr), 0);
int res = ACLCheckChannelAgainstList(upcoming, objectGetVal(o), sdslen(objectGetVal(o)), 0);
kill = (res == ACL_DENIED_CHANNEL);
}
dictReleaseIterator(di);
Expand All @@ -1986,7 +1986,7 @@ int ACLShouldKillPubsubClient(client *c, list *upcoming) {
di = dictGetIterator(c->pubsub_data->pubsubshard_channels);
while (!kill && ((de = dictNext(di)) != NULL)) {
o = dictGetKey(de);
int res = ACLCheckChannelAgainstList(upcoming, o->ptr, sdslen(o->ptr), 0);
int res = ACLCheckChannelAgainstList(upcoming, objectGetVal(o), sdslen(objectGetVal(o)), 0);
kill = (res == ACL_DENIED_CHANNEL);
}
dictReleaseIterator(di);
Expand Down Expand Up @@ -2485,7 +2485,7 @@ int ACLSaveToFile(const char *filename) {
user = sdscatsds(user, u->name);
user = sdscatlen(user, " ", 1);
robj *descr = ACLDescribeUser(u);
user = sdscatsds(user, descr->ptr);
user = sdscatsds(user, objectGetVal(descr));
decrRefCount(descr);
acl = sdscatsds(acl, user);
acl = sdscatlen(acl, "\n", 1);
Expand Down Expand Up @@ -2677,9 +2677,9 @@ void addACLLogEntry(client *c, int reason, int context, int argpos, sds username
} else {
switch (reason) {
case ACL_DENIED_CMD: le->object = sdsdup(c->cmd->fullname); break;
case ACL_DENIED_KEY: le->object = sdsdup(c->argv[argpos]->ptr); break;
case ACL_DENIED_CHANNEL: le->object = sdsdup(c->argv[argpos]->ptr); break;
case ACL_DENIED_AUTH: le->object = sdsdup(c->argv[0]->ptr); break;
case ACL_DENIED_KEY: le->object = sdsdup(objectGetVal(c->argv[argpos])); break;
case ACL_DENIED_CHANNEL: le->object = sdsdup(objectGetVal(c->argv[argpos])); break;
case ACL_DENIED_AUTH: le->object = sdsdup(objectGetVal(c->argv[0])); break;
default: le->object = sdsempty();
}
}
Expand Down Expand Up @@ -2843,15 +2843,15 @@ int aclAddReplySelectorDescription(client *c, aclSelector *s) {
* ACL LOG [<count> | RESET]
*/
void aclCommand(client *c) {
char *sub = c->argv[1]->ptr;
char *sub = objectGetVal(c->argv[1]);
if (!strcasecmp(sub, "setuser") && c->argc >= 3) {
/* Initially redact all of the arguments to not leak any information
* about the user. */
for (int j = 2; j < c->argc; j++) {
redactClientCommandArgument(c, j);
}

sds username = c->argv[2]->ptr;
sds username = objectGetVal(c->argv[2]);
/* Check username validity. */
if (ACLStringHasSpaces(username, sdslen(username))) {
addReplyError(c, "Usernames can't contain spaces or null characters");
Expand All @@ -2861,7 +2861,7 @@ void aclCommand(client *c) {
user *u = ACLGetUserByName(username, sdslen(username));

sds *temp_argv = zmalloc(c->argc * sizeof(sds));
for (int i = 3; i < c->argc; i++) temp_argv[i - 3] = c->argv[i]->ptr;
for (int i = 3; i < c->argc; i++) temp_argv[i - 3] = objectGetVal(c->argv[i]);

sds error = ACLStringSetUser(u, username, temp_argv, c->argc - 3);
zfree(temp_argv);
Expand All @@ -2878,15 +2878,15 @@ void aclCommand(client *c) {

int deleted = 0;
for (int j = 2; j < c->argc; j++) {
sds username = c->argv[j]->ptr;
sds username = objectGetVal(c->argv[j]);
if (!strcmp(username, "default")) {
addReplyError(c, "The 'default' user cannot be removed");
return;
}
}

for (int j = 2; j < c->argc; j++) {
sds username = c->argv[j]->ptr;
sds username = objectGetVal(c->argv[j]);
user *u;
if (raxRemove(Users, (unsigned char *)username, sdslen(username), (void **)&u)) {
ACLFreeUserAndKillClients(u);
Expand All @@ -2898,7 +2898,7 @@ void aclCommand(client *c) {
/* Redact the username to not leak any information about the user. */
redactClientCommandArgument(c, 2);

user *u = ACLGetUserByName(c->argv[2]->ptr, sdslen(c->argv[2]->ptr));
user *u = ACLGetUserByName(objectGetVal(c->argv[2]), sdslen(objectGetVal(c->argv[2])));
if (u == NULL) {
addReplyNull(c);
return;
Expand Down Expand Up @@ -2959,7 +2959,7 @@ void aclCommand(client *c) {
config = sdscatsds(config, u->name);
config = sdscatlen(config, " ", 1);
robj *descr = ACLDescribeUser(u);
config = sdscatsds(config, descr->ptr);
config = sdscatsds(config, objectGetVal(descr));
decrRefCount(descr);
addReplyBulkSds(c, config);
}
Expand Down Expand Up @@ -2998,9 +2998,9 @@ void aclCommand(client *c) {
for (j = 0; ACLCommandCategories[j].flag != 0; j++) addReplyBulkCString(c, ACLCommandCategories[j].name);
setDeferredArrayLen(c, dl, j);
} else if (!strcasecmp(sub, "cat") && c->argc == 3) {
uint64_t cflag = ACLGetCommandCategoryFlagByName(c->argv[2]->ptr);
uint64_t cflag = ACLGetCommandCategoryFlagByName(objectGetVal(c->argv[2]));
if (cflag == 0) {
addReplyErrorFormat(c, "Unknown category '%.128s'", (char *)c->argv[2]->ptr);
addReplyErrorFormat(c, "Unknown category '%.128s'", (char *)objectGetVal(c->argv[2]));
return;
}
int arraylen = 0;
Expand Down Expand Up @@ -3033,7 +3033,7 @@ void aclCommand(client *c) {
* the number of entries the user wants to display, or alternatively
* the "RESET" command in order to flush the old entries. */
if (c->argc == 3) {
if (!strcasecmp(c->argv[2]->ptr, "reset")) {
if (!strcasecmp(objectGetVal(c->argv[2]), "reset")) {
listSetFreeMethod(ACLLog, ACLFreeLogEntry);
listEmpty(ACLLog);
listSetFreeMethod(ACLLog, NULL);
Expand Down Expand Up @@ -3099,14 +3099,14 @@ void aclCommand(client *c) {
}
} else if (!strcasecmp(sub, "dryrun") && c->argc >= 4) {
struct serverCommand *cmd;
user *u = ACLGetUserByName(c->argv[2]->ptr, sdslen(c->argv[2]->ptr));
user *u = ACLGetUserByName(objectGetVal(c->argv[2]), sdslen(objectGetVal(c->argv[2])));
if (u == NULL) {
addReplyErrorFormat(c, "User '%s' not found", (char *)c->argv[2]->ptr);
addReplyErrorFormat(c, "User '%s' not found", (char *)objectGetVal(c->argv[2]));
return;
}

if ((cmd = lookupCommand(c->argv + 3, c->argc - 3)) == NULL) {
addReplyErrorFormat(c, "Command '%s' not found", (char *)c->argv[3]->ptr);
addReplyErrorFormat(c, "Command '%s' not found", (char *)objectGetVal(c->argv[3]));
return;
}

Expand All @@ -3118,7 +3118,7 @@ void aclCommand(client *c) {
int idx;
int result = ACLCheckAllUserCommandPerm(u, cmd, c->argv + 3, c->argc - 3, &idx);
if (result != ACL_OK) {
sds err = getAclErrorMessage(result, u, cmd, c->argv[idx + 3]->ptr, 1);
sds err = getAclErrorMessage(result, u, cmd, objectGetVal(c->argv[idx + 3]), 1);
addReplyBulkSds(c, err);
return;
}
Expand Down
16 changes: 8 additions & 8 deletions src/aof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,11 +1274,11 @@ sds catAppendOnlyGenericCommand(sds dst, int argc, robj **argv) {
for (j = 0; j < argc; j++) {
o = getDecodedObject(argv[j]);
buf[0] = '$';
len = 1 + ll2string(buf + 1, sizeof(buf) - 1, sdslen(o->ptr));
len = 1 + ll2string(buf + 1, sizeof(buf) - 1, sdslen(objectGetVal(o)));
buf[len++] = '\r';
buf[len++] = '\n';
dst = sdscatlen(dst, buf, len);
dst = sdscatlen(dst, o->ptr, sdslen(o->ptr));
dst = sdscatlen(dst, objectGetVal(o), sdslen(objectGetVal(o)));
dst = sdscatlen(dst, "\r\n", 2);
decrRefCount(o);
}
Expand Down Expand Up @@ -1772,9 +1772,9 @@ int rioWriteBulkObject(rio *r, robj *obj) {
/* Avoid using getDecodedObject to help copy-on-write (we are often
* in a child process when this function is called). */
if (obj->encoding == OBJ_ENCODING_INT) {
return rioWriteBulkLongLong(r, (long)obj->ptr);
return rioWriteBulkLongLong(r, (long)objectGetVal(obj));
} else if (sdsEncodedObject(obj)) {
return rioWriteBulkString(r, obj->ptr, sdslen(obj->ptr));
return rioWriteBulkString(r, objectGetVal(obj), sdslen(objectGetVal(obj)));
} else {
serverPanic("Unknown string encoding");
}
Expand Down Expand Up @@ -1854,7 +1854,7 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
long long count = 0, items = zsetLength(o);

if (o->encoding == OBJ_ENCODING_LISTPACK) {
unsigned char *zl = o->ptr;
unsigned char *zl = objectGetVal(o);
unsigned char *eptr, *sptr;
unsigned char *vstr;
unsigned int vlen;
Expand Down Expand Up @@ -1889,7 +1889,7 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
items--;
}
} else if (o->encoding == OBJ_ENCODING_SKIPLIST) {
zset *zs = o->ptr;
zset *zs = objectGetVal(o);
hashtableIterator iter;
hashtableInitIterator(&iter, zs->ht, 0);
void *next;
Expand Down Expand Up @@ -2039,7 +2039,7 @@ int rioWriteStreamEmptyConsumer(rio *r,
/* Emit the commands needed to rebuild a stream object.
* The function returns 0 on error, 1 on success. */
int rewriteStreamObject(rio *r, robj *key, robj *o) {
stream *s = o->ptr;
stream *s = objectGetVal(o);
streamIterator si;
streamIteratorStart(&si, s, NULL, NULL, 0);
streamID id;
Expand Down Expand Up @@ -2160,7 +2160,7 @@ int rewriteStreamObject(rio *r, robj *key, robj *o) {
* The function returns 0 on error, 1 on success. */
int rewriteModuleObject(rio *r, robj *key, robj *o, int dbid) {
ValkeyModuleIO io;
moduleValue *mv = o->ptr;
moduleValue *mv = objectGetVal(o);
moduleType *mt = mv->type;
moduleInitIOContext(&io, mt, r, key, dbid);
mt->aof_rewrite(&io, key, mv->value);
Expand Down
Loading
Loading