Handle error when adding pending contact

Related MR:
briar!1354

.gitlab-ci.yml

@@ -8,8 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 before_script:
-    - apt update && apt install --no-install-recommends -y gir1.2-gtk-3.0 python3-gi python3-pip python3-setuptools
-    - apt install --no-install-recommends -y libhandy-1-dev
+    - apt update && apt install --no-install-recommends -y gir1.2-gtk-3.0 python3-gi python3-pip python3-setuptools libhandy-1-dev git
     - pip3 install -r requirements-dev.txt
 
 stages:

app.briar.gtk.json

@@ -73,13 +73,13 @@
             "buildsystem": "simple",
             "build-commands": [
                 "mkdir -p /app/share/java",
-                "install -Dm644 briar-headless-1.2.12.jar /app/share/java/briar-headless.jar"
+                "install -Dm644 briar-headless.jar /app/share/java/briar-headless.jar"
             ],
             "sources": [
                 {
                     "type": "file",
-                    "url": "https://briarproject.org/jar/briar-headless-1.2.12.jar",
-                    "sha512": "8b0f5081b96094a3b563c26739034448c0b42d68c4ebf23ab7fe854ec47c5b720fdddced2852e2e0291a6c34bde6bfcfae41aefcec3c044898845052b5cc9bd8"
+                    "url": "https://media.dorfbrunnen.eu/briar/jars/015/briar-headless.jar",
+                    "sha512": "2aa3a30f8563da5777256e1b103300140a3d7498c03f6e296027c7a507bfd166f2208439d8c1157e18ae843a66197091a1c89fb0d564fff8bf3445b74ed58af9"
                 }
             ]
         },

briar-gtk/briar_gtk/add_contact/add_contact_view.py

@@ -3,6 +3,16 @@
 # License-Filename: LICENSE.md
 import os
 from gettext import gettext as _
+
+from briar_wrapper.exception import BriarWrapperException
+from briar_wrapper.exceptions.pending_already_exists_contact import \
+    PendingContactAlreadyExistsContact
+from briar_wrapper.exceptions.pending_already_exists_pending_contact import \
+    PendingContactAlreadyExistsPendingContact
+from briar_wrapper.exceptions.pending_invalid_link import \
+    PendingContactInvalidLinkException
+from briar_wrapper.exceptions.pending_invalid_public_key import \
+    PendingContactInvalidPublicKeyException
 from gi.repository import Gtk
 
 from briar_wrapper.models.contacts import Contacts
@@ -13,7 +23,6 @@ from briar_gtk.define import APP, RESOURCES_DIR
 
 
 class AddContactView(Gtk.Overlay):
-
     # TODO: Move more logic into AddContactPresenter
 
     ADD_CONTACT_UI = "add_contact.ui"
@@ -41,16 +50,15 @@ class AddContactView(Gtk.Overlay):
         return self.builder.get_object("their_link_entry")
 
     def proceed_from_links(self):
-        link_error_label = self.builder.get_object("link_error_label")
         if self._link_is_empty():
-            link_error_label.set_label(_("Please enter a link"))
-            link_error_label.show()
+            error_message = _("Please enter a link")
+            self._show_error_links_page(error_message)
             return
         if self._links_match():
-            link_error_label.show()
-            link_error_label.set_label(
-                _("Enter your contact's link, not your own"))
+            error_message = _("Enter your contact's link, not your own")
+            self._show_error_links_page(error_message)
             return
+        link_error_label = self.builder.get_object("link_error_label")
         link_error_label.hide()
         self._show_alias_page()
 
@@ -66,7 +74,6 @@ class AddContactView(Gtk.Overlay):
             return
         alias_error_label.hide()
         self._add_contact()
-        APP().window.show_conversation_view()
 
     def _setup_view(self):
         self._add_from_resource(self.ADD_CONTACT_UI)
@@ -102,6 +109,11 @@ class AddContactView(Gtk.Overlay):
     def _setup_link_enter_listener(self):
         self.their_link_entry.connect("activate", self._on_link_enter)
 
+    def _show_error_links_page(self, error_message):
+        link_error_label = self.builder.get_object("link_error_label")
+        link_error_label.set_label(error_message)
+        link_error_label.show()
+
     # pylint: disable=unused-argument
     def _on_link_enter(self, widget):
         self.proceed_from_links()
@@ -134,7 +146,120 @@ class AddContactView(Gtk.Overlay):
         return len(alias) == 0
 
     def _add_contact(self):
-        contacts = Contacts(APP().api)
-        their_link = self.their_link_entry.get_text()
         alias = self.alias_entry.get_text()
