wsdd: init at 0.6.2 #104520

Izorkin · 2020-11-21T19:39:24Z

Motivation for this change

Add wsdd package. This package implements a Web Service Discovery host daemon. This enables (Samba) hosts, like your local NAS device, to be found by Web Service Discovery Clients like Windows.

Things done

pkgs/servers/wsdd/default.nix

Izorkin · 2020-11-22T12:46:17Z

cc @flokli @aanderse @Mic92

flokli · 2020-11-22T13:32:41Z

Can this be made to run with DynamicUser?

Izorkin · 2020-11-22T14:20:05Z

With DynamicUser = true; worked, updated.

flokli · 2020-11-22T18:43:55Z

How does this relate so samba's wins?

Can this trivially be included in nixos/tests/samba.nix, and is there a client implementation, so this can be tested?

Izorkin · 2020-11-22T19:18:57Z

Used this information - https://linux-blog.anracom.com/2020/05/24/samba-4-shares-wsdd-and-windows-10-how-to-list-linux-samba-servers-in-the-win-10-explorer/
I running wsl on my home server - samba server is displayed in in the Explorer. With runnig wins server - in the Explorer not displayed.

flokli · 2020-11-22T20:46:35Z

Look at https://www.mankier.com/1/wsdd#Options-Client/Discovery_Mode_Options - we should enable wssd server on the samba server, and check with wssd's discovery mode on the client VM that the server can be seen.

Izorkin · 2020-11-22T21:09:32Z

Working without discovery - https://www.mankier.com/1/wsdd#Example_Usage-Set_the_Workgroup_according_to_smb.conf,_be_verbose,_run_with_dropped_privileges,_and_change_the_root_directory_to_an_(empty)_directory

Options --discovery need to search others WSD hosts/servers.

Izorkin · 2020-11-22T21:12:57Z

Example configuration:

  services.samba-wsdd = {
    enable = true;
    interface = "eno1";
    workgroup = "WORKGROUP";
    hostname = "FILESERVER";
    extraOptions = [ "--verbose" "--ipv4only" ];
  };

  services.samba = {
    enable = true;
    enableNmbd = true;
    enableWinbindd = false;
    nsswins = false;
    package = pkgs.samba4Minimal;
    securityType = "user";
    extraConfig = ''
      workgroup = WORKGROUP
      netbios name = FILESERVER
...

Izorkin · 2020-11-22T21:15:02Z

https://devanswers.co/discover-ubuntu-machines-samba-shares-windows-10-network/ - simpe WSDD configuration

flokli · 2020-11-22T23:41:14Z

Sorry, not sure I understand.

Please extend nixos/tests/samba.nix with a wssd configuration, so there's a working example in nixpkgs, that can be tested in an automated fashion.

Above example does not work, and pkgs.samba4Minimal doesn't even exist in nixpkgs, nor is there any described way on how to verify this, without booting a Windows machine and checking there.

I tried extending the test, by adding a second server with wsdd running, and using wsdd --discovery on the client, hoping I could see the server, but it didn't work, even when disabling the firewall.

Maybe you can pick up from here, here's my diff:

diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index 142269752b3..6aa43bc7a3f 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -5,34 +5,52 @@ import ./make-test-python.nix ({ pkgs, ... }:
 
   meta.maintainers = [ pkgs.lib.maintainers.eelco ];
 
-  nodes =
-    { client =
-        { pkgs, ... }:
-        { fileSystems = pkgs.lib.mkVMOverride
-            { "/public" = {
-                fsType = "cifs";
-                device = "//server/public";
-                options = [ "guest" ];
-              };
-            };
+  nodes = {
+    client = { pkgs, ... }: {
+      fileSystems = pkgs.lib.mkVMOverride {
+        "/public" = {
+          fsType = "cifs";
+          device = "//server/public";
+          options = [ "guest" ];
         };
+      };
+      networking.firewall.allowedTCPPorts = [ 5357 ];
+      networking.firewall.allowedUDPPorts = [ 3702 ];
+      networking.firewall.enable = false;
+    };
 
-      server =
-        { ... }:
-        { services.samba.enable = true;
-          services.samba.shares.public =
-            { path = "/public";
-              "read only" = true;
-              browseable = "yes";
-              "guest ok" = "yes";
-              comment = "Public samba share.";
-            };
-          networking.firewall.allowedTCPPorts = [ 139 445 ];
-          networking.firewall.allowedUDPPorts = [ 137 138 ];
-        };
+    server = { ... }: {
+      services.samba.enable = true;
+      services.samba.shares.public = {
+        path = "/public";
+        "read only" = true;
+        browseable = "yes";
+        "guest ok" = "yes";
+        comment = "Public samba share.";
+      };
+      networking.firewall.allowedTCPPorts = [ 139 445 ];
+      networking.firewall.allowedUDPPorts = [ 137 138 ];
     };
 
-  # client# [    4.542997] mount[777]: sh: systemd-ask-password: command not found
+    server_wsdd = { ... }: {
+      services.samba = {
+        enable = true;
+        enableNmbd = true;
+        enableWinbindd = false;
+        nsswins = false;
+      };
+      services.samba-wsdd = {
+        enable = true;
+        interface = "eth0";
+        workgroup = "WORKGROUP";
+        hostname = "SERVER-WSDD";
+        extraOptions = [ "--verbose" ];
+      };
+      networking.firewall.allowedTCPPorts = [ 139 445 5357 ];
+      networking.firewall.allowedUDPPorts = [ 137 138 3702 ];
+      networking.firewall.enable = false;
+    };
+  };
 
   testScript =
     ''
@@ -43,5 +61,16 @@ import ./make-test-python.nix ({ pkgs, ... }:
       client.start()
       client.wait_for_unit("remote-fs.target")
       client.succeed("[[ $(cat /public/foo) = bar ]]")
+
+      server_wsdd.start()
+      server_wsdd.wait_for_unit("samba-wsdd")
+
+      client.succeed(
+          "systemd-run -u wsdd-discovery -- ${pkgs.wsdd}/bin/wsdd --verbose --discovery --preserve-case -l /run/wsdd.sock >&2"
+      )
+
+      client.wait_until_succeeds(
+          "echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd.sock | grep -i SERVER-WSDD"
+      )
     '';
 })

Izorkin · 2020-11-23T07:31:55Z

Working if runnig in test VM
wsdd --interface eth0 --verbose --discovery

2020-11-23 10:12:38,157:wsdd INFO(pid 2046): using pre-defined UUID fd3a88ed-...-...
2020-11-23 10:12:38,157:wsdd WARNING(pid 2046): Discovery enabled but no listen option provided. Falling back to port 5359
2020-11-23 10:12:38,159:wsdd INFO(pid 2046): joined multicast group ('239.255.255.250', 3702) on 192. ... .221%eth0
2020-11-23 10:12:40,248:wsdd INFO(pid 2046): joined multicast group ('ff02::c', 3702, 22364, 2) on fe80::...:d2d5%eth0
2020-11-23 10:12:43,254:wsdd INFO(pid 2046): 192. ... .221:44651(eth0) - - "ProbeMatches urn:uuid:45e06928-...-... UDP" - -
2020-11-23 10:12:43,255:wsdd INFO(pid 2046): 192. ... .221:44651(eth0) - - "ResolveMatches urn:uuid:47aae12f-...-... UDP" - -
2020-11-23 10:12:43,261:wsdd INFO(pid 2046): discovered TECH in Workgroup:WORKGROUP on 192. ... .221%eth0

With nixos/tests i can't do the test.

Izorkin · 2020-11-23T10:26:49Z

Updatet PR and added test WSD Discovery.

Izorkin · 2020-11-23T12:02:37Z

@GrahamcOfBorg test samba

nixos/tests/samba.nix

pkgs/servers/wsdd/default.nix

Izorkin · 2020-11-23T14:15:10Z

@flokli updated PR.

Izorkin · 2020-11-23T16:35:35Z

@GrahamcOfBorg test samba-wsdd

Mic92

Untested, but LGTM.

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 21, 2020

SuperSandro2000 reviewed Nov 21, 2020

View reviewed changes

pkgs/servers/wsdd/default.nix Outdated Show resolved Hide resolved

pkgs/servers/wsdd/default.nix Outdated Show resolved Hide resolved

wsdd: init at 0.6.2

e10ce84

Izorkin force-pushed the wsdd branch from 563021e to e10ce84 Compare November 22, 2020 07:19

ofborg bot added 6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) and removed 10.rebuild-linux: 1 labels Nov 22, 2020

Izorkin force-pushed the wsdd branch from c277826 to 073c731 Compare November 22, 2020 14:23

nixos/samba-wsdd: init service samba-wsdd

03760ab

Izorkin force-pushed the wsdd branch from 073c731 to 3e04c32 Compare November 23, 2020 10:26

Izorkin force-pushed the wsdd branch from 3e04c32 to 2c7d095 Compare November 23, 2020 11:42

flokli reviewed Nov 23, 2020

View reviewed changes

nixos/tests/samba-wsdd: add check WSD Discovery

0aa34a0

Izorkin force-pushed the wsdd branch from 2c7d095 to 0aa34a0 Compare November 23, 2020 14:14

flokli approved these changes Nov 23, 2020

View reviewed changes

Mic92 approved these changes Nov 23, 2020

View reviewed changes

flokli merged commit bbf3c94 into NixOS:master Nov 23, 2020

Izorkin deleted the wsdd branch November 24, 2020 04:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wsdd: init at 0.6.2 #104520

wsdd: init at 0.6.2 #104520

Izorkin commented Nov 21, 2020

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020 via email

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020 •

edited

Izorkin commented Nov 22, 2020

Izorkin commented Nov 22, 2020

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Mic92 left a comment

wsdd: init at 0.6.2 #104520

wsdd: init at 0.6.2 #104520

Conversation

Izorkin commented Nov 21, 2020

Motivation for this change

Things done

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020 via email

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020 • edited

Izorkin commented Nov 22, 2020

Izorkin commented Nov 22, 2020

Izorkin commented Nov 22, 2020

flokli commented Nov 22, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Izorkin commented Nov 23, 2020

Mic92 left a comment

Choose a reason for hiding this comment

flokli commented Nov 22, 2020 •

edited