Update changelog, fix usage of m_set_clientid(), add test.
Roger A. Light
4 years ago
parent
6b054b60ea
commit
0433b8ee9b
@ -0,0 +1,63 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
from mosq_test_helper import *
|
||||
|
||||
def write_config(filename, port, plugin_ver):
|
||||
with open(filename, 'w') as f:
|
||||
f.write("listener %d\n" % (port))
|
||||
f.write("auth_plugin c/auth_plugin_id_change.so\n")
|
||||
f.write("allow_anonymous true\n")
|
||||
|
||||
def do_test(plugin_ver):
|
||||
port = mosq_test.get_port()
|
||||
conf_file = os.path.basename(__file__).replace('.py', '.conf')
|
||||
write_config(conf_file, port, plugin_ver)
|
||||
|
||||
rc = 1
|
||||
connect1_packet = mosq_test.gen_connect("already-exists")
|
||||
connack1_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
connect2_packet = mosq_test.gen_connect("id-change-test")
|
||||
connack2_packet = mosq_test.gen_connack(rc=0)
|
||||
|
||||
mid = 1
|
||||
subscribe_packet = mosq_test.gen_subscribe(mid, "#", 0)
|
||||
# Only subs by client id == allowed is allowed
|
||||
suback_packet_denied = mosq_test.gen_suback(mid, 128)
|
||||
suback_packet_ok = mosq_test.gen_suback(mid, 0)
|
||||
|
||||
mid = 2
|
||||
publish1_packet = mosq_test.gen_publish("publish/topic", qos=2, mid=mid, payload="message")
|
||||
pubrec1_packet = mosq_test.gen_pubrec(mid)
|
||||
pubrel1_packet = mosq_test.gen_pubrel(mid)
|
||||
pubcomp1_packet = mosq_test.gen_pubcomp(mid)
|
||||
|
||||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port)
|
||||
|
||||
try:
|
||||
sock1 = mosq_test.do_client_connect(connect1_packet, connack1_packet, timeout=20, port=port)
|
||||
sock2 = mosq_test.do_client_connect(connect2_packet, connack2_packet, timeout=20, port=port)
|
||||
|
||||
mosq_test.do_send_receive(sock1, subscribe_packet, suback_packet_denied, "suback denied")
|
||||
mosq_test.do_send_receive(sock2, subscribe_packet, suback_packet_ok, "suback ok")
|
||||
|
||||
mosq_test.do_ping(sock1)
|
||||
mosq_test.do_ping(sock2)
|
||||
sock1.close()
|
||||
sock2.close()
|
||||
|
||||
rc = 0
|
||||
except mosq_test.TestError:
|
||||
pass
|
||||
except Exception as err:
|
||||
print(err)
|
||||
finally:
|
||||
os.remove(conf_file)
|
||||
broker.terminate()
|
||||
broker.wait()
|
||||
(stdo, stde) = broker.communicate()
|
||||
if rc:
|
||||
print(stde.decode('utf-8'))
|
||||
exit(rc)
|
||||
|
||||
do_test(4)
|
||||
@ -0,0 +1,94 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <mosquitto.h>
|
||||
#include <mosquitto_broker.h>
|
||||
#include <mosquitto_plugin.h>
|
||||
|
||||
int mosquitto_auth_acl_check_v5(int event, void *event_data, void *user_data);
|
||||
int mosquitto_auth_unpwd_check_v5(int event, void *event_data, void *user_data);
|
||||
|
||||
static mosquitto_plugin_id_t *plg_id;
|
||||
|
||||
MOSQUITTO_PLUGIN_DECLARE_VERSION(5);
|
||||
|
||||
int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier, void **user_data, struct mosquitto_opt *auth_opts, int auth_opt_count)
|
||||
{
|
||||
(void)user_data;
|
||||
(void)auth_opts;
|
||||
(void)auth_opt_count;
|
||||
|
||||
plg_id = identifier;
|
||||
|
||||
mosquitto_callback_register(plg_id, MOSQ_EVT_ACL_CHECK, mosquitto_auth_acl_check_v5, NULL, NULL);
|
||||
mosquitto_callback_register(plg_id, MOSQ_EVT_BASIC_AUTH, mosquitto_auth_unpwd_check_v5, NULL, NULL);
|
||||
|
||||
return MOSQ_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
int mosquitto_plugin_cleanup(void *user_data, struct mosquitto_opt *auth_opts, int auth_opt_count)
|
||||
{
|
||||
(void)user_data;
|
||||
(void)auth_opts;
|
||||
(void)auth_opt_count;
|
||||
|
||||
mosquitto_callback_unregister(plg_id, MOSQ_EVT_ACL_CHECK, mosquitto_auth_acl_check_v5, NULL);
|
||||
mosquitto_callback_unregister(plg_id, MOSQ_EVT_BASIC_AUTH, mosquitto_auth_unpwd_check_v5, NULL);
|
||||
|
||||
return MOSQ_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
int mosquitto_auth_acl_check_v5(int event, void *event_data, void *user_data)
|
||||
{
|
||||
struct mosquitto_evt_acl_check *ed = event_data;
|
||||
int rc;
|
||||
|
||||
(void)user_data;
|
||||
|
||||
if(event != MOSQ_EVT_ACL_CHECK){
|
||||
abort();
|
||||
}
|
||||
|
||||
if(!strcmp(mosquitto_client_id(ed->client), "allowed")){
|
||||
/* Attempt to change to a different existing ID after we have
|
||||
* authenticated - should fail */
|
||||
rc = mosquitto_set_clientid(ed->client, "already-exists");
|
||||
if(rc != MOSQ_ERR_ALREADY_EXISTS){
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(!strcmp(mosquitto_client_id(ed->client), "allowed")){
|
||||
return MOSQ_ERR_SUCCESS;
|
||||
}else{
|
||||
return MOSQ_ERR_ACL_DENIED;
|
||||
}
|
||||
}
|
||||
|
||||
int mosquitto_auth_unpwd_check_v5(int event, void *event_data, void *user_data)
|
||||
{
|
||||
struct mosquitto_evt_basic_auth *ed = event_data;
|
||||
const char *clientid;
|
||||
int rc;
|
||||
|
||||
(void)user_data;
|
||||
|
||||
clientid = mosquitto_client_id(ed->client);
|
||||
|
||||
if(event != MOSQ_EVT_BASIC_AUTH){
|
||||
abort();
|
||||
}
|
||||
|
||||
if(!strcmp(clientid, "id-change-test")){
|
||||
rc = mosquitto_set_clientid(ed->client, "allowed");
|
||||
if(strcmp(mosquitto_client_id(ed->client), "allowed")){
|
||||
rc = MOSQ_ERR_INVAL;
|
||||
}
|
||||
if(rc != MOSQ_ERR_SUCCESS){
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
return MOSQ_ERR_SUCCESS;
|
||||
}
|
||||
Loading…
Reference in New Issue