Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fb0ad898ed0f
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ce60a81ba30
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 15, 2019

  1. Daemon: warn when an untrusted user cannot override a setting 

    In a daemon-based Nix setup, some options cannot be overridden by a
client unless the client's user is considered trusted.

Currently, if an untrusted user tries to override one of those
options, we are silently ignoring it.

This can be pretty confusing in certain situations.

e.g. a user thinks he disabled the sandbox when in reality he did not.

We are now sending a warning message letting know the user some options
have been ignored.

Related to #1761.
    @picnoir @grahamc
    picnoir authored and grahamc committed Jun 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e0f5f8 View commit details

  2. Merge pull request #2931 from NinjaTrappeur/nin-add-warning-setting-u… 

    …ntrusted

Daemon: warn when an untrusted user cannot override a setting
    @grahamc
    grahamc authored Jun 15, 2019
    Copy the full SHA
    7ce60a8 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/nix-daemon/nix-daemon.cc
2 changes: 1 addition & 1 deletion src/nix-daemon/nix-daemon.cc
View file
Original file line number Diff line number Diff line change
@@ -574,7 +574,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
else if (setSubstituters(settings.extraSubstituters))
;
else
debug("ignoring untrusted setting '%s'", name);
warn("ignoring the user-specified setting '%s', because it is a restricted setting and you are not a trusted user.", name);
} catch (UsageError & e) {
warn(e.what());
}