Skip to content

Verify acl the right way #2

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

Open
soundstorm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Verify acl the right way #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions be-cdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int be_cdb_getuser(void *handle, const char *username, const char *password, cha

/*
* Check access to topic for username. Look values for a key "acl:username"
* and use mosquitto_topic_matches_sub() to validate the topic.
* and use mosquitto_auth_sub_topic_matches_acl() to validate the topic.
*/

int be_cdb_access(void *handle, const char *username, char *topic)
Expand All @@ -123,7 +123,7 @@ int be_cdb_access(void *handle, const char *username, char *topic)
unsigned klen;
int found = 0;
struct cdb_find cdbf;
bool bf;
int bf = FALSE;

if (!conf || !username || !topic)
return (0);
Expand All @@ -142,7 +142,7 @@ int be_cdb_access(void *handle, const char *username, char *topic)
val = malloc(vlen);
cdb_read(conf->cdb, val, vlen, vpos);

mosquitto_topic_matches_sub(val, topic, &bf);
mosquitto_auth_sub_topic_matches_acl(val, topic, &bf);
found |= bf;

free(val);
Expand Down
4 changes: 2 additions & 2 deletions be-files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static int do_aclcheck(dllist * acl_list,
int access)
{
char buf[512];
bool ret;
int ret = FALSE;
acl_entry *acl;
const char *t;
const char *si;
Expand Down Expand Up @@ -391,7 +391,7 @@ static int do_aclcheck(dllist * acl_list,
}
}
*di = '\0';
if (mosquitto_topic_matches_sub(buf, topic, &ret) != MOSQ_ERR_SUCCESS) {
if (mosquitto_auth_sub_topic_matches_acl(buf, topic, &ret) != MOSQ_ERR_SUCCESS) {
LOG(MOSQ_LOG_ERR, "invalid topic '%s'", buf);
} else if (ret && (access & acl->access) != 0) {
return BACKEND_ALLOW;
Expand Down
4 changes: 2 additions & 2 deletions be-mysql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ int be_mysql_aclcheck(void *handle, const char *clientid, const char *username,
char *query = NULL, *u = NULL, *v;
long ulen;
int match = BACKEND_DEFER;
bool bf;
int bf = FALSE;
MYSQL_RES *res = NULL;
MYSQL_ROW rowdata;

Expand Down Expand Up @@ -366,7 +366,7 @@ int be_mysql_aclcheck(void *handle, const char *clientid, const char *username,

t_expand(clientid, username, v, &expanded);
if (expanded && *expanded) {
mosquitto_topic_matches_sub(expanded, topic, &bf);
mosquitto_auth_sub_topic_matches_acl(expanded, topic, &bf);
if (bf) match = BACKEND_ALLOW;
_log(LOG_DEBUG, " mysql: topic_matches(%s, %s) == %d",
expanded, v, bf);
Expand Down
4 changes: 2 additions & 2 deletions be-postgres.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ int be_pg_aclcheck(void *handle, const char *clientid, const char *username, con
struct pg_backend *conf = (struct pg_backend *)handle;
char *v = NULL;
int match = BACKEND_DEFER;
bool bf;
int bf = FALSE;
PGresult *res = NULL;

_log(LOG_DEBUG, "USERNAME: %s, TOPIC: %s, acc: %d", username, topic, acc);
Expand Down Expand Up @@ -337,7 +337,7 @@ int be_pg_aclcheck(void *handle, const char *clientid, const char *username, con

t_expand(clientid, username, v, &expanded);
if (expanded && *expanded) {
mosquitto_topic_matches_sub(expanded, topic, &bf);
mosquitto_auth_sub_topic_matches_acl(expanded, topic, &bf);
if (bf) match = BACKEND_ALLOW;
_log(LOG_DEBUG, " postgres: topic_matches(%s, %s) == %d",
expanded, v, bf);
Expand Down
2 changes: 1 addition & 1 deletion be-psk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ char *be_psk_getuser(void *handle, const char *username, const char *password, i

/*
* Check access to topic for username. Look values for a key "acl:username"
* and use mosquitto_topic_matches_sub() to validate the topic.
* and use mosquitto_auth_sub_topic_matches_acl() to validate the topic.
*/

int be_psk_access(void *handle, const char *username, char *topic)
Expand Down