nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-13 22:12:43 +01:00
Code Activity

libstore: Correct getUri methods for all stores

Browse source 
Previously `getUri` didn't include store query parameters,
`ssh-ng` didn't include any information at all and the local
store didn't have the path:

```
$ nix store info --store "local?root=/tmp/aaa&require-sigs=false"
Store URL: local
Version: 2.31.0
Trusted: 1
$ nix store info --store "ssh-ng://localhost?remote-program=nix-daemon"
Store URL: ssh-ng://
Version: 2.31.0
Trusted: 1
$ nix store info --store "ssh://localhost?remote-program=nix-store"
Store URL: ssh://localhost
```

This commit changes this to:

```
$ nix store info --store "local?root=/tmp/aaa&require-sigs=false"
Store URL: local?require-sigs=false&root=/tmp/aaa
Version: 2.31.0
Trusted: 1
$ nix store info --store "ssh-ng://localhost?remote-program=nix-daemon"
Store URL: ssh-ng://localhost?remote-program=nix-daemon
Version: 2.31.0
Trusted: 1
$ nix store info --store "ssh://localhost?remote-program=nix-store"
Store URL: ssh://localhost?remote-program=nix-store
```
This commit is contained in:
Sergei Zimmerman 2025-08-11 17:51:03 +03:00
parent 73ebdf2497
commit 41af531392
No known key found for this signature in database
7 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstore-tests/legacy-ssh-store.cc
View file

@ -6,21 +6,27 @@ namespace nix {
TEST(LegacySSHStore, constructConfig)
{
LegacySSHStoreConfig config{
initLibStore(/*loadConfig=*/false);
auto config = make_ref<LegacySSHStoreConfig>(
"ssh",
"localhost",
"me@localhost:2222",
StoreConfig::Params{
{
"remote-program",
// TODO #11106, no more split on space
"foo bar",
},
}};
});
EXPECT_EQ(
config.remoteProgram.get(),
config->remoteProgram.get(),
(Strings{
"foo",
"bar",
}));
auto store = config->openStore();
EXPECT_EQ(store->getUri(), "ssh://me@localhost:2222?remote-program=foo%20bar");
}
} // namespace nix