From fb34bc2e193295ebc3aca5a840c6c70aeed51ff6 Mon Sep 17 00:00:00 2001 From: James Pace Date: Sat, 9 Apr 2022 21:24:43 +0000 Subject: [PATCH] Cleanup logging. Readinging implies being able to subscribe. --- debian/changelog | 2 +- src/j7s-plugin.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index c03e47a..04a22c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -j7s-mosquitto-plugin (0.0.3-1) unstable; urgency=medium +j7s-mosquitto-plugin (0.0.6-1) unstable; urgency=medium * Load multiple keys per user. diff --git a/src/j7s-plugin.cpp b/src/j7s-plugin.cpp index fed77a2..8550bf3 100644 --- a/src/j7s-plugin.cpp +++ b/src/j7s-plugin.cpp @@ -158,24 +158,18 @@ int j7s_acl_check_callback(int event, void *event_data, void *userdata) return MOSQ_ERR_PLUGIN_DEFER; } - bool success = false; switch (acl_data->access) { case MOSQ_ACL_SUBSCRIBE: - mosquitto_log_printf(MOSQ_LOG_ERR, "ACL callback subscribe defer."); - return MOSQ_ERR_PLUGIN_DEFER; + return (authorizer->can_read(username) ? MOSQ_ERR_SUCCESS : MOSQ_ERR_ACL_DENIED); case MOSQ_ACL_UNSUBSCRIBE: - mosquitto_log_printf(MOSQ_LOG_ERR, "ACL callback unsubscribe defer."); - return MOSQ_ERR_PLUGIN_DEFER; + return MOSQ_ERR_SUCCESS; case MOSQ_ACL_WRITE: - success = authorizer->can_write(username); - mosquitto_log_printf(MOSQ_LOG_ERR, "ACL callback %s can write? %d", username.c_str(), success); return (authorizer->can_write(username) ? MOSQ_ERR_SUCCESS : MOSQ_ERR_ACL_DENIED); case MOSQ_ACL_READ: - success = authorizer->can_read(username); - mosquitto_log_printf(MOSQ_LOG_ERR, "ACL callback %s can read? %d", username.c_str(), success); return (authorizer->can_read(username) ? MOSQ_ERR_SUCCESS : MOSQ_ERR_ACL_DENIED); default: + mosquitto_log_printf(MOSQ_LOG_ERR, "Unhandled ACL check for user: %s", username.c_str()); return MOSQ_ERR_ACL_DENIED; } }