From b10f99a30e18493c309f3f794d138c8458a43007 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Thu, 30 Jan 2025 15:44:58 +0100 Subject: [PATCH] Separate invalid client test from the valid one --- deps/rabbitmq_mqtt/test/auth_SUITE.erl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_mqtt/test/auth_SUITE.erl b/deps/rabbitmq_mqtt/test/auth_SUITE.erl index 51bfe7b291a4..372de7b1edcb 100644 --- a/deps/rabbitmq_mqtt/test/auth_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/auth_SUITE.erl @@ -68,9 +68,11 @@ sub_groups() -> ssl_user_vhost_parameter_mapping_vhost_does_not_exist, ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping ]}, + {ssl_user_with_invalid_client_id_in_cert_san_dns, [], + [invalid_client_id_from_cert_san_dns + ]}, {ssl_user_with_client_id_in_cert_san_dns, [], - [client_id_from_cert_san_dns, - invalid_client_id_from_cert_san_dns + [client_id_from_cert_san_dns ]}, {ssl_user_with_client_id_in_cert_san_dns_1, [], [client_id_from_cert_san_dns_1 @@ -207,7 +209,8 @@ mqtt_config(no_ssl_user) -> mqtt_config(client_id_propagation) -> {rabbitmq_mqtt, [{ssl_cert_login, true}, {allow_anonymous, true}]}; -mqtt_config(ssl_user_with_client_id_in_cert_san_dns) -> +mqtt_config(T) when T == ssl_user_with_client_id_in_cert_san_dns; + T == ssl_user_with_invalid_client_id_in_cert_san_dns -> {rabbitmq_mqtt, [{ssl_cert_login, true}, {allow_anonymous, false}, {ssl_cert_client_id_from, subject_alternative_name}, @@ -588,7 +591,7 @@ client_id_from_cert_dn(Config) -> invalid_client_id_from_cert_san_dns(Config) -> MqttClientId = <<"other_client_id">>, {ok, C} = connect_ssl(MqttClientId, Config), - ?assertMatch({error, _}, emqtt:connect(C)), + {error, {client_identifier_not_valid, _}} = emqtt:connect(C), unlink(C). ssl_user_vhost_parameter_mapping_success(Config) ->