The `cupertino_http` package is throwing `ClientException` [0] instead of `HandShakeException` when the certificate is not valid.
Due to this the exception was directly shown in the UI. Inorder to make the error more user friendly catch the `NSErrorClientException` and rethrow `HandShakeException` if the certificate is not valid. Signed-off-by: Shan Shaji <[email protected]> --- lib/src/authenticate.dart | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/lib/src/authenticate.dart b/lib/src/authenticate.dart index 118408f..5217578 100644 --- a/lib/src/authenticate.dart +++ b/lib/src/authenticate.dart @@ -1,12 +1,13 @@ import 'dart:async'; import 'dart:convert'; +import 'dart:io'; +import 'package:cupertino_http/cupertino_http.dart'; import 'package:http/http.dart' as http; import 'package:proxmox_dart_api_client/proxmox_dart_api_client.dart'; import 'package:proxmox_dart_api_client/src/handle_ticket_response.dart'; import 'package:proxmox_dart_api_client/src/models/serializers.dart'; - /// Returns an authenticated client to work with if successful. /// /// This is the function you are looking for if you want to interact with any @@ -56,6 +57,12 @@ Future<ProxmoxApiClient> authenticate( } on TimeoutException catch (_) { throw ProxmoxApiException( 'Authentication takes unusually long, check network connection', 408); + } on NSErrorClientException catch (e) { + // Treat untrusted server certificate (-1202) as a handshake failure. + if (e.error.code == -1202) { + throw HandshakeException(e.message); + } + rethrow; } } @@ -64,14 +71,22 @@ Future<List<PveAccessDomainModel?>> accessDomains( bool validateSSL, { http.Client? httpClient, }) async { - httpClient ??= getCustomIOHttpClient(validateSSL: validateSSL); + try { + httpClient ??= getCustomIOHttpClient(validateSSL: validateSSL); - final path = '/api2/json/access/domains'; - final response = await httpClient - .get(apiBaseUrl.replace(path: path)) - .timeout(Duration(seconds: 25)); - var data = (json.decode(response.body)['data'] as List).map((f) { - return serializers.deserializeWith(PveAccessDomainModel.serializer, f); - }); - return data.toList(); + final path = '/api2/json/access/domains'; + final response = await httpClient + .get(apiBaseUrl.replace(path: path)) + .timeout(Duration(seconds: 25)); + var data = (json.decode(response.body)['data'] as List).map((f) { + return serializers.deserializeWith(PveAccessDomainModel.serializer, f); + }); + return data.toList(); + } on NSErrorClientException catch (e) { + // Treat untrusted server certificate (-1202) as a handshake failure. + if (e.error.code == -1202) { + throw HandshakeException(e.message); + } + rethrow; + } } -- 2.50.1 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
