Add configurable extra forwardings to stealth proxy in whispers ssh.HEADtrunk

M  whispers/packages/doc.scm
   Update ssh-tunneler-doc package to latest commit;
   Update whispers-doc package to latest commit
M  whispers/services/ssh-tunneler.scm
   In record type socks-proxy-configuration;
   Improve comments to the dynamic-forward member.
M  whispers/services/whispers/ssh.scm
   In record type whispers-forwarding;
   Add member stealth-extra-forwards;
   Use it to extend extra forwardings to proxy server sshd

3 files changed, 14 insertions, 7 deletions

diff --git a/whispers/packages/doc.scm b/whispers/packages/doc.scm
index cffd53f..d4d1043 100644
--- a/whispers/packages/doc.scm
+++ b/whispers/packages/doc.scm
@@ -43,9 +43,9 @@
      (method git-fetch)
      (uri (git-reference
            (url "https://git.whispers-vpn.org/ssh-tunneler-doc.git")
-           (commit "0b1d8a50339adb15c5915cec5e01102684cd571c")))
+           (commit "b5129af0b47fc113c32d1f984ce109e21377c62c")))
      (sha256
-      (base32 "1vv1bwz99aafmwb8vhkh3rxqncyskk715hm1irya8dpvfkk0c5r3"))))
+      (base32 "1fg2fs2gfii8m7q9vbvww8llsrmgzx0nljsjlbhnrz1d15kcsjnr"))))
    (native-inputs (list autoconf automake pkg-config texinfo))
    (inputs (list))
    (arguments (list #:tests? #f))
@@ -65,9 +65,9 @@ package provides an info manual.")
      (method git-fetch)
      (uri (git-reference
            (url "https://git.whispers-vpn.org/whispers-doc.git")
-           (commit "f185a299a61a5d88c48869a6801545ed59fef59a")))
+           (commit "458e68faab7cf84621ccdd197b1c344eb303bb9c")))
      (sha256
-      (base32 "1ysxrrddrbvvg8sarwj2ic0a5mgbks923vjf0jhppbmgh91lf2p4"))))
+      (base32 "0qw95hqjbpl5ndw3z4lpqyb55rfkpf91w1hxm5lff2vgcsqr9pyq"))))
    (native-inputs (list autoconf automake pkg-config texinfo))
    (inputs (list))
    (propagated-inputs (list ssh-tunneler-doc))
diff --git a/whispers/services/ssh-tunneler.scm b/whispers/services/ssh-tunneler.scm
index 7559336..505273e 100644
--- a/whispers/services/ssh-tunneler.scm
+++ b/whispers/services/ssh-tunneler.scm
@@ -294,7 +294,8 @@
                         (thunked))
   ;; #f, or a guix record returned by a call to
   ;; (ssh-connection-configuration
-  ;;  (forwards (list (dynamic-forward-configuration ...)))
+  ;;  (forwards (list (dynamic-forward-configuration ...)
+  ;;                  ...))
   ;;  ...)
   (dynamic-forward      socks-proxy-configuration-dynamic-forward
                         (default #f)))
diff --git a/whispers/services/whispers/ssh.scm b/whispers/services/whispers/ssh.scm
index 8cf73ff..56d12e0 100644
--- a/whispers/services/whispers/ssh.scm
+++ b/whispers/services/whispers/ssh.scm
@@ -182,6 +182,9 @@
   ;; An integer.
   (stealth-proxy-port     whispers-forwarding-stealth-proxy-port
                           (default 8585))
+  ;; A list of records of type <ssh-forward-configuration>
+  (stealth-extra-forwards whispers-forwarding-stealth-extra-forwards
+                          (default '()))
   ;; A boolean value.
   (%auto-start?           whispers-forwarding-auto-start?
                           (default #t)))
@@ -330,6 +333,8 @@ defined by FORWARDING, a record of the <whispers-forwarding> type."
          (stealth-timeout (whispers-forwarding-stealth-timeout forwarding))
          (stealth-proxy-port (whispers-forwarding-stealth-proxy-port
                               forwarding))
+         (stealth-extra-forwards (whispers-forwarding-stealth-extra-forwards
+                                  forwarding))
          (stealth-strict (whispers-forwarding-stealth-strict-check
                           forwarding))
          (stealth-kh-files (whispers-forwarding-stealth-known-hosts-files
@@ -396,8 +401,9 @@ defined by FORWARDING, a record of the <whispers-forwarding> type."
               (log-folder-override (log-folder-forwarding user (cadr conn)))
               (sshd-user stealth-sshd-user)
               (forwards
-               (list (dynamic-forward-configuration
-                      (entry-port stealth-proxy-port))))
+               (cons (dynamic-forward-configuration (entry-port
+                                                     stealth-proxy-port))
+                     stealth-extra-forwards))
               (sshd-host stealth-host)
               (sshd-port stealth-port)
               (strict-check stealth-strict)