wouldn't it be easier and more robust if we simply reverse the two
catch blocks?
e.g
try {
} on... {
...
} on NSErrorClientException catch (e) {
...
} on http.ClientException catch (e) {
...
}
?
On 10/1/25 11:52 AM, Shan Shaji wrote:
The `NSErrorClientException` catch clause was not being executed because
it's a subtype of `ClientException`. This resulted in showing the
actual error from the package instead of our custom error message when
the SSL/TLS handshake failed. Fixed the issue by adding a type check
inside the `ClientException` catch clause.
Signed-off-by: Shan Shaji <[email protected]>
---
lib/src/authenticate.dart | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/src/authenticate.dart b/lib/src/authenticate.dart
index 04f363f..aaae50b 100644
--- a/lib/src/authenticate.dart
+++ b/lib/src/authenticate.dart
@@ -61,12 +61,12 @@ Future<ProxmoxApiClient> authenticate(
if (e.message.contains('net::ERR_CERT_AUTHORITY_INVALID')) {
throw HandshakeException(e.message);
}
- rethrow;
- } on NSErrorClientException catch (e) {
+
// Treat untrusted server certificate (-1202) as a handshake failure.
- if (e.error.code == -1202) {
+ if (e is NSErrorClientException && e.error.code == -1202) {
throw HandshakeException(e.message);
}
+
rethrow;
}
}
@@ -91,12 +91,12 @@ Future<List<PveAccessDomainModel?>> accessDomains(
if (e.message.contains('net::ERR_CERT_AUTHORITY_INVALID')) {
throw HandshakeException(e.message);
}
- rethrow;
- } on NSErrorClientException catch (e) {
+
// Treat untrusted server certificate (-1202) as a handshake failure.
- if (e.error.code == -1202) {
+ if (e is NSErrorClientException && e.error.code == -1202) {
throw HandshakeException(e.message);
}
+
rethrow;
}
}
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
