Port the flags of nix-daemon to nix daemon #8788

bryanhonof · 2023-08-04T22:52:08Z

Motivation

The new nix daemon command doesn't accept the same flags that nix-daemon does.

Context

Ref #8785
Fixes #7128

Checklist for maintainers

Maintainers: tick if completed or explain if not relevant

agreed on idea
agreed on implementation strategy
tests, as appropriate
- functional tests - tests/**.sh
- unit tests - src/*/tests
- integration tests - tests/nixos/*
documentation in the manual
documentation in the internal API docs
code and comments are self-explanatory
commit message explains why the change was made
new feature or incompatible change: updated release notes

Priorities

Add 👍 to pull requests you find important.

The new `nix daemon` command didn't accept the same flags that `nix-daemon` did.

src/nix/daemon.cc

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>

Ericson2314

We can declaratively mark flags as experimental with the new CLI

src/nix/daemon.cc

Co-authored-by: John Ericson <git@JohnEricson.me>

bryanhonof · 2023-08-08T08:25:14Z

We can declaratively mark flags as experimental with the new CLI

@Ericson2314 I'm getting the following warning, which, I believe, is just fixed by switching .handler and .experimentalFeature.

src/nix/daemon.cc:518:13: warning: ISO C++ requires field designators to be specified in declaration order; field 'experimentalFeature' will be initialized after field 'handler' [-Wreorder-init-list]
            .handler = {[&]() {
            ^~~~~~~~~~~~~~~~~~~
src/nix/daemon.cc:517:36: note: previous initialization for field 'experimentalFeature' is here
            .experimentalFeature = Xp::DaemonTrustOverride,
                                   ^~~~~~~~~~~~~~~~~~~~~~~

However, what I find more concerning, when I now run the nix daemon command with --force-untrusted it just seems to work without enabling the experimental feature. Whilst before, it did error out.

Before:

$ ./outputs/out/bin/nix --extra-experimental-features nix-command daemon --force-untrusted --stdio
error: experimental Nix feature 'daemon-trust-override' is disabled; use '--extra-experimental-features daemon-trust-override' to override

After:

$ # Simply waits for input it seems like
$ ./outputs/out/bin/nix --extra-experimental-features nix-command daemon --force-untrusted --stdio

edolstra · 2023-08-21T11:17:24Z

src/nix/daemon.cc

+
+        addFlag({
+            .longName = "force-trusted",
+            .description = "Forces the daemon to trust connecting clients, forwarding the connection without the receiving daemon processing it.",


Does this actually forward the connection? I assume that depends on nix daemon's own --store parameter: If it's "local", then it won't forward to another daemon.

That is true. Forcing untrusted does make not force in the --stdio case when --store is a RemoteStore subclass, but forcing trusted (if I am reading the code above right) doesn't seem to affect when forwarding happens.

So, just "Forces the daemon to trust connecting clients." would be enough as a description in this case?

Yes I think that is good

src/nix/daemon.cc

tomberek · 2023-08-28T12:45:13Z

src/nix/daemon.cc

+
+        addFlag({
+            .longName = "force-untrusted",
+            .description = "Forces the daemon to not trust connecting clients, the connection will be processed by the receiving daemon before forwarding commands.",


Suggested change

.description = "Forces the daemon to not trust connecting clients, the connection will be processed by the receiving daemon before forwarding commands.",

.description = "Force the daemon to not trust connecting clients. The connection will be processed by the receiving daemon before forwarding commands.",

fricklerhandwerk · 2023-08-28T12:45:22Z

Reviewed in Nix team meeting for stabilisation effort:

agreed on the change
the new command is not tested, but runs the exact same code as the old one
- @bryanhonof if you have time, could you contribute something towards testing the daemon at the component level rather through the CLI?
fixed up documentation
merging

src/nix/daemon.cc

bryanhonof · 2023-08-28T13:34:10Z

@bryanhonof if you have time, could you contribute something towards testing the daemon at the component level rather through the CLI?

@fricklerhandwerk Wouldn't mind giving it a shot. Where can I find examples/docs of this?

nixos-discourse · 2023-08-28T17:54:21Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2023-08-28-nix-team-meeting-minutes-83/32290/1

Some of these are a bit after the specified time period, but I also believe some of these items are difficult to gauge how much "impact" they had. Helped organize, host, and run, the Summer of Nix Lecture Series 2022 - https://www.youtube.com/playlist?list=PLt4-_lkyRrOMWyp5G-m_d1wtTcbBaOxZk - NixOS/infra#213 Helped organize, and host infra for, the Summer of Nix Lecture Series 2023 - https://www.youtube.com/playlist?list=PLt4-_lkyRrOPcBuz_tjm6ZQb-6rJjU3cf - NixOS/infra#240 Helped organize, host, and was responsible for livestreaming infra during, NixCon Paris 2022 - https://www.youtube.com/playlist?list=PLgknCdxP89ReD6gxl755B6G_CI65z4J2e Maintenance of some nixpkgs packages - NixOS/nixpkgs#340223 (contribution after 2024-05-01) - NixOS/nixpkgs#290084 - NixOS/nixpkgs#170089 Organized, and assembled a team for the FOSDEM 2023 Nix/NixOS Devroom - https://discourse.nixos.org/t/fosdem-2023-nix-and-nixos-devroom/23133 Organizer & sole maintainer of the Config Management Camp Nix track - https://discourse.nixos.org/t/config-management-camp-2023-ghent/23455 - https://discourse.nixos.org/t/config-management-camp-2024-ghent/33852 - https://discourse.nixos.org/t/cfgmgmtcamp-2025-is-looking-for-nix-presentations/51658 (contribution after 2024-05-01) Public speaking & spreading awareness of Nix/NixOS - https://youtu.be/gUjvnZ9ZwMs?si=nDiZTCpQj53wwq8P - https://www.youtube.com/watch?v=hNcYPH5Q_pA&t=862s The occasional dabble into the Nix C++ code base - NixOS/nix#11494 (contribution after 2024-05-01) - NixOS/nix#11490 (contribution after 2024-05-01) - NixOS/nix#11489 (contribution after 2024-05-01) - NixOS/nix#11349 (contribution after 2024-05-01) - NixOS/nix#11241 (contribution after 2024-05-01) - NixOS/nix#9557 - NixOS/nix#8788 - NixOS/nix#8212 - NixOS/nix#5147 General evangelism Pretty much every event I attend, I'm talking about Nix, showing off Nix/NixOS, and just trying to get people to see how awesome this tool is.

bryanhonof requested a review from edolstra as a code owner August 4, 2023 22:52

github-actions bot added the new-cli Relating to the "nix" command label Aug 4, 2023

chore(nix/daemon): port the flags of nix-daemon to nix daemon

2c94ac5

The new `nix daemon` command didn't accept the same flags that `nix-daemon` did.

bryanhonof force-pushed the bryanhonof/nix-daemon-flag-port branch from b3649b6 to 2c94ac5 Compare August 4, 2023 22:57

edolstra reviewed Aug 7, 2023

View reviewed changes

src/nix/daemon.cc Outdated Show resolved Hide resolved

Update src/nix/daemon.cc

3bb079e

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>

Ericson2314 reviewed Aug 7, 2023

View reviewed changes

src/nix/daemon.cc Outdated Show resolved Hide resolved

src/nix/daemon.cc Outdated Show resolved Hide resolved

src/nix/daemon.cc Outdated Show resolved Hide resolved

bryanhonof and others added 3 commits August 8, 2023 10:09

Update src/nix/daemon.cc

a96d63f

Co-authored-by: John Ericson <git@JohnEricson.me>

Update src/nix/daemon.cc

747da01

Co-authored-by: John Ericson <git@JohnEricson.me>

Update src/nix/daemon.cc

a29afa7

Co-authored-by: John Ericson <git@JohnEricson.me>

docs(daemon): clarify the daemon trust override flags

7649cac

bryanhonof requested a review from Ericson2314 August 9, 2023 08:03

bryanhonof added 2 commits August 9, 2023 21:48

fix: change decleration order

f84c8d5

docs: add examples of nix daemon usage

39add5e

bryanhonof requested a review from fricklerhandwerk as a code owner August 9, 2023 19:59

github-actions bot added the documentation label Aug 9, 2023

bryanhonof requested a review from edolstra August 9, 2023 20:00

edolstra self-assigned this Aug 18, 2023

edolstra reviewed Aug 21, 2023

View reviewed changes

tomberek mentioned this pull request Aug 25, 2023

CLI stabilization effort #7701

Open

86 tasks

tomberek approved these changes Aug 28, 2023

View reviewed changes

tomberek reviewed Aug 28, 2023

View reviewed changes

src/nix/daemon.cc Outdated Show resolved Hide resolved

tomberek reviewed Aug 28, 2023

View reviewed changes

src/nix/daemon.cc Outdated Show resolved Hide resolved

Apply suggestions from code review

2787820

tomberek enabled auto-merge (squash) August 28, 2023 12:46

tomberek merged commit 736b9ce into NixOS:master Aug 28, 2023

bryanhonof deleted the bryanhonof/nix-daemon-flag-port branch August 31, 2023 20:21

thufschmitt added this to the CLI Stabilisation milestone Dec 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port the flags of nix-daemon to nix daemon #8788

Port the flags of nix-daemon to nix daemon #8788

bryanhonof commented Aug 4, 2023 •

edited by fricklerhandwerk

Loading

Ericson2314 left a comment

bryanhonof commented Aug 8, 2023 •

edited

Loading

edolstra Aug 21, 2023

Ericson2314 Aug 21, 2023

bryanhonof Aug 21, 2023

Ericson2314 Aug 25, 2023

tomberek Aug 28, 2023

fricklerhandwerk commented Aug 28, 2023 •

edited

Loading

bryanhonof commented Aug 28, 2023

nixos-discourse commented Aug 28, 2023

	.description = "Forces the daemon to not trust connecting clients, the connection will be processed by the receiving daemon before forwarding commands.",
	.description = "Force the daemon to not trust connecting clients. The connection will be processed by the receiving daemon before forwarding commands.",

Port the flags of nix-daemon to nix daemon #8788

Port the flags of nix-daemon to nix daemon #8788

Conversation

bryanhonof commented Aug 4, 2023 • edited by fricklerhandwerk Loading

Motivation

Context

Checklist for maintainers

Priorities

Ericson2314 left a comment

Choose a reason for hiding this comment

bryanhonof commented Aug 8, 2023 • edited Loading

edolstra Aug 21, 2023

Choose a reason for hiding this comment

Ericson2314 Aug 21, 2023

Choose a reason for hiding this comment

bryanhonof Aug 21, 2023

Choose a reason for hiding this comment

Ericson2314 Aug 25, 2023

Choose a reason for hiding this comment

tomberek Aug 28, 2023

Choose a reason for hiding this comment

fricklerhandwerk commented Aug 28, 2023 • edited Loading

bryanhonof commented Aug 28, 2023

nixos-discourse commented Aug 28, 2023

bryanhonof commented Aug 4, 2023 •

edited by fricklerhandwerk

Loading

bryanhonof commented Aug 8, 2023 •

edited

Loading

fricklerhandwerk commented Aug 28, 2023 •

edited

Loading