diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-08-18 22:40:21 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-08-19 01:18:56 +0800 |
| commit | f0793af4b460ffcde3df89f77590f6130c2b8b9e (patch) | |
| tree | 34910daa354defac9aef8ac17596e59e510e2c91 | |
| parent | 0a173bc247669513992889723e93eb2de4cc0de9 (diff) | |
| download | gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar.gz gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar.bz2 gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar.lz gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar.xz gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.tar.zst gsoc2013-empathy-f0793af4b460ffcde3df89f77590f6130c2b8b9e.zip | |
Add a details hash table as an out param of the verification
| -rw-r--r-- | libempathy/empathy-tls-verifier.c | 35 | ||||
| -rw-r--r-- | libempathy/empathy-tls-verifier.h | 1 |
2 files changed, 30 insertions, 6 deletions
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c index 55afb4087..cd76a8917 100644 --- a/libempathy/empathy-tls-verifier.c +++ b/libempathy/empathy-tls-verifier.c @@ -62,6 +62,7 @@ typedef struct { gchar *hostname; GSimpleAsyncResult *verify_result; + GHashTable *details; gboolean dispose_run; } EmpathyTLSVerifierPriv; @@ -271,13 +272,16 @@ real_start_verification (EmpathyTLSVerifier *self) { gchar *certified_hostname; + reason = EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH; certified_hostname = get_certified_hostname (first_cert); + tp_asv_set_string (priv->details, + "expected-hostname", priv->hostname); + tp_asv_set_string (priv->details, + "certificate-hostname", certified_hostname); + DEBUG ("Hostname mismatch: got %s but expected %s", certified_hostname, priv->hostname); - /* TODO: pass-through the expected hostname in the reject details */ - reason = EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH; - g_free (certified_hostname); goto out; } @@ -622,6 +626,7 @@ empathy_tls_verifier_finalize (GObject *object) g_ptr_array_unref (priv->cert_chain); g_free (priv->hostname); + tp_clear_boxed (G_TYPE_HASH_TABLE, &priv->details); G_OBJECT_CLASS (empathy_tls_verifier_parent_class)->finalize (object); } @@ -640,8 +645,11 @@ empathy_tls_verifier_constructed (GObject *object) static void empathy_tls_verifier_init (EmpathyTLSVerifier *self) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EmpathyTLSVerifierPriv *priv; + + priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_TLS_VERIFIER, EmpathyTLSVerifierPriv); + priv->details = tp_asv_new (NULL, NULL); } static void @@ -702,15 +710,30 @@ gboolean empathy_tls_verifier_verify_finish (EmpathyTLSVerifier *self, GAsyncResult *res, EmpTLSCertificateRejectReason *reason, + GHashTable **details, GError **error) { + EmpathyTLSVerifierPriv *priv = GET_PRIV (self); + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) { - *reason = (*error)->code; + if (reason != NULL) + *reason = (*error)->code; + + if (details != NULL) + { + *details = tp_asv_new (NULL, NULL); + tp_g_hash_table_update (*details, priv->details, + (GBoxedCopyFunc) g_strdup, + (GBoxedCopyFunc) tp_g_value_slice_dup); + } + return FALSE; } - *reason = EMP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN; + if (reason != NULL) + *reason = EMP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN; + return TRUE; } diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h index b4cc1fcb7..e73a71aeb 100644 --- a/libempathy/empathy-tls-verifier.h +++ b/libempathy/empathy-tls-verifier.h @@ -71,6 +71,7 @@ void empathy_tls_verifier_verify_async (EmpathyTLSVerifier *self, gboolean empathy_tls_verifier_verify_finish (EmpathyTLSVerifier *self, GAsyncResult *res, EmpTLSCertificateRejectReason *reason, + GHashTable **details, GError **error); G_END_DECLS |