diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-11 13:55:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-16 20:55:58 +0200 |
| commit | e4bd42f98f7da0ac49cdea579d1e43be64c0621f (patch) | |
| tree | 6632534b273cc8454788f120c1b6d3279cebe33f /src/libstore | |
| parent | 82c4b37c6fb8f32012b6922436ded3c590a69852 (diff) | |
Disallow SSH host names starting with a dash
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/ssh.cc | 11 | ||||
| -rw-r--r-- | src/libstore/ssh.hh | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index 776ffdb83..7ff7a9bff 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -2,6 +2,17 @@ namespace nix { +SSHMaster::SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD) + : host(host) + , keyFile(keyFile) + , useMaster(useMaster) + , compress(compress) + , logFD(logFD) +{ + if (host == "" || hasPrefix(host, "-")) + throw Error("invalid SSH host name '%s'", host); +} + void SSHMaster::addCommonSSHOpts(Strings & args) { for (auto & i : tokenizeString<Strings>(getEnv("NIX_SSHOPTS"))) diff --git a/src/libstore/ssh.hh b/src/libstore/ssh.hh index 18dea227a..1268e6d00 100644 --- a/src/libstore/ssh.hh +++ b/src/libstore/ssh.hh @@ -28,14 +28,7 @@ private: public: - SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD = -1) - : host(host) - , keyFile(keyFile) - , useMaster(useMaster) - , compress(compress) - , logFD(logFD) - { - } + SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD = -1); struct Connection { |