diff --git a/src/conf.c b/src/conf.c index 3115e9f6..ae99b55f 100644 --- a/src/conf.c +++ b/src/conf.c @@ -166,6 +166,7 @@ static int config__create_default_listener(struct mosquitto__config *config, con { if(config->default_listener) return MOSQ_ERR_SUCCESS; log__printf(NULL, MOSQ_LOG_INFO, "Creating default listener due to '%s' option.", option_name); + log__printf(NULL, MOSQ_LOG_INFO, "It is best practice to define a 'listener' first. Using the '%s' option without a listener will be disabled in the future.", option_name); if(config__add_listener(config)){ log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); return MOSQ_ERR_NOMEM; @@ -440,6 +441,7 @@ void config__bridge_cleanup(struct mosquitto__bridge *bridge) } mosquitto__FREE(bridge->addresses); } + mosquitto__FREE(bridge->bind_address); mosquitto__FREE(bridge->remote_clientid); mosquitto__FREE(bridge->remote_username); mosquitto__FREE(bridge->remote_password); @@ -460,9 +462,14 @@ void config__bridge_cleanup(struct mosquitto__bridge *bridge) } mosquitto__FREE(bridge->notification_topic); #ifdef WITH_TLS + mosquitto__FREE(bridge->tls_certfile); + mosquitto__FREE(bridge->tls_keyfile); mosquitto__FREE(bridge->tls_version); mosquitto__FREE(bridge->tls_cafile); + mosquitto__FREE(bridge->tls_capath); mosquitto__FREE(bridge->tls_alpn); + mosquitto__FREE(bridge->tls_ciphers); + mosquitto__FREE(bridge->tls_13_ciphers); #ifdef FINAL_WITH_TLS_PSK mosquitto__FREE(bridge->tls_psk_identity); mosquitto__FREE(bridge->tls_psk); @@ -1298,6 +1305,7 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload, return MOSQ_ERR_INVAL; } #endif + mosquitto__FREE(cur_bridge->tls_keyfile); if(conf__parse_string(&token, "bridge_keyfile", &cur_bridge->tls_keyfile, &saveptr)) return MOSQ_ERR_INVAL; #else log__printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge and/or TLS support not available."); @@ -1929,7 +1937,7 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload, REQUIRE_LISTENER_OR_DEFAULT_LISTENER(token); if(conf__parse_int(&token, token, &tmp_int, &saveptr)) return MOSQ_ERR_INVAL; if(tmp_int < 0 || tmp_int > 2){ - log__printf(NULL, MOSQ_LOG_ERR, "Error: max_qos must be between 0 and 2 inclusive."); + log__printf(NULL, MOSQ_LOG_ERR, "Error: 'max_qos' must be between 0 and 2 inclusive."); return MOSQ_ERR_INVAL; } cur_listener->max_qos = (uint8_t)tmp_int; @@ -1942,7 +1950,7 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload, if(tmp_int < 0 || tmp_int == UINT16_MAX){ tmp_int = 0; }else if(tmp_int > UINT16_MAX){ - log__printf(NULL, MOSQ_LOG_ERR, "Error: max_inflight_messages must be <= 65535."); + log__printf(NULL, MOSQ_LOG_ERR, "Error: 'max_inflight_messages' must be <= 65535."); return MOSQ_ERR_INVAL; } config->max_inflight_messages = (uint16_t)tmp_int; @@ -1984,12 +1992,12 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload, return MOSQ_ERR_INVAL; } }else if(!strcmp(token, "mount_point")){ - REQUIRE_LISTENER_OR_DEFAULT_LISTENER(token); + REQUIRE_LISTENER(token); mosquitto__FREE(cur_listener->mount_point); if(conf__parse_string(&token, "mount_point", &cur_listener->mount_point, &saveptr)) return MOSQ_ERR_INVAL; if(mosquitto_pub_topic_check(cur_listener->mount_point) != MOSQ_ERR_SUCCESS){ log__printf(NULL, MOSQ_LOG_ERR, - "Error: Invalid 'mount_point' (%s). Does it contain a wildcard character?", + "Error: Invalid 'mount_point' value (%s). Does it contain a wildcard character?", cur_listener->mount_point); return MOSQ_ERR_INVAL; } diff --git a/src/persist_write.c b/src/persist_write.c index eec74ee0..bac72b9f 100644 --- a/src/persist_write.c +++ b/src/persist_write.c @@ -320,7 +320,7 @@ int persist__backup(bool shutdown) log__printf(NULL, MOSQ_LOG_INFO, "Saving in-memory database to %s.", db.config->persistence_filepath); - return mosquitto_write_file(db.config->persistence_filepath,true,&persist__write_data,&shutdown,&persist__log_write_error); + return mosquitto_write_file(db.config->persistence_filepath, true, &persist__write_data, &shutdown, &persist__log_write_error); } static int persist__write_data(FILE* db_fptr, void* user_data) diff --git a/test/broker/16-config-missing.py b/test/broker/16-config-missing.py index 1ff14eee..484d9079 100755 --- a/test/broker/16-config-missing.py +++ b/test/broker/16-config-missing.py @@ -13,7 +13,7 @@ mosq_test.wait_for_subprocess(broker) assert(broker.returncode == 3) (_, stde) = broker.communicate() error_message = stde.decode('utf-8') -if not error_message.endswith(f"Error: Unable to open config file {conf_file}.\n"): +if not error_message.endswith(f"Error: Unable to open config file '{conf_file}'.\n"): print(f"Got wrong error message: '{error_message}'") exit(1) diff --git a/test/broker/16-config-parse-errors-tls.py b/test/broker/16-config-parse-errors-tls.py index 60fa9349..7db0d665 100755 --- a/test/broker/16-config-parse-errors-tls.py +++ b/test/broker/16-config-parse-errors-tls.py @@ -13,7 +13,6 @@ def write_config(filename, port, config_str): def do_test(config_str, rc_expected): rc = 1 - port = mosq_test.get_port() conf_file = os.path.basename(__file__).replace('.py', '.conf') write_config(conf_file, port, config_str) @@ -39,6 +38,7 @@ def do_test(config_str, rc_expected): exit(rc) +port = mosq_test.get_port() do_test("bridge_cafile string\n", 3) # Missing bridge config do_test("bridge_alpn string\n", 3) # Missing bridge config do_test("bridge_ciphers string\n", 3) # Missing bridge config @@ -48,20 +48,20 @@ do_test("bridge_certfile string\n", 3) # Missing bridge config do_test("bridge_keyfile string\n", 3) # Missing bridge config do_test("bridge_tls_version string\n", 3) # Missing bridge config -do_test("listener 1888\ncertfile\n", 3) # empty certfile -do_test("listener 1888\nkeyfile\n", 3) # empty keyfile +do_test(f"listener {port}\ncertfile\n", 3) # empty certfile +do_test(f"listener {port}\nkeyfile\n", 3) # empty keyfile -do_test("listener 1888\ncertfile ./16-config-parse-errors.py\nkeyfile ../ssl/server.key\n", 1) # invalid certfile -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ./16-config-parse-errors.py\n", 1) # invalid keyfile -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/client.key\n", 1) # mismatched certfile / keyfile +do_test(f"listener {port}\ncertfile ./16-config-parse-errors.py\nkeyfile ../ssl/server.key\n", 1) # invalid certfile +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ./16-config-parse-errors.py\n", 1) # invalid keyfile +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/client.key\n", 1) # mismatched certfile / keyfile -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ntls_version invalid\n", 1) # invalid tls_version +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ntls_version invalid\n", 1) # invalid tls_version -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ncrlfile invalid\n", 1) # missing crl file -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ndhparamfile invalid\n", 1) # missing dh param file -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ndhparamfile ./16-config-parse-errors.py\n", 1) # invalid dh param file +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ncrlfile invalid\n", 1) # missing crl file +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ndhparamfile invalid\n", 1) # missing dh param file +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\ndhparamfile ./16-config-parse-errors.py\n", 1) # invalid dh param file -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\nciphers invalid\n", 1) # invalid ciphers -do_test("listener 1888\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\nciphers_tls1.3 invalid\n", 1) # invalid ciphers_tls1.3 +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\nciphers invalid\n", 1) # invalid ciphers +do_test(f"listener {port}\ncertfile ../ssl/server.crt\nkeyfile ../ssl/server.key\nciphers_tls1.3 invalid\n", 1) # invalid ciphers_tls1.3 exit(0) diff --git a/test/broker/16-config-parse-errors-without-tls.py b/test/broker/16-config-parse-errors-without-tls.py index da0d788a..10ce3845 100755 --- a/test/broker/16-config-parse-errors-without-tls.py +++ b/test/broker/16-config-parse-errors-without-tls.py @@ -13,7 +13,6 @@ def write_config(filename, port, config_str): def do_test(config_str, rc_expected, error_log_entry): rc = 1 - port = mosq_test.get_port() conf_file = os.path.basename(__file__).replace('.py', '.conf') write_config(conf_file, port, config_str) @@ -45,83 +44,85 @@ def do_test(config_str, rc_expected, error_log_entry): print(f"While testing invalid config entry '{config_str}'") exit(rc) -do_test("unknown_option unknown\n", 3, 'Error: Unknown configuration variable "unknown_option"') - -do_test("user\n", 3, 'Error: Empty user value in configuration.') # Empty string, no space -do_test("user \n", 3, 'Error: Empty user value in configuration.') # Empty string, single space -do_test("user \n", 3, 'Error: Empty user value in configuration.') # Empty string, double space -do_test("pid_file /tmp/pid\npid_file /tmp/pid\n", 3, 'Error: Duplicate pid_file value in configuration.') # Duplicate string - -do_test("memory_limit\n", 3, 'Empty memory_limit value in configuration.') # Empty ssize_t - -do_test("accept_protocol_versions 3\n", 3, 'Error: You must define a listener before using the accept_protocol_versions option.') # Missing listener -do_test("listener 1888\naccept_protocol_versions\n", 3, 'Error: Empty accept_protocol_versions value in configuration.') # Empty value - -do_test("allow_anonymous\n", 3, 'Error: Empty allow_anonymous value in configuration.') # Empty bool -do_test("allow_anonymous falst\n", 3, 'Error: Invalid allow_anonymous value (falst).') # Invalid bool - -do_test("autosave_interval\n", 3, 'Error: Empty autosave_interval value in configuration.') # Empty int -#do_test("autosave_interval string\n", 3, 'bla') # Invalid int - -do_test("listener\n", 3, 'Error: Empty listener value in configuration.') # Empty listener -do_test("mount_point test/\n", 3, 'Error: You must use create a listener before using the mount_point option in the configuration file.') # Missing listener config -do_test("listener 1888\nmount_point test/+/\n", 3, "Error: Invalid mount_point 'test/+/'. Does it contain a wildcard character?") # Wildcard in mount point. -do_test("listener 1888\nprotocol\n", 3, 'Error: Empty protocol value in configuration.') # Empty proto -do_test("listener 1888\nprotocol test\n", 3, 'Error: Invalid protocol value (test).') # Invalid proto - -do_test("plugin_opt_inval string\n", 3, 'Error: A plugin_opt_ option exists in the config file without a plugin.') # plugin_opt_ without plugin -do_test("plugin c/auth_plugin.so\nplugin_opt_ string\n", 3, 'Error: Invalid plugin_opt_ config option.') # Incomplete plugin_opt_ -do_test("plugin c/auth_plugin.so\nplugin_opt_test\n", 3, 'Error: Empty test value in configuration.') # Empty plugin_opt_ - -do_test("bridge_attempt_unsubscribe true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_bind_address string\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_insecure true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_require_oscp true\n", 3, 'Error: Unknown configuration variable "bridge_require_oscp".') # Missing bridge config -do_test("bridge_max_packet_size 1000\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_max_topic_alias 1000\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_outgoing_retain false\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_protocol_version string\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_receive_maximum 10\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_reload_type string\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_session_expiry_interval 10000\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_tcp_keepalive 10000\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("bridge_tcp_user_timeout 10000\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("local_clientid str\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("local_password str\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("local_username str\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("notifications true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("notifications_local_only true\n", 3, 'Error: Invalid bridge configuration') # Missing bridge config -do_test("notification_topic true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("password pw\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("remote_password pw\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("restart_timeout 10\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("round_robin true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("start_type lazy\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("threshold 10\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("topic topic/10\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("try_private true\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config -do_test("username un\n", 3, 'Error: Invalid bridge configuration.') # Missing bridge config - -do_test("maximum_qos 3\n", 3, 'Error: max_qos must be between 0 and 2 inclusive.') # Invalid maximum qos -do_test("maximum_qos -1\n", 3, 'Error: max_qos must be between 0 and 2 inclusive.') # Invalid maximum qos - -do_test("max_inflight_messages 65536\n", 3, 'Error: max_inflight_messages must be <= 65535.') # Invalid value - -do_test("max_keepalive 65536\n", 3, 'Error: Invalid max_keepalive value (65536).') # Invalid value -do_test("max_keepalive -1\n", 3, 'Error: Invalid max_keepalive value (-1).') # Invalid value - -do_test("max_topic_alias 65536\n", 3, 'Error: Invalid max_topic_alias value in configuration.') # Invalid value -do_test("max_topic_alias -1\n", 3, 'Error: Invalid max_topic_alias value in configuration.') # Invalid value - -do_test("max_topic_alias_broker 65536\n", 3, 'Error: Invalid max_topic_alias_broker value in configuration.') # Invalid value -do_test("max_topic_alias_broker -1\n", 3, 'Error: Invalid max_topic_alias_broker value in configuration.') # Invalid value - -do_test("websockets_headers_size 65536\n", 3, 'Error: Websockets headers size must be between 0 and 65535 inclusive.') # Invalid value -do_test("websockets_headers_size -1\n", 3, 'Error: Websockets headers size must be between 0 and 65535 inclusive.') # Invalid value - -do_test("memory_limit -1\n", 3, 'Error: Invalid memory_limit value (-1).') # Invalid value - -do_test("sys_interval -1\n", 3, 'Error: Invalid sys_interval value (-1).') # Invalid value -do_test("sys_interval 65536\n", 3, 'Error: Invalid sys_interval value (65536).') # Invalid value +port = mosq_test.get_port() + +do_test("unknown_option unknown\n", 3, "Error: Unknown configuration variable 'unknown_option'") + +do_test("user\n", 3, "Error: Empty 'user' value in configuration.") # Empty string, no space +do_test("user \n", 3, "Error: Empty 'user' value in configuration.") # Empty string, single space +do_test("user \n", 3, "Error: Empty 'user' value in configuration.") # Empty string, double space +do_test("pid_file /tmp/pid\npid_file /tmp/pid\n", 3, "Error: Duplicate 'pid_file' value in configuration.") # Duplicate string + +do_test("memory_limit\n", 3, "Empty 'memory_limit' value in configuration.") # Empty ssize_t + +do_test("accept_protocol_versions 3\n", 3, "Error: The 'accept_protocol_versions' option requires a listener to be defined first.") # Missing listener +do_test(f"listener {port}\naccept_protocol_versions\n", 3, "Error: Empty 'accept_protocol_versions' value in configuration.") # Empty value + +do_test("allow_anonymous\n", 3, "Error: Empty 'allow_anonymous' value in configuration.") # Empty bool +do_test("allow_anonymous falst\n", 3, "Error: Invalid 'allow_anonymous' value (falst).") # Invalid bool + +do_test("autosave_interval\n", 3, "Error: Empty 'autosave_interval' value in configuration.") # Empty int +#do_test("autosave_interval string\n", 3, 'bla") # Invalid int + +do_test("listener\n", 3, "Error: Empty 'listener port' value in configuration.") # Empty listener +do_test("mount_point test/\n", 3, "Error: The 'mount_point' option requires a listener to be defined first.") # Missing listener config +do_test(f"listener {port}\nmount_point test/+/\n", 3, "Error: Invalid 'mount_point' value (test/+/). Does it contain a wildcard character?") # Wildcard in mount point. +do_test(f"listener {port}\nprotocol\n", 3, "Error: Empty 'protocol' value in configuration.") # Empty proto +do_test(f"listener {port}\nprotocol test\n", 3, "Error: Invalid 'protocol' value (test).") # Invalid proto + +do_test("plugin_opt_inval string\n", 3, "Error: The 'plugin_opt_inval' option requires plugin/global_plugin/plugin_load to be defined first.") # plugin_opt_ without plugin +do_test("plugin c/auth_plugin.so\nplugin_opt_ string\n", 3, "Error: Invalid 'plugin_opt_' config option.") # Incomplete plugin_opt_ +do_test("plugin c/auth_plugin.so\nplugin_opt_test\n", 3, "Error: Empty 'test' value in configuration.") # Empty plugin_opt_ + +do_test("bridge_attempt_unsubscribe true\n", 3, "Error: The 'bridge_attempt_unsubscribe' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_bind_address string\n", 3, "Error: The 'bridge_bind_address' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_insecure true\n", 3, "Error: The 'bridge_insecure' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_require_ocsp true\n", 3, "Error: The 'bridge_require_ocsp' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_max_packet_size 1000\n", 3, "Error: The 'bridge_max_packet_size' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_max_topic_alias 1000\n", 3, "Error: The 'bridge_max_topic_alias' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_outgoing_retain false\n", 3, "Error: The 'bridge_outgoing_retain' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_protocol_version string\n", 3, "Error: The 'bridge_protocol_version' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_receive_maximum 10\n", 3, "Error: The 'bridge_receive_maximum' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_reload_type string\n", 3, "Error: The 'bridge_reload_type' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_session_expiry_interval 10000\n", 3, "Error: The 'bridge_session_expiry_interval' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_tcp_keepalive 10000\n", 3, "Error: The 'bridge_tcp_keepalive' option requires a bridge to be defined first.") # Missing bridge config +do_test("bridge_tcp_user_timeout 10000\n", 3, "Error: The 'bridge_tcp_user_timeout' option requires a bridge to be defined first.") # Missing bridge config +do_test("local_clientid str\n", 3, "Error: The 'local_clientid' option requires a bridge to be defined first.") # Missing bridge config +do_test("local_password str\n", 3, "Error: The 'local_password' option requires a bridge to be defined first.") # Missing bridge config +do_test("local_username str\n", 3, "Error: The 'local_username' option requires a bridge to be defined first.") # Missing bridge config +do_test("notifications true\n", 3, "Error: The 'notifications' option requires a bridge to be defined first.") # Missing bridge config +do_test("notifications_local_only true\n", 3, "Error: The 'notifications_local_only' option requires a bridge to be defined first") # Missing bridge config +do_test("notification_topic true\n", 3, "Error: The 'notification_topic' option requires a bridge to be defined first.") # Missing bridge config +do_test("password pw\n", 3, "Error: The 'password' option requires a bridge to be defined first.") # Missing bridge config +do_test("remote_password pw\n", 3, "Error: The 'remote_password' option requires a bridge to be defined first.") # Missing bridge config +do_test("restart_timeout 10\n", 3, "Error: The 'restart_timeout' option requires a bridge to be defined first.") # Missing bridge config +do_test("round_robin true\n", 3, "Error: The 'round_robin' option requires a bridge to be defined first.") # Missing bridge config +do_test("start_type lazy\n", 3, "Error: The 'start_type' option requires a bridge to be defined first.") # Missing bridge config +do_test("threshold 10\n", 3, "Error: The 'threshold' option requires a bridge to be defined first.") # Missing bridge config +do_test("topic topic/10\n", 3, "Error: The 'topic' option requires a bridge to be defined first.") # Missing bridge config +do_test("try_private true\n", 3, "Error: The 'try_private' option requires a bridge to be defined first.") # Missing bridge config +do_test("username un\n", 3, "Error: The 'username' option requires a bridge to be defined first.") # Missing bridge config + +do_test("maximum_qos 3\n", 3, "Error: 'max_qos' must be between 0 and 2 inclusive.") # Invalid maximum qos +do_test("maximum_qos -1\n", 3, "Error: 'max_qos' must be between 0 and 2 inclusive.") # Invalid maximum qos + +do_test("max_inflight_messages 65536\n", 3, "Error: 'max_inflight_messages' must be <= 65535.") # Invalid value + +do_test("max_keepalive 65536\n", 3, "Error: Invalid 'max_keepalive' value (65536).") # Invalid value +do_test("max_keepalive -1\n", 3, "Error: Invalid 'max_keepalive' value (-1).") # Invalid value + +do_test(f"listener {port}\nmax_topic_alias 65536\n", 3, "Error: Invalid 'max_topic_alias' value in configuration.") # Invalid value +do_test(f"listener {port}\nmax_topic_alias -1\n", 3, "Error: Invalid 'max_topic_alias' value in configuration.") # Invalid value + +do_test(f"listener {port}\nmax_topic_alias_broker 65536\n", 3, "Error: Invalid 'max_topic_alias_broker' value in configuration.") # Invalid value +do_test(f"listener {port}\nmax_topic_alias_broker -1\n", 3, "Error: Invalid 'max_topic_alias_broker' value in configuration.") # Invalid value + +do_test("websockets_headers_size 65536\n", 3, "Error: Websockets headers size must be between 0 and 65535 inclusive.") # Invalid value +do_test("websockets_headers_size -1\n", 3, "Error: Websockets headers size must be between 0 and 65535 inclusive.") # Invalid value + +do_test("memory_limit -1\n", 3, "Error: Invalid 'memory_limit' value (-1).") # Invalid value + +do_test("sys_interval -1\n", 3, "Error: Invalid 'sys_interval' value (-1).") # Invalid value +do_test("sys_interval 65536\n", 3, "Error: Invalid 'sys_interval' value (65536).") # Invalid value exit(0) diff --git a/test/client/test.py b/test/client/test.py index b2fd8522..038c33bf 100755 --- a/test/client/test.py +++ b/test/client/test.py @@ -17,7 +17,7 @@ tests = [ (1, './02-subscribe-format-json-retain.py'), (1, './02-subscribe-null.py'), (1, './02-subscribe-qos1.py'), - (1, './02-subscribe-qos1-ws.py'), + (2, './02-subscribe-qos1-ws.py'), (1, './02-subscribe-verbose.py'), (1, './03-publish-argv-errors-tls-psk.py'), @@ -30,7 +30,7 @@ tests = [ (1, './03-publish-qos0-empty.py'), (1, './03-publish-qos1-properties.py'), (1, './03-publish-qos1.py'), - (1, './03-publish-qos1-ws.py'), + (2, './03-publish-qos1-ws.py'), (1, './03-publish-repeat.py'), (1, './03-publish-url.py'), @@ -43,7 +43,7 @@ tests = [ (1, './04-rr-argv-errors-without-tls.py'), (1, './04-rr-env.py'), (1, './04-rr-qos1.py'), - (1, './04-rr-qos1-ws.py'), + (2, './04-rr-qos1-ws.py'), ] ptest.run_tests(tests)