@@ -68,9 +68,11 @@ sub_groups() ->
6868 ssl_user_vhost_parameter_mapping_vhost_does_not_exist ,
6969 ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
7070 ]},
71+ {ssl_user_with_invalid_client_id_in_cert_san_dns , [],
72+ [invalid_client_id_from_cert_san_dns
73+ ]},
7174 {ssl_user_with_client_id_in_cert_san_dns , [],
72- [client_id_from_cert_san_dns ,
73- invalid_client_id_from_cert_san_dns
75+ [client_id_from_cert_san_dns
7476 ]},
7577 {ssl_user_with_client_id_in_cert_san_dns_1 , [],
7678 [client_id_from_cert_san_dns_1
@@ -207,7 +209,8 @@ mqtt_config(no_ssl_user) ->
207209mqtt_config (client_id_propagation ) ->
208210 {rabbitmq_mqtt , [{ssl_cert_login , true },
209211 {allow_anonymous , true }]};
210- mqtt_config (ssl_user_with_client_id_in_cert_san_dns ) ->
212+ mqtt_config (T ) when T == ssl_user_with_client_id_in_cert_san_dns ;
213+ T == ssl_user_with_invalid_client_id_in_cert_san_dns ->
211214 {rabbitmq_mqtt , [{ssl_cert_login , true },
212215 {allow_anonymous , false },
213216 {ssl_cert_client_id_from , subject_alternative_name },
@@ -588,7 +591,7 @@ client_id_from_cert_dn(Config) ->
588591invalid_client_id_from_cert_san_dns (Config ) ->
589592 MqttClientId = <<" other_client_id" >>,
590593 {ok , C } = connect_ssl (MqttClientId , Config ),
591- ? assertMatch ( {error , _ }, emqtt :connect (C )),
594+ {error , { client_identifier_not_valid , _ }} = emqtt :connect (C ),
592595 unlink (C ).
593596
594597ssl_user_vhost_parameter_mapping_success (Config ) ->
0 commit comments