d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use hash_find rather than hash_iter for unpwd check.

Browse Source
This commit is contained in:
Roger A. Light 2020-08-18 15:34:57 +01:00
parent b66ffb8039
commit 18e79eac22
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/security_default.c
View File

@ -888,7 +888,7 @@ static int mosquitto__memcmp_const(const void *a, const void *b, size_t len)
int mosquitto_unpwd_check_default(struct mosquitto_db *db, struct mosquitto *context) int mosquitto_unpwd_check_default(struct mosquitto_db *db, struct mosquitto *context)
{ {
struct mosquitto__unpwd *u, *tmp; struct mosquitto__unpwd *u;
struct mosquitto__unpwd *unpwd_ref; struct mosquitto__unpwd *unpwd_ref;
#ifdef WITH_TLS #ifdef WITH_TLS
unsigned char hash[EVP_MAX_MD_SIZE]; unsigned char hash[EVP_MAX_MD_SIZE];
@ -921,32 +921,31 @@ int mosquitto_unpwd_check_default(struct mosquitto_db *db, struct mosquitto *con
} }
} }
HASH_ITER(hh, unpwd_ref, u, tmp){ HASH_FIND(hh, unpwd_ref, context->username, strlen(context->username), u);
if(!strcmp(u->username, context->username)){ if(u){
if(u->password){ if(u->password){
if(context->password){ if(context->password){
#ifdef WITH_TLS #ifdef WITH_TLS
rc = pw__digest(context->password, u->salt, u->salt_len, hash, &hash_len); rc = pw__digest(context->password, u->salt, u->salt_len, hash, &hash_len);
if(rc == MOSQ_ERR_SUCCESS){ if(rc == MOSQ_ERR_SUCCESS){
if(hash_len == u->password_len && !mosquitto__memcmp_const(u->password, hash, hash_len)){ if(hash_len == u->password_len && !mosquitto__memcmp_const(u->password, hash, hash_len)){
return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
}
}else{
return rc;
}
#else
if(!strcmp(u->password, context->password)){
return MOSQ_ERR_SUCCESS; return MOSQ_ERR_SUCCESS;
}else{
return MOSQ_ERR_AUTH;
} }
#endif
}else{ }else{
return MOSQ_ERR_AUTH; return rc;
} }
#else
if(!strcmp(u->password, context->password)){
return MOSQ_ERR_SUCCESS;
}
#endif
}else{ }else{
return MOSQ_ERR_SUCCESS; return MOSQ_ERR_AUTH;
} }
}else{
return MOSQ_ERR_SUCCESS;
} }
} }