From 9663db522c2380f162bf6965b6700ee4d6a5f2a1 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 8 Mar 2023 14:03:32 -0500 Subject: [PATCH] Make the client respect the force_foolscap flag, and default to Foolscap-only for now. --- newsfragments/3936.minor | 0 src/allmydata/storage_client.py | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 newsfragments/3936.minor diff --git a/newsfragments/3936.minor b/newsfragments/3936.minor new file mode 100644 index 000000000..e69de29bb diff --git a/src/allmydata/storage_client.py b/src/allmydata/storage_client.py index 6fab1707b..fa0d2de49 100644 --- a/src/allmydata/storage_client.py +++ b/src/allmydata/storage_client.py @@ -299,7 +299,9 @@ class StorageFarmBroker(service.MultiService): "pub-{}".format(str(server_id, "ascii")), # server_id is v0- not pub-v0-key .. for reasons? ) - if len(server["ann"].get(ANONYMOUS_STORAGE_NURLS, [])) > 0: + if not self.node_config.get_config( + "storage", "force_foolscap", default=True, boolean=True, + ) and len(server["ann"].get(ANONYMOUS_STORAGE_NURLS, [])) > 0: s = HTTPNativeStorageServer( server_id, server["ann"],