X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Ftransports%2Fsmtp_socks.c;h=c410eceec8f972317c49c59d818eb3c60ad37534;hb=6b69b71028f15c7ba3157bac955103b764326f60;hp=33b25d1da3bde08d24f70b8381de81e3278fbdac;hpb=e6d2a9894df8c3b65920e903ab21076a0a37e20e;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c index 33b25d1da..c410eceec 100644 --- a/src/src/transports/smtp_socks.c +++ b/src/src/transports/smtp_socks.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Jeremy Harris 2015 */ +/* Copyright (c) Jeremy Harris 2015 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* SOCKS version 5 proxy, client-mode */ @@ -74,8 +74,6 @@ sob->priority = SOCKS_PRIORITY; static void socks_option(socks_opts * sob, const uschar * opt) { -const uschar * s; - if (Ustrncmp(opt, "auth=", 5) == 0) { opt += 5; @@ -87,13 +85,13 @@ else if (Ustrncmp(opt, "name=", 5) == 0) else if (Ustrncmp(opt, "pass=", 5) == 0) sob->auth_pwd = opt + 5; else if (Ustrncmp(opt, "port=", 5) == 0) - sob->port = atoi(opt + 5); + sob->port = atoi(CCS opt + 5); else if (Ustrncmp(opt, "tmo=", 4) == 0) - sob->timeout = atoi(opt + 4); + sob->timeout = atoi(CCS opt + 4); else if (Ustrncmp(opt, "pri=", 4) == 0) - sob->priority = atoi(opt + 4); + sob->priority = atoi(CCS opt + 4); else if (Ustrncmp(opt, "weight=", 7) == 0) - sob->weight = atoi(opt + 7); + sob->weight = atoi(CCS opt + 7); return; } @@ -112,7 +110,7 @@ switch(method) case AUTH_NONE: return OK; case AUTH_NAME: - HDEBUG(D_transport|D_acl|D_v) debug_printf(" socks auth NAME '%s' '%s'\n", + HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" socks auth NAME '%s' '%s'\n", sob->auth_name, sob->auth_pwd); i = Ustrlen(sob->auth_name); j = Ustrlen(sob->auth_pwd); @@ -121,21 +119,22 @@ switch(method) len = i + j + 3; HDEBUG(D_transport|D_acl|D_v) { - int i; - debug_printf(" SOCKS>>"); - for (i = 0; i>"); + for (int i = 0; iis_failed && sd->priority > pri) @@ -187,11 +176,11 @@ for (weights = 0, sd = proxies; sd < lim; sd++) if (weights == 0) /* all servers failed */ return -1; -for (rnd = random() % weights, i = 0; i < nproxies; i++) +for (rnd = random_number(weights), i = 0; i < nproxies; i++) { sd = &proxies[i]; if (!sd->is_failed && sd->priority == pri) - if ((rnd -= sd->weight) <= 0) + if ((rnd -= sd->weight) < 0) return i; } @@ -231,8 +220,9 @@ const uschar * state; uschar buf[24]; socks_opts proxies[32]; /* max #proxies handled */ unsigned nproxies; -socks_opts * sob; +socks_opts * sob = NULL; unsigned size; +blob early_data; if (!timeout) timeout = 24*60*60; /* use 1 day for "indefinite" */ tmo = time(NULL) + timeout; @@ -267,6 +257,15 @@ for (nproxies = 0; while ((option = string_nextinlist(&proxy_spec, &subsep, NULL, 0))) socks_option(sob, option); } +if (!sob) return -1; + +/* Set up the socks protocol method-selection message, +for sending on connection */ + +state = US"method select"; +buf[0] = 5; buf[1] = 1; buf[2] = sob->auth_type; +early_data.data = buf; +early_data.len = 3; /* Try proxies until a connection succeeds */ @@ -278,18 +277,19 @@ for(;;) if ((idx = socks_get_proxy(proxies, nproxies)) < 0) { - HDEBUG(D_transport|D_acl|D_v) debug_printf(" no proxies left\n"); + HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" no proxies left\n"); errno = EBUSY; return -1; } sob = &proxies[idx]; /* bodge up a host struct for the proxy */ - proxy.address = sob->proxy_host; + proxy.address = proxy.name = sob->proxy_host; proxy_af = Ustrchr(sob->proxy_host, ':') ? AF_INET6 : AF_INET; + /*XXX we trust that the method-select command is idempotent */ if ((fd = smtp_sock_connect(&proxy, proxy_af, sob->port, - interface, tb, sob->timeout)) >= 0) + interface, tb, sob->timeout, &early_data)) >= 0) { proxy_local_address = string_copy(proxy.address); proxy_local_port = sob->port; @@ -301,22 +301,21 @@ for(;;) } /* Do the socks protocol stuff */ -/* Send method-selection */ -state = US"method select"; -HDEBUG(D_transport|D_acl|D_v) debug_printf(" SOCKS>> 05 01 %02x\n", sob->auth_type); -buf[0] = 5; buf[1] = 1; buf[2] = sob->auth_type; -if (send(fd, buf, 3, 0) < 0) - goto snd_err; +HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" SOCKS>> 05 01 %02x\n", sob->auth_type); /* expect method response */ -if ( !fd_ready(fd, tmo-time(NULL)) +#ifdef TCP_QUICKACK +(void) setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, US &off, sizeof(off)); +#endif + +if ( !fd_ready(fd, tmo) || read(fd, buf, 2) != 2 ) goto rcv_err; HDEBUG(D_transport|D_acl|D_v) - debug_printf(" SOCKS<< %02x %02x\n", buf[0], buf[1]); + debug_printf_indent(" SOCKS<< %02x %02x\n", buf[0], buf[1]); if ( buf[0] != 5 || socks_auth(fd, buf[1], sob, tmo) != OK ) @@ -350,9 +349,8 @@ if ( buf[0] != 5 state = US"connect"; HDEBUG(D_transport|D_acl|D_v) { - int i; - debug_printf(" SOCKS>>"); - for (i = 0; i>"); + for (int i = 0; i>"); - for (i = 0; i>"); + for (int i = 0; i nelem(socks_errs) ? NULL : socks_errs + buf[1]; HDEBUG(D_transport|D_acl|D_v) - debug_printf(" proxy %s: %s\n", state, se ? se->reason : US"unknown error code received"); + debug_printf_indent(" proxy %s: %s\n", state, se ? se->reason : US"unknown error code received"); errno = se ? se->errcode : EPROTO; } rcv_err: - HDEBUG(D_transport|D_acl|D_v) debug_printf(" proxy rcv_err %s: %s\n", state, strerror(errno)); + HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" proxy rcv_err %s: %s\n", state, strerror(errno)); if (!errno) errno = EPROTO; else if (errno == ENOENT) errno = ECONNABORTED; return -1;