From a56fa2d1c794b45c49ec2f994f98cd533f474ec2 Mon Sep 17 00:00:00 2001
From: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Date: Fri, 13 Oct 2023 18:36:01 +0200
Subject: [PATCH] vendor: update to the latest version of ferny

This has some breaking API changes, so make adjustments as necessary.
---
 src/cockpit/polkit.py       |  6 +++---
 src/cockpit/remote.py       |  2 +-
 src/cockpit/superuser.py    | 12 ++++++------
 test/pytest/test_beiboot.py |  2 +-
 vendor/ferny                |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cockpit/polkit.py b/src/cockpit/polkit.py
index 1e3f85fbb45c..b59a6a2c7e44 100644
--- a/src/cockpit/polkit.py
+++ b/src/cockpit/polkit.py
@@ -22,7 +22,7 @@
 import pwd
 from typing import Dict, List, Sequence, Tuple
 
-from cockpit._vendor.ferny import InteractionResponder
+from cockpit._vendor.ferny import AskpassHandler
 from cockpit._vendor.systemd_ctypes import Variant, bus
 
 # that path is valid on at least Debian, Fedora/RHEL, and Arch
@@ -43,7 +43,7 @@
 # mapping, but that method is not available for Python 3.6 yet.
 
 class org_freedesktop_PolicyKit1_AuthenticationAgent(bus.Object):
-    def __init__(self, responder: InteractionResponder):
+    def __init__(self, responder: AskpassHandler):
         super().__init__()
         self.responder = responder
 
@@ -125,7 +125,7 @@ class PolkitAgent:
 
     Use this as a context manager to ensure that the agent gets unregistered again.
     """
-    def __init__(self, responder: InteractionResponder):
+    def __init__(self, responder: AskpassHandler):
         self.responder = responder
         self.agent_slot = None
 
diff --git a/src/cockpit/remote.py b/src/cockpit/remote.py
index b1cbaf48d80d..ba48de2f908e 100644
--- a/src/cockpit/remote.py
+++ b/src/cockpit/remote.py
@@ -30,7 +30,7 @@
 logger = logging.getLogger(__name__)
 
 
-class PasswordResponder(ferny.InteractionResponder):
+class PasswordResponder(ferny.AskpassHandler):
     PASSPHRASE_RE = re.compile(r"Enter passphrase for key '(.*)': ")
 
     password: Optional[str]
diff --git a/src/cockpit/superuser.py b/src/cockpit/superuser.py
index a938c128f179..c20e18deb6bb 100644
--- a/src/cockpit/superuser.py
+++ b/src/cockpit/superuser.py
@@ -40,9 +40,9 @@
 
 
 class SuperuserPeer(ConfiguredPeer):
-    responder: ferny.InteractionResponder
+    responder: ferny.AskpassHandler
 
-    def __init__(self, router: Router, config: BridgeConfig, responder: ferny.InteractionResponder):
+    def __init__(self, router: Router, config: BridgeConfig, responder: ferny.AskpassHandler):
         super().__init__(router, config)
         self.responder = responder
 
@@ -54,7 +54,7 @@ async def do_connect_transport(self) -> None:
             else:
                 logger.debug('connecting non-polkit superuser peer transport %r', self.args)
 
-            agent = ferny.InteractionAgent(self.responder)
+            agent = ferny.InteractionAgent([self.responder])
 
             if 'SUDO_ASKPASS=ferny-askpass' in self.env:
                 tmpdir = context.enter_context(TemporaryDirectory())
@@ -77,7 +77,7 @@ async def do_connect_transport(self) -> None:
                 raise PeerError('authentication-failed', message=str(exc)) from exc
 
 
-class CockpitResponder(ferny.InteractionResponder):
+class CockpitResponder(ferny.AskpassHandler):
     commands = ('ferny.askpass', 'cockpit.send-stderr')
 
     async def do_custom_command(self, command: str, args: Tuple, fds: List[int], stderr: str) -> None:
@@ -125,7 +125,7 @@ def apply_rule(self, options: JsonObject) -> Optional[Peer]:
             # superuser requested, but not active?  That's an error.
             raise RoutingError('access-denied')
 
-    # ferny.InteractionResponder
+    # ferny.AskpassHandler
     async def do_askpass(self, messages: str, prompt: str, hint: str) -> Optional[str]:
         assert self.pending_prompt is None
         echo = hint == "confirm"
@@ -153,7 +153,7 @@ def peer_done(self):
         self.current = 'none'
         self.peer = None
 
-    async def go(self, name: str, responder: ferny.InteractionResponder) -> None:
+    async def go(self, name: str, responder: ferny.AskpassHandler) -> None:
         if self.current != 'none':
             raise bus.BusError('cockpit.Superuser.Error', 'Superuser bridge already running')
 
diff --git a/test/pytest/test_beiboot.py b/test/pytest/test_beiboot.py
index cec36806c9c4..8571c02501a5 100644
--- a/test/pytest/test_beiboot.py
+++ b/test/pytest/test_beiboot.py
@@ -12,7 +12,7 @@
 class BeibootPeer(Peer):
     async def do_connect_transport(self) -> None:
         helper = BridgeBeibootHelper(self)
-        agent = ferny.InteractionAgent(helper)
+        agent = ferny.InteractionAgent([helper])
         transport = await self.spawn([sys.executable, '-iq'], env=[], stderr=agent)
         transport.write(bootloader.make_bootloader(helper.steps, gadgets=ferny.BEIBOOT_GADGETS).encode())
         await agent.communicate()
diff --git a/vendor/ferny b/vendor/ferny
index 7d706d567452..c26d44452e9c 160000
--- a/vendor/ferny
+++ b/vendor/ferny
@@ -1 +1 @@
-Subproject commit 7d706d56745274ce9c46a2540916dced14bcbd5e
+Subproject commit c26d44452e9cb82dcafa71f88032bffcd7b9fa41