forked from eclipse/mosquitto
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix broker sending duplicate CONNACK on failed MQTT v5 reauthentication.
Closes eclipse#2339. Thanks to hvxl.
- Loading branch information
Showing
7 changed files
with
117 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
#!/usr/bin/env python3 | ||
|
||
from mosq_test_helper import * | ||
|
||
def write_config(filename, port): | ||
with open(filename, 'w') as f: | ||
f.write("port %d\n" % (port)) | ||
f.write("auth_plugin c/auth_plugin_extended_reauth.so\n") | ||
|
||
port = mosq_test.get_port() | ||
conf_file = os.path.basename(__file__).replace('.py', '.conf') | ||
write_config(conf_file, port) | ||
|
||
rc = 1 | ||
|
||
# First authentication succeeds | ||
props = mqtt5_props.gen_string_prop(mqtt5_props.PROP_AUTHENTICATION_METHOD, "repeat") | ||
props += mqtt5_props.gen_string_prop(mqtt5_props.PROP_AUTHENTICATION_DATA, "repeat") | ||
connect_packet = mosq_test.gen_connect("client-params-test", keepalive=42, proto_ver=5, properties=props) | ||
|
||
props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_TOPIC_ALIAS_MAXIMUM, 10) | ||
props += mqtt5_props.gen_string_prop(mqtt5_props.PROP_AUTHENTICATION_METHOD, "repeat") | ||
props += mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 20) | ||
connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5, properties=props, property_helper=False) | ||
|
||
# Reauthentication fails | ||
props = mqtt5_props.gen_string_prop(mqtt5_props.PROP_AUTHENTICATION_METHOD, "repeat") | ||
props += mqtt5_props.gen_string_prop(mqtt5_props.PROP_AUTHENTICATION_DATA, "repeat") | ||
auth_packet = mosq_test.gen_auth(reason_code=mqtt5_rc.MQTT_RC_REAUTHENTICATE, properties=props) | ||
disconnect_packet = mosq_test.gen_disconnect(reason_code=mqtt5_rc.MQTT_RC_NOT_AUTHORIZED, proto_ver=5) | ||
|
||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) | ||
|
||
try: | ||
sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) | ||
mosq_test.do_send_receive(sock, auth_packet, disconnect_packet) | ||
sock.close() | ||
|
||
rc = 0 | ||
except mosq_test.TestError: | ||
pass | ||
finally: | ||
os.remove(conf_file) | ||
broker.terminate() | ||
broker.wait() | ||
(stdo, stde) = broker.communicate() | ||
if rc: | ||
print(stde.decode('utf-8')) | ||
|
||
|
||
exit(rc) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#include <stdlib.h> | ||
#include <stdio.h> | ||
#include <string.h> | ||
#include <mosquitto.h> | ||
#include <mosquitto_broker.h> | ||
#include <mosquitto_plugin.h> | ||
|
||
static int auth_count = 0; | ||
|
||
int mosquitto_auth_plugin_version(void) | ||
{ | ||
return 4; | ||
} | ||
|
||
int mosquitto_auth_plugin_init(void **user_data, struct mosquitto_opt *auth_opts, int auth_opt_count) | ||
{ | ||
return MOSQ_ERR_SUCCESS; | ||
} | ||
|
||
int mosquitto_auth_plugin_cleanup(void *user_data, struct mosquitto_opt *auth_opts, int auth_opt_count) | ||
{ | ||
return MOSQ_ERR_SUCCESS; | ||
} | ||
|
||
int mosquitto_auth_security_init(void *user_data, struct mosquitto_opt *auth_opts, int auth_opt_count, bool reload) | ||
{ | ||
return MOSQ_ERR_SUCCESS; | ||
} | ||
|
||
int mosquitto_auth_security_cleanup(void *user_data, struct mosquitto_opt *auth_opts, int auth_opt_count, bool reload) | ||
{ | ||
return MOSQ_ERR_SUCCESS; | ||
} | ||
|
||
int mosquitto_auth_acl_check(void *user_data, int access, struct mosquitto *client, const struct mosquitto_acl_msg *msg) | ||
{ | ||
return MOSQ_ERR_PLUGIN_DEFER; | ||
} | ||
|
||
|
||
int mosquitto_auth_start(void *user_data, struct mosquitto *client, const char *method, bool reauth, const void *data, uint16_t data_len, void **data_out, uint16_t *data_out_len) | ||
{ | ||
if(auth_count == 0){ | ||
auth_count++; | ||
return MOSQ_ERR_SUCCESS; | ||
}else{ | ||
return MOSQ_ERR_AUTH; | ||
} | ||
} | ||
|
||
int mosquitto_auth_continue(void *user_data, struct mosquitto *client, const char *method, const void *data, uint16_t data_len, void **data_out, uint16_t *data_out_len) | ||
{ | ||
return MOSQ_ERR_AUTH; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters