2001-01-22 14:34:52 +03:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2003-01-10 21:33:35 +03:00
|
|
|
#include <assert.h>
|
2003-01-11 12:31:54 +03:00
|
|
|
#include <time.h>
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
#include "putty.h"
|
|
|
|
#include "ssh.h"
|
|
|
|
|
|
|
|
#define GET_32BIT_LSB_FIRST(cp) \
|
|
|
|
(((unsigned long)(unsigned char)(cp)[0]) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[1] << 8) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[2] << 16) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[3] << 24))
|
|
|
|
|
|
|
|
#define PUT_32BIT_LSB_FIRST(cp, value) ( \
|
2003-01-12 17:11:38 +03:00
|
|
|
(cp)[0] = (char)(value), \
|
|
|
|
(cp)[1] = (char)((value) >> 8), \
|
|
|
|
(cp)[2] = (char)((value) >> 16), \
|
|
|
|
(cp)[3] = (char)((value) >> 24) )
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
#define GET_16BIT_LSB_FIRST(cp) \
|
|
|
|
(((unsigned long)(unsigned char)(cp)[0]) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[1] << 8))
|
|
|
|
|
|
|
|
#define PUT_16BIT_LSB_FIRST(cp, value) ( \
|
2003-01-12 17:11:38 +03:00
|
|
|
(cp)[0] = (char)(value), \
|
|
|
|
(cp)[1] = (char)((value) >> 8) )
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
#define GET_32BIT_MSB_FIRST(cp) \
|
|
|
|
(((unsigned long)(unsigned char)(cp)[0] << 24) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[1] << 16) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[2] << 8) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[3]))
|
|
|
|
|
|
|
|
#define PUT_32BIT_MSB_FIRST(cp, value) ( \
|
2003-01-12 17:11:38 +03:00
|
|
|
(cp)[0] = (char)((value) >> 24), \
|
|
|
|
(cp)[1] = (char)((value) >> 16), \
|
|
|
|
(cp)[2] = (char)((value) >> 8), \
|
|
|
|
(cp)[3] = (char)(value) )
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
#define GET_16BIT_MSB_FIRST(cp) \
|
|
|
|
(((unsigned long)(unsigned char)(cp)[0] << 8) | \
|
|
|
|
((unsigned long)(unsigned char)(cp)[1]))
|
|
|
|
|
|
|
|
#define PUT_16BIT_MSB_FIRST(cp, value) ( \
|
2003-01-12 17:11:38 +03:00
|
|
|
(cp)[0] = (char)((value) >> 8), \
|
|
|
|
(cp)[1] = (char)(value) )
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
#define GET_16BIT(endian, cp) \
|
|
|
|
(endian=='B' ? GET_16BIT_MSB_FIRST(cp) : GET_16BIT_LSB_FIRST(cp))
|
|
|
|
|
|
|
|
#define PUT_16BIT(endian, cp, val) \
|
|
|
|
(endian=='B' ? PUT_16BIT_MSB_FIRST(cp, val) : PUT_16BIT_LSB_FIRST(cp, val))
|
|
|
|
|
2003-01-10 21:33:35 +03:00
|
|
|
const char *const x11_authnames[] = {
|
2003-01-11 12:31:54 +03:00
|
|
|
"", "MIT-MAGIC-COOKIE-1", "XDM-AUTHORIZATION-1"
|
2003-01-10 21:33:35 +03:00
|
|
|
};
|
|
|
|
|
2002-10-26 15:23:15 +04:00
|
|
|
struct X11Auth {
|
2003-01-10 21:33:35 +03:00
|
|
|
unsigned char fakedata[64], realdata[64];
|
|
|
|
int fakeproto, realproto;
|
|
|
|
int fakelen, reallen;
|
2002-10-26 15:23:15 +04:00
|
|
|
};
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
struct X11Private {
|
2002-10-26 15:23:15 +04:00
|
|
|
const struct plug_function_table *fn;
|
2001-03-13 13:22:45 +03:00
|
|
|
/* the above variable absolutely *must* be the first in this structure */
|
2001-05-06 18:35:20 +04:00
|
|
|
unsigned char firstpkt[12]; /* first X data packet */
|
2002-10-26 15:23:15 +04:00
|
|
|
struct X11Auth *auth;
|
2001-01-22 14:34:52 +03:00
|
|
|
char *auth_protocol;
|
|
|
|
unsigned char *auth_data;
|
|
|
|
int data_read, auth_plen, auth_psize, auth_dlen, auth_dsize;
|
|
|
|
int verified;
|
2001-08-25 21:09:23 +04:00
|
|
|
int throttled, throttle_override;
|
2003-01-12 17:11:38 +03:00
|
|
|
unsigned long peer_ip;
|
|
|
|
int peer_port;
|
2001-05-06 18:35:20 +04:00
|
|
|
void *c; /* data used by ssh.c */
|
2001-03-13 13:22:45 +03:00
|
|
|
Socket s;
|
2001-01-22 14:34:52 +03:00
|
|
|
};
|
|
|
|
|
2002-10-26 15:23:15 +04:00
|
|
|
void *x11_invent_auth(char *proto, int protomaxlen,
|
2003-01-12 17:11:38 +03:00
|
|
|
char *data, int datamaxlen, int proto_id)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2003-03-29 19:14:26 +03:00
|
|
|
struct X11Auth *auth = snew(struct X11Auth);
|
2001-01-22 14:34:52 +03:00
|
|
|
char ourdata[64];
|
|
|
|
int i;
|
|
|
|
|
2003-01-12 17:11:38 +03:00
|
|
|
if (proto_id == X11_MIT) {
|
|
|
|
auth->fakeproto = X11_MIT;
|
2003-01-10 21:33:35 +03:00
|
|
|
|
2003-01-12 17:11:38 +03:00
|
|
|
/* MIT-MAGIC-COOKIE-1. Cookie size is 128 bits (16 bytes). */
|
|
|
|
auth->fakelen = 16;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
auth->fakedata[i] = random_byte();
|
|
|
|
} else {
|
|
|
|
assert(proto_id == X11_XDM);
|
|
|
|
auth->fakeproto = X11_XDM;
|
|
|
|
|
|
|
|
/* XDM-AUTHORIZATION-1. Cookie size is 16 bytes; byte 8 is zero. */
|
|
|
|
auth->fakelen = 16;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
auth->fakedata[i] = (i == 8 ? 0 : random_byte());
|
|
|
|
}
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
/* Now format for the recipient. */
|
2003-01-10 21:33:35 +03:00
|
|
|
strncpy(proto, x11_authnames[auth->fakeproto], protomaxlen);
|
2001-01-22 14:34:52 +03:00
|
|
|
ourdata[0] = '\0';
|
2003-01-10 21:33:35 +03:00
|
|
|
for (i = 0; i < auth->fakelen; i++)
|
|
|
|
sprintf(ourdata + strlen(ourdata), "%02x", auth->fakedata[i]);
|
2001-01-22 14:34:52 +03:00
|
|
|
strncpy(data, ourdata, datamaxlen);
|
2002-10-26 15:23:15 +04:00
|
|
|
|
|
|
|
return auth;
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|
|
|
|
|
2003-01-16 02:30:21 +03:00
|
|
|
void x11_free_auth(void *auth)
|
|
|
|
{
|
|
|
|
|
|
|
|
sfree(auth);
|
|
|
|
}
|
|
|
|
|
2003-01-10 21:33:35 +03:00
|
|
|
/*
|
|
|
|
* Fetch the real auth data for a given display string, and store
|
|
|
|
* it in an X11Auth structure. Returns NULL on success, or an error
|
|
|
|
* string.
|
|
|
|
*/
|
|
|
|
void x11_get_real_auth(void *authv, char *display)
|
|
|
|
{
|
|
|
|
struct X11Auth *auth = (struct X11Auth *)authv;
|
|
|
|
|
|
|
|
auth->realproto = X11_NO_AUTH; /* in case next call does nothing */
|
|
|
|
|
|
|
|
auth->reallen = sizeof(auth->realdata);
|
|
|
|
platform_get_x11_auth(display, &auth->realproto,
|
|
|
|
auth->realdata, &auth->reallen);
|
|
|
|
}
|
|
|
|
|
2003-01-12 17:11:38 +03:00
|
|
|
static char *x11_verify(unsigned long peer_ip, int peer_port,
|
|
|
|
struct X11Auth *auth, char *proto,
|
|
|
|
unsigned char *data, int dlen)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2003-01-10 21:33:35 +03:00
|
|
|
if (strcmp(proto, x11_authnames[auth->fakeproto]) != 0)
|
2003-01-12 17:11:38 +03:00
|
|
|
return "wrong authentication protocol attempted";
|
2003-01-10 21:33:35 +03:00
|
|
|
if (auth->fakeproto == X11_MIT) {
|
|
|
|
if (dlen != auth->fakelen)
|
2003-01-12 17:11:38 +03:00
|
|
|
return "MIT-MAGIC-COOKIE-1 data was wrong length";
|
2003-01-10 21:33:35 +03:00
|
|
|
if (memcmp(auth->fakedata, data, dlen) != 0)
|
2003-01-12 17:11:38 +03:00
|
|
|
return "MIT-MAGIC-COOKIE-1 data did not match";
|
|
|
|
}
|
|
|
|
if (auth->fakeproto == X11_XDM) {
|
|
|
|
unsigned long t;
|
|
|
|
time_t tim;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (dlen != 24)
|
|
|
|
return "XDM-AUTHORIZATION-1 data was wrong length";
|
|
|
|
if (peer_port == -1)
|
|
|
|
return "cannot do XDM-AUTHORIZATION-1 without remote address data";
|
|
|
|
des_decrypt_xdmauth(auth->fakedata+9, data, 24);
|
|
|
|
if (memcmp(auth->fakedata, data, 8) != 0)
|
|
|
|
return "XDM-AUTHORIZATION-1 data failed check"; /* cookie wrong */
|
|
|
|
if (GET_32BIT_MSB_FIRST(data+8) != peer_ip)
|
|
|
|
return "XDM-AUTHORIZATION-1 data failed check"; /* IP wrong */
|
|
|
|
if ((int)GET_16BIT_MSB_FIRST(data+12) != peer_port)
|
|
|
|
return "XDM-AUTHORIZATION-1 data failed check"; /* port wrong */
|
|
|
|
t = GET_32BIT_MSB_FIRST(data+14);
|
|
|
|
for (i = 18; i < 24; i++)
|
|
|
|
if (data[i] != 0) /* zero padding wrong */
|
|
|
|
return "XDM-AUTHORIZATION-1 data failed check";
|
|
|
|
tim = time(NULL);
|
|
|
|
if (abs(t - tim) > 20*60) /* 20 minute clock skew should be OK */
|
|
|
|
return "XDM-AUTHORIZATION-1 time stamp was too far out";
|
2003-01-10 21:33:35 +03:00
|
|
|
}
|
|
|
|
/* implement other protocols here if ever required */
|
2003-01-12 17:11:38 +03:00
|
|
|
return NULL;
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|
|
|
|
|
2001-05-06 18:35:20 +04:00
|
|
|
static int x11_closing(Plug plug, char *error_msg, int error_code,
|
|
|
|
int calling_back)
|
|
|
|
{
|
2001-03-13 13:22:45 +03:00
|
|
|
struct X11Private *pr = (struct X11Private *) plug;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have no way to communicate down the forwarded connection,
|
|
|
|
* so if an error occurred on the socket, we just ignore it
|
|
|
|
* and treat it like a proper close.
|
|
|
|
*/
|
|
|
|
sshfwd_close(pr->c);
|
|
|
|
x11_close(pr->s);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2001-05-06 18:35:20 +04:00
|
|
|
static int x11_receive(Plug plug, int urgent, char *data, int len)
|
|
|
|
{
|
2001-03-13 13:22:45 +03:00
|
|
|
struct X11Private *pr = (struct X11Private *) plug;
|
2001-01-22 14:34:52 +03:00
|
|
|
|
2001-08-25 21:09:23 +04:00
|
|
|
if (sshfwd_write(pr->c, data, len) > 0) {
|
|
|
|
pr->throttled = 1;
|
|
|
|
sk_set_frozen(pr->s, 1);
|
|
|
|
}
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2001-08-25 21:09:23 +04:00
|
|
|
static void x11_sent(Plug plug, int bufsize)
|
|
|
|
{
|
|
|
|
struct X11Private *pr = (struct X11Private *) plug;
|
|
|
|
|
|
|
|
sshfwd_unthrottle(pr->c, bufsize);
|
|
|
|
}
|
|
|
|
|
2003-01-02 13:41:22 +03:00
|
|
|
/*
|
|
|
|
* When setting up X forwarding, we should send the screen number
|
|
|
|
* from the specified local display. This function extracts it from
|
|
|
|
* the display string.
|
|
|
|
*/
|
|
|
|
int x11_get_screen_number(char *display)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
n = strcspn(display, ":");
|
|
|
|
if (!display[n])
|
|
|
|
return 0;
|
|
|
|
n = strcspn(display, ".");
|
|
|
|
if (!display[n])
|
|
|
|
return 0;
|
|
|
|
return atoi(display + n + 1);
|
|
|
|
}
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
/*
|
|
|
|
* Called to set up the raw connection.
|
|
|
|
*
|
|
|
|
* Returns an error message, or NULL on success.
|
|
|
|
* also, fills the SocketsStructure
|
|
|
|
*/
|
2003-01-12 17:11:38 +03:00
|
|
|
char *x11_init(Socket * s, char *display, void *c, void *auth,
|
2003-01-12 18:26:10 +03:00
|
|
|
const char *peeraddr, int peerport, const Config *cfg)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2002-10-26 15:23:15 +04:00
|
|
|
static const struct plug_function_table fn_table = {
|
2001-03-13 13:22:45 +03:00
|
|
|
x11_closing,
|
2001-08-25 21:09:23 +04:00
|
|
|
x11_receive,
|
|
|
|
x11_sent,
|
|
|
|
NULL
|
2001-03-13 13:22:45 +03:00
|
|
|
};
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
SockAddr addr;
|
|
|
|
int port;
|
2001-01-23 14:02:02 +03:00
|
|
|
char *err, *dummy_realhost;
|
2001-01-22 14:34:52 +03:00
|
|
|
char host[128];
|
|
|
|
int n, displaynum;
|
|
|
|
struct X11Private *pr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Split up display name into host and display-number parts.
|
|
|
|
*/
|
|
|
|
n = strcspn(display, ":");
|
|
|
|
if (display[n])
|
2001-05-06 18:35:20 +04:00
|
|
|
displaynum = atoi(display + n + 1);
|
2001-01-22 14:34:52 +03:00
|
|
|
else
|
2001-05-06 18:35:20 +04:00
|
|
|
displaynum = 0; /* sensible default */
|
|
|
|
if (n > sizeof(host) - 1)
|
|
|
|
n = sizeof(host) - 1;
|
2003-01-02 13:45:56 +03:00
|
|
|
if (n > 0) {
|
|
|
|
strncpy(host, display, n);
|
|
|
|
host[n] = '\0';
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Local display numbers, particularly on Unix, often omit
|
|
|
|
* the display part completely.
|
|
|
|
*/
|
|
|
|
strcpy(host, "localhost");
|
|
|
|
}
|
2001-01-22 14:34:52 +03:00
|
|
|
|
2003-01-06 01:52:11 +03:00
|
|
|
port = 6000 + displaynum;
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
/*
|
|
|
|
* Try to find host.
|
|
|
|
*/
|
2003-01-12 18:26:10 +03:00
|
|
|
addr = name_lookup(host, port, &dummy_realhost, cfg);
|
2003-01-05 17:23:30 +03:00
|
|
|
if ((err = sk_addr_error(addr)) != NULL)
|
2001-01-22 14:34:52 +03:00
|
|
|
return err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open socket.
|
|
|
|
*/
|
2003-03-29 19:14:26 +03:00
|
|
|
pr = snew(struct X11Private);
|
2001-03-13 13:22:45 +03:00
|
|
|
pr->fn = &fn_table;
|
2001-01-22 14:34:52 +03:00
|
|
|
pr->auth_protocol = NULL;
|
2002-10-26 15:23:15 +04:00
|
|
|
pr->auth = (struct X11Auth *)auth;
|
2001-01-22 14:34:52 +03:00
|
|
|
pr->verified = 0;
|
|
|
|
pr->data_read = 0;
|
2001-08-25 21:09:23 +04:00
|
|
|
pr->throttled = pr->throttle_override = 0;
|
2001-01-22 14:34:52 +03:00
|
|
|
pr->c = c;
|
|
|
|
|
2003-01-12 18:26:10 +03:00
|
|
|
pr->s = *s = new_connection(addr, dummy_realhost, port,
|
|
|
|
0, 1, 0, (Plug) pr, cfg);
|
2003-01-05 17:23:30 +03:00
|
|
|
if ((err = sk_socket_error(*s)) != NULL) {
|
2001-05-06 18:35:20 +04:00
|
|
|
sfree(pr);
|
2001-03-13 13:22:45 +03:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2003-01-12 17:11:38 +03:00
|
|
|
/*
|
|
|
|
* See if we can make sense of the peer address we were given.
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int i[4];
|
|
|
|
if (peeraddr &&
|
|
|
|
4 == sscanf(peeraddr, "%d.%d.%d.%d", i+0, i+1, i+2, i+3)) {
|
|
|
|
pr->peer_ip = (i[0] << 24) | (i[1] << 16) | (i[2] << 8) | i[3];
|
|
|
|
pr->peer_port = peerport;
|
|
|
|
} else {
|
|
|
|
pr->peer_ip = 0;
|
|
|
|
pr->peer_port = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
sk_set_private_ptr(*s, pr);
|
|
|
|
sk_addr_free(addr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2001-05-06 18:35:20 +04:00
|
|
|
void x11_close(Socket s)
|
|
|
|
{
|
|
|
|
struct X11Private *pr;
|
2001-08-09 00:44:35 +04:00
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
pr = (struct X11Private *) sk_get_private_ptr(s);
|
2001-01-22 14:34:52 +03:00
|
|
|
if (pr->auth_protocol) {
|
2001-05-06 18:35:20 +04:00
|
|
|
sfree(pr->auth_protocol);
|
|
|
|
sfree(pr->auth_data);
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
sfree(pr);
|
|
|
|
|
|
|
|
sk_close(s);
|
|
|
|
}
|
|
|
|
|
2001-08-25 21:09:23 +04:00
|
|
|
void x11_unthrottle(Socket s)
|
|
|
|
{
|
|
|
|
struct X11Private *pr;
|
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
pr = (struct X11Private *) sk_get_private_ptr(s);
|
|
|
|
|
|
|
|
pr->throttled = 0;
|
|
|
|
sk_set_frozen(s, pr->throttled || pr->throttle_override);
|
|
|
|
}
|
|
|
|
|
|
|
|
void x11_override_throttle(Socket s, int enable)
|
|
|
|
{
|
|
|
|
struct X11Private *pr;
|
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
pr = (struct X11Private *) sk_get_private_ptr(s);
|
|
|
|
|
|
|
|
pr->throttle_override = enable;
|
|
|
|
sk_set_frozen(s, pr->throttled || pr->throttle_override);
|
|
|
|
}
|
|
|
|
|
2001-01-22 14:34:52 +03:00
|
|
|
/*
|
|
|
|
* Called to send data down the raw connection.
|
|
|
|
*/
|
2001-08-25 21:09:23 +04:00
|
|
|
int x11_send(Socket s, char *data, int len)
|
2001-05-06 18:35:20 +04:00
|
|
|
{
|
2003-04-25 20:42:36 +04:00
|
|
|
struct X11Private *pr;
|
|
|
|
if (!s)
|
2001-08-25 21:09:23 +04:00
|
|
|
return 0;
|
2003-04-25 20:42:36 +04:00
|
|
|
pr = (struct X11Private *) sk_get_private_ptr(s);
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the first packet.
|
|
|
|
*/
|
|
|
|
while (len > 0 && pr->data_read < 12)
|
2001-05-06 18:35:20 +04:00
|
|
|
pr->firstpkt[pr->data_read++] = (unsigned char) (len--, *data++);
|
2001-01-22 14:34:52 +03:00
|
|
|
if (pr->data_read < 12)
|
2001-08-25 21:09:23 +04:00
|
|
|
return 0;
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have not allocated the auth_protocol and auth_data
|
|
|
|
* strings, do so now.
|
|
|
|
*/
|
|
|
|
if (!pr->auth_protocol) {
|
2001-05-06 18:35:20 +04:00
|
|
|
pr->auth_plen = GET_16BIT(pr->firstpkt[0], pr->firstpkt + 6);
|
|
|
|
pr->auth_dlen = GET_16BIT(pr->firstpkt[0], pr->firstpkt + 8);
|
|
|
|
pr->auth_psize = (pr->auth_plen + 3) & ~3;
|
|
|
|
pr->auth_dsize = (pr->auth_dlen + 3) & ~3;
|
|
|
|
/* Leave room for a terminating zero, to make our lives easier. */
|
2003-03-29 19:14:26 +03:00
|
|
|
pr->auth_protocol = snewn(pr->auth_psize + 1, char);
|
2003-03-30 03:05:36 +04:00
|
|
|
pr->auth_data = snewn(pr->auth_dsize, unsigned char);
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the auth_protocol and auth_data strings.
|
|
|
|
*/
|
|
|
|
while (len > 0 && pr->data_read < 12 + pr->auth_psize)
|
2001-05-06 18:35:20 +04:00
|
|
|
pr->auth_protocol[pr->data_read++ - 12] = (len--, *data++);
|
2001-01-22 14:34:52 +03:00
|
|
|
while (len > 0 && pr->data_read < 12 + pr->auth_psize + pr->auth_dsize)
|
2001-05-06 18:35:20 +04:00
|
|
|
pr->auth_data[pr->data_read++ - 12 -
|
|
|
|
pr->auth_psize] = (unsigned char) (len--, *data++);
|
2001-01-22 14:34:52 +03:00
|
|
|
if (pr->data_read < 12 + pr->auth_psize + pr->auth_dsize)
|
2001-08-25 21:09:23 +04:00
|
|
|
return 0;
|
2001-01-22 14:34:52 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If we haven't verified the authentication, do so now.
|
|
|
|
*/
|
|
|
|
if (!pr->verified) {
|
2003-01-12 17:11:38 +03:00
|
|
|
char *err;
|
2001-05-06 18:35:20 +04:00
|
|
|
|
|
|
|
pr->auth_protocol[pr->auth_plen] = '\0'; /* ASCIZ */
|
2003-01-12 17:11:38 +03:00
|
|
|
err = x11_verify(pr->peer_ip, pr->peer_port,
|
|
|
|
pr->auth, pr->auth_protocol,
|
2002-10-26 15:23:15 +04:00
|
|
|
pr->auth_data, pr->auth_dlen);
|
2001-05-06 18:35:20 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If authentication failed, construct and send an error
|
|
|
|
* packet, then terminate the connection.
|
|
|
|
*/
|
2003-01-12 17:11:38 +03:00
|
|
|
if (err) {
|
|
|
|
char *message;
|
|
|
|
int msglen, msgsize;
|
|
|
|
unsigned char *reply;
|
|
|
|
|
|
|
|
message = dupprintf("PuTTY X11 proxy: %s", err);
|
|
|
|
msglen = strlen(message);
|
2003-03-29 19:14:26 +03:00
|
|
|
reply = snewn(8 + msglen+1 + 4, unsigned char); /* include zero */
|
2003-01-12 17:11:38 +03:00
|
|
|
msgsize = (msglen + 3) & ~3;
|
2001-05-06 18:35:20 +04:00
|
|
|
reply[0] = 0; /* failure */
|
|
|
|
reply[1] = msglen; /* length of reason string */
|
|
|
|
memcpy(reply + 2, pr->firstpkt + 2, 4); /* major/minor proto vsn */
|
2001-08-28 16:24:50 +04:00
|
|
|
PUT_16BIT(pr->firstpkt[0], reply + 6, msgsize >> 2);/* data len */
|
2001-05-06 18:35:20 +04:00
|
|
|
memset(reply + 8, 0, msgsize);
|
|
|
|
memcpy(reply + 8, message, msglen);
|
2003-01-05 17:20:49 +03:00
|
|
|
sshfwd_write(pr->c, (char *)reply, 8 + msgsize);
|
2001-05-06 18:35:20 +04:00
|
|
|
sshfwd_close(pr->c);
|
|
|
|
x11_close(s);
|
2003-01-12 17:11:38 +03:00
|
|
|
sfree(reply);
|
|
|
|
sfree(message);
|
2001-08-25 21:09:23 +04:00
|
|
|
return 0;
|
2001-05-06 18:35:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we know we're going to accept the connection. Strip
|
2003-01-10 21:33:35 +03:00
|
|
|
* the fake auth data, and optionally put real auth data in
|
|
|
|
* instead.
|
2001-05-06 18:35:20 +04:00
|
|
|
*/
|
2003-01-10 21:33:35 +03:00
|
|
|
{
|
|
|
|
char realauthdata[64];
|
|
|
|
int realauthlen = 0;
|
|
|
|
int authstrlen = strlen(x11_authnames[pr->auth->realproto]);
|
2003-01-11 12:31:54 +03:00
|
|
|
unsigned long ip;
|
|
|
|
int port;
|
2003-01-10 21:33:35 +03:00
|
|
|
static const char zeroes[4] = { 0,0,0,0 };
|
|
|
|
|
|
|
|
if (pr->auth->realproto == X11_MIT) {
|
|
|
|
assert(pr->auth->reallen <= lenof(realauthdata));
|
|
|
|
realauthlen = pr->auth->reallen;
|
|
|
|
memcpy(realauthdata, pr->auth->realdata, realauthlen);
|
2003-01-11 12:31:54 +03:00
|
|
|
} else if (pr->auth->realproto == X11_XDM &&
|
|
|
|
pr->auth->reallen == 16 &&
|
|
|
|
sk_getxdmdata(s, &ip, &port)) {
|
|
|
|
time_t t;
|
|
|
|
realauthlen = 24;
|
|
|
|
memset(realauthdata, 0, 24);
|
|
|
|
memcpy(realauthdata, pr->auth->realdata, 8);
|
|
|
|
PUT_32BIT_MSB_FIRST(realauthdata+8, ip);
|
|
|
|
PUT_16BIT_MSB_FIRST(realauthdata+12, port);
|
|
|
|
t = time(NULL);
|
|
|
|
PUT_32BIT_MSB_FIRST(realauthdata+14, t);
|
2003-01-11 17:08:46 +03:00
|
|
|
des_encrypt_xdmauth(pr->auth->realdata+9,
|
|
|
|
(unsigned char *)realauthdata, 24);
|
2003-01-11 12:31:54 +03:00
|
|
|
}
|
2003-01-10 21:33:35 +03:00
|
|
|
/* implement other auth methods here if required */
|
|
|
|
|
|
|
|
PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 6, authstrlen);
|
|
|
|
PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 8, realauthlen);
|
|
|
|
|
|
|
|
sk_write(s, (char *)pr->firstpkt, 12);
|
|
|
|
|
|
|
|
if (authstrlen) {
|
|
|
|
sk_write(s, x11_authnames[pr->auth->realproto], authstrlen);
|
|
|
|
sk_write(s, zeroes, 3 & (-authstrlen));
|
|
|
|
}
|
|
|
|
if (realauthlen) {
|
|
|
|
sk_write(s, realauthdata, realauthlen);
|
|
|
|
sk_write(s, zeroes, 3 & (-realauthlen));
|
|
|
|
}
|
|
|
|
}
|
2001-05-06 18:35:20 +04:00
|
|
|
pr->verified = 1;
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* After initialisation, just copy data simply.
|
|
|
|
*/
|
|
|
|
|
2001-08-25 21:09:23 +04:00
|
|
|
return sk_write(s, data, len);
|
2001-01-22 14:34:52 +03:00
|
|
|
}
|