From 8f675da301eafe79897f3ad67ff5450fcc397f78 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Mon, 31 Aug 2015 20:22:37 +0200 Subject: move rfc4251 types into their own namespace --- ssh-agent-filter.C | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'ssh-agent-filter.C') diff --git a/ssh-agent-filter.C b/ssh-agent-filter.C index 2b6df6f..8deaf19 100644 --- a/ssh-agent-filter.C +++ b/ssh-agent-filter.C @@ -97,8 +97,8 @@ vector allowed_comment; vector confirmed_b64; vector confirmed_md5; vector confirmed_comment; -std::set allowed_pubkeys; -std::map confirmed_pubkeys; +std::set allowed_pubkeys; +std::map confirmed_pubkeys; bool debug{false}; bool all_confirmed{false}; string saf_name; @@ -237,17 +237,17 @@ void setup_filters () { io::stream agent{make_upstream_agent_conn(), io::close_handle}; arm(agent); - agent << rfc4251string{string{SSH2_AGENTC_REQUEST_IDENTITIES}}; - rfc4251string answer{agent}; + agent << rfc4251::string{string{SSH2_AGENTC_REQUEST_IDENTITIES}}; + rfc4251::string answer{agent}; io::stream answer_iss{answer.data(), answer.size()}; arm(answer_iss); - rfc4251byte resp_code{answer_iss}; + rfc4251::byte resp_code{answer_iss}; if (resp_code != SSH2_AGENT_IDENTITIES_ANSWER) throw runtime_error{"unexpected answer from ssh-agent"}; - rfc4251uint32 keycount{answer_iss}; + rfc4251::uint32 keycount{answer_iss}; for (uint32_t i = keycount; i; --i) { - rfc4251string key{answer_iss}; - rfc4251string comment{answer_iss}; + rfc4251::string key{answer_iss}; + rfc4251::string comment{answer_iss}; auto b64 = base64_encode(key); if (debug) clog << b64 << endl; @@ -325,19 +325,19 @@ bool confirm (string const & question) { } } -bool dissect_auth_data_ssh (rfc4251string const & data, string & request_description) try { +bool dissect_auth_data_ssh (rfc4251::string const & data, string & request_description) try { io::stream datastream{data.data(), data.size()}; arm(datastream); // Format specified in RFC 4252 Section 7 - 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}; + rfc4251::string session_identifier{datastream}; + rfc4251::byte requesttype{datastream}; + rfc4251::string username{datastream}; + rfc4251::string servicename{datastream}; + rfc4251::string publickeystring{datastream}; + rfc4251::boolean shouldbetrue{datastream}; + rfc4251::string publickeyalgorithm{datastream}; + rfc4251::string publickey{datastream}; request_description = "The request is for an ssh connection as user '" + string{username} + "' with service name '" + string{servicename} + "'."; @@ -346,17 +346,17 @@ bool dissect_auth_data_ssh (rfc4251string const & data, string & request_descrip io::stream idstream{session_identifier.data(), session_identifier.size()}; arm(idstream); - rfc4251uint32 type{idstream}; + rfc4251::uint32 type{idstream}; if (type == 101) { // PAM_SSH_AGENT_AUTH_REQUESTv1 - rfc4251string cookie{idstream}; - rfc4251string user{idstream}; - rfc4251string ruser{idstream}; - rfc4251string pam_service{idstream}; - rfc4251string pwd{idstream}; - rfc4251string action{idstream}; - rfc4251string hostname{idstream}; - rfc4251uint64 timestamp{idstream}; + rfc4251::string cookie{idstream}; + rfc4251::string user{idstream}; + rfc4251::string ruser{idstream}; + rfc4251::string pam_service{idstream}; + rfc4251::string pwd{idstream}; + rfc4251::string action{idstream}; + rfc4251::string hostname{idstream}; + rfc4251::uint64 timestamp{idstream}; string singleuser{user}; if (user != ruser) @@ -369,12 +369,12 @@ bool dissect_auth_data_ssh (rfc4251string const & data, string & request_descrip io::stream actionstream{action.data(), action.size()}; arm(actionstream); - rfc4251uint32 argc{actionstream}; + rfc4251::uint32 argc{actionstream}; if (argc) { additional += " to run"; for (uint32_t i = argc; i; --i) { - rfc4251string argv{actionstream}; + rfc4251::string argv{actionstream}; additional += ' ' + string{argv}; } } @@ -395,45 +395,45 @@ bool dissect_auth_data_ssh (rfc4251string const & data, string & request_descrip return false; } -rfc4251string handle_request (rfc4251string const & r) { +rfc4251::string handle_request (rfc4251::string const & r) { io::stream request{r.data(), r.size()}; - rfc4251string ret; + rfc4251::string ret; io::stream>> answer{ret.value}; arm(request); arm(answer); - rfc4251byte request_code{request}; + rfc4251::byte request_code{request}; switch (request_code) { case SSH2_AGENTC_REQUEST_IDENTITIES: { io::stream agent{make_upstream_agent_conn(), io::close_handle}; arm(agent); - agent << rfc4251string{string{SSH2_AGENTC_REQUEST_IDENTITIES}}; + agent << rfc4251::string{string{SSH2_AGENTC_REQUEST_IDENTITIES}}; // temp to test key filtering when signing - //return rfc4251string{agent}; - rfc4251string agent_answer{agent}; + //return rfc4251::string{agent}; + rfc4251::string agent_answer{agent}; io::stream agent_answer_iss{agent_answer.data(), agent_answer.size()}; arm(agent_answer_iss); - rfc4251byte answer_code{agent_answer_iss}; - rfc4251uint32 keycount{agent_answer_iss}; + rfc4251::byte answer_code{agent_answer_iss}; + rfc4251::uint32 keycount{agent_answer_iss}; if (answer_code != SSH2_AGENT_IDENTITIES_ANSWER) throw runtime_error{"unexpected answer from ssh-agent"}; - vector> keys; + vector> keys; for (uint32_t i = keycount; i; --i) { - rfc4251string key{agent_answer_iss}; - rfc4251string comment{agent_answer_iss}; + rfc4251::string key{agent_answer_iss}; + rfc4251::string comment{agent_answer_iss}; if (allowed_pubkeys.count(key) or confirmed_pubkeys.count(key)) keys.emplace_back(move(key), move(comment)); } - answer << answer_code << rfc4251uint32{static_cast(keys.size())}; + answer << answer_code << rfc4251::uint32{static_cast(keys.size())}; for (auto const & k : keys) answer << k.first << k.second; } break; case SSH2_AGENTC_SIGN_REQUEST: { - rfc4251string key{request}; - rfc4251string data{request}; - rfc4251uint32 flags{request}; + rfc4251::string key{request}; + rfc4251::string data{request}; + rfc4251::uint32 flags{request}; bool allow{false}; if (allowed_pubkeys.count(key)) @@ -460,21 +460,21 @@ rfc4251string handle_request (rfc4251string const & r) { if (allow) { io::stream agent{make_upstream_agent_conn(), io::close_handle}; arm(agent); - rfc4251string agent_answer; + rfc4251::string agent_answer; agent << r; - return rfc4251string{agent}; + return rfc4251::string{agent}; } else - answer << rfc4251byte{SSH_AGENT_FAILURE}; + answer << rfc4251::byte{SSH_AGENT_FAILURE}; } break; case SSH_AGENTC_REQUEST_RSA_IDENTITIES: - answer << rfc4251byte{SSH_AGENT_RSA_IDENTITIES_ANSWER}; + answer << rfc4251::byte{SSH_AGENT_RSA_IDENTITIES_ANSWER}; // we got no SSHv1 keys - answer << rfc4251uint32{0}; + answer << rfc4251::uint32{0}; break; case SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES: - answer << rfc4251byte{SSH_AGENT_SUCCESS}; + answer << rfc4251::byte{SSH_AGENT_SUCCESS}; break; case SSH_AGENTC_RSA_CHALLENGE: case SSH_AGENTC_ADD_RSA_IDENTITY: @@ -490,7 +490,7 @@ rfc4251string handle_request (rfc4251string const & r) { case SSH_AGENTC_UNLOCK: case SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED: default: - answer << rfc4251byte{SSH_AGENT_FAILURE}; + answer << rfc4251::byte{SSH_AGENT_FAILURE}; break; } @@ -503,7 +503,7 @@ void handle_client (int const sock) try { arm(client); for (;;) - client << handle_request(rfc4251string{client}) << flush; + client << handle_request(rfc4251::string{client}) << flush; } catch (...) { } -- cgit v1.2.3