fix verification by self

Author: link2xt

src/contact.rs

@@ -1867,6 +1867,7 @@ pub(crate) async fn mark_contact_id_as_verified(
     contact_id: ContactId,
     verifier_id: ContactId,
 ) -> Result<()> {
+    debug_assert_ne!(contact_id, verifier_id, "Contact cannot be verified by self");
     context
         .sql
         .transaction(|transaction| {
@@ -1878,13 +1879,15 @@ pub(crate) async fn mark_contact_id_as_verified(
             if contact_fingerprint.is_empty() {
                 bail!("Non-PGP contact {contact_id} cannot be verified.");
             }
-            let verifier_fingerprint: String = transaction.query_row(
-                "SELECT fingerprint FROM contacts WHERE id=?",
-                (verifier_id,),
-                |row| row.get(0),
-            )?;
-            if verifier_fingerprint.is_empty() {
-                bail!("Contact {contact_id} cannot be verified by non-PGP contact {verifier_id}.");
+            if verifier_id != ContactId::SELF {
+                let verifier_fingerprint: String = transaction.query_row(
+                    "SELECT fingerprint FROM contacts WHERE id=?",
+                    (verifier_id,),
+                    |row| row.get(0),
+                )?;
+                if verifier_fingerprint.is_empty() {
+                    bail!("Contact {contact_id} cannot be verified by non-PGP contact {verifier_id}.");
+                }
             }
             transaction.execute(
                 "UPDATE contacts SET verifier=? WHERE id=?",

src/context.rs

@@ -1168,7 +1168,7 @@ impl Context {
             .await?
             .first()
             .context("Self reporting bot vCard does not contain a contact")?;
-        mark_contact_id_as_verified(self, contact_id, contact_id).await?;
+        mark_contact_id_as_verified(self, contact_id, ContactId::SELF).await?;
 
         let chat_id = ChatId::create_for_contact(self, contact_id).await?;
         chat_id

src/securejoin.rs

@@ -208,7 +208,7 @@ async fn verify_sender_by_fingerprint(
     let contact = Contact::get_by_id(context, contact_id).await?;
     let is_verified = contact.fingerprint().is_some_and(|fp| &fp == fingerprint);
     if is_verified {
-        mark_contact_id_as_verified(context, contact_id, contact_id).await?;
+        mark_contact_id_as_verified(context, contact_id, ContactId::SELF).await?;
     }
     Ok(is_verified)
 }
@@ -537,7 +537,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
         return Ok(HandshakeMessage::Ignore);
     };
 
-    mark_contact_id_as_verified(context, contact_id, contact_id).await?;
+    mark_contact_id_as_verified(context, contact_id, ContactId::SELF).await?;
 
     ChatId::set_protection_for_contact(context, contact_id, mime_message.timestamp_sent).await?;
 

src/test_utils.rs

@@ -1370,7 +1370,7 @@ fn print_logevent(logevent: &LogEvent) {
 /// and peerstate as backwards verified.
 pub(crate) async fn mark_as_verified(this: &TestContext, other: &TestContext) {
     let contact_id = this.add_or_lookup_contact_id(other).await;
-    mark_contact_id_as_verified(this, contact_id, contact_id)
+    mark_contact_id_as_verified(this, contact_id, ContactId::SELF)
         .await
         .unwrap();
 }