From 0f31e3cd4b054b17076ffeaa73cc412bc63191b3 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Thu, 13 Oct 2022 14:41:59 -0400 Subject: [PATCH] Leave HTTP off by default for now. --- src/allmydata/node.py | 8 ++++++-- src/allmydata/test/common_system.py | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 7d33d220a..f572cf7d9 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -908,12 +908,16 @@ def create_main_tub(config, tub_options, # FIXME? "node.pem" was the CERTFILE option/thing certfile = config.get_private_path("node.pem") - tub = create_tub( tub_options, default_connection_handlers, foolscap_connection_handlers, - force_foolscap=config.get_config("node", "force_foolscap", False), + # TODO eventually we will want the default to be False, but for now we + # don't want to enable HTTP by default. + # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3934 + force_foolscap=config.get_config( + "node", "force_foolscap", default=True, boolean=True + ), handler_overrides=handler_overrides, certFile=certfile, ) diff --git a/src/allmydata/test/common_system.py b/src/allmydata/test/common_system.py index ee345a0c0..edeea5689 100644 --- a/src/allmydata/test/common_system.py +++ b/src/allmydata/test/common_system.py @@ -794,13 +794,13 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): if which in feature_matrix.get((section, feature), {which}): config.setdefault(section, {})[feature] = value - if force_foolscap: - config.setdefault("node", {})["force_foolscap"] = force_foolscap + #config.setdefault("node", {})["force_foolscap"] = force_foolscap setnode = partial(setconf, config, which, "node") sethelper = partial(setconf, config, which, "helper") setnode("nickname", u"client %d \N{BLACK SMILING FACE}" % (which,)) + setnode("force_foolscap", str(force_foolscap)) tub_location_hint, tub_port_endpoint = self.port_assigner.assign(reactor) setnode("tub.port", tub_port_endpoint) @@ -818,7 +818,6 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): " furl: %s\n") % self.introducer_furl iyaml_fn = os.path.join(basedir, "private", "introducers.yaml") fileutil.write(iyaml_fn, iyaml) - return _render_config(config) def _set_up_client_node(self, which, force_foolscap):