From 7d0f47c171b716b7e138157f8165ebf790227582 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Sun, 23 Mar 2014 23:40:49 +0100 Subject: rfc4251string: add more operators this adds <= > >= != --- rfc4251.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index b2f9658..74bdc34 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -35,6 +35,7 @@ #include #include // ntohl() / htonl() #include +#include struct rfc4251byte { union { @@ -136,7 +137,7 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251uint64 const & x) { } -struct rfc4251string { +struct rfc4251string : boost::totally_ordered { std::vector value; rfc4251string () = default; -- cgit v1.2.3 From 26b246ac93d59a7f7ba29cff36ad1a3e61306a58 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Mon, 14 Apr 2014 21:08:54 +0200 Subject: cosmetic: fix double semicolons --- rfc4251.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index 74bdc34..98734bf 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -54,7 +54,7 @@ inline std::istream & operator>> (std::istream & is, rfc4251byte & x) { } inline std::ostream & operator<< (std::ostream & os, rfc4251byte const & x) { - return os.write(x.buf, sizeof(x.buf));; + return os.write(x.buf, sizeof(x.buf)); } @@ -75,7 +75,7 @@ inline std::istream & operator>> (std::istream & is, rfc4251bool & x) { } inline std::ostream & operator<< (std::ostream & os, rfc4251bool const & x) { - return os.write(x.buf, sizeof(x.buf));; + return os.write(x.buf, sizeof(x.buf)); } @@ -96,7 +96,7 @@ inline std::istream & operator>> (std::istream & is, rfc4251uint32 & x) { } inline std::ostream & operator<< (std::ostream & os, rfc4251uint32 const & x) { - return os.write(x.buf, sizeof(x.buf));; + return os.write(x.buf, sizeof(x.buf)); } @@ -133,7 +133,7 @@ inline std::istream & operator>> (std::istream & is, rfc4251uint64 & x) { } inline std::ostream & operator<< (std::ostream & os, rfc4251uint64 const & x) { - return os.write(x.buf, sizeof(x.buf));; + return os.write(x.buf, sizeof(x.buf)); } -- cgit v1.2.3 From afc8cbf6fad71317ee11b6e6374f8f3ce4816197 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Mon, 14 Apr 2014 21:38:45 +0200 Subject: rfc4251*: add constructors from std::istream and use them --- rfc4251.h | 21 +++++++++++++++++ ssh-agent-filter.C | 67 +++++++++++++++++++++--------------------------------- 2 files changed, 47 insertions(+), 41 deletions(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index 98734bf..2d01215 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -45,6 +45,7 @@ struct rfc4251byte { rfc4251byte () = default; explicit rfc4251byte (uint8_t v) : value(v) {} + inline explicit rfc4251byte (std::istream &); operator uint8_t () const { return value; } }; @@ -57,6 +58,9 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251byte const & x) { return os.write(x.buf, sizeof(x.buf)); } +inline rfc4251byte::rfc4251byte (std::istream & is) { + is >> *this; +} struct rfc4251bool { union { @@ -66,6 +70,7 @@ struct rfc4251bool { rfc4251bool () = default; explicit rfc4251bool (uint8_t v) : value(v) {} + inline explicit rfc4251bool (std::istream &); operator uint8_t () const { return value; } }; @@ -78,6 +83,9 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251bool const & x) { return os.write(x.buf, sizeof(x.buf)); } +inline rfc4251bool::rfc4251bool (std::istream & is) { + is >> *this; +} struct rfc4251uint32 { union { @@ -87,6 +95,7 @@ struct rfc4251uint32 { rfc4251uint32 () = default; explicit rfc4251uint32 (uint32_t v) { value = htonl(v); } + inline explicit rfc4251uint32 (std::istream &); operator uint32_t () const { return ntohl(value); } }; @@ -99,6 +108,9 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251uint32 const & x) { return os.write(x.buf, sizeof(x.buf)); } +inline rfc4251uint32::rfc4251uint32 (std::istream & is) { + is >> *this; +} struct rfc4251uint64 { union { @@ -108,6 +120,7 @@ struct rfc4251uint64 { rfc4251uint64 () = default; inline explicit rfc4251uint64 (uint64_t v); + inline explicit rfc4251uint64 (std::istream &); inline explicit operator uint64_t () const; }; @@ -136,6 +149,9 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251uint64 const & x) { return os.write(x.buf, sizeof(x.buf)); } +inline rfc4251uint64::rfc4251uint64 (std::istream & is) { + is >> *this; +} struct rfc4251string : boost::totally_ordered { std::vector value; @@ -147,6 +163,7 @@ struct rfc4251string : boost::totally_ordered { explicit rfc4251string (std::vector const &); explicit rfc4251string (mpz_srcptr); explicit rfc4251string (mpz_class const & x) : rfc4251string{x.get_mpz_t()} {} + inline explicit rfc4251string (std::istream &); operator std::string () const { return {value.begin(), value.end()}; } operator std::vector () const; @@ -213,6 +230,10 @@ inline std::ostream & operator<< (std::ostream & os, rfc4251string const & s) { return os; } +inline rfc4251string::rfc4251string (std::istream & is) { + is >> *this; +} + inline bool operator== (rfc4251string const & l, rfc4251string const & r) { return l.value == r.value; } diff --git a/ssh-agent-filter.C b/ssh-agent-filter.C index 46d9f94..17090e9 100644 --- a/ssh-agent-filter.C +++ b/ssh-agent-filter.C @@ -209,20 +209,15 @@ void setup_filters () { agent.exceptions(std::ios::badbit | std::ios::failbit); agent << rfc4251string{std::string{SSH2_AGENTC_REQUEST_IDENTITIES}}; - rfc4251string answer; - agent >> answer; - std::istringstream answer_iss{answer}; + std::istringstream answer_iss{rfc4251string{agent}}; answer_iss.exceptions(std::ios::badbit | std::ios::failbit); - rfc4251byte resp_code; - answer_iss >> resp_code; + rfc4251byte resp_code{answer_iss}; if (resp_code != SSH2_AGENT_IDENTITIES_ANSWER) throw std::runtime_error{"unexpected answer from ssh-agent"}; - rfc4251uint32 keycount; - answer_iss >> keycount; + rfc4251uint32 keycount{answer_iss}; for (uint32_t i = keycount; i; --i) { - rfc4251string key; - rfc4251string comment; - answer_iss >> key >> comment; + rfc4251string key{answer_iss}; + rfc4251string comment{answer_iss}; auto b64 = base64_encode(key); if (debug) std::clog << b64 << std::endl; @@ -302,14 +297,14 @@ bool dissect_auth_data_ssh (rfc4251string const & data, std::string & request_de datastream.exceptions(std::ios::badbit | std::ios::failbit); // Format specified in RFC 4252 Section 7 - rfc4251string session_identifier; datastream >> session_identifier; - rfc4251byte requesttype; datastream >> requesttype; - rfc4251string username; datastream >> username; - rfc4251string servicename; datastream >> servicename; - rfc4251string publickeystring; datastream >> publickeystring; - rfc4251bool shouldbetrue; datastream >> shouldbetrue; - rfc4251string publickeyalgorithm; datastream >> publickeyalgorithm; - rfc4251string publickey; datastream >> publickey; + rfc4251string session_identifier{datastream}; + rfc4251byte requesttype{datastream}; + rfc4251string username{datastream}; + rfc4251string servicename{datastream}; + rfc4251string publickeystring{datastream}; + rfc4251bool shouldbetrue{datastream}; + rfc4251string publickeyalgorithm{datastream}; + rfc4251string publickey{datastream}; request_description = "The request is for an ssh connection as user '" + std::string{username} + "' with service name '" + std::string{servicename} + "'."; @@ -323,31 +318,26 @@ rfc4251string handle_request (rfc4251string const & r) { std::ostringstream answer; request.exceptions(std::ios::badbit | std::ios::failbit); answer.exceptions(std::ios::badbit | std::ios::failbit); - rfc4251byte request_code; - request >> request_code; + rfc4251byte request_code{request}; switch (request_code) { case SSH2_AGENTC_REQUEST_IDENTITIES: { io::stream_buffer agent_filebuf{make_upstream_agent_conn(), io::close_handle}; std::iostream agent{&agent_filebuf}; agent.exceptions(std::ios::badbit | std::ios::failbit); - rfc4251string agent_answer; agent << rfc4251string{std::string{SSH2_AGENTC_REQUEST_IDENTITIES}}; - agent >> agent_answer; // temp to test key filtering when signing - //return agent_answer; - std::istringstream agent_answer_iss{agent_answer}; + //return rfc4251string{agent}; + std::istringstream agent_answer_iss{rfc4251string{agent}}; agent_answer_iss.exceptions(std::ios::badbit | std::ios::failbit); - rfc4251byte answer_code; - rfc4251uint32 keycount; - agent_answer_iss >> answer_code >> keycount; + rfc4251byte answer_code{agent_answer_iss}; + rfc4251uint32 keycount{agent_answer_iss}; if (answer_code != SSH2_AGENT_IDENTITIES_ANSWER) throw std::runtime_error{"unexpected answer from ssh-agent"}; std::vector> keys; for (uint32_t i = keycount; i; --i) { - rfc4251string key; - rfc4251string comment; - agent_answer_iss >> key >> comment; + rfc4251string key{agent_answer_iss}; + rfc4251string comment{agent_answer_iss}; if (allowed_pubkeys.count(key) or confirmed_pubkeys.count(key)) keys.emplace_back(std::move(key), std::move(comment)); } @@ -358,10 +348,9 @@ rfc4251string handle_request (rfc4251string const & r) { break; case SSH2_AGENTC_SIGN_REQUEST: { - rfc4251string key; - rfc4251string data; - rfc4251uint32 flags; - request >> key >> data >> flags; + rfc4251string key{request}; + rfc4251string data{request}; + rfc4251uint32 flags{request}; bool allow{false}; if (allowed_pubkeys.count(key)) @@ -392,8 +381,7 @@ rfc4251string handle_request (rfc4251string const & r) { rfc4251string agent_answer; agent << r; - agent >> agent_answer; - return agent_answer; + return rfc4251string{agent}; } else answer << rfc4251byte{SSH_AGENT_FAILURE}; } @@ -432,11 +420,8 @@ void handle_client (int const sock) try { std::iostream client{&client_filebuf}; client.exceptions(std::ios::badbit | std::ios::failbit); - for (;;) { - rfc4251string request; - client >> request; - client << handle_request(request) << std::flush; - } + for (;;) + client << handle_request(rfc4251string{client}) << std::flush; } catch (...) { } -- cgit v1.2.3 From ec5920ac2ed11b29135acb834ce6d633259aad75 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Tue, 15 Apr 2014 20:09:21 +0200 Subject: rfc4251: move remaining non-inline functions to impl file --- Makefile | 2 +- rfc4251.C | 32 ++++++++++++++++++++++++++++++++ rfc4251.h | 31 ------------------------------- 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 rfc4251.C (limited to 'rfc4251.h') diff --git a/Makefile b/Makefile index 1ed7804..fcecbaa 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ ssh-agent-filter.1: ssh-agent-filter ssh-agent-filter: ssh-agent-filter.o ssh-agent-filter.o: ssh-agent-filter.C rfc4251.h ssh-agent.h version.h - +rfc4251.o: rfc4251.C rfc4251.h rfc4251_gmp.o: rfc4251_gmp.C rfc4251.h version.h: diff --git a/rfc4251.C b/rfc4251.C new file mode 100644 index 0000000..0d59420 --- /dev/null +++ b/rfc4251.C @@ -0,0 +1,32 @@ +#include "rfc4251.h" + +rfc4251string::rfc4251string (std::vector const & v) { + for (auto it = v.begin(); it != v.end();) { + if (it->size() == 0) + throw std::length_error{"name of zero length"}; + if (value.size() + it->size() > std::numeric_limits::max()) + throw std::length_error{"32-bit limit for rfc4251string exceeded"}; + value.insert(value.end(), it->data(), it->data() + it->size()); + ++it; + if (it == v.end()) + break; + value.push_back(','); + } +} + +rfc4251string::operator std::vector () const { + std::vector ret; + auto name_start = value.begin(); + if (name_start != value.end()) + for (auto it = name_start; ; ++it) { + if (it == value.end() or *it == ',') { + if (it == name_start) + throw std::length_error{"name of zero length"}; + ret.emplace_back(name_start, it); + name_start = it + 1; + } + if (it == value.end()) + break; + } + return ret; +} diff --git a/rfc4251.h b/rfc4251.h index 2d01215..e9b94f2 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -181,37 +181,6 @@ inline rfc4251string::rfc4251string (char const * s, size_t l) { value.insert(value.end(), s, s + l); } -rfc4251string::rfc4251string (std::vector const & v) { - for (auto it = v.begin(); it != v.end();) { - if (it->size() == 0) - throw std::length_error{"name of zero length"}; - if (value.size() + it->size() > std::numeric_limits::max()) - throw std::length_error{"32-bit limit for rfc4251string exceeded"}; - value.insert(value.end(), it->data(), it->data() + it->size()); - ++it; - if (it == v.end()) - break; - value.push_back(','); - } -} - -rfc4251string::operator std::vector () const { - std::vector ret; - auto name_start = value.begin(); - if (name_start != value.end()) - for (auto it = name_start; ; ++it) { - if (it == value.end() or *it == ',') { - if (it == name_start) - throw std::length_error{"name of zero length"}; - ret.emplace_back(name_start, it); - name_start = it + 1; - } - if (it == value.end()) - break; - } - return ret; -} - inline std::istream & operator>> (std::istream & is, rfc4251string & s) { s.value.clear(); rfc4251uint32 len; -- cgit v1.2.3 From 185d1b9525cb132bc802cdecbc6901ed30d58555 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Thu, 17 Apr 2014 21:30:27 +0200 Subject: rfc4251string: drop unused and dangerous constructor from just a pointer better use std::istringstream or boost::iostream::array_source --- rfc4251.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index e9b94f2..876db07 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -157,7 +157,6 @@ struct rfc4251string : boost::totally_ordered { std::vector value; rfc4251string () = default; - inline explicit rfc4251string (char const *); inline explicit rfc4251string (char const *, size_t); explicit rfc4251string (std::string const & s) : rfc4251string{s.data(), s.size()} {} explicit rfc4251string (std::vector const &); @@ -170,11 +169,6 @@ struct rfc4251string : boost::totally_ordered { operator mpz_class () const; }; -inline rfc4251string::rfc4251string (char const * s) { - auto len = ntohl(*reinterpret_cast(s)); - value.insert(value.begin(), s + 4, s + 4 + len); -} - inline rfc4251string::rfc4251string (char const * s, size_t l) { if (l > std::numeric_limits::max()) throw std::length_error{"32-bit limit for rfc4251string exceeded"}; -- cgit v1.2.3 From a257a44837e78d283f1735b4685618c270aa54bc Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Sun, 20 Apr 2014 23:35:04 +0200 Subject: use boost::iostreams instead of std::stringstreams boost::iostreams::array_source instead of istringstream boost::iostreams::back_insert_device instead of ostringstream this should save at least one copy each and still has length checks (input) or dynamic growth (output) --- rfc4251.h | 4 ++++ ssh-agent-filter.C | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index 876db07..3c291a2 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -164,6 +164,10 @@ struct rfc4251string : boost::totally_ordered { explicit rfc4251string (mpz_class const & x) : rfc4251string{x.get_mpz_t()} {} inline explicit rfc4251string (std::istream &); + size_t size () const { return value.size(); } + char const * data () const { return value.data(); } + char * data () { return value.data(); } + operator std::string () const { return {value.begin(), value.end()}; } operator std::vector () const; operator mpz_class () const; diff --git a/ssh-agent-filter.C b/ssh-agent-filter.C index a7844f9..ff28601 100644 --- a/ssh-agent-filter.C +++ b/ssh-agent-filter.C @@ -26,6 +26,8 @@ namespace po = boost::program_options; namespace fs = boost::filesystem; #include +#include +#include #include namespace io = boost::iostreams; @@ -33,7 +35,6 @@ namespace io = boost::iostreams; #include #include #include -#include #include #include @@ -208,7 +209,8 @@ void setup_filters () { agent.exceptions(std::ios::badbit | std::ios::failbit); agent << rfc4251string{std::string{SSH2_AGENTC_REQUEST_IDENTITIES}}; - std::istringstream answer_iss{rfc4251string{agent}}; + rfc4251string answer{agent}; + io::stream answer_iss{answer.data(), answer.size()}; answer_iss.exceptions(std::ios::badbit | std::ios::failbit); rfc4251byte resp_code{answer_iss}; if (resp_code != SSH2_AGENT_IDENTITIES_ANSWER) @@ -292,7 +294,7 @@ bool confirm (std::string const & question) { } bool dissect_auth_data_ssh (rfc4251string const & data, std::string & request_description) try { - std::istringstream datastream{data}; + io::stream datastream{data.data(), data.size()}; datastream.exceptions(std::ios::badbit | std::ios::failbit); // Format specified in RFC 4252 Section 7 @@ -313,8 +315,9 @@ bool dissect_auth_data_ssh (rfc4251string const & data, std::string & request_de } rfc4251string handle_request (rfc4251string const & r) { - std::istringstream request{r}; - std::ostringstream answer; + io::stream request{r.data(), r.size()}; + rfc4251string ret; + io::stream>> answer{ret.value}; request.exceptions(std::ios::badbit | std::ios::failbit); answer.exceptions(std::ios::badbit | std::ios::failbit); rfc4251byte request_code{request}; @@ -326,7 +329,8 @@ rfc4251string handle_request (rfc4251string const & r) { agent << rfc4251string{std::string{SSH2_AGENTC_REQUEST_IDENTITIES}}; // temp to test key filtering when signing //return rfc4251string{agent}; - std::istringstream agent_answer_iss{rfc4251string{agent}}; + rfc4251string agent_answer{agent}; + io::stream agent_answer_iss{agent_answer.data(), agent_answer.size()}; agent_answer_iss.exceptions(std::ios::badbit | std::ios::failbit); rfc4251byte answer_code{agent_answer_iss}; rfc4251uint32 keycount{agent_answer_iss}; @@ -409,7 +413,8 @@ rfc4251string handle_request (rfc4251string const & r) { break; } - return rfc4251string{answer.str()}; + answer << std::flush; + return ret; } void handle_client (int const sock) try { -- cgit v1.2.3 From 5cc6f72612187001f70255f6097437381cf49bba Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Mon, 26 May 2014 20:41:08 +0200 Subject: rfc4251uint64: fix byte order conversion --- rfc4251.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rfc4251.h') diff --git a/rfc4251.h b/rfc4251.h index 3c291a2..35f97fb 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -135,8 +135,8 @@ inline rfc4251uint64::rfc4251uint64 (uint64_t v) { inline rfc4251uint64::operator uint64_t () const { uint64_t ret{0}; for (uint_fast8_t i{0}; i < 8; ++i) { - ret |= buf[i]; ret <<= 8; + ret |= static_cast(buf[i]); } return ret; } -- cgit v1.2.3 From 57f385d44cdc4eec0d0d2de7ea04ade6f4154dbf Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Tue, 27 May 2014 00:16:40 +0200 Subject: update copyright --- rfc4251.C | 24 ++++++++++++++++++++++++ rfc4251.h | 2 +- ssh-agent-filter.C | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) (limited to 'rfc4251.h') diff --git a/rfc4251.C b/rfc4251.C index 0d59420..8ca5f2b 100644 --- a/rfc4251.C +++ b/rfc4251.C @@ -1,3 +1,27 @@ +/* + * rfc4251.C -- support for name-list type from RFC 4251, section 5 + * + * These are the conversions between an rfc4251string containing a name-list + * and vector. + * + * Copyright (C) 2013 Timo Weingärtner + * + * This file is part of ssh-agent-filter. + * + * ssh-agent-filter is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * ssh-agent-filter is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with ssh-agent-filter. If not, see . + */ + #include "rfc4251.h" rfc4251string::rfc4251string (std::vector const & v) { diff --git a/rfc4251.h b/rfc4251.h index 35f97fb..d9ac93e 100644 --- a/rfc4251.h +++ b/rfc4251.h @@ -10,7 +10,7 @@ * those structs contain the objects in their RFC 4251 representation, * conversions are provided via constructors and cast operators * - * Copyright (C) 2013 Timo Weingärtner + * Copyright (C) 2013-2014 Timo Weingärtner * * This file is part of ssh-agent-filter. * diff --git a/ssh-agent-filter.C b/ssh-agent-filter.C index 7ac2687..faa31f9 100644 --- a/ssh-agent-filter.C +++ b/ssh-agent-filter.C @@ -1,7 +1,7 @@ /* * ssh-agent-filter.C -- filtering proxy for ssh-agent meant to be forwarded to untrusted servers * - * Copyright (C) 2013 Timo Weingärtner + * Copyright (C) 2013-2014 Timo Weingärtner * * This file is part of ssh-agent-filter. * -- cgit v1.2.3