From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yNw8FAlq2GbMDgEAqHPOHw:P1 (envelope-from ) for ; Wed, 04 Sep 2024 14:09:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yNw8FAlq2GbMDgEAqHPOHw (envelope-from ) for ; Wed, 04 Sep 2024 16:09:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Pt6gh7sq; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KAxAvHlt; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725458953; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=A1rZ5mGRdCKDZTcDkyk/zvuxIBEsT5NwBwP47yUd77g=; b=lyIQ2NYJeumLb2JAh9NChq04735UkAGmUzZHLX5t5T5UIqm6EDv3ecHACIEDXWmn/T/cSA 6kCXaKmQPvNGR9b7+WSBP6MITPVK2Ph3KUfnH7VUcuHM5Vy/pHXZeUsptFjJ5A7lQSBvZu fVO0MRWjskevkATG+r/Pnh8G+pirRCcwjbpuHRei9SFFuK5DC5CV82+nCg65hS0sp5XGP0 ILR0dJDXeT7Xc2l1PVBpfnEW/ZWOmKnyj4fm1Cv7e4Dq8oGG860VZY3DQQT0Q3tYT+RWj2 9cKYUB+ZGD6JSgtLUyzbF3z5tjuXGiEP9YYIzTr++XCq4ue5MKRlijPx2yOdOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725458953; a=rsa-sha256; cv=none; b=HWAd0naahsRBHd+BVTmEaCxES0fZCmL8p7mhTIGQunc/a9+Y5sUg5Q8IoOaE0pls+jKKum DBWN07tFgjoqr1EnsCcy2fHlmQAc+Y5cd+82BIaLW8w8w04/zubrLK13r1TG6HuPMjRsDS ISgx00NEkgaFJNeSlHmUbpInMDn+dCJIw2u977umCuEyrxf+SGm+BFjk+le+d8Ka4EWgcV 0h2By0HwjTJI6p9GjDQ37YXM8OCPMF8DVtS/5u6S+V/2trBtvSsOF7ME0Fvip7LO8yXEso MHtiZa//XAXk+eRfffWwaZB4HdL9yJL5nGY2gMPSKQh00H/2WKIFhiXlSOilSg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Pt6gh7sq; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KAxAvHlt; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 305C51F35F for ; Wed, 4 Sep 2024 16:09:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slqgx-00026S-HF; Wed, 04 Sep 2024 10:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slqgs-0001uk-LI for guix-patches@gnu.org; Wed, 04 Sep 2024 10:08:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1slqgs-0002XK-8u for guix-patches@gnu.org; Wed, 04 Sep 2024 10:08:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=A1rZ5mGRdCKDZTcDkyk/zvuxIBEsT5NwBwP47yUd77g=; b=Pt6gh7sqjHpw3SR8Dl3IHKRYyKOW3LYU/62LwLOE44RcfDqdH2oDeSg6KwgB3k+/WyFVDvPiJrrZM65T5Vc/K6MDJ/TpaccoKw02iABP2ArxgqsaTc2kSsQd3pItXko1JMCC1I6KpXgAJpIlLBhB5cFOpVYpLl8gXXDqw5k+bBYvb2GUqavzXwRWlNmYXuDlvmyqtXlNo91Fe7nLymIY6AwY/95Fn1Sk/xC0g1Na/APmjJRXXfOOafAMQDwD/i6M1gW86wNQzZGWyXpSluxxcuYzu2UK639irMwYkzIE7iFypT5aeh+frLKmPX9p5EXgSi8MzEcYw91aZgzxTs/04A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slqht-00034G-US for guix-patches@gnu.org; Wed, 04 Sep 2024 10:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70341] [PATCH v7] services: tor: Add support for pluggable transports. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Sep 2024 14:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70341 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nigko Yerden Cc: Maxim Cournoyer , Florian Pelz , 70341@debbugs.gnu.org, Matthew Trzcinski Received: via spool by 70341-submit@debbugs.gnu.org id=B70341.172545896111549 (code B ref 70341); Wed, 04 Sep 2024 14:10:01 +0000 Received: (at 70341) by debbugs.gnu.org; 4 Sep 2024 14:09:21 +0000 Received: from localhost ([127.0.0.1]:35089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slqhF-000305-6m for submit@debbugs.gnu.org; Wed, 04 Sep 2024 10:09:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slqhC-0002z0-1P for 70341@debbugs.gnu.org; Wed, 04 Sep 2024 10:09:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slqg4-0002G7-BM; Wed, 04 Sep 2024 10:08:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=A1rZ5mGRdCKDZTcDkyk/zvuxIBEsT5NwBwP47yUd77g=; b=KAxAvHltZo+lYpsFSFZ+ 1sIT/isn5VdTf8P6tXM6bgy2oBZ14VWIr+a2JYG+3qOqil3/WJTloKwwu+6YB/bsiKjoiZ1jCedBD BjsJ3cB028EOMkcpzt92D5FQRDKKEVbhIw3LDobKRUmpZu1KihI2Buh8ugC6bkqPptJfsSGjlOvSC YS/RQkT+t9F1/u1PEh5ujil2TbF+gO6adZWvIKotgyT/3uPm03kCUN1WBal5C2Drh9mvAY8IZqtXg xsoOAwOuOCiuOh7C0f3fGEFipjPmv0g85jujXU/TSmaoirO/jAqlUm17BSnTQUDqvliDDFIKJK4Ju p+tQqWOe8t3gbA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <6bcd7fab071edaf6c8ffbbfd86fef286ee7e38e7.1723194927.git.nigko.yerden@gmail.com> (Nigko Yerden's message of "Fri, 9 Aug 2024 14:15:27 +0500") References: <11e72216f4be8b6559ecc04646fd722daa5dd09d.1712846897.git.nigko.yerden@gmail.com> <6bcd7fab071edaf6c8ffbbfd86fef286ee7e38e7.1723194927.git.nigko.yerden@gmail.com> Date: Wed, 04 Sep 2024 16:08:03 +0200 Message-ID: <87ed5zcy0s.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 305C51F35F X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -7.58 X-Spam-Score: -7.58 X-TUID: tgKrJfa1moS0 Hi Nigko, Nigko Yerden skribis: > Pluggable transports are programs that disguise Tor traffic, which > can be useful in case Tor is censored. Pluggable transports > cannot be configured by #:config-file file exclusively because Tor > process is run via 'least-authority-wrapper' and cannot have access > to transport plugin, which is a separate executable (Bug#70302, > Bug#70332). > > Example configuration snippet to be appended to > operation-system services > (see https://bridges.torproject.org/ to get > full bridge's lines): > > (service tor-service-type > (tor-configuration > (config-file (plain-file "torrc" > "\ > UseBridges 1 > Bridge obfs4 ... > Bridge obfs4 ...")) > (transport-plugins > (list (tor-transport-plugin > (path-to-binary > (file-append > go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-l= yrebird > "/bin/lyrebird"))))))) > > * doc/guix.texi (Networking Services): Document 'tor-transport-plugin' > data type and 'transport-plugins' option for 'tor-configuration. > * gnu/services/networking.scm: Export > 'tor-configuration-transport-plugins', 'tor-transport-plugin', > 'tor-transport-plugin?', 'tor-transport-plugin-role', > 'tor-transport-plugin-protocol', and 'tor-transport-plugin-path'. > (): Add 'transport-plugins' field. > (): New variable. > (tor-configuration->torrc): Add content to 'torrc' computed-file. > (tor-shepherd-service): Add file-system-mapping(s). > > Change-Id: I1b0319358778c7aee650bc843e021a6803a1cf3a [...] > +Each transport plugin corresponds either to > +``ClientTransportPlugin ...'' or to > +``ServerTransportPlugin ...'' line in the default Maybe use @code{=E2=80=A6} instead of quotes above. Could you perhaps move the example from the commit log to doc/guix.texi, enclosed in @lisp, and with one or two sentences explaining what it does? > +configuration file, see the @code{man tor}. Rather: =E2=80=9Csee @command{man tor}.=E2=80=9D > +(define-record-type* > + tor-transport-plugin make-tor-transport-plugin > + tor-transport-plugin? > + (role tor-transport-plugin-role > + (default 'client) > + (sanitize (lambda (value) > + (if (memq value '(client server)) > + value > + (configuration-field-error #f 'role value))))) > + (protocol tor-transport-plugin-protocol > + (default "obfs4")) > + (path-to-binary tor-transport-plugin-path)) Rather: (program tor-plugin-program) The doc needs to be updated as well. (By convention, in Guix and GNU, =E2=80=9Cpath=E2=80=9D refers to =E2=80=9C= search paths=E2=80=9D like $PATH or $PYTHONPATH; to avoid the ambiguity, we use the term =E2=80=9Cfile name=E2=80=9D or something along these lines.) Apart from that it looks great to me. Could you send an updated patch? Thanks, and apologies for the delay! Ludo=E2=80=99.