Here is an attempted merger of patch 1 and 2. I hope that it applies
cleanly to master, but if it does not, please let me know!
* gnu/services/ssh.scm: Add endlessh service
endlessh-configuration>): New record type.
(endlessh-config->conf, endlessh-shepherd-service, endlessh-service-type): New procedures.
* doc/guix.texi: added documnetation for the endlessh service.
doc/guix.texi | 60 ++++++++++++++++++++++++++++++++++++
gnu/services/ssh.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 133 insertions(+)
Toggle diff (164 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 99f8ba6c54..9a1e2801dd 100644
@@ -20393,6 +20393,66 @@ may cause undefined behaviour.
+@deffn {Scheme Variable} endlessh-service-type+This is the type for the @uref{https://github.com/skeeto/endlessh,+Endlessh} service, which is an ssh tarbit. It delays ssh clients for
+days at a time by @emph{very slowly} sending a random and endless SSH+banner. The smart hacker will run endlessh on port 22, and let crackers
+get stuck in this tarpit. This lets your real ssh server run more
+securely on a non-standard port.
+(service endlessh-service-type
+ (endlessh-configuration
+@deftp {Data Type} endlessh-configuration+Data type representing the configuration for @code{endlessh-service}.+@item @code{package} (default: @var{endlessh})+@code{endlessh} package to use.+@item @code{bind-family} (default: @code{'(ipv4 ipv6)})+This specifies if endlessh should use ipv4 and/or ipv6.
+@item @code{delay} (default: @code{10000})+The endless banner is sent one line at a time. This is the delay
+in milliseconds between individual lines.
+@item @code{length} (default: @code{32})+The length of each line is randomized. This controls the maximum length
+of each line. Shorter lines may keep clients on for longer if they give
+up after a certain number of bytes.
+@item @code{max-clients} (default: @code{4096})+Maximum number of connections to accept at a time. Connections beyond
+this are not immediately rejected, but will wait in the queue.
+@item @code{port-number} (default: @code{2222})+The port on which to listen for new SSH connections. Most users who
+want to use endlessh as intended should set this port number to
+@item @code{log-level} (default: @code{0})+Set the detail level for the log.
+@item 1 = Standard, useful log messages
+@item 2 = Very noisy debugging information
+@item @code{syslog} (default: @code{#f})+Print diagnostics to syslog instead of standard output
@deffn {Scheme Variable} webssh-service-type This is the type for the @uref{https://webssh.huashengdun.org/, WebSSH}diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 72e7183590..2e547b63cd 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -58,6 +58,10 @@ (define-module (gnu services ssh)
+ endlessh-configuration?
@@ -802,6 +806,75 @@ (define autossh-service-type
autossh-service-activation)))
(default-value (autossh-configuration))))
+(define-record-type* <endlessh-configuration>
+ endlessh-configuration make-endlessh-configuration
+ endlessh-configuration?
+ ;; list of two symbols, allowed values are ipv4, ipv6 or both
+ (bind-family endlessh-configuration-bind-family (default '(ipv4 ipv6)))
+ (delay endlessh-configuration-delay (default 10000))
+ ;; Must be in the range
+ (length endlessh-configuration-length (default 32))
+ (max-clients endlessh-configuration-max-clients (default 4096))
+ (port-number endlessh-configuration-port-number (default 2222))
+ ;; Allowed values are 0, 1 and 2
+ (log-level endlessh-configuration-log-level (default 0)))
+(define (endlessh-config->conf config)
+ "Convert the CONFIG of type <endlessh-config> to a config file."
+ (let* ((family (endlessh-configuration-bind-family config))
+ (ipv4 (member 'ipv4 family))
+ (ipv6 (member 'ipv6 family))
+ (port (endlessh-configuration-port-number config))
+ (delay (endlessh-configuration-delay config))
+ (length (endlessh-configuration-length config))
+ (log-level (endlessh-configuration-log-level config))
+ (max-clients (endlessh-configuration-max-clients config))
+ ;; check if both are true (0), or only one of them is present
+ (if (not (and (equal? ipv4 ipv6) ipv4))
+ "bind-family must contain at least one value")))
+ (mixed-text-file "endlessh.conf"
+ "# Generated by 'endlessh-config'.\n\n"
+ "Port " (number->string port) "\n"
+ "Delay " (number->string delay) "\n"
+ "MaxLineLength " (number->string length) "\n"
+ "MaxClients " (number->string max-clients) "\n"
+ "LogLevel " (number->string log-level) "\n"
+ "BindFamily " (number->string bind) "\n")))
+(define (endlessh-shepherd-service config)
+ (documentation "Run endlessh tarpit server.")
+ (provision '(endlessh))
+ (start #~(make-forkexec-constructor
+ (list #$(file-append endlessh "/bin/endlessh")
+ "-f" #$(endlessh-config->conf config))))
+ (stop #~(make-kill-destructor))))
+(define endlessh-service-type
+ (description "Run endlessh tarpit server.")
+ (list (service-extension shepherd-root-service-type
+ (compose list endlessh-shepherd-service))))
+ (default-value (endlessh-configuration))))