nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #14271 from NixOS/no-check-sigs

Browse source 
Factor out `--no-check-sigs` into its own class
This commit is contained in:
Eelco Dolstra 2025-10-16 15:07:29 +00:00 • committed by GitHub
commit f84b33644c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libcmd/include/nix/cmd/command.hh
View file

@ -350,6 +350,20 @@ struct MixEnvironment : virtual Args
void setEnviron();
};
struct MixNoCheckSigs : virtual Args
{
CheckSigsFlag checkSigs = CheckSigs;
MixNoCheckSigs()
{
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
}
};
void completeFlakeInputAttrPath(
AddCompletions & completions,
ref<EvalState> evalState,

10
src/nix/copy.cc
View file

@ -5,10 +5,9 @@
using namespace nix;
struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile
struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile, MixNoCheckSigs
{
std::optional<std::filesystem::path> outLink;
CheckSigsFlag checkSigs = CheckSigs;
SubstituteFlag substitute = NoSubstitute;
@ -24,13 +23,6 @@ struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile
.handler = {&outLink},
.completer = completePath,
});
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
addFlag({
.longName = "substitute-on-destination",
.shortName = 's',

9
src/nix/flake.cc
View file

@ -1032,12 +1032,10 @@ struct CmdFlakeClone : FlakeCommand
}
};
struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun
struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun, MixNoCheckSigs
{
std::string dstUri;
CheckSigsFlag checkSigs = CheckSigs;
SubstituteFlag substitute = NoSubstitute;
CmdFlakeArchive()
@ -1048,11 +1046,6 @@ struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun
.labels = {"store-uri"},
.handler = {&dstUri},
});
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
}
std::string description() override

4
src/nix/sigs.cc
View file

@ -104,6 +104,7 @@ struct CmdSign : StorePathsCommand
.labels = {"file"},
.handler = {&secretKeyFile},
.completer = completePath,
.required = true,
});
}
@ -114,9 +115,6 @@ struct CmdSign : StorePathsCommand
void run(ref<Store> store, StorePaths && storePaths) override
{
if (secretKeyFile.empty())
throw UsageError("you must specify a secret key file using '-k'");
SecretKey secretKey(readFile(secretKeyFile));
LocalSigner signer(std::move(secretKey));