From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:46:23 2018 Received: (at submit) by debbugs.gnu.org; 2 Aug 2018 06:46:23 +0000 Received: from localhost ([127.0.0.1]:38155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7NO-0004yL-9N for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:46:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7NM-0004y9-80 for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:46:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fl7NG-0000ds-4H for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:46:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:36234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fl7NG-0000dl-08 for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:46:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl7NE-00068Z-NV for guix-patches@gnu.org; Thu, 02 Aug 2018 02:46:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fl7NB-0000a1-M5 for guix-patches@gnu.org; Thu, 02 Aug 2018 02:46:12 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:36851) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fl7NB-0000ZS-GH for guix-patches@gnu.org; Thu, 02 Aug 2018 02:46:09 -0400 Received: by mail-pf1-x442.google.com with SMTP id b11-v6so732456pfo.3 for ; Wed, 01 Aug 2018 23:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EcY8AmWtFoehEVF/uycIPDlGN7ZUFzIvi6TMluNzFbk=; b=pcKWjMAHbZUHMGg0HCc12h9AEK/S7xY/UEIHNlLYSQjE8g+rzbYgaP9krO2EJhw6ba Gfzswrn01/Vp+Z/LsXlzmSZIte3RwEdjftJwgmEg/ilUtRa8LlaN5WHlSm7FDc4ETSew 1fCq/J1kliZYO+6WNGG3BrGAnTHFBvNh7jlM5jrqTyTdx7Y8TLjjIXfutF6jZ7+v+3Ws Z76rZXa4uQ+a9tXklsZYpXImeBuSv9qqccHETp5E0Xl2unXLnIsbqLFSKivwIQWX11+I yYIq4W6lN618Hq/07OxV/y1v2pdePuWa6kCbwIhv62hd4J3ugw+rwZ75oQDDKb5VtxI1 QeKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EcY8AmWtFoehEVF/uycIPDlGN7ZUFzIvi6TMluNzFbk=; b=XWjoDw+JgY8xxfNq54xzH3D+8EYpeAzNxGqwnJlHB5daVeq+a44QCwaitlkq0Vm8mC pbnK5Nr+Nw6z5e8OL6NRFnxlir/wn8/B3Nl6F8GWyb9h/+MsOoBN1fKEajJk119aAEUG sOQVtBF1TuWqGtIQ/z69BxnZzOF+TNzujIeWgp8fZRW7JyZjB75ST6DFfDYRgdKbF6xJ n0F+bFkrwKXnqwgTXmWPfctxGWI9EE0Z5C3fs2bETIbQ9boDwbR0gT4OLz6/zgXgYX8S OPQ+1vqgakm1H3OrgCWlEuJYB8DaaAmlKaPZraMj48iLxeGqw4+49RpGoe9MiN6lF6Sk QVzw== X-Gm-Message-State: AOUpUlFw7IDo20UqiILIFwn+11JYNg4LpksiNiuUANnhBNkQMxwC6xDv Ao9BOs2KOvESAHCD8J7MeKLtAz6WYFE= X-Google-Smtp-Source: AAOMgpcVBHJsHaVcTFX4uLuLZ7AGAMn8upn2vyaUpAS2EPfYuJ+bZvuXyIrb4aQWMYjR4MoD16GvIQ== X-Received: by 2002:a63:5b0d:: with SMTP id p13-v6mr1521136pgb.202.1533192368008; Wed, 01 Aug 2018 23:46:08 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id 5-v6sm1444660pgc.86.2018.08.01.23.46.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:46:06 -0700 (PDT) From: Chris Marusich To: guix-patches@gnu.org Subject: [PATCH 0/6] TOR via Unix domain SOCKS socket Date: Wed, 1 Aug 2018 23:45:20 -0700 Message-Id: <20180802064520.20273-1-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi, This patch series makes it possible to use our TOR service over a Unix domain socket. Specifically, after applying this patch series you can configure the TOR service as follows: (service tor-service-type (tor-configuration (socks-socket-type 'unix))) This configures the TOR daemon to run its SOCKS proxy on the Unix domain socket "/var/run/tor/socks-sock" rather than localhost port 9050. The SOCKS socket is made group-writable so that any member of the "tor" group may connect to it. Along the way, this patch series also adds system tests for TOR and adds a tiny bit of functionality to the marionette test framework. This patch series applies cleanly to commit 0d206dd054b74279838d44029c52a5f7663de189. For each patch in the series, I've verified that (1) Guix builds successfully and (2) both the new "tor" system test and the existing "dhcpd" system test pass. I ran the "dhcpd" system test as a sanity test to make sure I didn't introduce a regression in existing system tests. I'm currently reconfiguring my GuixSD system to confirm that it works for real, but it's going to take a long time for the reconfigure to succeed, so I'm sending the patch series now. Regarding hidden services, I haven't changed anything intentionally, so it should continue to work as before. I'll also test hidden services, but that's also going to take more time because I've never done it before, and I have to wait for my system to build many things. I'll let you know if it all works after I reconfigure my system. In the meantime, please take a look at the patches. Thank you! Chris Marusich (6): services: tor: Add a system test. services: tor: Rename activation procedure. marionette: Add support for QEMU's "quit" command. marionette: Add wait-for-unix-socket. tests: tor: Add more test cases. services: tor: Make it easier to use UNIX sockets. doc/guix.texi | 52 +++++++++++++++++--- gnu/build/marionette.scm | 28 ++++++++++- gnu/services/networking.scm | 34 ++++++++++--- gnu/tests/networking.scm | 97 ++++++++++++++++++++++++++++++++++++- 4 files changed, 196 insertions(+), 15 deletions(-) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:02 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:02 +0000 Received: from localhost ([127.0.0.1]:38171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tp-00058V-Rv for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:02 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:42034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7To-00058D-48 for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:00 -0400 Received: by mail-pg1-f174.google.com with SMTP id y4-v6so662115pgp.9 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XgHfHGNG8q4Slo868fB5qT0VQWMcBAoevlaFaN1UP0s=; b=jDsWCzaa43Dtb0DCyVtznx6cMHbL7ZgasJxQSIDjhe7G+1UNcJM4YHn8AL9IGSBc61 2QuOU/cbffm5M+XI3FE+YD8qvGAOoHq6phmF/F0jDc5nUehOIUrmRYiAQC8TeNMpasDQ 9+40OusdlA9Lxd2EUcGKJXOKi4OEF2ZVt2/kX0pNARDGJWyZLBJpIbnf+0CIM6QbrAl/ M2DOlqpbyO5+r13AATjXUpv1+a+HwnnNe0Sztu1bVIAk7Qe7CDaP3wlX/L2kQ5kMv+9P vjlslc9i0p9JVK2HHkX2JCf9dyzeuvnb/UgVh0/FlWypDkajVq/Sln35PZork7XC/u2Q H/ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XgHfHGNG8q4Slo868fB5qT0VQWMcBAoevlaFaN1UP0s=; b=GqVJVunplrbWwtpRbQ44R7wJeTf6zkVgTS19BAgfYcJ0plWLhGMPILXSp9bGkxRhp5 zS9NVTvJaSTv1oC3g/bySqifgkc5vQSmr/X7zbfJ/yboGQzq7FMZpbbDL6KI/80y8XPY s5TfzUFzbcMPVDSHLFxEhuYlgQDD5LFTlQ02ijPMwFgyNPl65iMBneTniGJJjw7KN0n2 pcZdiKy4q9Cd0xoRmV5B7iVuLYT0KDy1b55H09yVZ96EEv3tlZly9UpaxGtSI02jYznt vyI9GdpIEFhceJ7f2AwZv/d4Q2rXyEG6nNolhR3MnvypDcSTPVGjF0bOEfnnrey+ifVD seJQ== X-Gm-Message-State: AOUpUlE44jWEkYRY/UGjGR/Rpxt2KUWyKoVeOFMzr1pS36V3b047MvyC /4ug3FLthLfk0mg72Q47FJDYgINQagQ= X-Google-Smtp-Source: AAOMgpcPfnpRYBCUbtqwIHKvB5YWIMNe/Y7MZQdcx1Y0UFNqm5uSbfHx46vVa4A8P7Tkfkc5ATlsZA== X-Received: by 2002:a65:450a:: with SMTP id n10-v6mr1457655pgq.392.1533192773863; Wed, 01 Aug 2018 23:52:53 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:52:52 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 1/6] services: tor: Add a system test. Date: Wed, 1 Aug 2018 23:51:54 -0700 Message-Id: <20180802065159.20413-1-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802064520.20273-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/networking.scm (tor-configuration->torrc): Set PidFile to /var/run/tor/tor.pid in the base torrc configuration. (tor-shepherd-service) : Call make-forkexec-constructor/container with a new #:pid-file argument to tell Shepherd where to find the PID file. Add a a new to its existing #:mappings argument to share /var/run/tor with the the container. (tor-hidden-services-activation): Update docstring. Create /var/run/tor and set its permissions so only the tor user can access it. * gnu/tests/networking.scm (%test-tor, %tor-os): New variables. (run-tor-test): New procedure. --- gnu/services/networking.scm | 20 +++++++++++-- gnu/tests/networking.scm | 56 ++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index d5d0cf9d1..bd79e6589 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -612,6 +613,7 @@ demand."))) ### These lines were generated from your system configuration: User tor DataDirectory /var/lib/tor +PidFile /var/run/tor/tor.pid Log notice syslog\n" port) (for-each (match-lambda @@ -665,12 +667,17 @@ HiddenServicePort ~a ~a~%" (writable? #t)) (file-system-mapping (source "/dev/log") ;for syslog - (target source))))) + (target source)) + (file-system-mapping + (source "/var/run/tor") + (target source) + (writable? #t))) + #:pid-file "/var/run/tor/tor.pid")) (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) (define (tor-hidden-service-activation config) - "Return the activation gexp for SERVICES, a list of hidden services." + "Set up directories for TOR and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -686,6 +693,15 @@ HiddenServicePort ~a ~a~%" ;; The daemon bails out if we give wider permissions. (chmod directory #o700))) + ;; Allow TOR to write its PID file. + (mkdir-p "/var/run/tor") + (chown "/var/run/tor" (passwd:uid %user) (passwd:gid %user)) + ;; Set the group permissions to rw so that if the system administrator + ;; has specified UnixSocksGroupWritable=1 in their torrc file, members + ;; of the "tor" group will be able to use the SOCKS socket. + (chmod "/var/run/tor" #o750) + + ;; Allow TOR to access the hidden services' directories. (mkdir-p "/var/lib/tor") (chown "/var/lib/tor" (passwd:uid %user) (passwd:gid %user)) (chmod "/var/lib/tor" #o700) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 323679e7f..c9a4f5463 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -30,7 +30,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch %test-dhcpd)) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -339,3 +339,57 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (name "dhcpd") (description "Test a running DHCP daemon configuration.") (value (run-dhcpd-test)))) + + +;;; +;;; Services related to TOR +;;; + +(define %tor-os + (simple-operating-system + (tor-service))) + +(define (run-tor-test) + (define os + (marionette-operating-system %tor-os + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-64)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + (test-assert "tor is alive" + (marionette-eval + '(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + (live-service-running + (find (lambda (live) + (memq 'tor + (live-service-provision live))) + (current-services)))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "tor-test" test)) + +(define %test-tor + (system-test + (name "tor") + (description "Test a running TOR daemon configuration.") + (value (run-tor-test)))) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:05 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:05 +0000 Received: from localhost ([127.0.0.1]:38175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tt-00059B-9W for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:05 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:37265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tp-00058F-C6 for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:01 -0400 Received: by mail-pf1-f181.google.com with SMTP id a26-v6so738176pfo.4 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S6R9dRM8p1t4V4CuPS9tEYyHIcnFYW7N6F7/gT9+zyQ=; b=KXWMi4yK2iRe8do7oyvXTogfV0Jr9SbQD/qTadHdNMOH/kAHSgYgaZtydcXbQMgKND SQvRD3OZCgrvTgNBmAgip4GFcCUQKHtP4lKQwyS5bdmPcxHcYFBM7uCM6ceQv9yid19j UKAT1GJUbuwHGf8b0HzPqedYORHH6EPhSXB1zZ8rz2MhZCtI89KvwKtZnWJBGF76taxo N9Lb0HQCj+/XQnBuWB3kesMuMFeIGDIIyCK9nreZw49t6NTaC8PaV9WG2cjY4kjuzwdA yXt/yV22boYfQHajpLcmHWDzLoe5kDF13eajCTURpR/OSal3UZ0NF/MsfWAwXR5cICCr InTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S6R9dRM8p1t4V4CuPS9tEYyHIcnFYW7N6F7/gT9+zyQ=; b=bfAVKF0Or0Wq0v9kEw/tIJ6KhZoZHoxDXbxjfVL3zX9S1G2kwobllZK7cj3Ye00p++ rcth5kvqh3IOa8iZDWng5ju9Uvp4KAYVwhiuHKWBnGpPV0DqlILNdXmlMYDGDmZo9Z1m OmQil0mo3W/95A8uAyj3xN3p4Gksczko5F2h9SLOasOgbRnEtV7ndae5TY8/OwxIqSFz ksGyfABRArOrUV/eA7UVZ5uqeb9HK+sRIGgLDdu+sLs/yp3b4WrzGGQu7HJBVpGeZheZ za/toXw4NT3Y8vKzJ4JXUsNDLLNQYCy4C7G6fcuzuUBayaIDGKLcKz7uOX6D6KYDU7/p my8A== X-Gm-Message-State: AOUpUlH5oEnoY18wgj4Dee1p+IxSxi9HbB4nBDA8s6tVQMxlmTGA1J6M 37JuFVLxcN4BpvogbPDMSIaGc1CRzQE= X-Google-Smtp-Source: AAOMgpe7KqSSI4BBPSwnryjs5dEGv9OEGe53l+IaCWCfcO4wWKqbwFtrcRLidnrCJKjNcc5Q5JscaA== X-Received: by 2002:a63:f043:: with SMTP id s3-v6mr1433502pgj.94.1533192775313; Wed, 01 Aug 2018 23:52:55 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:52:54 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 2/6] services: tor: Rename activation procedure. Date: Wed, 1 Aug 2018 23:51:55 -0700 Message-Id: <20180802065159.20413-2-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/networking.scm: Rename the procedure tor-hidden-service-activation to tor-activation. --- gnu/services/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index bd79e6589..9523f97f6 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -676,7 +676,7 @@ HiddenServicePort ~a ~a~%" (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) -(define (tor-hidden-service-activation config) +(define (tor-activation config) "Set up directories for TOR and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -721,7 +721,7 @@ HiddenServicePort ~a ~a~%" (service-extension account-service-type (const %tor-accounts)) (service-extension activation-service-type - tor-hidden-service-activation))) + tor-activation))) ;; This can be extended with hidden services. (compose concatenate) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:05 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:05 +0000 Received: from localhost ([127.0.0.1]:38177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tt-00059H-IV for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:05 -0400 Received: from mail-pl0-f53.google.com ([209.85.160.53]:36425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tr-00058H-0B for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:03 -0400 Received: by mail-pl0-f53.google.com with SMTP id e11-v6so583100plb.3 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OSGbSYH0Lxgc7x2nOb6Ab5o+TGEBBimCAEQpwOpIjH0=; b=WVPaUoXAH27o/ZvjPzkXtbAVLwWz7+Vao9roQmtSVBwxh08EoFtqaUfcFqRGJsaZv6 ec9IfVpm4p3Y2NMfxEsZot3Iflm4Bt11DGdFqzqcRyRiz0aZehpwBsSEQZy/wLS7VwQV djBTAGm5tgEDxvt9A8d7A4M67WlVx9VA4SFKX7rr1aDxiZaSPloZnc18gB9M9wZXnYhK tmCoDn8CZBbdkxM9Odnx70LAPDaJXF2CWyXItfwimpPk9v8Fq6ouUKUX/yDrnyaWJjGS Z5TFgpLCKXDPluAVZVmo44j+th096YgS2YGYfhsl/9KuUBVsfQAktRlc9CcORUZ9RLNc OtCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OSGbSYH0Lxgc7x2nOb6Ab5o+TGEBBimCAEQpwOpIjH0=; b=p9dl4aHrmlZYt9NRsWtACZEnED7Iu8N0jDQJ+xui5zXR5hDFxRniGNyp4fRUyQk5s3 V4r022455vqC31eVrVhAGTuae0ExKOZTVt1M1g3fy3KTeVEBS7Qj5XYMBLNWOFsI1q56 g5YWMRR1iwKxZ16quOQooXC7M+5QQEl064j+r0lZrEmiJBl7L3tU0A1aVnezlkinRk58 zTy7atvEHRq2J2bJIwnwfGx4/u1ZDos5pJdJActgb4MI3+8B2qT8fpIeek3Gi6wednru +bTBL0/SLoh3X65F5MqgKPsuGQECyvtH1/D0CoVZ8M5mc+kw/4PHyiIuZxGhQC0NM3qo hiTQ== X-Gm-Message-State: AOUpUlGCNPpTcjFUUbMqNj87oXU+ck9LKCn/YB0QHB434WnK5x4Z6dfR kBjlTgcciL2lej4BbZRtTWfpqiLhyMA= X-Google-Smtp-Source: AAOMgpfIexBZkvvgtp0wmKMD1dPzG7oWp8awgO2Pgrd6k7VoDpJmrWci0g6rwtqQk1Q36ZGX2wBZbA== X-Received: by 2002:a17:902:7482:: with SMTP id h2-v6mr1294977pll.185.1533192777063; Wed, 01 Aug 2018 23:52:57 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:52:55 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 3/6] marionette: Add support for QEMU's "quit" command. Date: Wed, 1 Aug 2018 23:51:56 -0700 Message-Id: <20180802065159.20413-3-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/build/marionette.scm (marionette-control): Don't wait for the monitor prompt when the command was "quit". --- gnu/build/marionette.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index bb018fc9c..61284b898 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -222,7 +222,8 @@ pcsys_monitor\")." (($ _ _ monitor) (display command monitor) (newline monitor) - (wait-for-monitor-prompt monitor)))) + ;; The "quit" command terminates QEMU immediately, with no output. + (unless (string=? command "quit") (wait-for-monitor-prompt monitor))))) (define* (marionette-screen-text marionette #:key -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:06 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:06 +0000 Received: from localhost ([127.0.0.1]:38179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tt-00059K-PQ for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:05 -0400 Received: from mail-pf1-f174.google.com ([209.85.210.174]:46172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Ts-00058K-Ed for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:04 -0400 Received: by mail-pf1-f174.google.com with SMTP id u24-v6so717238pfn.13 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QrOVjHIUyuwcD3XVFxcGH0TKZRVANkWJ/M1ccyDMfik=; b=n1/zFQ88JMTOw6Ev/1iFfmjbyyTMR5OneLUqc2xXOPoyIDJUqrKv07giMoWTRe2dYI e7nH0EEowUhtYiEtRtBdDxCYw/hrqywzwgPIpR2dECPLYQAklbvwzKqrO8ESwCdjK+IR Up3T0GkkfJYCgvqZSMQuwpJutbXvnJoUwKr5B8yaCMFTmZHh79qIpu5q+YbfN+QG0lF/ j4AIbn6vTRevA7zgwU/6MEKt9acbcBBvT64bG5JaQxWppY9vBWp5UH2ZCkx1rs/5tRJT cqje65Uqr4+vOoniGTCpo0o12+JVWDKE1EgcohbC3fiNck8uhuyFddjhfWu9v4XY8E2L 6nKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QrOVjHIUyuwcD3XVFxcGH0TKZRVANkWJ/M1ccyDMfik=; b=VYe06DQbr4b4qzPnYZWOFFz9r0fGb/pVOA70VSDhMXiyu19ebWR9gsMeNOKBFwo/bK hYO/4YNXQa9Y44yh0Zzonax5id7araTsAywH6PxU+i9253BviZYSkcXUSg0YxNsenHIZ +ajj2T+NF6St6RLq4NVzChz+QuMcMfqt+glrRD140xcRCOuafl3jAlyNDXnpnrOZDdfR fLSwGN82ZSUhIyAsVf51droqPdPrxfaZi2hnSnEX6v43q6GJgTA0oKP9/pJ0jtvdA9Mr 4ad9HpcH14HUcR87fmIJaT6pfNoYp8AYGYOnnqd6KFBv0MdDDqV3yavvRG7OT8xkrv/C MsqA== X-Gm-Message-State: AOUpUlGTmjEuzJD+N+vMWFB9O9vhUDjRkCsXcuTNF+Jq/eUsUI/K7kfG t8PEnzcfKgxrF5sqP1yjHBIUqZ14HyM= X-Google-Smtp-Source: AAOMgpeJfNg2jpKGUfbVLHE+nEIymJ8PsE5L+55VMyH9gDqxR3/ep+dLvHVmysjsbY0B4IyH5ER+sg== X-Received: by 2002:a63:fa49:: with SMTP id g9-v6mr1108682pgk.18.1533192778483; Wed, 01 Aug 2018 23:52:58 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:52:57 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 4/6] marionette: Add wait-for-unix-socket. Date: Wed, 1 Aug 2018 23:51:57 -0700 Message-Id: <20180802065159.20413-4-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/build/marionette.scm (wait-for-unix-socket): New variable. --- gnu/build/marionette.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 61284b898..3588bcbe6 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ marionette-eval wait-for-file wait-for-tcp-port + wait-for-unix-socket marionette-control marionette-screen-text wait-for-screen-text @@ -214,6 +216,29 @@ MARIONETTE. Raise an error on failure." ('failure (error "nobody's listening on port" port)))) +(define* (wait-for-unix-socket path marionette + #:key (timeout 20)) + "Wait for up to TIMEOUT seconds for PATH, a Unix domain socket, to accept +connections in MARIONETTE. Raise an error on failure." + (match (marionette-eval + `(begin + (let ((sock (socket PF_UNIX SOCK_STREAM 0))) + (let loop ((i 0)) + (catch 'system-error + (lambda () + (connect sock AF_UNIX ,path) + 'success) + (lambda args + (if (< i ,timeout) + (begin + (sleep 1) + (loop (+ 1 i))) + 'failure)))))) + marionette) + ('success #t) + ('failure + (error "nobody's listening on unix domain socket" path)))) + (define (marionette-control command marionette) "Run COMMAND in the QEMU monitor of MARIONETTE. COMMAND is a string such as \"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(qemu-doc) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:09 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:09 +0000 Received: from localhost ([127.0.0.1]:38183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tx-00059j-18 for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:09 -0400 Received: from mail-pf1-f169.google.com ([209.85.210.169]:35309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tt-00058O-VL for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:06 -0400 Received: by mail-pf1-f169.google.com with SMTP id p12-v6so745286pfh.2 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4WJ3sz7sCXO3OgTRpCOXsgyDJfDXRfmS+05uqdf7fjo=; b=TEITqsnkHe8a8VzU93KgcErHq/1Kr2SB0gUH/MUehUbl/bfTq6U02XW6VodTBAuuaW tI4Ah0qOzg8WbWUSE/6iruJemmdw2fFx4y5L3Nxd/vspCaesoqGruTtgGaYmAMgsqNMV zpF1oKLCiMHp+DMFlkgIu5xB2vhKNBJpLc1GEg6i4rRWFjV7Zs9CsKtI8072G37/ZP9P H/mEi2m2z06PYqn3IE8nqSOD6EHSNjYR18wq04yOBxcdr5gawzxiUG65BG3FHOlLQGWn hXU6b83ARLOLhIzJBVYU8W57Df+pOajkEpGpkrKuut4BvIJD52d6PjNTg4ccEWPkqG1e 5AKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4WJ3sz7sCXO3OgTRpCOXsgyDJfDXRfmS+05uqdf7fjo=; b=bPZ4vBACneK2hcMC1gStA/aygrHej6G/yVtYjuNx+Zst8gE9gaFih0QEZavcC8LDN6 JruAL9wVNS9jgLfa8XyvV/A0z2l8PVrIy3ARP2kFNQPYN2BysIZ9XzApujF14PWQtYeg 1BxDwUeqhxnoQtBTmXrrELWr2lBIjI8sxdIMrbQAUgkDYwEvts4Aep9lhsTKFTIMnOg1 DxZeRZ1i722TSNTTNdmsIF+FWQokSGNRNvad/QCs2oF4vMFfsCaAVrQrCJhjfyqKhNn+ iFIedYRIHPHdE/9Cvqa7eS6afZl3fj7Sev6MEuuV21iONWWsnzstrM4OG6mjAfOkrvUY zTxA== X-Gm-Message-State: AOUpUlF3UjosZ9oil8trO9o5/ThdcoqYq9pk5kFTQHqEWSnyvUFhESjX +Jf2mrwGx2WKvM1s6k1rWWO0cgoxeH8= X-Google-Smtp-Source: AAOMgpekgI5TcarRU0pURvGnlk1qw/KWl79/X/wYHxT8h1oDGiClAVxne4n8C96n89g9ZX8XE8tHGQ== X-Received: by 2002:a62:1f06:: with SMTP id f6-v6mr1632316pff.140.1533192779884; Wed, 01 Aug 2018 23:52:59 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:52:58 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 5/6] tests: tor: Add more test cases. Date: Wed, 1 Aug 2018 23:51:58 -0700 Message-Id: <20180802065159.20413-5-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/tests/networking.scm (%tor-os/unix-socks-socket): New variable. (run-tor-test) : New variables. <"tor is alive">: Move common code from this test case... : ...into this new procedure. <"tor is listening", "tor is alive, even when using a SOCKS socket"> <"tor is listening, even when using a SOCKS socket">: New test cases. --- gnu/tests/networking.scm | 59 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index c9a4f5463..b332ec3cf 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -349,12 +350,29 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (tor-service))) +(define %tor-os/unix-socks-socket + (simple-operating-system + (service tor-service-type + (tor-configuration + (config-file + (plain-file "test-torrc" + "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1 +") + ))))) + (define (run-tor-test) (define os (marionette-operating-system %tor-os #:imported-modules '((gnu services herd)) #:requirements '(tor))) + (define os/unix-socks-socket + (marionette-operating-system %tor-os/unix-socks-socket + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + (define test (with-imported-modules '((gnu build marionette)) #~(begin @@ -366,12 +384,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - - (test-begin "tor") - - (test-assert "tor is alive" + (define (tor-is-alive? marionette) (marionette-eval '(begin (use-modules (gnu services herd) @@ -383,6 +396,40 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (current-services)))) marionette)) + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + ;; Test the usual TOR service. + + (test-assert "tor is alive" + (tor-is-alive? marionette)) + + (test-assert "tor is listening" + (let ((default-port 9050)) + (wait-for-tcp-port default-port marionette))) + + ;; Don't run two VMs at once. + (marionette-control "quit" marionette) + + ;; Test the TOR service using a SOCKS socket. + + (let* ((socket-directory "/tmp/more-sockets") + (_ (mkdir socket-directory)) + (marionette/unix-socks-socket + (make-marionette + (list #$(virtual-machine os/unix-socks-socket)) + ;; We can't use the same socket directory as the first + ;; marionette. + #:socket-directory socket-directory))) + (test-assert "tor is alive, even when using a SOCKS socket" + (tor-is-alive? marionette/unix-socks-socket)) + + (test-assert "tor is listening, even when using a SOCKS socket" + (wait-for-unix-socket "/var/run/tor/socks-sock" + marionette/unix-socks-socket))) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 02:53:09 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 06:53:09 +0000 Received: from localhost ([127.0.0.1]:38185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tx-00059m-Ax for submit@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:09 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:37727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl7Tv-00058g-D1 for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 02:53:08 -0400 Received: by mail-pg1-f178.google.com with SMTP id n7-v6so671966pgq.4 for <32346@debbugs.gnu.org>; Wed, 01 Aug 2018 23:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jUh9Hz55/UJKwDX+oa0bnknCqIiRW1z8hVFPe5iq79s=; b=G5p56dTd6jh3kSB6c2RYdZifbCCjVFvedvnZgshfF7yIP9M1nNJmsphW4agLSQ8Xcc xNWzLkJQdLGKm8zr+vItnC3/+fnIcAyF2ozV+Nl0TGIOH4JDi778U0QJDMZAORAwouHT Lu3FmOCIT4JSvQv6a/fz9EGnm1aKRomE+4hyWtioDoEjrWVEClsZEVPhY8RdihLwwcm6 dCyxCZILAdj1sAXabstDLdmxIwQ3Ut92niFP+vgTdE1UZurPRfGU45JtsDmIaTXjQvlA e3QXfSaK/YPIaCydIj8XJ/IeEorPflNZDhWJSzPI7rjToepiRn0EPy6DoRwxehfLmwNT RbSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jUh9Hz55/UJKwDX+oa0bnknCqIiRW1z8hVFPe5iq79s=; b=WB8tUC+zH7ybQLlo8QFETZsHqy1oQ6mzVnG5hM9FBAUnkt64zTEteYOgik3dmy0FYo p7QyG2qMP/dyuOfdjo6CYaFR1DsNkdom8S2GcBsvLpTgH9MU/MymOPprlfEPbA5mZjhJ nxmq8xjd4ZlFEk/2KTF99wu0j/kKXwAnR8nP6WITXIKtgJQ6hpSgH82Z+YrDu8sX1ZT2 Bvr934NLdIyy8Ec656dmlNoYKxL0roo021anFrU+nyE8WJQLAm7rjmQaoaQqb3c6KRBI bAZNJnQhZLjV6sYYzSL4fwp++8vV7hyZ9nEbiF/bsDroyKi8/D3maZfSl2Cg0gxljLzY f8iw== X-Gm-Message-State: AOUpUlF75RWhTZPiMXPmG3xfV4Z6hRrbkmsIa2M+u1544BB+qm8pWa70 NgBWyLvMhO69hD5VwPK+8IAVSLC9fBc= X-Google-Smtp-Source: AAOMgpdyUh8xYCJp4OqodBB1pXTddnptFyY1z+egMXCZV8NrlRSJYpOHNwqoiOUryKalXiH4lpDDKg== X-Received: by 2002:a62:45d2:: with SMTP id n79-v6mr1595737pfi.137.1533192781345; Wed, 01 Aug 2018 23:53:01 -0700 (PDT) Received: from garuda.local.net (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h69-v6sm1673801pfh.13.2018.08.01.23.52.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 23:53:00 -0700 (PDT) From: Chris Marusich To: 32346@debbugs.gnu.org Subject: [PATCH 6/6] services: tor: Make it easier to use UNIX sockets. Date: Wed, 1 Aug 2018 23:51:59 -0700 Message-Id: <20180802065159.20413-6-cmmarusich@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , Chris Marusich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/guix.texi (Networking Services): Document it, and mention that tor-service is deprecated. * gnu/services/networking.scm () : New field. (tor-configuration->torrc): When socks-socket-type is 'unix, set SocksPort to UNIX domain socket /var/run/tor/socks-sock and set UnixSocksGroupWritable to 1. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): Instead of using a custom config file, just set socks-socket-type to 'unix. --- doc/guix.texi | 52 ++++++++++++++++++++++++++++++++----- gnu/services/networking.scm | 10 +++++-- gnu/tests/networking.scm | 8 +----- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 080b091b3..c72b1e480 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11445,16 +11445,54 @@ detailed discussion of each configuration field. @end deftp @cindex Tor -@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}] -Return a service to run the @uref{https://torproject.org, Tor} anonymous -networking daemon. +@defvr {Scheme Variable} tor-service-type +This is the type for a service that runs the @uref{https://torproject.org, +Tor} anonymous networking daemon. The service is configured using a +@code{} record. By default, the TOR daemon runs as the +@code{tor} unprivileged user, which is a member of the @code{tor} group. + +@end defvr -The daemon runs as the @code{tor} unprivileged user. It is passed -@var{config-file}, a file-like object, with an additional @code{User tor} line -and lines for hidden services added via @code{tor-hidden-service}. Run -@command{man tor} for information about the configuration file. +@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}] +This procedure is deprecated and will be removed in a future release. Return +a service of the @code{tor-service-type} type. @var{config-file} and +@var{tor} have the same meaning as in @code{}. @end deffn +@deftp {Data Type} tor-configuration +@table @asis +@item @code{tor} (default: @code{tor}) +The package that provides the TOR daemon. This package is expected to provide +the daemon at @file{bin/tor} relative to its output directory. The default +package is the @uref{https://www.torproject.org, TOR Project's} +implementation. +@item @code{config-file} (default: @code{(plain-file "empty" "")}) +The configuration file to use. It will be appended to a default configuration +file, and the final configuration file will be passed to @code{tor} via its +@code{-f} option. This may be any ``file-like'' object (@pxref{G-Expressions, +file-like objects}). See @code{man tor} for details on the configuration file +syntax. +@item @code{hidden-services} (default: @code{'()}) +The list of @code{} records to use. For any hidden service +you include in this list, appropriate configuration to enable the hidden +service will be automatically added to the default configuration file. You +may conveniently create @code{} records using the +@code{tor-hidden-service} procedure described below. +@item @code{socks-socket-type} (default: @code{'tcp}) +The default socket type that TOR should use for its SOCKS socket. This must +be either @code{'tcp} or @code{'unix}. If it is @code{'tcp}, then by default +TOR will listen on TCP port 9050 on the loopback interface (i.e., localhost). +If it is @code{'unix}, then TOR will listen on the UNIX domain socket +@file{/var/run/tor/socks-sock}, which will be made writable by members of the +@code{tor} group. + +If you want to customize the SOCKS socket in more detail, leave +@code{socks-socket-type} at its default value of @code{'tcp} and use +@code{config-file} to override the default by providing your own +@code{SocksPort} option. +@end table +@end deftp + @cindex hidden service @deffn {Scheme Procedure} tor-hidden-service @var{name} @var{mapping} Define a new Tor @dfn{hidden service} called @var{name} and implementing diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 9523f97f6..a7f722807 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -577,7 +577,9 @@ demand."))) (config-file tor-configuration-config-file (default (plain-file "empty" ""))) (hidden-services tor-configuration-hidden-services - (default '()))) + (default '())) + (socks-socket-type tor-configuration-socks-socket-type ; 'tcp or 'unix + (default 'tcp))) (define %tor-accounts ;; User account and groups for Tor. @@ -599,7 +601,7 @@ demand."))) (define (tor-configuration->torrc config) "Return a 'torrc' file for CONFIG." (match config - (($ tor config-file services) + (($ tor config-file services socks-socket-type) (computed-file "torrc" (with-imported-modules '((guix build utils)) @@ -615,6 +617,10 @@ User tor DataDirectory /var/lib/tor PidFile /var/run/tor/tor.pid Log notice syslog\n" port) + (when (eq? 'unix '#$socks-socket-type) + (display "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1\n" port)) (for-each (match-lambda ((service (ports hosts) ...) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index b332ec3cf..06d6250b8 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -354,13 +354,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (service tor-service-type (tor-configuration - (config-file - (plain-file "test-torrc" - "\ -SocksPort unix:/var/run/tor/socks-sock -UnixSocksGroupWritable 1 -") - ))))) + (socks-socket-type 'unix))))) (define (run-tor-test) (define os -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 05:27:10 2018 Received: (at 32346) by debbugs.gnu.org; 2 Aug 2018 09:27:10 +0000 Received: from localhost ([127.0.0.1]:38255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl9t0-0000bL-5l for submit@debbugs.gnu.org; Thu, 02 Aug 2018 05:27:10 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:33238 helo=conspiracy.of.n0.is) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fl9sy-0000bA-BP for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 05:27:08 -0400 Received: by conspiracy.of.n0.is (OpenSMTPD) with ESMTPSA id c487f92e (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 2 Aug 2018 09:27:07 +0000 (UTC) Date: Thu, 2 Aug 2018 09:27:53 +0000 From: Nils Gillmann To: Chris Marusich Subject: Re: [bug#32346] [PATCH 0/6] TOR via Unix domain SOCKS socket Message-ID: <20180802092753.nsiaxrvrjh3qbmov@abyayala> References: <20180802064520.20273-1-cmmarusich@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180802064520.20273-1-cmmarusich@gmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Chris Marusich transcribed 2.1K bytes: > Hi, ... > Regarding hidden services, I haven't changed anything intentionally, > so it should continue to work as before. I'll also test hidden > services, but that's also going to take more time because I've never > done it before, and I have to wait for my system to build many things. Good Work! Now for the hidden-services.. Couldn't you achieve the effect you wanted without renaming tor-hidden-services? > I'll let you know if it all works after I reconfigure my system. In > the meantime, please take a look at the patches. Thank you! > > Chris Marusich (6): > services: tor: Add a system test. > services: tor: Rename activation procedure. > marionette: Add support for QEMU's "quit" command. > marionette: Add wait-for-unix-socket. > tests: tor: Add more test cases. > services: tor: Make it easier to use UNIX sockets. > > doc/guix.texi | 52 +++++++++++++++++--- > gnu/build/marionette.scm | 28 ++++++++++- > gnu/services/networking.scm | 34 ++++++++++--- > gnu/tests/networking.scm | 97 ++++++++++++++++++++++++++++++++++++- > 4 files changed, 196 insertions(+), 15 deletions(-) > > -- > 2.18.0 > > > > From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 02 22:22:54 2018 Received: (at 32346) by debbugs.gnu.org; 3 Aug 2018 02:22:54 +0000 Received: from localhost ([127.0.0.1]:39388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flPjy-0006Ef-Gw for submit@debbugs.gnu.org; Thu, 02 Aug 2018 22:22:54 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:46430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flPjx-0006ET-5T for 32346@debbugs.gnu.org; Thu, 02 Aug 2018 22:22:53 -0400 Received: by mail-pl0-f68.google.com with SMTP id t17-v6so1855306ply.13 for <32346@debbugs.gnu.org>; Thu, 02 Aug 2018 19:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=fnwWkVevjQhzxkaDsNBr36kuO9plwMeJCPrU1KQKvvY=; b=Kglw6F4nxmZgg7CptBNb2PHyzVtxtmLyyl3hvslEoipjklpMof06TE2FC4vsB+MhUc SDfhzOc/RcND4mM9eu4j2pvWDi4qzIYUshLEFKDKFSriPiymklSaDRTWQVsbgDLTw2jE AlHCR3F4RJw1UwnGVSiCi7oaxUEem9zaNmPckyS4EKHFN/D7W6Vr+ci5Wp0hxYKUm4yx COxEZ3EuX51F14pyJnbov19Y2VfED8RogFGpWCBQoxJNDJF9LBqXCKBIG/h6fvVQxv3q /wu5niUB2gyeXWGTVJpbV02m8uR2trMtczMYVei/kE1PSPdpozFpohw6sTC4PjmJvERS +7UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=fnwWkVevjQhzxkaDsNBr36kuO9plwMeJCPrU1KQKvvY=; b=qx/Fexi0K1quoMIQXb0rOw2PWcque8nSZg73O2h9Qn6LkqO1m6NTIJXQzqCo5/mM1g PO9QdasPJFxVH4Ue3xITFhpbkpnI/4obalhaRJnSFlTJI01ADESMapLz0J4Tbl2kAzXw O0Y6aLKoY1bji3n7kSYAJsCAS2zWeGu8si57W2CXVEvSwPe+A55Kav/PfAa89hG8M4Or PEsQ9MZdIZQu80hNJagTgTzZan2rvaDA4Q3V6XBn+2w7j3VbPRUehFuOPnLwRk/KJmcU 9Go4plxahbsg6HOVJe4kyiGhHCA5Q51ziR/48KW7KI/jK5v7jXKQOX+MHETCo5RvqKcv SbPA== X-Gm-Message-State: AOUpUlEjBO3ZG7+eHxvPIojW2PJN6z4g9N/058xv/L1PtvURTFw+VV1q c3v72ujNiqGJ0pcwyACMdjIxUCoucOg= X-Google-Smtp-Source: AAOMgpe2SZobJIed5qJq9rnXnRWXZbIXgqe+/lY6i4h9Nl0fVjjxLAbcEtYsSHHXs60/iVvrrxE9KA== X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr1722222plf.286.1533262966888; Thu, 02 Aug 2018 19:22:46 -0700 (PDT) Received: from garuda.local (c-24-18-253-84.hsd1.wa.comcast.net. [24.18.253.84]) by smtp.gmail.com with ESMTPSA id h7-v6sm7000108pfd.155.2018.08.02.19.22.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Aug 2018 19:22:45 -0700 (PDT) From: Chris Marusich To: Nils Gillmann Subject: Re: [bug#32346] [PATCH 0/6] TOR via Unix domain SOCKS socket References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802092753.nsiaxrvrjh3qbmov@abyayala> Date: Thu, 02 Aug 2018 19:22:44 -0700 In-Reply-To: <20180802092753.nsiaxrvrjh3qbmov@abyayala> (Nils Gillmann's message of "Thu, 2 Aug 2018 09:27:53 +0000") Message-ID: <87bmakxk7f.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Nils Gillmann writes: > Good Work! Thank you! I hope it proves useful. > Now for the hidden-services.. > Couldn't you achieve the effect you wanted without renaming > tor-hidden-services? Which patch are you referring to? I don't think I've renamed tor-hidden-services. =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAltjvHQACgkQ3UCaFdgi Rp091RAAw+WyP0nYbzHb98tREXTFqjjdE1esTQapsnv2Q961w2T7TqNvbhlbXCxV NUxQcn04CELsu0UxD76OXm3aD6uKwFNIW27H/gDbaKAbzAUwmlMmnodxNx2HvXX1 ovFrCHgX86reb4yl4/fO2ikbFaeAvYxxEfgPdwkgto32mYS1jM3fGt5sRB9gHVlk AajBEXI1J0AwMWVluEr84gpuvuZW/wNC0ZmkQ83ggntYDfRvmzRDWPDNPUfdX2+z 0O1LtxyTTlHLnt2igjkdGtqKfusRJzJtAhXHEXCSxI3LL6zlbMOEJ3Ib6wmBfhGJ JGKSSwmm+gn8CGoBSsX1f30+EOvXCDzFAQBEyz9NNYWAI7I1hIuHKYW+5yomgU1i MBf/Unt7vK50IfYdXV6ac7ndJGX687ah1zhrmc3ZOt7cP1wInRk+e6qiAe+rvEvM 2K+AE+DappTaxUDbJtQKZ/BGMe0VclW+h1Hah/yu0Sa3moOJvnffUnZliRlMfTQ/ oUH2jxvwpmHqmyEYEHjvZBgm6Saz8JU52oEUpbMEGTObD3+h3hZkSo4DOnvtQ/2F 5Lad6cECvuylX0XSQio+KSJ3WSXlCYXTNoteb0UgFZ0YAslUXgK3w6vTRTg7+eBM vzEsnjcdPwpSPf5SrCNoc4ebqM6Ot26eg+ngMXM3iJ02hIZsQWY= =u4sB -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 03 07:43:07 2018 Received: (at 32346) by debbugs.gnu.org; 3 Aug 2018 11:43:07 +0000 Received: from localhost ([127.0.0.1]:39576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flYU6-0000fX-OJ for submit@debbugs.gnu.org; Fri, 03 Aug 2018 07:43:07 -0400 Received: from static.195.114.201.195.clients.your-server.de ([195.201.114.195]:49990 helo=conspiracy.of.n0.is) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1flYU4-0000fN-Lq for 32346@debbugs.gnu.org; Fri, 03 Aug 2018 07:43:05 -0400 Received: by conspiracy.of.n0.is (OpenSMTPD) with ESMTPSA id 1d06bafb (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 3 Aug 2018 11:43:01 +0000 (UTC) Date: Fri, 3 Aug 2018 11:43:47 +0000 From: Nils Gillmann To: Chris Marusich Subject: Re: [bug#32346] [PATCH 0/6] TOR via Unix domain SOCKS socket Message-ID: <20180803114347.xwlqf6hhavun3bh5@abyayala> References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802092753.nsiaxrvrjh3qbmov@abyayala> <87bmakxk7f.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3vcexklmkzcf6c3s" Content-Disposition: inline In-Reply-To: <87bmakxk7f.fsf@gmail.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Nils Gillmann , 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --3vcexklmkzcf6c3s Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Chris Marusich transcribed 1.3K bytes: > Nils Gillmann writes: >=20 > > Good Work! >=20 > Thank you! I hope it proves useful. >=20 > > Now for the hidden-services.. > > Couldn't you achieve the effect you wanted without renaming > > tor-hidden-services? >=20 > Which patch are you referring to? I don't think I've renamed > tor-hidden-services. >=20 > --=20 > Chris Oh, I've read it again. My bad. Blame the heat :) --3vcexklmkzcf6c3s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAltkP/MACgkQ4i+bv+40 hYjTcw/9HXsJFLN5BxxCOHX3UkyVBhuN/g/glrT3uYa0BTaz/sO4XlnuA0edZdw+ S23/xnU4YyyUzy60jDNxMxxhPCZxdMYeu56i4eQ3LHec/zObxX9Y0RDyJ9s5BKJW KPsQtfVs819uW74HgMFseDHk3V6sRPWETOCLqGqJeUiexgK6jWfjAts+9hYf9bhw 7wfSJYiME975dCh/cEU/kncirpAtS+cX5F93TOwqq0O1gwjwHoEfIINcuVhAyJwz TDf+0QS6MZVlxRBHcndHEf42nRCmkHcLN4GcAxSRmlQhMtvqneWJNub9zF97ukJN Ph6wBLg9Zd1RneagxC4dfcF7x2/zHLaVkU9oY6iDYjzM5LC3WxebvKRczcpalHVZ YmBENri5RQLiqcWJa3dKPd+Af899Cs/5cNphhvGuSAyxuowHltN8Wx/IjMAEntne iV1OdKc4js4TgTSKdiE+KCk7/fc8AXZSYIn9WBXXPHd2ZuBY48dqBI3qwyRoLcQd I2qc4QDIqZlopHmtr0E6RzbxOr/Y4o1oE6QVc16vP6SmQb1Hnns52azpi4dbqXMv YrGmLVkYL4luFMYfKFHE6QBteKZXXdhDTXJW4DY2YU/lxUmzAyo89qEJrkQolzf/ S4bsc6CZFenWmHVx2ISN/QfZLFDlo1JaechrGg0cdLF3PVHDeAc= =efs7 -----END PGP SIGNATURE----- --3vcexklmkzcf6c3s-- From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 04 00:34:46 2018 Received: (at 32346) by debbugs.gnu.org; 4 Aug 2018 04:34:46 +0000 Received: from localhost ([127.0.0.1]:40368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1floH8-0008Kw-5u for submit@debbugs.gnu.org; Sat, 04 Aug 2018 00:34:46 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:42766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1floH6-0008Kj-AX for 32346@debbugs.gnu.org; Sat, 04 Aug 2018 00:34:44 -0400 Received: by mail-pg1-f193.google.com with SMTP id y4-v6so3744381pgp.9 for <32346@debbugs.gnu.org>; Fri, 03 Aug 2018 21:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=rOTsccGXzCBpr+cR56Qx6EIZX8MBPJOZc8a4wramibQ=; b=fU9dSXDSnZI6Sqeaas4o9prah7WVHEng8be1qbGFrS4I9ELtQf7QJ/DgRgsc2y6bN1 b2WmhmJchGbUU9UJv5C6prBJdzPvdEl//GAtMiKqoaSj0vB6Uj/VNS6Mp8MCL1cy1eRx r7abd4n0UYAhFDODyDkbT+aq0dlLo0HUky03lSA3qfJv5YJkeRjr/TE0vAn3SVVImw3E WI2uXgixx4OPAcyEFbBw1SsiVJpdelI7MNgpfKVs1622SmFpY1FftacBd459f75K+Pty 9Zwqc5qClqFXFHJFmwWgHfQgYIFEyTa5RwklSebPQSTqgYXziwcXYayjpc9TiZW1Ly1Y JwgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=rOTsccGXzCBpr+cR56Qx6EIZX8MBPJOZc8a4wramibQ=; b=byD78mTE8QKua6h72k2cA3PUG3CY7gyxPKc4UEDnat9srVze/TVmaEf5DnnZYREIqi YvUCnAcEgm7x1xDgtrX+2YcnztixB9WNP9rYvZgj1MEvRDkxBXOueldRD8zU5CmB+gWd yhtea8oTSHE9IZCJbIV3WEk8giKlQTFgVUYmKYA/DY+IuirKyhs3Qp38moNxPZOwt9jq Yr2ADm2i9W6bya7V0eGHMaJSCIf56NXTzj3CPYp2Fn3I1x/RquNig58VtMywxNw6nOqT ViuqnaRQYG8KT6dEH/FMKTxo48CYJ/UDhmZHmuVu8Q01L330/XrlDAwPO7TlvIOcYL9H AMcg== X-Gm-Message-State: AOUpUlFuGD/xeYeBOE2BOBagFTJITk6nFTd7WQwzCMcsZP02Ah/rzc+d EGtJ/us7tU+xetullow8EuE= X-Google-Smtp-Source: AAOMgpeVIEG06KdtIDmgFfFBYEoNd6om4nCYnwZzMsMbL4MhIDiEzXNmS4Jus686+xm+Tu4Kpk/Zqw== X-Received: by 2002:a62:cd3:: with SMTP id 80-v6mr7544989pfm.184.1533357278319; Fri, 03 Aug 2018 21:34:38 -0700 (PDT) Received: from garuda.local ([2601:602:9d02:4725:6495:ba21:1ebe:620a]) by smtp.gmail.com with ESMTPSA id h10-v6sm11980292pfj.78.2018.08.03.21.34.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 21:34:36 -0700 (PDT) From: Chris Marusich X-Google-Original-From: Chris Marusich To: Chris Marusich Subject: Re: [bug#32346] [PATCH 0/6] TOR via Unix domain SOCKS socket References: <20180802064520.20273-1-cmmarusich@gmail.com> Date: Fri, 03 Aug 2018 21:34:31 -0700 In-Reply-To: <20180802064520.20273-1-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:45:20 -0700") Message-ID: <87lg9magx4.fsf@garuda.local.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346 Cc: Christopher Lemmer Webber , 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Chris Marusich writes: > I'm currently reconfiguring my GuixSD system to confirm that it works > for real. [...] I'll also test hidden services. I finished reconfiguring my system. I can confirm that TOR works even with a UNIX domain socket, and hidden services work the same as before. =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAltlLNgACgkQ3UCaFdgi Rp0xpxAAwPMJBkybC3qRwYB4vMGVVXESpNSL3DdPUHOs193glZzPN++eGPoKwHFE vMMUjtMzGCKn6zVHmolLFADBkIDKM8uy9DEKiJ3N06U2eIS+y9mI1v8Soe4an61w 8xVFWt1Hw8z8WJ72AllcY6xT1hOyKDc9FToN1cDg9kYVwNnK51twXwEyIYlMxgPu 58+PGQ3gXD82GtiFECIc7C0moK3glwqphSncPfJQ13TAg8u6YV+D3mpXEabLsXYV eT1asSPvqwXz3QISWdk6R8lrNHwnQGOI5PaolUhsIl4JAdasBmh3jHF7J91DHNn6 /tc86BKwA8GLagK0Bnxnf1fpJ+TCww05+LY+A4YVz+655oGMGkgZGPIWhGWNB8xI by5K+20j7aa+LZ51DqfQUamU146YCnEat8+juwcIXQROxwOXn8o+k+CqH4D+CBgi FZTlIJsFg977/DpMM57y7D6ISKIWVhXOaIUZge1t6bWmi2SEo9ZCA6RdbijGb4Ya J+HNuMKiHgXCCf07RYSjg5dTKL955r2QRxysBBMUfxUzJZBGVkfPubBnSBIUJhpc s7nOtZX+Bo37clNtkb2uFWGE2/KwPOwtcMmhd598GOQXAL0RCemoC7F6pg1uWVN3 f1l8CnlT3Gq673jMmCaKX5aNjk6+m14MytYQPufLtEeekqWVqSk= =KKbm -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:02:59 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:02:59 +0000 Received: from localhost ([127.0.0.1]:55901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqOB-00020b-5D for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:02:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqO9-00020G-QP for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:02:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqO3-0002dG-M2 for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:02:52 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqO3-0002cZ-Ct; Mon, 20 Aug 2018 16:02:51 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51662 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqO2-0002ZY-Tu; Mon, 20 Aug 2018 16:02:51 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 1/6] services: tor: Add a system test. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:02:49 +0200 In-Reply-To: <20180802065159.20413-1-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:54 -0700") Message-ID: <874lfoerh2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Chris, Chris Marusich skribis: > * gnu/services/networking.scm (tor-configuration->torrc): Set PidFile to > /var/run/tor/tor.pid in the base torrc configuration. > (tor-shepherd-service) : Call make-forkexec-constructor/container = with > a new #:pid-file argument to tell Shepherd where to find the PID file. A= dd a > a new to its existing #:mappings argument to share > /var/run/tor with the the container. > (tor-hidden-services-activation): Update docstring. Create /var/run/tor = and > set its permissions so only the tor user can access it. > * gnu/tests/networking.scm (%test-tor, %tor-os): New variables. > (run-tor-test): New procedure. LGTM! Great work. > + ;; Allow TOR to write its PID file. Nitpick: I think the maintainers no longer consider the name an acronym and write it as =E2=80=9CTor=E2=80=9D, not =E2=80=9CTOR=E2=80=9D. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:03:29 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:03:29 +0000 Received: from localhost ([127.0.0.1]:55905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqOf-00021r-Fj for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:03:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqOc-00021Y-0d for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:03:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqOR-0002uq-Th for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:03:18 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqOK-0002rw-QQ; Mon, 20 Aug 2018 16:03:09 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51664 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqOK-0002bq-9e; Mon, 20 Aug 2018 16:03:08 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 2/6] services: tor: Rename activation procedure. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <20180802065159.20413-2-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:03:07 +0200 In-Reply-To: <20180802065159.20413-2-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:55 -0700") Message-ID: <87zhxgdcw4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Chris Marusich skribis: > * gnu/services/networking.scm: Rename the procedure > tor-hidden-service-activation to tor-activation. OK! From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:04:10 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:04:10 +0000 Received: from localhost ([127.0.0.1]:55909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqPJ-00023I-PW for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:04:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqPF-00022e-Ll for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqPA-0003NG-05 for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:04:00 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqP9-0003My-Qf; Mon, 20 Aug 2018 16:03:59 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51666 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqP9-0002gs-Iz; Mon, 20 Aug 2018 16:03:59 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 3/6] marionette: Add support for QEMU's "quit" command. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <20180802065159.20413-3-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:03:58 +0200 In-Reply-To: <20180802065159.20413-3-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:56 -0700") Message-ID: <87va84dcup.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Chris Marusich skribis: > * gnu/build/marionette.scm (marionette-control): Don't wait for the > monitor prompt when the command was "quit". LGTM! From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:06:02 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:06:02 +0000 Received: from localhost ([127.0.0.1]:55917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqR6-00026e-Au for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:06:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqR4-00026S-Ja for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqQx-0004dw-S5 for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:05:53 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqQv-0004cU-4I; Mon, 20 Aug 2018 16:05:49 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51668 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqQu-0002rs-Ry; Mon, 20 Aug 2018 16:05:49 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 4/6] marionette: Add wait-for-unix-socket. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <20180802065159.20413-4-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:05:47 +0200 In-Reply-To: <20180802065159.20413-4-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:57 -0700") Message-ID: <87lg90dcro.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Chris Marusich skribis: > * gnu/build/marionette.scm (wait-for-unix-socket): New variable. [...] > +(define* (wait-for-unix-socket path marionette Super nitpick: s/path/file/ or s/path/file-name/, as per GNU convention (where =E2=80=9Cpath=E2=80=9D means =E2=80=9Csearch path=E2=80= =9D.) Otherwise LGTM! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:06:59 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:06:59 +0000 Received: from localhost ([127.0.0.1]:55920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqS3-00028I-AV for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:06:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqS2-000283-28 for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:06:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqRt-0005C6-8u for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:06:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqRr-0005BH-6M; Mon, 20 Aug 2018 16:06:47 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51670 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqRq-0002vJ-V4; Mon, 20 Aug 2018 16:06:47 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 5/6] tests: tor: Add more test cases. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <20180802065159.20413-5-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:06:45 +0200 In-Reply-To: <20180802065159.20413-5-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:58 -0700") Message-ID: <87h8jodcq2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Chris Marusich skribis: > * gnu/tests/networking.scm (%tor-os/unix-socks-socket): New variable. > (run-tor-test) > : New variables. > <"tor is alive">: Move common code from this test case... > : ...into this new procedure. > <"tor is listening", "tor is alive, even when using a SOCKS socket"> > <"tor is listening, even when using a SOCKS socket">: New test cases. Excellent, LGTM! From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 16:09:42 2018 Received: (at 32346) by debbugs.gnu.org; 20 Aug 2018 20:09:42 +0000 Received: from localhost ([127.0.0.1]:55925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqUf-0002Cq-Of for submit@debbugs.gnu.org; Mon, 20 Aug 2018 16:09:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1frqUe-0002Cd-2u for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:09:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqUT-000710-AG for 32346@debbugs.gnu.org; Mon, 20 Aug 2018 16:09:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqUS-00070b-Ez; Mon, 20 Aug 2018 16:09:29 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51672 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1frqUS-00038Q-7E; Mon, 20 Aug 2018 16:09:28 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Chris Marusich Subject: Re: [bug#32346] [PATCH 6/6] services: tor: Make it easier to use UNIX sockets. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <20180802065159.20413-6-cmmarusich@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 20 Aug 2018 22:09:27 +0200 In-Reply-To: <20180802065159.20413-6-cmmarusich@gmail.com> (Chris Marusich's message of "Wed, 1 Aug 2018 23:51:59 -0700") Message-ID: <87bm9wdclk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32346 Cc: 32346@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Chris Marusich skribis: > * doc/guix.texi (Networking Services): Document it, and mention that > tor-service is deprecated. > * gnu/services/networking.scm () : > New field. > (tor-configuration->torrc): When socks-socket-type is 'unix, set > SocksPort to UNIX domain socket /var/run/tor/socks-sock and set > UnixSocksGroupWritable to 1. > * gnu/tests/networking.scm (%tor-os/unix-socks-socket): Instead of using > a custom config file, just set socks-socket-type to 'unix. [...] > +This is the type for a service that runs the @uref{https://torproject.or= g, > +Tor} anonymous networking daemon. The service is configured using a > +@code{} record. By default, the TOR daemon runs as t= he Please s/TOR/Tor/ in this file. > +@deftp {Data Type} tor-configuration > +@table @asis > +@item @code{tor} (default: @code{tor}) > +The package that provides the TOR daemon. This package is expected to p= rovide > +the daemon at @file{bin/tor} relative to its output directory. The defa= ult > +package is the @uref{https://www.torproject.org, TOR Project's} > +implementation. > +@item @code{config-file} (default: @code{(plain-file "empty" "")}) You could skip a line between between each @item for clarity. Otherwise LGTM. Thank you for this nice patch series! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 28 03:46:25 2018 Received: (at 32346-done) by debbugs.gnu.org; 28 Aug 2018 07:46:25 +0000 Received: from localhost ([127.0.0.1]:34789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuYhl-000611-IP for submit@debbugs.gnu.org; Tue, 28 Aug 2018 03:46:25 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:46050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuYhj-00060n-76 for 32346-done@debbugs.gnu.org; Tue, 28 Aug 2018 03:46:23 -0400 Received: by mail-pf1-f181.google.com with SMTP id i26-v6so322653pfo.12 for <32346-done@debbugs.gnu.org>; Tue, 28 Aug 2018 00:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=SW9bHMTdw5rjdpsANb5JKnqei1KIOZbkA7b5AgJXaN8=; b=ffmqU9AEBzN7zLiHludFXo5wpRoLTeXSqLYwqCdkAsSFQiXsUGpyFp3RLhAaUBHW4/ pqWj/9VrAYot/qQaAaqbdSeV4uf8FMNczJtHA3ujbzCXHSOQNFWlx2IKfkTGdFbFwLFd 37+3efaqnP4r042zoz5LkcZ7pKEXTaeLGDBnXWRT9rFDXgm184tYM/wqt4Hg8x4jLz0y c6iX5ib3IBFbIRESTbzlZArH6C9ncrsifzdy6WWlm3rIecfgXz2yTJC7ds5CFACuNc9S ONtsjWmnwYR7Zll/yJ1zTKphqEGGYPbVgb2ccnNI0Hbi/kcC/seo0JA4p2YqNJnYDS0L nFKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=SW9bHMTdw5rjdpsANb5JKnqei1KIOZbkA7b5AgJXaN8=; b=Rj6tVUg2Cny5m7cdc/I4ob6WgQ0HBkAyz0E8B6SzVbbelkjz8upFgYu/mwD4+X1P1R WvzzYeMeN57es+8ASNjNiek49P5765pflaDM6dvA9d9p9/9eSb0Y7hKQFj1FpMkf2y4M xbhAgMzJn9IG7nQiv66YZBWnJM006WACGdTDof8T0SsGUnC5cgXElcKqoooAkfxP0ho6 At7RrkV5s85gxjkOeN76WOSbDRi7l4AK9QeaaJS2R3Qc1u6Un/TuHAdrMbVJhkArWtsG ofZNQQOU0wJp7YqnTahyQ4TyG5alxkPSpb3kgEyNcOKB0AHr06CwF9WuuNknkKVc6DqD wlGg== X-Gm-Message-State: APzg51AADEGvfUPPnqFbb+7ImIkLnvMQZtfvcX+x/QDga874HR7cXDhq e8OFd8dv4GDqqQztNdfNNXffuObq X-Google-Smtp-Source: ANB0VdY4iEz1abrGgATaoLAfd2PhJilEanW/TzjnaV4onAKbGZuTL91+4J6pxaFlW60PzdDIi5CgQg== X-Received: by 2002:a62:9683:: with SMTP id s3-v6mr316499pfk.191.1535442376893; Tue, 28 Aug 2018 00:46:16 -0700 (PDT) Received: from garuda.local ([2601:602:9d02:4725:6495:ba21:1ebe:620a]) by smtp.gmail.com with ESMTPSA id 16-v6sm766772pfo.164.2018.08.28.00.46.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Aug 2018 00:46:15 -0700 (PDT) From: Chris Marusich To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#32346] [PATCH 1/6] services: tor: Add a system test. References: <20180802064520.20273-1-cmmarusich@gmail.com> <20180802065159.20413-1-cmmarusich@gmail.com> <874lfoerh2.fsf@gnu.org> Date: Tue, 28 Aug 2018 00:46:05 -0700 In-Reply-To: <874lfoerh2.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 20 Aug 2018 22:02:49 +0200") Message-ID: <87sh2zaq82.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32346-done Cc: 32346-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, I've incorporated your feedback and committed this patch series as 3bcb305b98e02f6c9d98e7325813fc00f18f0e6c. Details follow. ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Chris Marusich skribis: > > > [...] > >> + ;; Allow TOR to write its PID file. > > Nitpick: I think the maintainers no longer consider the name an acronym > and write it as =E2=80=9CTor=E2=80=9D, not =E2=80=9CTOR=E2=80=9D. This is good to know. In each patch that uses the incorrect name "TOR", I've changed it to use the correct name "Tor". >> +(define* (wait-for-unix-socket path marionette > > Super nitpick: s/path/file/ or s/path/file-name/, as per GNU > convention (where =E2=80=9Cpath=E2=80=9D means =E2=80=9Csearch path=E2=80= =9D.) I've updated this to follow the convention. >> +@deftp {Data Type} tor-configuration >> +@table @asis >> +@item @code{tor} (default: @code{tor}) >> +The package that provides the TOR daemon. This package is expected >> to provide >> +the daemon at @file{bin/tor} relative to its output directory. The def= ault >> +package is the @uref{https://www.torproject.org, TOR Project's} >> +implementation. >> +@item @code{config-file} (default: @code{(plain-file "empty" "")}) > > You could skip a line between between each @item for clarity. Good idea. I've done this, too. > Thank you for this nice patch series! Thank you for the thoughtful review! I appreciate your attention to detail. If you hadn't told me, I wouldn't have known about some of these things, such as the GNU convention to use "file" or "file-name" instead of "path" when speaking about UNIX domain sockets. I'll remember these things going forward. And with that, I will now close this patch! =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAluE/b4ACgkQ3UCaFdgi Rp0myA/7BgAGGSU8jZJnOzkoF+lzAXE4fjSZNZPQDRLCZzxO8bPaaNU/ZVsyczs/ 3CCkmJZhTLWqd9N72KaXLMTbdK9couxT+1vdcPMLLgNnWlz7S/f83YGZsuEjG9Do /ePxEXN5Nh3qZcPhmOm2o6X7xsbo5gyPKmQMW+atOCiAHkMl2kTEOEUfGJ0ZZzOf q9J0I7Dnbbkv/y285r1eU1VIplTruMsp+KmpreM6cRgbItc+yDR1QXoQwrlG3Arp AhTXL/HC7RTvyDrJSOYOdwjb2VJFqjpXLgWjjFSSONxqmqQMK7O0qBTIhqIZ9Gw2 oYNPbXNXWavFCJma24bc0rRBYw24EYxmbHdvGqu69/uo1JrZsFdbN1zxgdlYR/hm ++VjeabNZDaJS7/ZlNA4sc6wZqJz9fR0EPHxGJ4f22Qag0TlCZfCZ2gzTtZJYRD6 Q1OCGLz7J64H0z9/c7zuYOo7Tu4cGfCDTJq6qt9lkk0Qjlk6wWwZ38R4S3VoQdZH uqmMnEEiObv/MvLXSnRkYBGyvwZx0bdqY67ADskySLJaalBhJ2m625Z0jmBtbJ8N 6d27gROWPpdyD+Xg2mokbWq8zb/Geu3cVJntt1MKX8eqSBPtEciugpxAmsJegWM0 bcQPQ+VN1PAyF0v8wCbZR6TC+kAONEYZktv1d+XkzZ3hNHbQbwg= =CoK0 -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 13 11:08:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 25 Sep 2018 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator