Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
/*
|
|
|
|
* Packet protocol layer for the server side of the SSH-2 userauth
|
|
|
|
* protocol (RFC 4252).
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "putty.h"
|
|
|
|
#include "ssh.h"
|
|
|
|
#include "sshbpp.h"
|
|
|
|
#include "sshppl.h"
|
|
|
|
#include "sshcr.h"
|
|
|
|
#include "sshserver.h"
|
|
|
|
|
|
|
|
#ifndef NO_GSSAPI
|
|
|
|
#include "sshgssc.h"
|
|
|
|
#include "sshgss.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct ssh2_userauth_server_state {
|
|
|
|
int crState;
|
|
|
|
|
|
|
|
PacketProtocolLayer *transport_layer, *successor_layer;
|
|
|
|
ptrlen session_id;
|
|
|
|
|
|
|
|
AuthPolicy *authpolicy;
|
|
|
|
|
|
|
|
ptrlen username, service, method;
|
|
|
|
unsigned methods, this_method;
|
|
|
|
int partial_success;
|
|
|
|
|
2018-10-22 19:32:58 +00:00
|
|
|
AuthKbdInt *aki;
|
|
|
|
|
Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
PacketProtocolLayer ppl;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void ssh2_userauth_server_free(PacketProtocolLayer *);
|
|
|
|
static void ssh2_userauth_server_process_queue(PacketProtocolLayer *);
|
|
|
|
|
|
|
|
static const struct PacketProtocolLayerVtable ssh2_userauth_server_vtable = {
|
|
|
|
ssh2_userauth_server_free,
|
|
|
|
ssh2_userauth_server_process_queue,
|
|
|
|
NULL /* get_specials */,
|
|
|
|
NULL /* special_cmd */,
|
|
|
|
NULL /* want_user_input */,
|
|
|
|
NULL /* got_user_input */,
|
|
|
|
NULL /* reconfigure */,
|
|
|
|
"ssh-userauth",
|
|
|
|
};
|
|
|
|
|
2018-10-22 19:32:58 +00:00
|
|
|
static void free_auth_kbdint(AuthKbdInt *aki)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!aki)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sfree(aki->title);
|
|
|
|
sfree(aki->instruction);
|
|
|
|
for (i = 0; i < aki->nprompts; i++)
|
|
|
|
sfree(aki->prompts[i].prompt);
|
|
|
|
sfree(aki->prompts);
|
|
|
|
sfree(aki);
|
|
|
|
}
|
|
|
|
|
Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
PacketProtocolLayer *ssh2_userauth_server_new(
|
|
|
|
PacketProtocolLayer *successor_layer, AuthPolicy *authpolicy)
|
|
|
|
{
|
|
|
|
struct ssh2_userauth_server_state *s =
|
|
|
|
snew(struct ssh2_userauth_server_state);
|
|
|
|
memset(s, 0, sizeof(*s));
|
|
|
|
s->ppl.vt = &ssh2_userauth_server_vtable;
|
|
|
|
|
|
|
|
s->successor_layer = successor_layer;
|
|
|
|
s->authpolicy = authpolicy;
|
|
|
|
|
|
|
|
return &s->ppl;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ssh2_userauth_server_set_transport_layer(PacketProtocolLayer *userauth,
|
|
|
|
PacketProtocolLayer *transport)
|
|
|
|
{
|
|
|
|
struct ssh2_userauth_server_state *s =
|
|
|
|
container_of(userauth, struct ssh2_userauth_server_state, ppl);
|
|
|
|
s->transport_layer = transport;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ssh2_userauth_server_free(PacketProtocolLayer *ppl)
|
|
|
|
{
|
|
|
|
struct ssh2_userauth_server_state *s =
|
|
|
|
container_of(ppl, struct ssh2_userauth_server_state, ppl);
|
|
|
|
|
|
|
|
if (s->successor_layer)
|
|
|
|
ssh_ppl_free(s->successor_layer);
|
|
|
|
|
2018-10-22 19:32:58 +00:00
|
|
|
free_auth_kbdint(s->aki);
|
|
|
|
|
Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
sfree(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PktIn *ssh2_userauth_server_pop(struct ssh2_userauth_server_state *s)
|
|
|
|
{
|
|
|
|
return pq_pop(s->ppl.in_pq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ssh2_userauth_server_add_session_id(
|
|
|
|
struct ssh2_userauth_server_state *s, strbuf *sigdata)
|
|
|
|
{
|
|
|
|
if (s->ppl.remote_bugs & BUG_SSH2_PK_SESSIONID) {
|
|
|
|
put_data(sigdata, s->session_id.ptr, s->session_id.len);
|
|
|
|
} else {
|
|
|
|
put_stringpl(sigdata, s->session_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ssh2_userauth_server_process_queue(PacketProtocolLayer *ppl)
|
|
|
|
{
|
|
|
|
struct ssh2_userauth_server_state *s =
|
|
|
|
container_of(ppl, struct ssh2_userauth_server_state, ppl);
|
|
|
|
PktIn *pktin;
|
|
|
|
PktOut *pktout;
|
|
|
|
|
|
|
|
crBegin(s->crState);
|
|
|
|
|
|
|
|
s->session_id = ssh2_transport_get_session_id(s->transport_layer);
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
crMaybeWaitUntilV((pktin = ssh2_userauth_server_pop(s)) != NULL);
|
|
|
|
if (pktin->type != SSH2_MSG_USERAUTH_REQUEST) {
|
|
|
|
ssh_proto_error(s->ppl.ssh, "Received unexpected packet when "
|
|
|
|
"expecting USERAUTH_REQUEST, type %d (%s)",
|
|
|
|
pktin->type,
|
|
|
|
ssh2_pkt_type(s->ppl.bpp->pls->kctx,
|
|
|
|
s->ppl.bpp->pls->actx, pktin->type));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->username = get_string(pktin);
|
|
|
|
s->service = get_string(pktin);
|
|
|
|
s->method = get_string(pktin);
|
|
|
|
|
|
|
|
if (!ptrlen_eq_string(s->service, s->successor_layer->vt->name)) {
|
|
|
|
/*
|
|
|
|
* Unconditionally reject authentication for any service
|
|
|
|
* other than the one we're going to hand over to.
|
|
|
|
*/
|
|
|
|
pktout = ssh_bpp_new_pktout(s->ppl.bpp, SSH2_MSG_USERAUTH_FAILURE);
|
|
|
|
put_stringz(pktout, "");
|
|
|
|
put_bool(pktout, FALSE);
|
|
|
|
pq_push(s->ppl.out_pq, pktout);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->methods = auth_methods(s->authpolicy);
|
|
|
|
s->partial_success = FALSE;
|
|
|
|
|
|
|
|
if (ptrlen_eq_string(s->method, "none")) {
|
|
|
|
s->this_method = AUTHMETHOD_NONE;
|
|
|
|
if (!(s->methods & s->this_method))
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
if (!auth_none(s->authpolicy, s->username))
|
|
|
|
goto failure;
|
|
|
|
} else if (ptrlen_eq_string(s->method, "password")) {
|
|
|
|
int changing;
|
|
|
|
ptrlen password;
|
|
|
|
|
|
|
|
s->this_method = AUTHMETHOD_PASSWORD;
|
|
|
|
if (!(s->methods & s->this_method))
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
changing = get_bool(pktin);
|
|
|
|
if (changing)
|
|
|
|
goto failure; /* FIXME: not yet supported */
|
|
|
|
|
|
|
|
password = get_string(pktin);
|
|
|
|
|
|
|
|
if (!auth_password(s->authpolicy, s->username, password))
|
|
|
|
goto failure;
|
|
|
|
} else if (ptrlen_eq_string(s->method, "publickey")) {
|
|
|
|
int has_signature, success;
|
|
|
|
ptrlen algorithm, blob, signature;
|
|
|
|
const ssh_keyalg *keyalg;
|
|
|
|
ssh_key *key;
|
|
|
|
strbuf *sigdata;
|
|
|
|
|
|
|
|
s->this_method = AUTHMETHOD_PUBLICKEY;
|
|
|
|
if (!(s->methods & s->this_method))
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
has_signature = get_bool(pktin);
|
|
|
|
algorithm = get_string(pktin);
|
|
|
|
blob = get_string(pktin);
|
|
|
|
|
|
|
|
if (!auth_publickey(s->authpolicy, s->username, blob))
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
keyalg = find_pubkey_alg_len(algorithm);
|
|
|
|
if (!keyalg)
|
|
|
|
goto failure;
|
|
|
|
key = ssh_key_new_pub(keyalg, blob);
|
|
|
|
if (!key)
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
if (!has_signature) {
|
|
|
|
ssh_key_free(key);
|
|
|
|
pktout = ssh_bpp_new_pktout(
|
|
|
|
s->ppl.bpp, SSH2_MSG_USERAUTH_PK_OK);
|
|
|
|
put_stringpl(pktout, algorithm);
|
|
|
|
put_stringpl(pktout, blob);
|
|
|
|
pq_push(s->ppl.out_pq, pktout);
|
|
|
|
continue; /* skip USERAUTH_{SUCCESS,FAILURE} epilogue */
|
|
|
|
}
|
|
|
|
|
|
|
|
sigdata = strbuf_new();
|
|
|
|
ssh2_userauth_server_add_session_id(s, sigdata);
|
|
|
|
put_byte(sigdata, SSH2_MSG_USERAUTH_REQUEST);
|
|
|
|
put_stringpl(sigdata, s->username);
|
|
|
|
put_stringpl(sigdata, s->service);
|
|
|
|
put_stringpl(sigdata, s->method);
|
|
|
|
put_bool(sigdata, has_signature);
|
|
|
|
put_stringpl(sigdata, algorithm);
|
|
|
|
put_stringpl(sigdata, blob);
|
|
|
|
|
|
|
|
signature = get_string(pktin);
|
|
|
|
success = ssh_key_verify(key, signature,
|
|
|
|
ptrlen_from_strbuf(sigdata));
|
|
|
|
ssh_key_free(key);
|
|
|
|
strbuf_free(sigdata);
|
|
|
|
|
|
|
|
if (!success)
|
|
|
|
goto failure;
|
2018-10-22 19:32:58 +00:00
|
|
|
} else if (ptrlen_eq_string(s->method, "keyboard-interactive")) {
|
|
|
|
int i, ok;
|
|
|
|
unsigned n;
|
|
|
|
|
|
|
|
s->this_method = AUTHMETHOD_KBDINT;
|
|
|
|
if (!(s->methods & s->this_method))
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
do {
|
|
|
|
s->aki = auth_kbdint_prompts(s->authpolicy, s->username);
|
|
|
|
if (!s->aki)
|
|
|
|
goto failure;
|
|
|
|
|
|
|
|
pktout = ssh_bpp_new_pktout(
|
|
|
|
s->ppl.bpp, SSH2_MSG_USERAUTH_INFO_REQUEST);
|
|
|
|
put_stringz(pktout, s->aki->title);
|
|
|
|
put_stringz(pktout, s->aki->instruction);
|
|
|
|
put_stringz(pktout, ""); /* language tag */
|
|
|
|
put_uint32(pktout, s->aki->nprompts);
|
|
|
|
for (i = 0; i < s->aki->nprompts; i++) {
|
|
|
|
put_stringz(pktout, s->aki->prompts[i].prompt);
|
|
|
|
put_bool(pktout, s->aki->prompts[i].echo);
|
|
|
|
}
|
|
|
|
pq_push(s->ppl.out_pq, pktout);
|
|
|
|
|
|
|
|
crMaybeWaitUntilV(
|
|
|
|
(pktin = ssh2_userauth_server_pop(s)) != NULL);
|
|
|
|
if (pktin->type != SSH2_MSG_USERAUTH_INFO_RESPONSE) {
|
|
|
|
ssh_proto_error(
|
|
|
|
s->ppl.ssh, "Received unexpected packet when "
|
|
|
|
"expecting USERAUTH_INFO_RESPONSE, type %d (%s)",
|
|
|
|
pktin->type,
|
|
|
|
ssh2_pkt_type(s->ppl.bpp->pls->kctx,
|
|
|
|
s->ppl.bpp->pls->actx, pktin->type));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
n = get_uint32(pktin);
|
|
|
|
if (n != s->aki->nprompts) {
|
|
|
|
ssh_proto_error(
|
|
|
|
s->ppl.ssh, "Received %u keyboard-interactive "
|
|
|
|
"responses after sending %u prompts",
|
|
|
|
n, s->aki->nprompts);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
ptrlen *responses = snewn(s->aki->nprompts, ptrlen);
|
|
|
|
for (i = 0; i < s->aki->nprompts; i++)
|
|
|
|
responses[i] = get_string(pktin);
|
|
|
|
ok = auth_kbdint_responses(s->authpolicy, responses);
|
|
|
|
sfree(responses);
|
|
|
|
}
|
|
|
|
|
|
|
|
free_auth_kbdint(s->aki);
|
|
|
|
s->aki = NULL;
|
|
|
|
} while (ok == 0);
|
|
|
|
|
|
|
|
if (ok <= 0)
|
|
|
|
goto failure;
|
Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
} else {
|
|
|
|
goto failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we get here, we've successfully completed this
|
|
|
|
* authentication step.
|
|
|
|
*/
|
|
|
|
if (auth_successful(s->authpolicy, s->username, s->this_method)) {
|
|
|
|
/*
|
|
|
|
* ... and it was the last one, so we're completely done.
|
|
|
|
*/
|
|
|
|
pktout = ssh_bpp_new_pktout(s->ppl.bpp, SSH2_MSG_USERAUTH_SUCCESS);
|
|
|
|
pq_push(s->ppl.out_pq, pktout);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* ... but another is required, so fall through to
|
|
|
|
* generation of USERAUTH_FAILURE, having first refreshed
|
|
|
|
* the bit mask of available methods.
|
|
|
|
*/
|
|
|
|
s->methods = auth_methods(s->authpolicy);
|
|
|
|
}
|
|
|
|
s->partial_success = TRUE;
|
|
|
|
|
|
|
|
failure:
|
|
|
|
pktout = ssh_bpp_new_pktout(s->ppl.bpp, SSH2_MSG_USERAUTH_FAILURE);
|
|
|
|
{
|
|
|
|
strbuf *list = strbuf_new();
|
|
|
|
if (s->methods & AUTHMETHOD_NONE)
|
|
|
|
add_to_commasep(list, "none");
|
|
|
|
if (s->methods & AUTHMETHOD_PASSWORD)
|
|
|
|
add_to_commasep(list, "password");
|
|
|
|
if (s->methods & AUTHMETHOD_PUBLICKEY)
|
|
|
|
add_to_commasep(list, "publickey");
|
2018-10-22 19:32:58 +00:00
|
|
|
if (s->methods & AUTHMETHOD_KBDINT)
|
|
|
|
add_to_commasep(list, "keyboard-interactive");
|
Add an actual SSH server program.
This server is NOT SECURE! If anyone is reading this commit message,
DO NOT DEPLOY IT IN A HOSTILE-FACING ENVIRONMENT! Its purpose is to
speak the server end of everything PuTTY speaks on the client side, so
that I can test that I haven't broken PuTTY when I reorganise its
code, even things like RSA key exchange or chained auth methods which
it's hard to find a server that speaks at all.
(For this reason, it's declared with [UT] in the Recipe file, so that
it falls into the same category as programs like testbn, which won't
be installed by 'make install'.)
Working title is 'Uppity', partly for 'Universal PuTTY Protocol
Interaction Test Yoke', but mostly because it looks quite like the
word 'PuTTY' with part of it reversed. (Apparently 'test yoke' is a
very rarely used term meaning something not altogether unlike 'test
harness', which is a bit of a stretch, but it'll do.)
It doesn't actually _support_ everything I want yet. At the moment,
it's a proof of concept only. But it has most of the machinery
present, and the parts it's missing - such as chained auth methods -
should be easy enough to add because I've built in the required
flexibility, in the form of an AuthPolicy object which can request
them if it wants to. However, the current AuthPolicy object is
entirely trivial, and will let in any user with the password "weasel".
(Another way in which this is not a production-ready server is that it
also has no interaction with the OS's authentication system. In
particular, it will not only let in any user with the same password,
but it won't even change uid - it will open shells and forwardings
under whatever user id you started it up as.)
Currently, the program can only speak the SSH protocol on its standard
I/O channels (using the new FdSocket facility), so if you want it to
listen on a network port, you'll have to run it from some kind of
separate listening program similar to inetd. For my own tests, I'm not
even doing that: I'm just having PuTTY spawn it as a local proxy
process, which also conveniently eliminates the risk of anyone hostile
connecting to it.
The bulk of the actual code reorganisation is already done by previous
commits, so this change is _mostly_ just dropping in a new set of
server-specific source files alongside the client-specific ones I
created recently. The remaining changes in the shared SSH code are
numerous, but all minor:
- a few extra parameters to BPP and PPL constructors (e.g. 'are you
in server mode?'), and pass both sets of SSH-1 protocol flags from
the login to the connection layer
- in server mode, unconditionally send our version string _before_
waiting for the remote one
- a new hook in the SSH-1 BPP to handle enabling compression in
server mode, where the message exchange works the other way round
- new code in the SSH-2 BPP to do _deferred_ compression the other
way round (the non-deferred version is still nicely symmetric)
- in the SSH-2 transport layer, some adjustments to do key derivation
either way round (swapping round the identifying letters in the
various hash preimages, and making sure to list the KEXINITs in the
right order)
- also in the SSH-2 transport layer, an if statement that controls
whether we send SERVICE_REQUEST and wait for SERVICE_ACCEPT, or
vice versa
- new ConnectionLayer methods for opening outgoing channels for X and
agent forwardings
- new functions in portfwd.c to establish listening sockets suitable
for remote-to-local port forwarding (i.e. not under the direction
of a Conf the way it's done on the client side).
2018-10-20 21:09:54 +00:00
|
|
|
put_stringsb(pktout, list);
|
|
|
|
}
|
|
|
|
put_bool(pktout, s->partial_success);
|
|
|
|
pq_push(s->ppl.out_pq, pktout);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally, hand over to our successor layer, and return
|
|
|
|
* immediately without reaching the crFinishV: ssh_ppl_replace
|
|
|
|
* will have freed us, so crFinishV's zeroing-out of crState would
|
|
|
|
* be a use-after-free bug.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
PacketProtocolLayer *successor = s->successor_layer;
|
|
|
|
s->successor_layer = NULL; /* avoid freeing it ourself */
|
|
|
|
ssh_ppl_replace(&s->ppl, successor);
|
|
|
|
return; /* we've just freed s, so avoid even touching s->crState */
|
|
|
|
}
|
|
|
|
|
|
|
|
crFinishV;
|
|
|
|
}
|