aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-11-23 23:18:23 +0100
committerGitHub <noreply@github.com>2020-11-23 23:18:23 +0100
commitbbf3c9483b84367a37f729ed86490d32990c905b (patch)
treed652a95606c32b072d1eb4d7b55078584a3edab0
parent5ba79b8cf4922e983db7b0bdeb372c76f62d6dcc (diff)
parent0aa34a03d000515370086d81686f4110a894751d (diff)
Merge pull request #104520 from Izorkin/wsdd
wsdd: init at 0.6.2
-rw-r--r--nixos/doc/manual/release-notes/rl-2103.xml5
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/network-filesystems/samba-wsdd.nix124
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/samba-wsdd.nix44
-rw-r--r--pkgs/servers/wsdd/default.nix34
-rw-r--r--pkgs/top-level/all-packages.nix2
7 files changed, 211 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 5bdc44365ed5..fda0f8ea074d 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -56,6 +56,11 @@
section of the NixOS manual</link> for more information.
</para>
</listitem>
+ <listitem>
+ <para>
+ <xref linkend="opt-services.samba-wsdd.enable" /> Web Services Dynamic Discovery host daemon
+ </para>
+ </listitem>
</itemizedlist>
</section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0a38fa317305..214d9356aa6a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -583,6 +583,7 @@
./services/network-filesystems/orangefs/client.nix
./services/network-filesystems/rsyncd.nix
./services/network-filesystems/samba.nix
+ ./services/network-filesystems/samba-wsdd.nix
./services/network-filesystems/tahoe.nix
./services/network-filesystems/diod.nix
./services/network-filesystems/u9fs.nix
diff --git a/nixos/modules/services/network-filesystems/samba-wsdd.nix b/nixos/modules/services/network-filesystems/samba-wsdd.nix
new file mode 100644
index 000000000000..004d07064afd
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/samba-wsdd.nix
@@ -0,0 +1,124 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.samba-wsdd;
+
+in {
+ options = {
+ services.samba-wsdd = {
+ enable = mkEnableOption ''
+ Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
+ to be found by Web Service Discovery Clients like Windows.
+ <note>
+ <para>If you use the firewall consider adding the following:</para>
+ <programlisting>
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+ </programlisting>
+ </note>
+ '';
+ interface = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "eth0";
+ description = "Interface or address to use.";
+ };
+ hoplimit = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 2;
+ description = "Hop limit for multicast packets (default = 1).";
+ };
+ workgroup = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "HOME";
+ description = "Set workgroup name (default WORKGROUP).";
+ };
+ hostname = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "FILESERVER";
+ description = "Override (NetBIOS) hostname to be used (default hostname).";
+ };
+ domain = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Set domain name (disables workgroup).";
+ };
+ discovery = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable discovery operation mode.";
+ };
+ listen = mkOption {
+ type = types.str;
+ default = "/run/wsdd/wsdd.sock";
+ description = "Listen on path or localhost port in discovery mode.";
+ };
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ "--shortlog" ];
+ example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ];
+ description = "Additional wsdd options.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.wsdd ];
+
+ systemd.services.samba-wsdd = {
+ description = "Web Services Dynamic Discovery host daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ Type = "simple";
+ ExecStart = ''
+ ${pkgs.wsdd}/bin/wsdd ${optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \
+ ${optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \
+ ${optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \
+ ${optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \
+ ${optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \
+ ${optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \
+ ${escapeShellArgs cfg.extraOptions}
+ '';
+ # Runtime directory and mode
+ RuntimeDirectory = "wsdd";
+ RuntimeDirectoryMode = "0750";
+ # Access write directories
+ UMask = "0027";
+ # Capabilities
+ CapabilityBoundingSet = "";
+ # Security
+ NoNewPrivileges = true;
+ # Sandboxing
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateUsers = false;
+ ProtectHostname = true;
+ ProtectClock = true;
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectKernelLogs = true;
+ ProtectControlGroups = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ # System Call Filtering
+ SystemCallArchitectures = "native";
+ SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap";
+ };
+ };
+ };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3c10d6215186..899509696e3c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -315,6 +315,7 @@ in
runInMachine = handleTest ./run-in-machine.nix {};
rxe = handleTest ./rxe.nix {};
samba = handleTest ./samba.nix {};
+ samba-wsdd = handleTest ./samba-wsdd.nix {};
sanoid = handleTest ./sanoid.nix {};
sbt = handleTest ./sbt.nix {};
sbt-extras = handleTest ./sbt-extras.nix {};
diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix
new file mode 100644
index 000000000000..1edef6c0056d
--- /dev/null
+++ b/nixos/tests/samba-wsdd.nix
@@ -0,0 +1,44 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+ name = "samba-wsdd";
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
+
+ nodes = {
+ client_wsdd = { pkgs, ... }: {
+ services.samba-wsdd = {
+ enable = true;
+ interface = "eth1";
+ workgroup = "WORKGROUP";
+ hostname = "CLIENT-WSDD";
+ discovery = true;
+ extraOptions = [ "--no-host" ];
+ };
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+ };
+
+ server_wsdd = { ... }: {
+ services.samba-wsdd = {
+ enable = true;
+ interface = "eth1";
+ workgroup = "WORKGROUP";
+ hostname = "SERVER-WSDD";
+ };
+ networking.firewall.allowedTCPPorts = [ 5357 ];
+ networking.firewall.allowedUDPPorts = [ 3702 ];
+ };
+ };
+
+ testScript = ''
+ client_wsdd.start()
+ client_wsdd.wait_for_unit("samba-wsdd")
+
+ server_wsdd.start()
+ server_wsdd.wait_for_unit("samba-wsdd")
+
+ client_wsdd.wait_until_succeeds(
+ "echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
+ )
+ '';
+})
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
new file mode 100644
index 000000000000..1411b6f3adcf
--- /dev/null
+++ b/pkgs/servers/wsdd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
+
+stdenv.mkDerivation rec {
+ pname = "wsdd";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "christgau";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ install -Dm0755 src/wsdd.py $out/bin/wsdd
+ wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
+ '';
+
+ passthru = {
+ tests.samba-wsdd = nixosTests.samba-wsdd;
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/christgau/wsdd";
+ description = "A Web Service Discovery (WSD) host daemon for SMB/Samba";
+ maintainers = with maintainers; [ izorkin ];
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b29a33e476..92e68417e479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17624,6 +17624,8 @@ in
webmetro = callPackage ../servers/webmetro { };
+ wsdd = callPackage ../servers/wsdd { };
+
webhook = callPackage ../servers/http/webhook { };
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";