-        contacts.add_pending(their_link, alias)
+        their_link = self.their_link_entry.get_text()
+        try:
+            contacts = Contacts(APP().api)
+            contacts.add_pending(their_link, alias)
+            APP().window.show_conversation_view()
+        except PendingContactInvalidLinkException:
+            self.show_links_page()
+            error_message = _("Invalid link")
+            self._show_error_links_page(error_message)
+        except PendingContactInvalidPublicKeyException:
+            self.show_links_page()
+            error_message = _("Invalid link")
+            self._show_error_links_page(error_message)
+        except PendingContactAlreadyExistsContact as e:
+            self._handle_existing_contact(e.remote_author_name, alias)
+        except PendingContactAlreadyExistsPendingContact as e:
+            self._handle_existing_pending_contact(e, alias, their_link)
+        except BriarWrapperException:
+            self.show_links_page()
+            error_message = _("An error occurred while adding the contact")
+            self._show_error_links_page(error_message)
+
+    def _handle_existing_contact(self, existing_contact_name, alias):
+        callback = lambda widget, response_id: \
+            self._handle_existing_contact_same_person(
+                widget, response_id, existing_contact_name, alias)
+        self._show_same_link_dialog(existing_contact_name, alias, callback)
+
+    def _handle_existing_contact_same_person(self, widget, response_id,
+                                             existing_contact_name, alias):
+        if response_id == Gtk.ResponseType.YES:
+            message = _("Contact %s already exists") % existing_contact_name
+            confirmation_dialog = Gtk.MessageDialog(
+                transient_for=APP().window,
+                flags=Gtk.DialogFlags.MODAL,
+                message_type=Gtk.MessageType.INFO,
+                buttons=Gtk.ButtonsType.OK,
+                text=message,
+            )
+            confirmation_dialog.connect("response", self._on_final_dialog)
+            confirmation_dialog.show_all()
+            widget.destroy()
+        elif response_id == Gtk.ResponseType.NO:
+            self._show_warning_dialog(existing_contact_name, alias)
+            widget.destroy()
+
+    def _handle_existing_pending_contact(self, exception, alias, link):
+        callback = lambda widget, response_id: \
+            self._handle_existing_pending_contact_same_person(
+                widget, response_id, exception, alias, link)
+        self._show_same_link_dialog(exception.pending_contact_alias, alias,
+                                    callback)
+
+    def _handle_existing_pending_contact_same_person(self, widget, response_id,
+                                                     exception, alias, link):
+        if response_id == Gtk.ResponseType.YES:
+            widget.destroy()
+            message = _("Pending contact updated")
+            try:
+                contacts = Contacts(APP().api)
+                contacts.delete_pending(exception.pending_contact_id)
+                contacts.add_pending(link, alias)
+            except BriarWrapperException:
+                message = _(
+                    "An error occurred while updating the pending contact")
+            confirmation_dialog = Gtk.MessageDialog(
+                transient_for=APP().window,
+                flags=Gtk.DialogFlags.MODAL,
+                message_type=Gtk.MessageType.INFO,
+                buttons=Gtk.ButtonsType.OK,
+                text=message,
+            )
+            confirmation_dialog.connect("response", self._on_final_dialog)
+            confirmation_dialog.show_all()
+        elif response_id == Gtk.ResponseType.NO:
+            self._show_warning_dialog(exception.pending_contact_alias, alias)
+            widget.destroy()
+
+    @staticmethod
+    def _show_same_link_dialog(existing_name, alias_name, callback):
+        confirmation_dialog = Gtk.MessageDialog(
+            transient_for=APP().window,
+            flags=Gtk.DialogFlags.MODAL,
+            message_type=Gtk.MessageType.QUESTION,
+            buttons=Gtk.ButtonsType.YES_NO,
+            text=_("Duplicate Link"),
+        )
+        message = _(
+            "You already have a pending contact with this link: %s") % (
+                      existing_name)
+        message = message + "\n\n" + _("Are %s and %s the same person?") % (
+            alias_name, existing_name)
+        confirmation_dialog.format_secondary_text(message)
+
+        confirmation_dialog.connect("response", callback)
+        confirmation_dialog.show_all()
+
+    def _show_warning_dialog(self, name1, name2):
+        confirmation_dialog = Gtk.MessageDialog(
+            transient_for=APP().window,
+            flags=Gtk.DialogFlags.MODAL,
+            message_type=Gtk.MessageType.ERROR,
+            buttons=Gtk.ButtonsType.OK,
+            text=_("Duplicate Link"),
+        )
+        message = _(
+            "%s and %s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.") % (name1, name2)  # noqa
+        confirmation_dialog.format_secondary_text(message)
+
+        confirmation_dialog.connect("response", self._on_final_dialog)
+        confirmation_dialog.show_all()
+
+    @staticmethod
+    def _on_final_dialog(widget, response_id):
+        widget.destroy()
+        APP().window.show_conversation_view()

briar-wrapper @ afba642b

-Subproject commit b1bd45f151c0dc9655701e2a3ac27c7addd9c1d4
+Subproject commit afba642b3a9556661b16220751283b8a2f9fc1c4

requirements.txt

-# Copyright (c) 2019 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 
-briar-wrapper>=0.0.6
+git+https://code.briarproject.org/briar/python-briar-wrapper.git@afba642b3a9556661b16220751283b8a2f9fc1c4#egg=briar-wrapper